From 7a8b73df338845fdcee128932a2434fdaf26311a Mon Sep 17 00:00:00 2001 From: Elad Gildnur Date: Sun, 15 Dec 2024 16:10:31 +0200 Subject: [PATCH] First step: Recover anything but specs --- docker/common/post_node_init.sh | 7 +-- docker/load-balancing/docker-compose.yml | 20 +++---- docker/new-node/docker-compose.yml | 18 +++--- protocol/rpcprovider/rpcprovider.go | 2 +- scripts/automation_scripts/ReadMe.md | 26 +++++---- scripts/automation_scripts/grpc_scaffolder.py | 8 +-- .../automation_scripts/grpc_spec_builder.py | 6 +- .../automation_scripts/inheritence_merger.py | 2 +- .../remove_type_from_grpc_spec_api.py | 8 +-- .../spec_proposal_sorter.py | 2 +- scripts/init_chain_commands.sh | 4 +- scripts/pre_setups/init_aptos_only_test.sh | 3 +- scripts/pre_setups/init_arbitrum_only_test.sh | 3 +- scripts/pre_setups/init_avalanch_only.sh | 3 +- .../pre_setups/init_axelar_only_with_node.sh | 3 +- scripts/pre_setups/init_canto_only_test.sh | 3 +- .../init_celestia_only_with_node.sh | 3 +- scripts/pre_setups/init_eth_archive_mix.sh | 3 +- scripts/pre_setups/init_evmos_only_test.sh | 3 +- .../pre_setups/init_evmos_only_with_node.sh | 3 +- scripts/pre_setups/init_fvm_only_test.sh | 3 +- scripts/pre_setups/init_lava_only_test.sh | 3 +- scripts/pre_setups/init_lava_only_test_5.sh | 3 +- .../init_lava_only_test_with_badge.sh | 3 +- .../pre_setups/init_lava_only_with_node.sh | 3 +- .../init_lava_only_with_node_rate_limit.sh | 3 +- ...nit_lava_only_with_node_three_providers.sh | 3 +- .../init_lava_only_with_node_with_cache.sh | 3 +- ..._lava_only_with_node_with_cache_archive.sh | 3 +- ...t_lava_only_with_node_with_python_proxy.sh | 3 +- ...it_lava_only_with_node_with_relayserver.sh | 3 +- .../pre_setups/init_lava_static_provider.sh | 3 +- scripts/pre_setups/init_moralis_only.sh | 3 +- .../pre_setups/init_near_only_with_node.sh | 3 +- scripts/pre_setups/init_osmosis_only.sh | 3 +- scripts/pre_setups/init_solana_only.sh | 3 +- scripts/pre_setups/init_sqdsubgraph_only.sh | 3 +- .../init_starknet_addons_only_with_node.sh | 3 +- .../pre_setups/setup_lavavisor_dev_test.sh | 3 +- scripts/test/cli_test.sh | 3 +- scripts/test/inich_100_providers.sh | 5 +- scripts/test/init_e2e.sh | 2 +- scripts/test/init_payment_e2e.sh | 2 +- scripts/test/jail_provider_test.sh | 4 +- scripts/test_spec_full.sh | 5 +- scripts/useful_commands.sh | 41 +++++++++++++ testutil/e2e/protocolE2E.go | 11 +++- utils/keeper/spec.go | 58 +++++++++++++++---- x/spec/keeper/spec_test.go | 15 +++-- 49 files changed, 227 insertions(+), 106 deletions(-) diff --git a/docker/common/post_node_init.sh b/docker/common/post_node_init.sh index 4f1cc2649f..c709b6b666 100644 --- a/docker/common/post_node_init.sh +++ b/docker/common/post_node_init.sh @@ -47,10 +47,9 @@ NODE="${NODE:-tcp://lava-node:26657}" lavad config node $NODE ( -cd /lava/cookbook/specs/ -lavad tx gov submit-legacy-proposal spec-add \ - ./ibc.json,./tendermint.json,./cosmoswasm.json,./cosmossdk.json,./cosmossdk_45.json,./cosmossdk_full.json,./ethermint.json,./ethereum.json,./cosmoshub.json,./lava.json \ - --lava-dev-test -y --from $FROM --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE +cd /lava/specs/mainnet-1/specs/ +specs=$(get_base_specs) +lavad tx gov submit-legacy-proposal spec-add $specs,./cosmoshub.json,./lava.json --lava-dev-test -y --from $FROM --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE ) vote_yes_on_all_pending_proposals diff --git a/docker/load-balancing/docker-compose.yml b/docker/load-balancing/docker-compose.yml index bfab3ca273..bab8ee0c59 100644 --- a/docker/load-balancing/docker-compose.yml +++ b/docker/load-balancing/docker-compose.yml @@ -13,7 +13,7 @@ services: - ../common/new_node_init.sh:/lava/config/new_node_init.sh networks: - lava_network - + lava-node-config: image: ghcr.io/tomwright/dasel:v2.7.0 entrypoint: ["sh", "-c"] @@ -65,11 +65,11 @@ services: container_name: lava-node command: ["start", "--pruning=nothing"] ports: - - '${LAVA_NODE_PORT_API:-1317}:1317' - - '${LAVA_NODE_PORT_GRPC:-9090}:9090' - - '${LAVA_NODE_PORT_GRPC_WEB:-9091}:9091' - - '${LAVA_NODE_PORT_P2P:-26656}:26656' - - '${LAVA_NODE_PORT_RPC:-26657}:26657' + - "${LAVA_NODE_PORT_API:-1317}:1317" + - "${LAVA_NODE_PORT_GRPC:-9090}:9090" + - "${LAVA_NODE_PORT_GRPC_WEB:-9091}:9091" + - "${LAVA_NODE_PORT_P2P:-26656}:26656" + - "${LAVA_NODE_PORT_RPC:-26657}:26657" volumes: - lava_data:/lava networks: @@ -94,7 +94,7 @@ services: volumes: - lava_data:/lava - ../common/post_node_init.sh:/lava/config/post_node_init.sh - - ../../cookbook/specs/:/lava/cookbook/specs/ + - ../../specs/:/lava/specs/ - ../../cookbook/plans/:/lava/cookbook/plans/ networks: - lava_network @@ -112,7 +112,7 @@ services: - ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro - ./nginx/nginx.crt:/etc/nginx/ssl/nginx.crt:ro - ./nginx/nginx.key:/etc/nginx/ssl/nginx.key:ro - + depends_on: - provider1 - provider2 @@ -212,7 +212,7 @@ services: restart: always volumes: - lava_data: + lava_data: networks: - lava_network: \ No newline at end of file + lava_network: diff --git a/docker/new-node/docker-compose.yml b/docker/new-node/docker-compose.yml index 02e488f9a4..7db4cbc837 100644 --- a/docker/new-node/docker-compose.yml +++ b/docker/new-node/docker-compose.yml @@ -13,7 +13,7 @@ services: - ../common/new_node_init.sh:/lava/config/new_node_init.sh networks: - lava_network - + lava-node-config: image: ghcr.io/tomwright/dasel:v2.7.0 entrypoint: ["sh", "-c"] @@ -65,11 +65,11 @@ services: container_name: lava-node command: ["start", "--pruning=nothing"] ports: - - '${LAVA_NODE_PORT_API:-1317}:1317' - - '${LAVA_NODE_PORT_GRPC:-9090}:9090' - - '${LAVA_NODE_PORT_GRPC_WEB:-9091}:9091' - - '${LAVA_NODE_PORT_P2P:-26656}:26656' - - '${LAVA_NODE_PORT_RPC:-26657}:26657' + - "${LAVA_NODE_PORT_API:-1317}:1317" + - "${LAVA_NODE_PORT_GRPC:-9090}:9090" + - "${LAVA_NODE_PORT_GRPC_WEB:-9091}:9091" + - "${LAVA_NODE_PORT_P2P:-26656}:26656" + - "${LAVA_NODE_PORT_RPC:-26657}:26657" volumes: - lava_data:/lava networks: @@ -94,7 +94,7 @@ services: volumes: - lava_data:/lava - ../common/post_node_init.sh:/lava/config/post_node_init.sh - - ../../cookbook/specs/:/lava/cookbook/specs/ + - ../../specs/:/lava/specs/ - ../../cookbook/plans/:/lava/cookbook/plans/ networks: - lava_network @@ -103,7 +103,7 @@ services: condition: service_healthy volumes: - lava_data: + lava_data: networks: - lava_network: \ No newline at end of file + lava_network: diff --git a/protocol/rpcprovider/rpcprovider.go b/protocol/rpcprovider/rpcprovider.go index 2bdb3d837c..2bb4466368 100644 --- a/protocol/rpcprovider/rpcprovider.go +++ b/protocol/rpcprovider/rpcprovider.go @@ -830,7 +830,7 @@ rpcprovider 127.0.0.1:3333 OSMOSIS tendermintrpc "wss://www.node-path.com:80,htt cmdRPCProvider.Flags().String(HealthCheckURLPathFlagName, HealthCheckURLPathFlagDefault, "the url path for the provider's grpc health check") cmdRPCProvider.Flags().DurationVar(&updaters.TimeOutForFetchingLavaBlocks, common.TimeOutForFetchingLavaBlocksFlag, time.Second*5, "setting the timeout for fetching lava blocks") cmdRPCProvider.Flags().IntVar(&numberOfRetriesAllowedOnNodeErrors, common.SetRelayCountOnNodeErrorFlag, 2, "set the number of retries attempt on node errors") - cmdRPCProvider.Flags().String(common.UseStaticSpecFlag, "", "load offline spec provided path to spec file, used to test specs before they are proposed on chain, example for spec with inheritance: --use-static-spec ./cookbook/specs/ibc.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/evmos.json") + cmdRPCProvider.Flags().String(common.UseStaticSpecFlag, "", "load offline spec provided path to spec file, used to test specs before they are proposed on chain, example for spec with inheritance: --use-static-spec ./specs/mainnet-1/specs/ibc.json,./specs/mainnet-1/specs/tendermint.json,./specs/mainnet-1/specs/cosmossdk.json,./specs/mainnet-1/specs/ethermint.json,./specs/mainnet-1/specs/ethereum.json,./specs/mainnet-1/specs/evmos.json") cmdRPCProvider.Flags().Uint64(common.RateLimitRequestPerSecondFlag, 0, "Measuring the load relative to this number for feedback - per second - per chain - default unlimited. Given Y simultaneous relay calls, a value of X and will measure Y/X load rate.") cmdRPCProvider.Flags().BoolVar(&chainlib.AllowMissingApisByDefault, common.AllowMissingApisByDefaultFlagName, true, "allows missing apis to be proxied to the node by default, set false to block missing apis in the spec, might result in degraded performance if spec is misconfigured") common.AddRollingLogConfig(cmdRPCProvider) diff --git a/scripts/automation_scripts/ReadMe.md b/scripts/automation_scripts/ReadMe.md index 0effcfd86f..e8e9e3277d 100644 --- a/scripts/automation_scripts/ReadMe.md +++ b/scripts/automation_scripts/ReadMe.md @@ -1,16 +1,17 @@ Automation Scripts Readme -# gRPC Spec Builder: +# gRPC Spec Builder: Used for verifying the REST part of a spec, and building the grpc part from it. It uses the grpc descriptors of the endpoint you provide in order to cross validate the missing parts, and the grpc spec itself. -### Usage: +### Usage: + +- Set the following parameters before use, for example: -* Set the following parameters before use, for example: ``` grpc_server = "juno-node-1.lavapro.xyz:9090" -spec_current_file_path = "/home/user/go/src/lava/cookbook/specs/juno.json" +spec_current_file_path = "/home/user/go/src/lava/specs/mainnet-1/specs/juno.json" ``` Launch the script @@ -19,30 +20,31 @@ Launch the script python3 scripts/automation_scripts/grpc_spec_builder.py ``` -Read the results carefully to understand if any Rest API's were missing / more than necessary. take a look at the new grpc spec file that was created +Read the results carefully to understand if any Rest API's were missing / more than necessary. take a look at the new grpc spec file that was created You can also uncomment the block of code at the bottom of the script that sets the grpc_server and spec_current_file_path variables to different values. This will allow you to switch between different gRPC servers and JSON files by simply commenting out the block of code that you are not using. Note that you will need to have the grpcurl command-line tool installed and available in your system's PATH in order to run the script. grpcurl is a command-line tool for interacting with gRPC servers. You can download it from the gRPC GitHub page: https://github.com/grpc/grpc -# gRPC Scaffolder: +# gRPC Scaffolder: -Used for Scaffolding grpc interface. +Used for Scaffolding grpc interface. ### Usage: -* Set the following parameters before use, for example: +- Set the following parameters before use, for example: + ``` grpc_server = "juno-node-1.lavapro.xyz:9090" -spec_current_file_path = "/home/user/go/src/lava/cookbook/specs/juno.json" +spec_current_file_path = "/home/user/go/src/lava/specs/mainnet-1/specs/juno.json" chain = "Juno" result_dir = "/home/user/go/src/lava/scripts/automation_scripts/automation_results/grpcClientProtobufs" ``` -Launch the script, if grpc files are already located in there it will just append the missing API's. +Launch the script, if grpc files are already located in there it will just append the missing API's. -* There might be bugs in the script as it wasnt tested enough, so make sure you have a backed up version from git. its alot easier to compare the diff afterwards +- There might be bugs in the script as it wasnt tested enough, so make sure you have a backed up version from git. its alot easier to compare the diff afterwards ``` python3 scripts/automation_scripts/grpc_scaffolder.py -``` \ No newline at end of file +``` diff --git a/scripts/automation_scripts/grpc_scaffolder.py b/scripts/automation_scripts/grpc_scaffolder.py index 7cac1522ab..52275272de 100755 --- a/scripts/automation_scripts/grpc_scaffolder.py +++ b/scripts/automation_scripts/grpc_scaffolder.py @@ -3,22 +3,22 @@ # Lava: # grpc_server = "public-rpc.lavanet.xyz:9090" -# spec_current_file_path = "/home/user/go/src/lava/cookbook/specs/lava.json" +# spec_current_file_path = "/home/user/go/src/lava/specs/mainnet-1/specs/lava.json" # chain = "Lava" # Osmosis: # grpc_server = "prod-pnet-osmosisnode-1.lavapro.xyz:9090" -# spec_current_file_path = "/home/user/go/src/lava/cookbook/specs/osmosis.json" +# spec_current_file_path = "/home/user/go/src/lava/specs/mainnet-1/specs/osmosis.json" # chain = "Osmosis" # Cosmos # grpc_server = "gaia-node-1.lavapro.xyz:9090" -# spec_current_file_path = "/home/user/go/src/lava/cookbook/specs/cosmoshub.json" +# spec_current_file_path = "/home/user/go/src/lava/specs/mainnet-1/specs/cosmoshub.json" # chain = "Cosmos" # JUNO grpc_server = "juno-node-1.lavapro.xyz:9090" -spec_current_file_path = "/home/user/go/src/lava/cookbook/specs/juno.json" +spec_current_file_path = "/home/user/go/src/lava/specs/mainnet-1/specs/juno.json" chain = "Juno" diff --git a/scripts/automation_scripts/grpc_spec_builder.py b/scripts/automation_scripts/grpc_spec_builder.py index 74d072f776..03ae0ec910 100755 --- a/scripts/automation_scripts/grpc_spec_builder.py +++ b/scripts/automation_scripts/grpc_spec_builder.py @@ -18,11 +18,11 @@ # Osmosis: # grpc_server = "grpc.osmosis.zone:9090" -# spec_current_file_path = "/home/user/go/src/lava/cookbook/specs/osmosis.json" +# spec_current_file_path = "/home/user/go/src/lava/specs/mainnet-1/specs/osmosis.json" # Cosmos # grpc_server = "gaia-node-1.lavapro.xyz:9090" -# spec_current_file_path = "/home/user/go/src/lava/cookbook/specs/cosmoshub.json" +# spec_current_file_path = "/home/user/go/src/lava/specs/mainnet-1/specs/cosmoshub.json" # Juno # grpc_server = "juno-node-1.lavapro.xyz:9090" @@ -57,7 +57,7 @@ ## -spec_current_file_path = os.getcwd() + "/cookbook/specs/" + spec_file_name +spec_current_file_path = os.getcwd() + "/specs/mainnet-1/specs/" + spec_file_name special_cases_descriptors_with_no_rest_api = [] diff --git a/scripts/automation_scripts/inheritence_merger.py b/scripts/automation_scripts/inheritence_merger.py index 2ff99477a5..e5f6110017 100644 --- a/scripts/automation_scripts/inheritence_merger.py +++ b/scripts/automation_scripts/inheritence_merger.py @@ -4,7 +4,7 @@ ## Checks if a spec inherits another spec (recursively) and creates an array that includes all supported rest api calls. ## Constants (Do not edit) -specs_dir = os.getcwd() + "/cookbook/specs/" +specs_dir = os.getcwd() + "/specs/mainnet-1/specs/" rest_api_list = [] def get_inherited_rest_apis(importName): diff --git a/scripts/automation_scripts/remove_type_from_grpc_spec_api.py b/scripts/automation_scripts/remove_type_from_grpc_spec_api.py index f22c8c1afa..05d139d761 100755 --- a/scripts/automation_scripts/remove_type_from_grpc_spec_api.py +++ b/scripts/automation_scripts/remove_type_from_grpc_spec_api.py @@ -1,10 +1,10 @@ import json input_files = [ - "/home/user/go/src/lava/cookbook/specs/cosmoshub.json", - "/home/user/go/src/lava/cookbook/specs/juno.json", - "/home/user/go/src/lava/cookbook/specs/lava.json", - "/home/user/go/src/lava/cookbook/specs/osmosis.json", + "/home/user/go/src/lava/specs/mainnet-1/specs/cosmoshub.json", + "/home/user/go/src/lava/specs/mainnet-1/specs/juno.json", + "/home/user/go/src/lava/specs/mainnet-1/specs/lava.json", + "/home/user/go/src/lava/specs/mainnet-1/specs/osmosis.json", ] for f in input_files: diff --git a/scripts/automation_scripts/spec_proposal_sorter.py b/scripts/automation_scripts/spec_proposal_sorter.py index dc5bf2f6fe..88f036e029 100755 --- a/scripts/automation_scripts/spec_proposal_sorter.py +++ b/scripts/automation_scripts/spec_proposal_sorter.py @@ -3,7 +3,7 @@ import os import shutil -all_specs = glob.glob(os.path.join(os.getcwd(), "cookbook/specs/*.json")) +all_specs = glob.glob(os.path.join(os.getcwd(), "specs/mainnet-1/specs/*.json")) imported = set() exported = {} diff --git a/scripts/init_chain_commands.sh b/scripts/init_chain_commands.sh index 75faa7345d..e49818f2dd 100755 --- a/scripts/init_chain_commands.sh +++ b/scripts/init_chain_commands.sh @@ -9,8 +9,8 @@ screen -wipe GASPRICE="0.00002ulava" echo; echo "#### Sending proposal for specs ####" -cd ./cookbook/specs/ -lavad tx gov submit-legacy-proposal spec-add ./ibc.json,./tendermint.json,./cosmoswasm.json,./cosmossdk.json,./cosmossdk_45.json,./cosmossdk_full.json,./ethermint.json,./ethereum.json,./cosmoshub.json,./lava.json,./osmosis.json,./fantom.json,./celo.json,./optimism.json,./arbitrum.json,./starknet.json,./aptos.json,./juno.json,./polygon.json,./evmos.json,./base.json,./canto.json,./sui.json,./solana.json,./bsc.json,./axelar.json,./avalanche.json,./fvm.json,./near.json,./sqdsubgraph.json,./agoric.json,./koii.json,./stargaze.json,./blast.json,./secret.json,./celestia.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE +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 cd ../../ echo; echo "#### Waiting 2 blocks ####" wait_count_blocks 2 diff --git a/scripts/pre_setups/init_aptos_only_test.sh b/scripts/pre_setups/init_aptos_only_test.sh index f3f22557e5..131532b86a 100755 --- a/scripts/pre_setups/init_aptos_only_test.sh +++ b/scripts/pre_setups/init_aptos_only_test.sh @@ -10,7 +10,8 @@ rm $LOGS_DIR/*.log killall screen screen -wipe GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 lavad tx gov vote 1 yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE wait_next_block diff --git a/scripts/pre_setups/init_arbitrum_only_test.sh b/scripts/pre_setups/init_arbitrum_only_test.sh index ac7cb42319..5fdf8812a2 100755 --- a/scripts/pre_setups/init_arbitrum_only_test.sh +++ b/scripts/pre_setups/init_arbitrum_only_test.sh @@ -10,7 +10,8 @@ rm $LOGS_DIR/*.log killall screen screen -wipe GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 lavad tx gov vote 1 yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE wait_next_block diff --git a/scripts/pre_setups/init_avalanch_only.sh b/scripts/pre_setups/init_avalanch_only.sh index e5f25d9aa2..03bdf3fd4a 100755 --- a/scripts/pre_setups/init_avalanch_only.sh +++ b/scripts/pre_setups/init_avalanch_only.sh @@ -10,7 +10,8 @@ rm $LOGS_DIR/*.log killall screen screen -wipe GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 & lavad tx gov vote 1 yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE lavad tx gov submit-legacy-proposal plans-add ./cookbook/plans/test_plans/default.json -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE diff --git a/scripts/pre_setups/init_axelar_only_with_node.sh b/scripts/pre_setups/init_axelar_only_with_node.sh index 019c52cacd..d81e1757b8 100755 --- a/scripts/pre_setups/init_axelar_only_with_node.sh +++ b/scripts/pre_setups/init_axelar_only_with_node.sh @@ -21,7 +21,8 @@ sleep 5 wait_for_lava_node_to_start GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_canto_only_test.sh b/scripts/pre_setups/init_canto_only_test.sh index 1c36e6bcbb..a3d16c4e93 100755 --- a/scripts/pre_setups/init_canto_only_test.sh +++ b/scripts/pre_setups/init_canto_only_test.sh @@ -10,7 +10,8 @@ rm $LOGS_DIR/*.log killall screen screen -wipe GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 lavad tx gov vote 1 yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE sleep 4 diff --git a/scripts/pre_setups/init_celestia_only_with_node.sh b/scripts/pre_setups/init_celestia_only_with_node.sh index 3bea92f70a..12aa6c170a 100755 --- a/scripts/pre_setups/init_celestia_only_with_node.sh +++ b/scripts/pre_setups/init_celestia_only_with_node.sh @@ -21,7 +21,8 @@ sleep 5 wait_for_lava_node_to_start GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json,./cookbook/specs/celestia.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_eth_archive_mix.sh b/scripts/pre_setups/init_eth_archive_mix.sh index 134dfcb21e..aceff4371f 100755 --- a/scripts/pre_setups/init_eth_archive_mix.sh +++ b/scripts/pre_setups/init_eth_archive_mix.sh @@ -17,7 +17,8 @@ PROVIDER3_LISTENER="127.0.0.1:2223" PROVIDER4_LISTENER="127.0.0.1:2224" PROVIDER5_LISTENER="127.0.0.1:2225" if [ $# -eq 0 ]; then - lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & + 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 diff --git a/scripts/pre_setups/init_evmos_only_test.sh b/scripts/pre_setups/init_evmos_only_test.sh index 3fab94eb62..865c321342 100755 --- a/scripts/pre_setups/init_evmos_only_test.sh +++ b/scripts/pre_setups/init_evmos_only_test.sh @@ -10,7 +10,8 @@ rm $LOGS_DIR/*.log killall screen screen -wipe GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 lavad tx gov vote 1 yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE sleep 4 diff --git a/scripts/pre_setups/init_evmos_only_with_node.sh b/scripts/pre_setups/init_evmos_only_with_node.sh index 49ce1b20e3..8fc9927fd7 100755 --- a/scripts/pre_setups/init_evmos_only_with_node.sh +++ b/scripts/pre_setups/init_evmos_only_with_node.sh @@ -21,7 +21,8 @@ sleep 3 wait_for_lava_node_to_start GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_fvm_only_test.sh b/scripts/pre_setups/init_fvm_only_test.sh index 612d114dd2..4b68381a3e 100755 --- a/scripts/pre_setups/init_fvm_only_test.sh +++ b/scripts/pre_setups/init_fvm_only_test.sh @@ -10,7 +10,8 @@ rm $LOGS_DIR/*.log killall screen screen -wipe GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 lavad tx gov vote 1 yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE sleep 4 diff --git a/scripts/pre_setups/init_lava_only_test.sh b/scripts/pre_setups/init_lava_only_test.sh index f7160e2561..9ae5fda01d 100755 --- a/scripts/pre_setups/init_lava_only_test.sh +++ b/scripts/pre_setups/init_lava_only_test.sh @@ -20,7 +20,8 @@ echo "[Lavavisor Setup] sleeping 20 seconds for node to finish setup (if its not sleep 20 GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_lava_only_test_5.sh b/scripts/pre_setups/init_lava_only_test_5.sh index f45ab2a675..6acffd29fa 100755 --- a/scripts/pre_setups/init_lava_only_test_5.sh +++ b/scripts/pre_setups/init_lava_only_test_5.sh @@ -10,7 +10,8 @@ rm $LOGS_DIR/*.log killall screen screen -wipe GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_lava_only_test_with_badge.sh b/scripts/pre_setups/init_lava_only_test_with_badge.sh index d6d4f8b222..e190d7acf1 100755 --- a/scripts/pre_setups/init_lava_only_test_with_badge.sh +++ b/scripts/pre_setups/init_lava_only_test_with_badge.sh @@ -10,7 +10,8 @@ rm $LOGS_DIR/*.log killall screen screen -wipe GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_lava_only_with_node.sh b/scripts/pre_setups/init_lava_only_with_node.sh index 61f814b263..580e06df63 100755 --- a/scripts/pre_setups/init_lava_only_with_node.sh +++ b/scripts/pre_setups/init_lava_only_with_node.sh @@ -21,7 +21,8 @@ sleep 5 wait_for_lava_node_to_start GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_lava_only_with_node_rate_limit.sh b/scripts/pre_setups/init_lava_only_with_node_rate_limit.sh index 4d35705eb0..116adff696 100755 --- a/scripts/pre_setups/init_lava_only_with_node_rate_limit.sh +++ b/scripts/pre_setups/init_lava_only_with_node_rate_limit.sh @@ -21,7 +21,8 @@ sleep 5 wait_for_lava_node_to_start GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_lava_only_with_node_three_providers.sh b/scripts/pre_setups/init_lava_only_with_node_three_providers.sh index 1e0e5bff34..869b8ffb35 100755 --- a/scripts/pre_setups/init_lava_only_with_node_three_providers.sh +++ b/scripts/pre_setups/init_lava_only_with_node_three_providers.sh @@ -21,7 +21,8 @@ sleep 5 wait_for_lava_node_to_start GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_lava_only_with_node_with_cache.sh b/scripts/pre_setups/init_lava_only_with_node_with_cache.sh index d582b1954d..bad73adbbb 100755 --- a/scripts/pre_setups/init_lava_only_with_node_with_cache.sh +++ b/scripts/pre_setups/init_lava_only_with_node_with_cache.sh @@ -21,7 +21,8 @@ sleep 5 wait_for_lava_node_to_start GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_lava_only_with_node_with_cache_archive.sh b/scripts/pre_setups/init_lava_only_with_node_with_cache_archive.sh index 76ba4ecbcf..23e4f40aaf 100755 --- a/scripts/pre_setups/init_lava_only_with_node_with_cache_archive.sh +++ b/scripts/pre_setups/init_lava_only_with_node_with_cache_archive.sh @@ -28,7 +28,8 @@ sleep 5 wait_for_lava_node_to_start GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_lava_only_with_node_with_python_proxy.sh b/scripts/pre_setups/init_lava_only_with_node_with_python_proxy.sh index f6e4dabd1a..8cbc6f67d0 100755 --- a/scripts/pre_setups/init_lava_only_with_node_with_python_proxy.sh +++ b/scripts/pre_setups/init_lava_only_with_node_with_python_proxy.sh @@ -23,7 +23,8 @@ sleep 5 wait_for_lava_node_to_start GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_lava_only_with_node_with_relayserver.sh b/scripts/pre_setups/init_lava_only_with_node_with_relayserver.sh index a0bbb8a6af..cec9811ed0 100755 --- a/scripts/pre_setups/init_lava_only_with_node_with_relayserver.sh +++ b/scripts/pre_setups/init_lava_only_with_node_with_relayserver.sh @@ -20,7 +20,8 @@ echo "[Test Setup] sleeping 20 seconds for node to finish setup (if its not enou sleep 20 GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_lava_static_provider.sh b/scripts/pre_setups/init_lava_static_provider.sh index 05ac61dde9..0ad135c638 100755 --- a/scripts/pre_setups/init_lava_static_provider.sh +++ b/scripts/pre_setups/init_lava_static_provider.sh @@ -20,7 +20,8 @@ echo "[Lavavisor Setup] sleeping 20 seconds for node to finish setup (if its not sleep 20 GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_moralis_only.sh b/scripts/pre_setups/init_moralis_only.sh index c6be7159cb..f18a3d833d 100755 --- a/scripts/pre_setups/init_moralis_only.sh +++ b/scripts/pre_setups/init_moralis_only.sh @@ -10,7 +10,8 @@ rm $LOGS_DIR/*.log killall screen screen -wipe GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/moralis.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_near_only_with_node.sh b/scripts/pre_setups/init_near_only_with_node.sh index 9b90003e66..a49e0c3493 100755 --- a/scripts/pre_setups/init_near_only_with_node.sh +++ b/scripts/pre_setups/init_near_only_with_node.sh @@ -21,7 +21,8 @@ sleep 5 wait_for_lava_node_to_start GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/near.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_osmosis_only.sh b/scripts/pre_setups/init_osmosis_only.sh index cdf41357cf..b217d7e325 100755 --- a/scripts/pre_setups/init_osmosis_only.sh +++ b/scripts/pre_setups/init_osmosis_only.sh @@ -10,7 +10,8 @@ rm $LOGS_DIR/*.log killall screen screen -wipe GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 & lavad tx gov vote 1 yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE lavad tx gov submit-legacy-proposal plans-add ./cookbook/plans/test_plans/default.json -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE diff --git a/scripts/pre_setups/init_solana_only.sh b/scripts/pre_setups/init_solana_only.sh index 88d94eb70e..33c3c85f60 100755 --- a/scripts/pre_setups/init_solana_only.sh +++ b/scripts/pre_setups/init_solana_only.sh @@ -10,7 +10,8 @@ rm $LOGS_DIR/*.log killall screen screen -wipe GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 & lavad tx gov vote 1 yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE lavad tx gov submit-legacy-proposal plans-add ./cookbook/plans/test_plans/default.json -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE diff --git a/scripts/pre_setups/init_sqdsubgraph_only.sh b/scripts/pre_setups/init_sqdsubgraph_only.sh index 8b467330e2..258c76d709 100755 --- a/scripts/pre_setups/init_sqdsubgraph_only.sh +++ b/scripts/pre_setups/init_sqdsubgraph_only.sh @@ -10,7 +10,8 @@ rm $LOGS_DIR/*.log killall screen screen -wipe GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/sqdsubgraph.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/init_starknet_addons_only_with_node.sh b/scripts/pre_setups/init_starknet_addons_only_with_node.sh index 00350a01e7..dd47128009 100755 --- a/scripts/pre_setups/init_starknet_addons_only_with_node.sh +++ b/scripts/pre_setups/init_starknet_addons_only_with_node.sh @@ -21,7 +21,8 @@ sleep 3 wait_for_lava_node_to_start GASPRICE="0.00002ulava" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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 diff --git a/scripts/pre_setups/setup_lavavisor_dev_test.sh b/scripts/pre_setups/setup_lavavisor_dev_test.sh index d13f228c6a..f244a9a28b 100755 --- a/scripts/pre_setups/setup_lavavisor_dev_test.sh +++ b/scripts/pre_setups/setup_lavavisor_dev_test.sh @@ -31,7 +31,8 @@ lavavisor create-service provider ./config/provider_examples/lava_example.yml -- echo "[Lavavisor Setup] finished creating service files for lavavisor" echo "[Lavavisor Setup] submitting spec proposal" -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices 0.00002ulava & +specs=$(get_all_specs) +lavad tx gov submit-legacy-proposal spec-add $specs -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices 0.00002ulava & wait_next_block wait_next_block lavad tx gov vote 1 yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices 0.00002ulava; diff --git a/scripts/test/cli_test.sh b/scripts/test/cli_test.sh index 6129b48d6e..8030150401 100755 --- a/scripts/test/cli_test.sh +++ b/scripts/test/cli_test.sh @@ -58,7 +58,8 @@ trace lavad q downtimequery params >/dev/null trace lavad q downtimequery downtime 10 >/dev/null echo "Proposing specs" -(trace lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json,./cookbook/specs/near.json $txoptions) >/dev/null +specs=$(get_all_specs) +(trace lavad tx gov submit-legacy-proposal spec-add $specs $txoptions) >/dev/null wait_count_blocks 2 >/dev/null (lavad tx gov vote $(latest_vote) yes $txoptions) >/dev/null wait_count_blocks 2 >/dev/null diff --git a/scripts/test/inich_100_providers.sh b/scripts/test/inich_100_providers.sh index aa9e6b9ef1..dd3bd6cb44 100755 --- a/scripts/test/inich_100_providers.sh +++ b/scripts/test/inich_100_providers.sh @@ -9,9 +9,8 @@ screen -wipe GASPRICE="0.000000001ulava" echo; echo "#### Sending proposal for specs ####" -cd ./cookbook/specs/ || exit -lavad tx gov submit-legacy-proposal spec-add ./ibc.json,./tendermint.json,./cosmoswasm.json,./cosmossdk.json,./cosmossdk_45.json,./cosmossdk_full.json,./ethermint.json,./ethereum.json,./cosmoshub.json,./lava.json,./osmosis.json,./fantom.json,./celo.json,./optimism.json,./arbitrum.json,./starknet.json,./aptos.json,./juno.json,./polygon.json,./evmos.json,./base.json,./canto.json,./sui.json,./solana.json,./bsc.json,./axelar.json,./avalanche.json,./fvm.json,./near.json,./sqdsubgraph.json,./agoric.json,./koii.json,./stargaze.json,./blast.json,./secret.json,./celestia.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE -cd ../../ || exit +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 echo; echo "#### Waiting 2 blocks ####" wait_count_blocks 2 diff --git a/scripts/test/init_e2e.sh b/scripts/test/init_e2e.sh index 2e6963f10b..b403c235c2 100755 --- a/scripts/test/init_e2e.sh +++ b/scripts/test/init_e2e.sh @@ -9,7 +9,7 @@ GASPRICE="0.00002ulava" # Specs proposal echo ---- Specs proposal ---- -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/ibc.json,./cookbook/specs/tendermint.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/lava.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE +lavad tx gov submit-legacy-proposal spec-add ./specs/mainnet-1/specs/ethermint.json,./specs/mainnet-1/specs/ethereum.json,./specs/mainnet-1/specs/cosmoswasm.json,./specs/mainnet-1/specs/ibc.json,./specs/mainnet-1/specs/tendermint.json,./specs/mainnet-1/specs/tendermint.json,./specs/mainnet-1/specs/cosmossdk.json,./specs/mainnet-1/specs/cosmossdkv50.json,./specs/testnet-2/specs/lava.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE wait_next_block lavad tx gov vote 1 yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE sleep 6 # need to sleep because plan policies need the specs when setting chain policies verifications diff --git a/scripts/test/init_payment_e2e.sh b/scripts/test/init_payment_e2e.sh index 87b118a725..7e662fd52a 100755 --- a/scripts/test/init_payment_e2e.sh +++ b/scripts/test/init_payment_e2e.sh @@ -8,7 +8,7 @@ source $__dir/../useful_commands.sh GASPRICE="0.00002ulava" # Specs proposal -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/cosmoswasm.json,./cookbook/specs/ibc.json,./cookbook/specs/tendermint.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/lava.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE +lavad tx gov submit-legacy-proposal spec-add ./specs/mainnet-1/specs/cosmoswasm.json,./specs/mainnet-1/specs/ibc.json,./specs/mainnet-1/specs/tendermint.json,./specs/mainnet-1/specs/tendermint.json,./specs/mainnet-1/specs/cosmossdk.json,./specs/mainnet-1/specs/cosmossdkv50.json,./specs/testnet-2/specs/lava.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE wait_next_block lavad tx gov deposit 1 100ulava -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE wait_next_block diff --git a/scripts/test/jail_provider_test.sh b/scripts/test/jail_provider_test.sh index f190e70376..edb97cc684 100755 --- a/scripts/test/jail_provider_test.sh +++ b/scripts/test/jail_provider_test.sh @@ -11,8 +11,8 @@ killall screen screen -wipe GASPRICE="0.00002ulava" -# ,./cookbook/specs/mantle.json -lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/lava.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & +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_count_blocks 2 echo "submitted first proposal" echo "latest vote2: $(latest_vote)" diff --git a/scripts/test_spec_full.sh b/scripts/test_spec_full.sh index cd504f47ec..4a37783f6d 100755 --- a/scripts/test_spec_full.sh +++ b/scripts/test_spec_full.sh @@ -2,7 +2,7 @@ # call this bash with this format: # test_spec_full [SPEC_file_path] {[api_interface] [service-url] ...} [--install] # example: -# test_spec_full cookbook/specs/lava.json rest 127.0.0.1:1317 tendermintrpc 127.0.0.1:26657 +# test_spec_full specs/mainnet-1/specs/lava.json rest 127.0.0.1:1317 tendermintrpc 127.0.0.1:26657 __dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source $__dir/useful_commands.sh @@ -68,7 +68,8 @@ if [ "$dry" = false ]; then GASPRICE="0.00002ulava" # add all existing specs so inheritance works - lavad tx gov submit-legacy-proposal spec-add ${__dir}/../cookbook/specs/ibc.json,${__dir}/../cookbook/specs/cosmoswasm.json,${__dir}/../cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,${__dir}/../cookbook/specs/cosmossdk_45.json,${__dir}/../cookbook/specs/cosmossdk_full.json,${__dir}/../cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,${__dir}/../cookbook/specs/cosmoshub.json,${__dir}/../cookbook/specs/lava.json,${__dir}/../cookbook/specs/osmosis.json,${__dir}/../cookbook/specs/fantom.json,${__dir}/../cookbook/specs/celo.json,${__dir}/../cookbook/specs/optimism.json,${__dir}/../cookbook/specs/arbitrum.json,${__dir}/../cookbook/specs/starknet.json,${__dir}/../cookbook/specs/aptos.json,${__dir}/../cookbook/specs/juno.json,${__dir}/../cookbook/specs/polygon.json,${__dir}/../cookbook/specs/evmos.json,${__dir}/../cookbook/specs/base.json,${__dir}/../cookbook/specs/canto.json,${__dir}/../cookbook/specs/sui.json,${__dir}/../cookbook/specs/solana.json,${__dir}/../cookbook/specs/bsc.json,${__dir}/../cookbook/specs/axelar.json,${__dir}/../cookbook/specs/avalanche.json,${__dir}/../cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & + 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 diff --git a/scripts/useful_commands.sh b/scripts/useful_commands.sh index e6ac07bbbf..28578374e9 100755 --- a/scripts/useful_commands.sh +++ b/scripts/useful_commands.sh @@ -168,4 +168,45 @@ done echo "---------------------------------------------" echo "- ENV Validation Done -" echo "---------------------------------------------" +} + +get_base_specs() { + local priority_specs=( + "./specs/mainnet-1/specs/ibc.json" + "./specs/mainnet-1/specs/cosmoswasm.json" + "./specs/mainnet-1/specs/tendermint.json" + "./specs/mainnet-1/specs/cosmossdk.json" + "./specs/mainnet-1/specs/cosmossdkv45.json" + "./specs/mainnet-1/specs/cosmossdkv50.json" + "./specs/mainnet-1/specs/ethermint.json" + "./specs/mainnet-1/specs/ethereum.json" + "./specs/mainnet-1/specs/solana.json" + ) + + (IFS=,; echo "${priority_specs[*]}") +} + +get_all_specs() { + local priority_specs=($(get_base_specs)) # Ensure it's an array + local other_specs=() + + find specs/{mainnet-1,testnet-2}/specs -name "*.json" > /tmp/specs_list.txt + + while IFS= read -r file; do + local is_priority=false + for pspec in "${priority_specs[@]}"; do + if [[ "./$file" == "$pspec" ]]; then + is_priority=true + break + fi + done + + if [[ "$is_priority" == "false" ]]; then + other_specs+=("$file") + fi + done < /tmp/specs_list.txt + + rm /tmp/specs_list.txt + + (IFS=,; echo "${priority_specs[*]},${other_specs[*]}") } \ No newline at end of file diff --git a/testutil/e2e/protocolE2E.go b/testutil/e2e/protocolE2E.go index 541eb66a2c..56b924279b 100644 --- a/testutil/e2e/protocolE2E.go +++ b/testutil/e2e/protocolE2E.go @@ -726,8 +726,14 @@ func restTests(rpcURL string, testDuration time.Duration) error { reply, err := getRequest(fmt.Sprintf(api, rpcURL)) if err != nil { errors = append(errors, fmt.Sprintf("%s", err)) - } else if strings.Contains(string(reply), "error") { - errors = append(errors, string(reply)) + } else { + var jsonReply map[string]interface{} + err = json.Unmarshal(reply, &jsonReply) + if err != nil { + errors = append(errors, fmt.Sprintf("%s", err)) + } else if jsonReply != nil && jsonReply["error"] != nil { + errors = append(errors, string(reply)) + } } } } @@ -879,6 +885,7 @@ func (lt *lavaTest) saveLogs() { } if strings.Contains(line, " ERR ") || strings.Contains(line, "[Error]" /* sdk errors*/) { isAllowedError := false + for errorSubstring := range allowedErrors { if strings.Contains(line, errorSubstring) { isAllowedError = true diff --git a/utils/keeper/spec.go b/utils/keeper/spec.go index b31d6d696e..f40a2ebc70 100644 --- a/utils/keeper/spec.go +++ b/utils/keeper/spec.go @@ -144,19 +144,55 @@ func GetASpec(specIndex, getToTopMostPath string, ctxArg *sdk.Context, keeper *k } else { ctx = *ctxArg } - proposalDirectory := "cookbook/specs/" - proposalFiles := []string{ - "ibc.json", "cosmoswasm.json", "tendermint.json", "cosmossdk.json", "cosmossdk_full.json", - "ethereum.json", "cosmoshub.json", "lava.json", "osmosis.json", "fantom.json", "celo.json", - "optimism.json", "arbitrum.json", "starknet.json", "aptos.json", "juno.json", "polygon.json", - "evmos.json", "base.json", "canto.json", "sui.json", "solana.json", "bsc.json", "axelar.json", - "avalanche.json", "fvm.json", "near.json", + + proposalDirectories := []string{ + "specs/mainnet-1/specs/", + "specs/testnet-2/specs/", } - for _, fileName := range proposalFiles { - spec, err := GetSpecFromPath(getToTopMostPath+proposalDirectory+fileName, specIndex, &ctx, keeper) - if err == nil { - return spec, nil + baseProposalFiles := []string{ + "ibc.json", "cosmoswasm.json", "tendermint.json", "cosmossdk.json", + "cosmossdkv45.json", "cosmossdkv50.json", "ethereum.json", "ethermint.json", "solana.json", + } + + // Create a map of base files for quick lookup + baseFiles := make(map[string]struct{}) + for _, f := range baseProposalFiles { + baseFiles[f] = struct{}{} + } + + // Try each directory + for _, proposalDirectory := range proposalDirectories { + // Try base proposal files first + for _, fileName := range baseProposalFiles { + spec, err := GetSpecFromPath(getToTopMostPath+proposalDirectory+fileName, specIndex, &ctx, keeper) + if err == nil { + return spec, nil + } + } + + // Read all files from the proposal directory + files, err := os.ReadDir(getToTopMostPath + proposalDirectory) + if err != nil { + continue // Skip to next directory if this one fails + } + + // Try additional JSON files that aren't in baseProposalFiles + for _, file := range files { + fileName := file.Name() + // Skip if not a JSON file or if it's in baseProposalFiles + if !strings.HasSuffix(fileName, ".json") { + continue + } + if _, exists := baseFiles[fileName]; exists { + continue + } + + spec, err := GetSpecFromPath(getToTopMostPath+proposalDirectory+fileName, specIndex, &ctx, keeper) + if err == nil { + return spec, nil + } } } + return spectypes.Spec{}, fmt.Errorf("spec not found %s", specIndex) } diff --git a/x/spec/keeper/spec_test.go b/x/spec/keeper/spec_test.go index 49ccedf14b..0b34d0b7b5 100644 --- a/x/spec/keeper/spec_test.go +++ b/x/spec/keeper/spec_test.go @@ -815,21 +815,28 @@ func TestApiCollectionsExpandAndInheritance(t *testing.T) { } } -func TestCookbookSpecs(t *testing.T) { +func TestSpecs(t *testing.T) { ts := newTester(t) - getToTopMostPath := "../../.././cookbook/specs/" + getToTopMostPath := "../../.././specs/mainnet-1/specs/" specsFiles, err := getAllFilesInDirectory(getToTopMostPath) require.NoError(t, err) + getToTopMostPath = "../../.././specs/testnet-2/specs/" + + specsFilesTestnet, err := getAllFilesInDirectory(getToTopMostPath) + require.NoError(t, err) + + specsFiles = append(specsFiles, specsFilesTestnet...) + // Sort specs by hierarchy - specs that are imported by others should come first specImports := make(map[string][]string) specProposals := make(map[string]types.Spec) // First read all spec contents for _, fileName := range specsFiles { - contents, err := os.ReadFile(getToTopMostPath + fileName) + contents, err := os.ReadFile(fileName) require.NoError(t, err) // Parse imports from spec @@ -917,7 +924,7 @@ func getAllFilesInDirectory(directory string) ([]string, error) { // Skip directories; we only want files continue } - files = append(files, entry.Name()) + files = append(files, directory+entry.Name()) } return files, nil