From 2763d47bbc66ad024cfa4e5d782fa7a632b2e605 Mon Sep 17 00:00:00 2001 From: ducnt131 <62016666+anhductn2001@users.noreply.github.com> Date: Thu, 8 Aug 2024 18:11:41 +0700 Subject: [PATCH] feat(rollapp): add vm type to rollapp registration (#361) --- go.mod | 4 +-- go.sum | 8 +++--- tests/automated_denommetadata_test.go | 16 +++++------ tests/bridging_fee_test.go | 4 +-- tests/data/metadata_sequencer.json | 14 ++++++++++ tests/disconnection_test.go | 6 ++--- tests/eibc_ack_error_test.go | 24 ++++++++--------- tests/eibc_fee_market_test.go | 16 +++++------ tests/eibc_feemarket_test.go | 16 +++++------ tests/eibc_fulfillment_test.go | 36 ++++++++++++------------- tests/eibc_invariant_test.go | 8 +++--- tests/eibc_not_fulfillment_test.go | 8 +++--- tests/eibc_pfm_test.go | 8 +++--- tests/eibc_timeout_test.go | 8 +++--- tests/frozen_test.go | 32 +++++++++++----------- tests/ibc_grace_period_test.go | 24 ++++++++--------- tests/ibc_pfm_with_grace_period_test.go | 8 +++--- tests/rollapp_invariant_test.go | 8 +++--- tests/sequencer_invariant_test.go | 16 +++++------ tests/setup.go | 6 ++--- tests/upgrade_hub_test.go | 4 +-- 21 files changed, 144 insertions(+), 130 deletions(-) create mode 100644 tests/data/metadata_sequencer.json diff --git a/go.mod b/go.mod index 70902cb4..1a64334a 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,8 @@ replace ( ) require ( - github.com/decentrio/e2e-testing-live v0.0.0-20240805104706-dc8d537e8007 - github.com/decentrio/rollup-e2e-testing v0.0.0-20240807082808-165b0678bfbb + github.com/decentrio/e2e-testing-live v0.0.0-20240718080249-ee255229c869 + github.com/decentrio/rollup-e2e-testing v0.0.0-20240808101000-556004e1aa84 github.com/dymensionxyz/dymension/v3 v3.1.0-rc03.0.20240717194206-54c0fca5fada ) diff --git a/go.sum b/go.sum index a6fb8e8f..13e591a1 100644 --- a/go.sum +++ b/go.sum @@ -382,10 +382,10 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/decentrio/e2e-testing-live v0.0.0-20240805104706-dc8d537e8007 h1:nZx4zQTGwk7STTqSj5UKVeMo18RC38hk0C7nXc4T35w= -github.com/decentrio/e2e-testing-live v0.0.0-20240805104706-dc8d537e8007/go.mod h1:qLIf3XX6bQsQlmVqhbNOiLc/ONeA0NDiPmpsrljJkXc= -github.com/decentrio/rollup-e2e-testing v0.0.0-20240807082808-165b0678bfbb h1:ElITwp9D3LbC1ubglR9imMmkKRSMmKFyTzyjtahChAI= -github.com/decentrio/rollup-e2e-testing v0.0.0-20240807082808-165b0678bfbb/go.mod h1:QmBrZgZplhtgHRWC0Z7LC7TDsKuC8sDyQvZyXXaqw/c= +github.com/decentrio/e2e-testing-live v0.0.0-20240718080249-ee255229c869 h1:qWpUYGOsrSC+1Vmd2TjhbsSpntvvx9PsX3AoeMunFxc= +github.com/decentrio/e2e-testing-live v0.0.0-20240718080249-ee255229c869/go.mod h1:HZNYnPwmSxkwTPjSD5yolauc1Vx1ZzKL4FFMxTq4H5Y= +github.com/decentrio/rollup-e2e-testing v0.0.0-20240808101000-556004e1aa84 h1:KXI8/cnVknibrMymVaSOk+yc5+8BHhzWXaxcQEHbCAU= +github.com/decentrio/rollup-e2e-testing v0.0.0-20240808101000-556004e1aa84/go.mod h1:QmBrZgZplhtgHRWC0Z7LC7TDsKuC8sDyQvZyXXaqw/c= github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= diff --git a/tests/automated_denommetadata_test.go b/tests/automated_denommetadata_test.go index 66d50107..3320c732 100644 --- a/tests/automated_denommetadata_test.go +++ b/tests/automated_denommetadata_test.go @@ -40,7 +40,7 @@ func TestADMC_Hub_to_RA_reserved_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -80,7 +80,7 @@ func TestADMC_Hub_to_RA_reserved_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -356,7 +356,7 @@ func TestADMC_Hub_to_RA_3rd_Party_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -396,7 +396,7 @@ func TestADMC_Hub_to_RA_3rd_Party_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -657,7 +657,7 @@ func TestADMC_Hub_to_RA_reserved_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -697,7 +697,7 @@ func TestADMC_Hub_to_RA_reserved_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", @@ -972,7 +972,7 @@ func TestADMC_Hub_to_RA_3rd_Party_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -1012,7 +1012,7 @@ func TestADMC_Hub_to_RA_3rd_Party_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", diff --git a/tests/bridging_fee_test.go b/tests/bridging_fee_test.go index 8ffee588..e42d045a 100644 --- a/tests/bridging_fee_test.go +++ b/tests/bridging_fee_test.go @@ -180,7 +180,7 @@ func TestChangeBridgeFeeParam_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -228,7 +228,7 @@ func TestChangeBridgeFeeParam_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", diff --git a/tests/data/metadata_sequencer.json b/tests/data/metadata_sequencer.json new file mode 100644 index 00000000..de4cf4d3 --- /dev/null +++ b/tests/data/metadata_sequencer.json @@ -0,0 +1,14 @@ +{ + "moniker": "sequencer", + "details": "This is a description of the Rollapp.", + "p2p_seeds": ["seed1"], + "rpcs": ["https://rpc.wpd.evm.rollapp.noisnemyd.xyz:443", "https://rpc.wpd.wasm.rollapp.noisnemyd.xyz:443"], + "evm_rpcs": ["https://rpc.wpd.evm.evm.noisnemyd.xyz:443"], + "rest_api_urls": ["https://api.wpd.evm.rollapp.noisnemyd.xyz:443"], + "explorer_url": "explorer_url", + "genesis_urls": ["genesis"], + "contact_details":{}, + "extra_data": [], + "snapshots": [], + "gas_price": "0" + } \ No newline at end of file diff --git a/tests/disconnection_test.go b/tests/disconnection_test.go index 8c28b74e..686985b2 100644 --- a/tests/disconnection_test.go +++ b/tests/disconnection_test.go @@ -87,9 +87,9 @@ func customConfig() ibc.ChainConfig { if err := dyno.Set(g, "10000000000", "app_state", "gov", "params", "min_deposit", 0, "amount"); err != nil { return nil, fmt.Errorf("failed to set amount on gov min_deposit in genesis json: %w", err) } - if err := dyno.Set(g, "1000000000000", "app_state", "rollapp", "params", "registration_fee", "amount"); err != nil { - return nil, fmt.Errorf("failed to set registration_fee in genesis json: %w", err) - } + // if err := dyno.Set(g, "1000000000000", "app_state", "rollapp", "params", "registration_fee", "amount"); err != nil { + // return nil, fmt.Errorf("failed to set registration_fee in genesis json: %w", err) + // } if err := dyno.Set(g, "adym", "app_state", "gamm", "params", "pool_creation_fee", 0, "denom"); err != nil { return nil, fmt.Errorf("failed to set amount on gov min_deposit in genesis json: %w", err) } diff --git a/tests/eibc_ack_error_test.go b/tests/eibc_ack_error_test.go index bd45ba05..735e7ddf 100644 --- a/tests/eibc_ack_error_test.go +++ b/tests/eibc_ack_error_test.go @@ -44,7 +44,7 @@ func TestEIBC_AckError_Dym_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -92,7 +92,7 @@ func TestEIBC_AckError_Dym_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -459,7 +459,7 @@ func TestEIBC_AckError_RA_Token_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -507,7 +507,7 @@ func TestEIBC_AckError_RA_Token_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -819,7 +819,7 @@ func TestEIBC_AckError_3rd_Party_Token_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -867,7 +867,7 @@ func TestEIBC_AckError_3rd_Party_Token_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -1256,7 +1256,7 @@ func TestEIBC_AckError_Dym_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -1304,7 +1304,7 @@ func TestEIBC_AckError_Dym_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", @@ -1657,7 +1657,7 @@ func TestEIBC_AckError_RA_Token_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -1705,7 +1705,7 @@ func TestEIBC_AckError_RA_Token_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", @@ -2014,7 +2014,7 @@ func TestEIBC_AckError_3rd_Party_Token_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -2062,7 +2062,7 @@ func TestEIBC_AckError_3rd_Party_Token_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", diff --git a/tests/eibc_fee_market_test.go b/tests/eibc_fee_market_test.go index c8260e8b..21cdf1a0 100644 --- a/tests/eibc_fee_market_test.go +++ b/tests/eibc_fee_market_test.go @@ -39,7 +39,7 @@ func TestEIBCFulfillAlreadyFulfilledDemand_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -77,7 +77,7 @@ func TestEIBCFulfillAlreadyFulfilledDemand_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -354,7 +354,7 @@ func TestEIBCAlreadyFulfilledDemand_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -392,7 +392,7 @@ func TestEIBCAlreadyFulfilledDemand_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", @@ -669,7 +669,7 @@ func TestEIBCUnallowedSigner_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -707,7 +707,7 @@ func TestEIBCUnallowedSigner_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -928,7 +928,7 @@ func TestEIBCUnallowedSigner_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -966,7 +966,7 @@ func TestEIBCUnallowedSigner_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", diff --git a/tests/eibc_feemarket_test.go b/tests/eibc_feemarket_test.go index 8d9d29b4..12ec7431 100644 --- a/tests/eibc_feemarket_test.go +++ b/tests/eibc_feemarket_test.go @@ -38,7 +38,7 @@ func TestEIBC_Fee_Market_Success_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "30s") @@ -84,7 +84,7 @@ func TestEIBC_Fee_Market_Success_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -337,7 +337,7 @@ func TestEIBC_Fee_Market_Success_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "30s") @@ -383,7 +383,7 @@ func TestEIBC_Fee_Market_Success_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", @@ -648,7 +648,7 @@ func TestEIBC_Fee_Market_Auto_Created_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "30s") @@ -694,7 +694,7 @@ func TestEIBC_Fee_Market_Auto_Created_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -945,7 +945,7 @@ func TestEIBC_Fee_Market_Auto_Created_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "30s") @@ -991,7 +991,7 @@ func TestEIBC_Fee_Market_Auto_Created_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", diff --git a/tests/eibc_fulfillment_test.go b/tests/eibc_fulfillment_test.go index 1cdc7558..2655bcfa 100644 --- a/tests/eibc_fulfillment_test.go +++ b/tests/eibc_fulfillment_test.go @@ -43,7 +43,7 @@ func TestEIBCFulfillOnOneRollApp_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -89,7 +89,7 @@ func TestEIBCFulfillOnOneRollApp_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -429,7 +429,7 @@ func TestEIBCFulfillOnOneRollApp_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -475,7 +475,7 @@ func TestEIBCFulfillOnOneRollApp_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", @@ -814,7 +814,7 @@ func TestEIBCFulfillment_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -860,7 +860,7 @@ func TestEIBCFulfillment_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -1110,7 +1110,7 @@ func TestEIBCFulfillment_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -1156,7 +1156,7 @@ func TestEIBCFulfillment_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", @@ -1415,7 +1415,7 @@ func TestEIBCFulfillment_two_rollapps_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -1461,7 +1461,7 @@ func TestEIBCFulfillment_two_rollapps_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -1786,7 +1786,7 @@ func TestEIBCFulfillment_ThirdParty_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -1842,7 +1842,7 @@ func TestEIBCFulfillment_ThirdParty_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -2195,7 +2195,7 @@ func TestEIBCFulfillment_ThirdParty_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -2243,7 +2243,7 @@ func TestEIBCFulfillment_ThirdParty_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", @@ -2596,7 +2596,7 @@ func TestEIBCFulfillment_ignore_hub_to_RA_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -2642,7 +2642,7 @@ func TestEIBCFulfillment_ignore_hub_to_RA_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -2851,7 +2851,7 @@ func TestEIBCFulfillment_ignore_hub_to_RA_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -2896,7 +2896,7 @@ func TestEIBCFulfillment_ignore_hub_to_RA_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", diff --git a/tests/eibc_invariant_test.go b/tests/eibc_invariant_test.go index 57b5b102..1e591860 100644 --- a/tests/eibc_invariant_test.go +++ b/tests/eibc_invariant_test.go @@ -38,7 +38,7 @@ func TestEIBCInvariant_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -89,7 +89,7 @@ func TestEIBCInvariant_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -390,7 +390,7 @@ func TestEIBCInvariant_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -441,7 +441,7 @@ func TestEIBCInvariant_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", diff --git a/tests/eibc_not_fulfillment_test.go b/tests/eibc_not_fulfillment_test.go index 222bc3db..efe68fa8 100644 --- a/tests/eibc_not_fulfillment_test.go +++ b/tests/eibc_not_fulfillment_test.go @@ -40,7 +40,7 @@ func TestEIBCNotFulfillment_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -86,7 +86,7 @@ func TestEIBCNotFulfillment_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -321,7 +321,7 @@ func TestEIBCNotFulfillment_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -367,7 +367,7 @@ func TestEIBCNotFulfillment_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", diff --git a/tests/eibc_pfm_test.go b/tests/eibc_pfm_test.go index 2ebd172f..26518838 100644 --- a/tests/eibc_pfm_test.go +++ b/tests/eibc_pfm_test.go @@ -41,7 +41,7 @@ func TestEIBCPFM_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -87,7 +87,7 @@ func TestEIBCPFM_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -320,7 +320,7 @@ func TestEIBCPFM_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -367,7 +367,7 @@ func TestEIBCPFM_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-test2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", diff --git a/tests/eibc_timeout_test.go b/tests/eibc_timeout_test.go index 4ce57af4..1b62d5f4 100644 --- a/tests/eibc_timeout_test.go +++ b/tests/eibc_timeout_test.go @@ -298,7 +298,7 @@ func TestEIBCTimeoutFulFillDymToRollapp_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -345,7 +345,7 @@ func TestEIBCTimeoutFulFillDymToRollapp_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -692,7 +692,7 @@ func TestEIBCTimeoutFulFillDymToRollapp_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -740,7 +740,7 @@ func TestEIBCTimeoutFulFillDymToRollapp_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", diff --git a/tests/frozen_test.go b/tests/frozen_test.go index 70d062c7..4ecad76f 100644 --- a/tests/frozen_test.go +++ b/tests/frozen_test.go @@ -51,7 +51,7 @@ func TestRollAppFreeze_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -90,7 +90,7 @@ func TestRollAppFreeze_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -393,7 +393,7 @@ func TestRollAppFreeze_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -431,7 +431,7 @@ func TestRollAppFreeze_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", @@ -761,7 +761,7 @@ func TestOtherRollappNotAffected_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -799,7 +799,7 @@ func TestOtherRollappNotAffected_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp1", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -1193,7 +1193,7 @@ func TestOtherRollappNotAffected_Wasm(t *testing.T) { dymintTomlOverrides2 := make(testutil.Toml) dymintTomlOverrides2["settlement_layer"] = "dymension" dymintTomlOverrides2["settlement_node_address"] = fmt.Sprintf("http://dymension_100-1-val-0-%s:26657", t.Name()) - dymintTomlOverrides2["rollapp_id"] = "rollappwasm_12345-1" + dymintTomlOverrides2["rollapp_id"] = "decentrio_12345-1" dymintTomlOverrides2["settlement_gas_prices"] = "0adym" dymintTomlOverrides2["max_proof_time"] = "500ms" dymintTomlOverrides2["max_idle_time"] = "3s" @@ -1233,7 +1233,7 @@ func TestOtherRollappNotAffected_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp1", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", @@ -2270,7 +2270,7 @@ func TestRollAppFreezeNoBrokenInvariants_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -2308,7 +2308,7 @@ func TestRollAppFreezeNoBrokenInvariants_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp1", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -2605,7 +2605,7 @@ func TestRollAppFreezeNoBrokenInvariants_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -2643,7 +2643,7 @@ func TestRollAppFreezeNoBrokenInvariants_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", @@ -2940,7 +2940,7 @@ func TestRollAppSqcSlashedJailed_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -2978,7 +2978,7 @@ func TestRollAppSqcSlashedJailed_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp1", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -3350,7 +3350,7 @@ func TestRollAppSqcSlashedJailed_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -3388,7 +3388,7 @@ func TestRollAppSqcSlashedJailed_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", diff --git a/tests/ibc_grace_period_test.go b/tests/ibc_grace_period_test.go index 2d10cbd4..9f1f85dc 100644 --- a/tests/ibc_grace_period_test.go +++ b/tests/ibc_grace_period_test.go @@ -39,7 +39,7 @@ func TestIBCGracePeriodCompliance_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -85,7 +85,7 @@ func TestIBCGracePeriodCompliance_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -328,7 +328,7 @@ func TestIBCGracePeriodCompliance_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -374,7 +374,7 @@ func TestIBCGracePeriodCompliance_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", @@ -613,7 +613,7 @@ func TestDelayedAck_NoFinalizedStates_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "30s") @@ -660,7 +660,7 @@ func TestDelayedAck_NoFinalizedStates_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -867,7 +867,7 @@ func TestDelayedAck_NoFinalizedStates_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "30s") @@ -914,7 +914,7 @@ func TestDelayedAck_NoFinalizedStates_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", @@ -1120,7 +1120,7 @@ func TestDelayedAck_RelayerDown_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -1167,7 +1167,7 @@ func TestDelayedAck_RelayerDown_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -1427,7 +1427,7 @@ func TestDelayedAck_RelayerDown_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -1474,7 +1474,7 @@ func TestDelayedAck_RelayerDown_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", diff --git a/tests/ibc_pfm_with_grace_period_test.go b/tests/ibc_pfm_with_grace_period_test.go index 64b49c99..1616b409 100644 --- a/tests/ibc_pfm_with_grace_period_test.go +++ b/tests/ibc_pfm_with_grace_period_test.go @@ -629,7 +629,7 @@ package tests // // setup config for rollapp 2 // settlement_layer_rollapp2 := "dymension" -// rollapp2_id := "rollappevm_12345-1" +// rollapp2_id := "decentrio_12345-1" // gas_price_rollapp2 := "0adym" // maxIdleTime2 := "3s" // configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -676,7 +676,7 @@ package tests // ChainConfig: ibc.ChainConfig{ // Type: "rollapp-dym", // Name: "rollapp-temp2", -// ChainID: "rollappevm_12345-1", +// ChainID: "decentrio_12345-1", // Images: []ibc.DockerImage{rollappEVMImage}, // Bin: "rollappd", // Bech32Prefix: "ethm", @@ -985,7 +985,7 @@ package tests // // setup config for rollapp 2 // settlement_layer_rollapp2 := "dymension" -// rollapp2_id := "rollappwasm_12345-1" +// rollapp2_id := "decentrio_12345-1" // gas_price_rollapp2 := "0adym" // maxIdleTime2 := "3s" // configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -1031,7 +1031,7 @@ package tests // ChainConfig: ibc.ChainConfig{ // Type: "rollapp-dym", // Name: "rollapp-temp2", -// ChainID: "rollappwasm_12345-1", +// ChainID: "decentrio_12345-1", // Images: []ibc.DockerImage{rollappWasmImage}, // Bin: "rollappd", // Bech32Prefix: "rol", diff --git a/tests/rollapp_invariant_test.go b/tests/rollapp_invariant_test.go index 8399764f..353aaabf 100644 --- a/tests/rollapp_invariant_test.go +++ b/tests/rollapp_invariant_test.go @@ -35,7 +35,7 @@ func TestRollappInvariant_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -81,7 +81,7 @@ func TestRollappInvariant_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -298,7 +298,7 @@ func TestRollappInvariant_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -344,7 +344,7 @@ func TestRollappInvariant_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", diff --git a/tests/sequencer_invariant_test.go b/tests/sequencer_invariant_test.go index 064b4666..d171b73e 100644 --- a/tests/sequencer_invariant_test.go +++ b/tests/sequencer_invariant_test.go @@ -35,7 +35,7 @@ func TestSequencerInvariant_EVM(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -81,7 +81,7 @@ func TestSequencerInvariant_EVM(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappevm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappEVMImage}, Bin: "rollappd", Bech32Prefix: "ethm", @@ -201,14 +201,14 @@ func TestSequencerInvariant_EVM(t *testing.T) { rollappUserAddr := rollappUser.FormattedAddress() command = []string{} - command = append(command, "sequencer", "create-sequencer", string(pub1), rollapp1.Config().ChainID, rollapp1.GetSequencerKeyDir()+"/metadata.json", "1000000000adym", + command = append(command, "sequencer", "create-sequencer", string(pub1), rollapp1.Config().ChainID, rollapp1.GetSequencerKeyDir()+"/metadata_sequencer.json", "1000000000adym", "--broadcast-mode", "async") _, err = dymension.GetNode().ExecTx(ctx, sequencer1.KeyName(), command...) require.NoError(t, err) command = []string{} - command = append(command, "sequencer", "create-sequencer", string(pub2), rollapp1.Config().ChainID, rollapp1.GetSequencerKeyDir()+"/metadata.json", "1000000000adym", + command = append(command, "sequencer", "create-sequencer", string(pub2), rollapp1.Config().ChainID, rollapp1.GetSequencerKeyDir()+"/metadata_sequencer.json", "1000000000adym", "--broadcast-mode", "async") _, err = dymension.GetNode().ExecTx(ctx, sequencer2.KeyName(), command...) @@ -301,7 +301,7 @@ func TestSequencerInvariant_Wasm(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappwasm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "3s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -347,7 +347,7 @@ func TestSequencerInvariant_Wasm(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol", @@ -467,14 +467,14 @@ func TestSequencerInvariant_Wasm(t *testing.T) { rollappUserAddr := rollappUser.FormattedAddress() command = []string{} - command = append(command, "sequencer", "create-sequencer", string(pub1), rollapp1.Config().ChainID, rollapp1.GetSequencerKeyDir()+"/metadata.json", "1000000000adym", + command = append(command, "sequencer", "create-sequencer", string(pub1), rollapp1.Config().ChainID, rollapp1.GetSequencerKeyDir()+"/metadata_sequencer.json", "1000000000adym", "--broadcast-mode", "async") _, err = dymension.GetNode().ExecTx(ctx, sequencer1.KeyName(), command...) require.NoError(t, err) command = []string{} - command = append(command, "sequencer", "create-sequencer", string(pub2), rollapp1.Config().ChainID, rollapp1.GetSequencerKeyDir()+"/metadata.json", "1000000000adym", + command = append(command, "sequencer", "create-sequencer", string(pub2), rollapp1.Config().ChainID, rollapp1.GetSequencerKeyDir()+"/metadata_sequencer.json", "1000000000adym", "--broadcast-mode", "async") _, err = dymension.GetNode().ExecTx(ctx, sequencer2.KeyName(), command...) diff --git a/tests/setup.go b/tests/setup.go index f8dbbcb6..55b3566a 100644 --- a/tests/setup.go +++ b/tests/setup.go @@ -547,9 +547,9 @@ func modifyDymensionGenesis(genesisKV []cosmos.GenesisKV) func(ibc.ChainConfig, if err := dyno.Set(g, "adym", "app_state", "gov", "params", "min_deposit", 0, "denom"); err != nil { return nil, fmt.Errorf("failed to set denom on gov min_deposit in genesis json: %w", err) } - if err := dyno.Set(g, "1000000000000", "app_state", "rollapp", "params", "registration_fee", "amount"); err != nil { - return nil, fmt.Errorf("failed to set registration_fee in genesis json: %w", err) - } + // if err := dyno.Set(g, "1000000000000", "app_state", "rollapp", "params", "registration_fee", "amount"); err != nil { + // return nil, fmt.Errorf("failed to set registration_fee in genesis json: %w", err) + // } if err := dyno.Set(g, "10000000000", "app_state", "gov", "params", "min_deposit", 0, "amount"); err != nil { return nil, fmt.Errorf("failed to set amount on gov min_deposit in genesis json: %w", err) } diff --git a/tests/upgrade_hub_test.go b/tests/upgrade_hub_test.go index d49c86a7..7b0554dd 100644 --- a/tests/upgrade_hub_test.go +++ b/tests/upgrade_hub_test.go @@ -53,7 +53,7 @@ func TestHubUpgrade(t *testing.T) { // setup config for rollapp 2 settlement_layer_rollapp2 := "dymension" - rollapp2_id := "rollappevm_12345-1" + rollapp2_id := "decentrio_12345-1" gas_price_rollapp2 := "0adym" maxIdleTime2 := "1s" configFileOverrides2 := overridesDymintToml(settlement_layer_rollapp2, settlement_node_address, rollapp2_id, gas_price_rollapp2, maxIdleTime2, maxProofTime, "100s") @@ -93,7 +93,7 @@ func TestHubUpgrade(t *testing.T) { ChainConfig: ibc.ChainConfig{ Type: "rollapp-dym", Name: "rollapp-temp2", - ChainID: "rollappwasm_12345-1", + ChainID: "decentrio_12345-1", Images: []ibc.DockerImage{rollappWasmImage}, Bin: "rollappd", Bech32Prefix: "rol",