fix spec

lavanet · Feb 10, 2025 · 846ae89 · 846ae89
1 parent d8b16f9
commit 846ae89
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 46 deletions.
diff --git a/scripts/pre_setups/init_fvm_only_test.sh → ...pts/pre_setups/init_fvm_only_with_node.sh b/scripts/pre_setups/init_fvm_only_test.sh → ...pts/pre_setups/init_fvm_only_with_node.sh
@@ -9,38 +9,51 @@ rm $LOGS_DIR/*.log
 
 killall screen
 screen -wipe
+
+echo "[Test Setup] installing all binaries"
+make install-all 
+
+echo "[Test Setup] setting up a new lava node"
+screen -d -m -S node bash -c "./scripts/start_env_dev.sh"
+screen -ls
+echo "[Test Setup] sleeping 20 seconds for node to finish setup (if its not enough increase timeout)"
+sleep 5
+wait_for_lava_node_to_start
+
 GASPRICE="0.00002ulava"
 specs=$(get_all_specs)
 lavad tx gov submit-legacy-proposal spec-add $specs --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE &
 wait_next_block
+wait_next_block
 lavad tx gov vote 1 yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE
 sleep 4
 
 # Plans proposal
 lavad tx gov submit-legacy-proposal plans-add ./cookbook/plans/test_plans/default.json,./cookbook/plans/test_plans/temporary-add.json -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE
 wait_next_block
+wait_next_block
 lavad tx gov vote 2 yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE
 
 sleep 4
 
-
 CLIENTSTAKE="500000000000ulava"
 PROVIDERSTAKE="500000000000ulava"
 
-PROVIDER1_LISTENER="127.0.0.1:2221"
+PROVIDER1_LISTENER="127.0.0.1:2220"
 
 lavad tx subscription buy DefaultPlan $(lavad keys show user1 -a) -y --from user1 --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE
 wait_next_block
-lavad tx pairing stake-provider "FVM" $PROVIDERSTAKE "$PROVIDER1_LISTENER,1" 1 $(operator_address) -y --from servicer1 --provider-moniker "dummyMoniker" --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE
+lavad tx pairing stake-provider "FVM" $PROVIDERSTAKE "$PROVIDER1_LISTENER,1" 1 $(operator_address) -y --from servicer1 --provider-moniker "dummyMoniker"  --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE
+
 sleep_until_next_epoch
 
 screen -d -m -S provider1 bash -c "source ~/.bashrc; lavap rpcprovider \
-$PROVIDER1_LISTENER FVM jsonrpc "$FVM_WS" \
-$EXTRA_PROVIDER_FLAGS --geolocation 1 --log_level debug --from servicer1 --chain-id lava 2>&1 | tee $LOGS_DIR/PROVIDER1.log" && sleep 0.25
+$PROVIDER1_LISTENER FVM jsonrpc '$FVM,$FVM_WS' \
+$EXTRA_PROVIDER_FLAGS --geolocation 1 --log_level debug --from servicer1 --chain-id lava --metrics-listen-address ":7776" 2>&1 | tee $LOGS_DIR/PROVIDER1.log" && sleep 0.25
 
 screen -d -m -S consumers bash -c "source ~/.bashrc; lavap rpcconsumer \
 127.0.0.1:3360 FVM jsonrpc \
-$EXTRA_PORTAL_FLAGS --geolocation 1 --log_level debug --from user1 --chain-id lava --allow-insecure-provider-dialing 2>&1 | tee $LOGS_DIR/CONSUMERS.log" && sleep 0.25
+$EXTRA_PORTAL_FLAGS --geolocation 1 --log_level debug --from user1 --chain-id lava --allow-insecure-provider-dialing --metrics-listen-address ":7779" 2>&1 | tee $LOGS_DIR/CONSUMERS.log" && sleep 0.25
 
 echo "--- setting up screens done ---"
 screen -ls
diff --git a/specs/mainnet-1/specs/filecoin.json b/specs/mainnet-1/specs/filecoin.json
@@ -28,14 +28,7 @@
                             "type": "POST",
                             "add_on": ""
                         },
-                        "inheritance_apis": [
-                            {
-                                "api_interface": "jsonrpc",
-                                "internal_path": "WS-ONLY",
-                                "type": "POST",
-                                "add_on": ""
-                            }
-                        ],
+                        "inheritance_apis": [],
                         "apis": [
                             {
                                 "name": "Filecoin.AuthVerify",
@@ -2807,10 +2800,41 @@
                                     "stateful": 0
                                 },
                                 "extra_compute_units": 0
+                            },
+                            {
+                                "name": "Filecoin.ChainNotify",
+                                "block_parsing": {
+                                    "parser_arg": [
+                                        "latest"
+                                    ],
+                                    "parser_func": "DEFAULT"
+                                },
+                                "compute_units": 1000,
+                                "enabled": true,
+                                "category": {
+                                    "deterministic": false,
+                                    "local": false,
+                                    "subscription": true,
+                                    "stateful": 0
+                                },
+                                "extra_compute_units": 0
                             }
                         ],
                         "headers": [],
-                        "parse_directives": [],
+                        "parse_directives": [
+                            {
+                                "function_tag": "SUBSCRIBE",
+                                "api_name": "Filecoin.EthSubscribe"
+                            },
+                            {
+                                "function_tag": "UNSUBSCRIBE",
+                                "api_name": "Filecoin.EthUnsubscribe"
+                            },
+                            {
+                                "function_tag": "SUBSCRIBE",
+                                "api_name": "Filecoin.ChainNotify"
+                            }
+                        ],
                         "verifications": [
                             {
                                 "name": "chain-id",
@@ -2845,37 +2869,7 @@
                                 }
                             }
                         ]
-                    },
-                    {
-                        "enabled": false,
-                        "collection_data": {
-                            "api_interface": "jsonrpc",
-                            "internal_path": "WS-ONLY",
-                            "type": "POST",
-                            "add_on": ""
-                        },
-                        "apis": [
-                            {
-                                "name": "Filecoin.ChainNotify",
-                                "block_parsing": {
-                                    "parser_arg": [
-                                        "latest"
-                                    ],
-                                    "parser_func": "DEFAULT"
-                                },
-                                "compute_units": 10,
-                                "enabled": true,
-                                "category": {
-                                    "deterministic": false,
-                                    "local": false,
-                                    "subscription": false,
-                                    "stateful": 0
-                                },
-                                "extra_compute_units": 0
-                            }
-                        ],
-                        "parse_directives": []
-                    }
+                    }                    
                 ],
                 "contributor": [
                     "lava@16gjdwqfpvk3dyasy83wsr26pk27kjq9wvfz0qy"