Remove chain.Chain from zetaclientd config (#3137)

zeta-chain · Nov 12, 2024 · dede049 · dede049
1 parent edebb7a
commit dede049
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 55 deletions.
diff --git a/changelog.md b/changelog.md
@@ -16,6 +16,7 @@
 * [3118](https://github.com/zeta-chain/node/pull/3118) - zetaclient: remove hsm signer
 * [3122](https://github.com/zeta-chain/node/pull/3122) - improve & refactor zetaclientd cli
 * [3125](https://github.com/zeta-chain/node/pull/3125) - drop support for header proofs
+* [3137](https://github.com/zeta-chain/node/pull/3137) - remove chain.Chain from zetaclientd config
 
 ### Fixes
 * [3041](https://github.com/zeta-chain/node/pull/3041) - replace libp2p public DHT with private gossip peer discovery and connection gater for inbound connections

diff --git a/cmd/zetaclientd/start.go b/cmd/zetaclientd/start.go
@@ -55,7 +55,7 @@ func Start(_ *cobra.Command, _ []string) error {
 		chains.Network_solana.String(): solanaKeyPass,
 	}
 
-	//Load Config file given path
+	// Load Config file given path
 	cfg, err := config.Load(globalOpts.ZetacoreHome)
 	if err != nil {
 		return err

diff --git a/zetaclient/chains/evm/observer/observer_test.go b/zetaclient/chains/evm/observer/observer_test.go
@@ -53,7 +53,6 @@ func getAppContext(
 	// create config
 	cfg := config.New(false)
 	cfg.EVMChainConfigs[evmChain.ChainId] = config.EVMConfig{
-		Chain:    evmChain,
 		Endpoint: endpoint,
 	}
 
@@ -178,7 +177,6 @@ func Test_NewObserver(t *testing.T) {
 		{
 			name: "should be able to create observer",
 			evmCfg: config.EVMConfig{
-				Chain:    chain,
 				Endpoint: "http://localhost:8545",
 			},
 			chainParams: params,
@@ -192,7 +190,6 @@ func Test_NewObserver(t *testing.T) {
 		{
 			name: "should fail if RPC call fails",
 			evmCfg: config.EVMConfig{
-				Chain:    chain,
 				Endpoint: "http://localhost:8545",
 			},
 			chainParams: params,
@@ -212,7 +209,6 @@ func Test_NewObserver(t *testing.T) {
 		{
 			name: "should fail on invalid ENV var",
 			evmCfg: config.EVMConfig{
-				Chain:    chain,
 				Endpoint: "http://localhost:8545",
 			},
 			chainParams: params,

diff --git a/zetaclient/config/config_chain.go b/zetaclient/config/config_chain.go
@@ -32,7 +32,9 @@ func New(setDefaults bool) Config {
 // bitcoinConfigRegnet contains Bitcoin config for regnet
 func bitcoinConfigRegnet() BTCConfig {
 	return BTCConfig{
-		RPCUsername:     "smoketest", // smoketest is the previous name for E2E test, we keep this name for compatibility between client versions in upgrade test
+		// `smoketest` is the previous name for E2E test,
+		// we keep this name for compatibility between client versions in upgrade test
+		RPCUsername:     "smoketest",
 		RPCPassword:     "123",
 		RPCHost:         "bitcoin:18443",
 		RPCParams:       "regtest",
@@ -59,30 +61,7 @@ func tonConfigLocalnet() TONConfig {
 // it contains list of EVM chains with empty endpoint except for localnet
 func evmChainsConfigs() map[int64]EVMConfig {
 	return map[int64]EVMConfig{
-		chains.Ethereum.ChainId: {
-			Chain: chains.Ethereum,
-		},
-		chains.BscMainnet.ChainId: {
-			Chain: chains.BscMainnet,
-		},
-		chains.Goerli.ChainId: {
-			Chain:    chains.Goerli,
-			Endpoint: "",
-		},
-		chains.Sepolia.ChainId: {
-			Chain:    chains.Sepolia,
-			Endpoint: "",
-		},
-		chains.BscTestnet.ChainId: {
-			Chain:    chains.BscTestnet,
-			Endpoint: "",
-		},
-		chains.Mumbai.ChainId: {
-			Chain:    chains.Mumbai,
-			Endpoint: "",
-		},
 		chains.GoerliLocalnet.ChainId: {
-			Chain:           chains.GoerliLocalnet,
 			Endpoint:        "http://eth:8545",
 			RPCAlertLatency: 60,
 		},

diff --git a/zetaclient/config/types.go b/zetaclient/config/types.go
@@ -6,8 +6,6 @@ import (
 	"sync"
 
 	"github.com/showa-93/go-mask"
-
-	"github.com/zeta-chain/node/pkg/chains"
 )
 
 // KeyringBackend is the type of keyring backend to use for the hotkey
@@ -40,7 +38,6 @@ type ClientConfiguration struct {
 
 // EVMConfig is the config for EVM chain
 type EVMConfig struct {
-	Chain           chains.Chain
 	Endpoint        string `mask:"filled"`
 	RPCAlertLatency int64
 }
@@ -216,7 +213,7 @@ func (c Config) GetRelayerKeyPath() string {
 }
 
 func (c EVMConfig) Empty() bool {
-	return c.Endpoint == "" || c.Chain.IsEmpty()
+	return c.Endpoint == ""
 }
 
 func (c BTCConfig) Empty() bool {

diff --git a/zetaclient/config/types_test.go b/zetaclient/config/types_test.go
@@ -17,7 +17,6 @@ func Test_GetRelayerKeyPath(t *testing.T) {
 }
 
 func Test_GetEVMConfig(t *testing.T) {
-	chain := chains.Sepolia
 	chainID := chains.Sepolia.ChainId
 
 	t.Run("should find non-empty evm config", func(t *testing.T) {
@@ -26,7 +25,6 @@ func Test_GetEVMConfig(t *testing.T) {
 
 		// set valid evm endpoint
 		cfg.EVMChainConfigs[chainID] = config.EVMConfig{
-			Chain:    chain,
 			Endpoint: "localhost",
 		}
 
@@ -44,21 +42,6 @@ func Test_GetEVMConfig(t *testing.T) {
 		_, found := cfg.GetEVMConfig(chainID)
 		require.False(t, found)
 	})
-
-	t.Run("should not find evm config if chain is empty", func(t *testing.T) {
-		// create config with defaults
-		cfg := config.New(true)
-
-		// set empty chain
-		cfg.EVMChainConfigs[chainID] = config.EVMConfig{
-			Chain:    chains.Chain{},
-			Endpoint: "localhost",
-		}
-
-		// should not find evm config because chain is empty
-		_, found := cfg.GetEVMConfig(chainID)
-		require.False(t, found)
-	})
 }
 
 func Test_GetBTCConfig(t *testing.T) {

diff --git a/zetaclient/orchestrator/bootstap_test.go b/zetaclient/orchestrator/bootstap_test.go
@@ -44,12 +44,10 @@ func TestCreateSignerMap(t *testing.T) {
 		cfg := config.New(false)
 
 		cfg.EVMChainConfigs[chains.Ethereum.ChainId] = config.EVMConfig{
-			Chain:    chains.Ethereum,
 			Endpoint: testutils.MockEVMRPCEndpoint,
 		}
 
 		cfg.EVMChainConfigs[chains.Polygon.ChainId] = config.EVMConfig{
-			Chain:    chains.Polygon,
 			Endpoint: testutils.MockEVMRPCEndpoint,
 		}
 
@@ -225,12 +223,10 @@ func TestCreateChainObserverMap(t *testing.T) {
 		cfg := config.New(false)
 
 		cfg.EVMChainConfigs[chains.Ethereum.ChainId] = config.EVMConfig{
-			Chain:    chains.Ethereum,
 			Endpoint: evmServer.Endpoint,
 		}
 
 		cfg.EVMChainConfigs[chains.Polygon.ChainId] = config.EVMConfig{
-			Chain:    chains.Polygon,
 			Endpoint: evmServer.Endpoint,
 		}
 

diff --git a/zetaclient/orchestrator/orchestrator_test.go b/zetaclient/orchestrator/orchestrator_test.go
@@ -602,7 +602,7 @@ func createAppContext(t *testing.T, chainsOrParams ...any) *zctx.AppContext {
 	for _, c := range supportedChains {
 		switch {
 		case chains.IsEVMChain(c.ChainId, nil):
-			cfg.EVMChainConfigs[c.ChainId] = config.EVMConfig{Chain: c}
+			cfg.EVMChainConfigs[c.ChainId] = config.EVMConfig{Endpoint: "localhost"}
 		case chains.IsBitcoinChain(c.ChainId, nil):
 			cfg.BTCChainConfigs[c.ChainId] = config.BTCConfig{RPCHost: "localhost"}
 		case chains.IsSolanaChain(c.ChainId, nil):