Refactor ChainID

cmd/ethermintd/root.go

@@ -31,6 +31,7 @@ import (
 
 	"cosmossdk.io/simapp/params"
 	rosettaCmd "cosmossdk.io/tools/rosetta/cmd"
+	tmtypes "github.com/cometbft/cometbft/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/config"
@@ -246,6 +247,19 @@ func (a appCreator) newApp(logger tmlog.Logger, db dbm.DB, traceStore io.Writer,
 		cast.ToUint32(appOpts.Get(sdkserver.FlagStateSyncSnapshotKeepRecent)),
 	)
 
+	homeDir := cast.ToString(appOpts.Get(flags.FlagHome))
+
+	// Setup chainId
+	chainID := cast.ToString(appOpts.Get(flags.FlagChainID))
+	if len(chainID) == 0 {
+		// fallback to genesis chain-id
+		appGenesis, err := tmtypes.GenesisDocFromFile(filepath.Join(homeDir, "config", "genesis.json"))
+		if err != nil {
+			panic(err)
+		}
+		chainID = appGenesis.ChainID
+	}
+
 	ethermintApp := app.NewEthermintApp(
 		logger, db, traceStore, true, skipUpgradeHeights,
 		cast.ToString(appOpts.Get(flags.FlagHome)),
@@ -263,7 +277,7 @@ func (a appCreator) newApp(logger tmlog.Logger, db dbm.DB, traceStore io.Writer,
 		baseapp.SetSnapshot(snapshotStore, snapshotOptions),
 		baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(sdkserver.FlagIAVLCacheSize))),
 		baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(sdkserver.FlagDisableIAVLFastNode))),
-		baseapp.SetChainID("ethermint_9000-1"),
+		baseapp.SetChainID(chainID),
 	)
 
 	return ethermintApp

tests/integration_tests/test_upgrade.py

@@ -121,7 +121,7 @@ def test_cosmovisor_upgrade(custom_ethermint: Ethermint):
     )
     assert rsp["code"] == 0, rsp["raw_log"]
     # wait until tx will be processed
-    time.sleep(3)
+    time.sleep(5)
     approve_proposal(custom_ethermint, rsp)
 
     # update cli chain binary

tests/integration_tests/utils.py

@@ -219,8 +219,10 @@ def cb(attrs):
     for i in range(len(n.config["validators"])):
         rsp = n.cosmos_cli(i).gov_vote("validator", proposal_id, "yes", gas=1000000)
         assert rsp["code"] == 0, rsp["raw_log"]
-
+    # wait until txs will be processed
+    time.sleep(5)
     wait_for_new_blocks(cli, 1)
+
     res = cli.query_tally(proposal_id)
     res = res.get("tally") or res
     assert (