cmd, common, eth: copy constants after get chain id

XinFinOrg · Feb 18, 2025 · e431f12 · e431f12
1 parent 6f22270
commit e431f12
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 33 deletions.
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -1447,7 +1447,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 	if ctx.Bool(XDCTestnetFlag.Name) {
 		cfg.NetworkId = 51
 	}
-	common.CopyConstans(cfg.NetworkId)
 
 	if ctx.IsSet(CacheFlag.Name) || ctx.IsSet(CacheDatabaseFlag.Name) {
 		cfg.DatabaseCache = ctx.Int(CacheFlag.Name) * ctx.Int(CacheDatabaseFlag.Name) / 100

diff --git a/common/constants.go b/common/constants.go
@@ -143,8 +143,8 @@ var (
 	LendingRegistrationSMC        = MaintnetConstant.lendingRegistrationSMC
 	LendingRegistrationSMCTestnet = MaintnetConstant.lendingRegistrationSMCTestnet
 
-	ignoreSignerCheckBlockArray = map[uint64]struct{}{}
-	blacklist                   = map[Address]struct{}{}
+	ignoreSignerCheckBlockArray = MaintnetConstant.ignoreSignerCheckBlockArray
+	blacklist                   = MaintnetConstant.blacklist
 )
 
 func IsIgnoreSignerCheckBlock(blockNumber uint64) bool {
@@ -160,12 +160,13 @@ func IsInBlacklist(address *Address) bool {
 	return ok
 }
 
+// CopyConstans only handles testnet, devnet, local. It does not
+// handles mainnet since the default value is from mainnet.
 func CopyConstans(chainID uint64) {
 	var c *constant
-	if chainID == MaintnetConstant.chainID {
-		c = &MaintnetConstant
-	} else if chainID == TestnetConstant.chainID {
+	if chainID == TestnetConstant.chainID {
 		c = &TestnetConstant
+		IsTestnet = true
 	} else if chainID == DevnetConstant.chainID {
 		c = &DevnetConstant
 	} else if chainID == localConstant.chainID {
@@ -207,9 +208,10 @@ func CopyConstans(chainID uint64) {
 	LendingRegistrationSMC = c.lendingRegistrationSMC
 	LendingRegistrationSMCTestnet = c.lendingRegistrationSMCTestnet
 
+	// clear destination first to make safe when called again
 	clear(ignoreSignerCheckBlockArray)
-	maps.Copy(ignoreSignerCheckBlockArray, c.ignoreSignerCheckBlockArray)
-
 	clear(blacklist)
+
+	maps.Copy(ignoreSignerCheckBlockArray, c.ignoreSignerCheckBlockArray)
 	maps.Copy(blacklist, c.blacklist)
 }
diff --git a/common/constants/constants.go.devnet b/common/constants/constants.go.devnet
@@ -143,8 +143,8 @@ var (
 	LendingRegistrationSMC        = MaintnetConstant.lendingRegistrationSMC
 	LendingRegistrationSMCTestnet = MaintnetConstant.lendingRegistrationSMCTestnet
 
-	ignoreSignerCheckBlockArray = map[uint64]struct{}{}
-	blacklist                   = map[Address]struct{}{}
+	ignoreSignerCheckBlockArray = MaintnetConstant.ignoreSignerCheckBlockArray
+	blacklist                   = MaintnetConstant.blacklist
 )
 
 func IsIgnoreSignerCheckBlock(blockNumber uint64) bool {
@@ -160,12 +160,13 @@ func IsInBlacklist(address *Address) bool {
 	return ok
 }
 
+// CopyConstans only handles testnet, devnet, local. It does not
+// handles mainnet since the default value is from mainnet.
 func CopyConstans(chainID uint64) {
 	var c *constant
-	if chainID == MaintnetConstant.chainID {
-		c = &MaintnetConstant
-	} else if chainID == TestnetConstant.chainID {
+	if chainID == TestnetConstant.chainID {
 		c = &TestnetConstant
+		IsTestnet = true
 	} else if chainID == DevnetConstant.chainID {
 		c = &DevnetConstant
 	} else if chainID == localConstant.chainID {
@@ -207,9 +208,10 @@ func CopyConstans(chainID uint64) {
 	LendingRegistrationSMC = c.lendingRegistrationSMC
 	LendingRegistrationSMCTestnet = c.lendingRegistrationSMCTestnet
 
+	// clear destination first to make safe when called again
 	clear(ignoreSignerCheckBlockArray)
-	maps.Copy(ignoreSignerCheckBlockArray, c.ignoreSignerCheckBlockArray)
-
 	clear(blacklist)
+
+	maps.Copy(ignoreSignerCheckBlockArray, c.ignoreSignerCheckBlockArray)
 	maps.Copy(blacklist, c.blacklist)
 }
diff --git a/common/constants/constants.go.local b/common/constants/constants.go.local
@@ -143,8 +143,8 @@ var (
 	LendingRegistrationSMC        = MaintnetConstant.lendingRegistrationSMC
 	LendingRegistrationSMCTestnet = MaintnetConstant.lendingRegistrationSMCTestnet
 
-	ignoreSignerCheckBlockArray = map[uint64]struct{}{}
-	blacklist                   = map[Address]struct{}{}
+	ignoreSignerCheckBlockArray = MaintnetConstant.ignoreSignerCheckBlockArray
+	blacklist                   = MaintnetConstant.blacklist
 )
 
 func IsIgnoreSignerCheckBlock(blockNumber uint64) bool {
@@ -160,12 +160,13 @@ func IsInBlacklist(address *Address) bool {
 	return ok
 }
 
+// CopyConstans only handles testnet, devnet, local. It does not
+// handles mainnet since the default value is from mainnet.
 func CopyConstans(chainID uint64) {
 	var c *constant
-	if chainID == MaintnetConstant.chainID {
-		c = &MaintnetConstant
-	} else if chainID == TestnetConstant.chainID {
+	if chainID == TestnetConstant.chainID {
 		c = &TestnetConstant
+		IsTestnet = true
 	} else if chainID == DevnetConstant.chainID {
 		c = &DevnetConstant
 	} else if chainID == localConstant.chainID {
@@ -207,9 +208,10 @@ func CopyConstans(chainID uint64) {
 	LendingRegistrationSMC = c.lendingRegistrationSMC
 	LendingRegistrationSMCTestnet = c.lendingRegistrationSMCTestnet
 
+	// clear destination first to make safe when called again
 	clear(ignoreSignerCheckBlockArray)
-	maps.Copy(ignoreSignerCheckBlockArray, c.ignoreSignerCheckBlockArray)
-
 	clear(blacklist)
+
+	maps.Copy(ignoreSignerCheckBlockArray, c.ignoreSignerCheckBlockArray)
 	maps.Copy(blacklist, c.blacklist)
 }
diff --git a/common/constants/constants.go.testnet b/common/constants/constants.go.testnet
@@ -143,8 +143,8 @@ var (
 	LendingRegistrationSMC        = MaintnetConstant.lendingRegistrationSMC
 	LendingRegistrationSMCTestnet = MaintnetConstant.lendingRegistrationSMCTestnet
 
-	ignoreSignerCheckBlockArray = map[uint64]struct{}{}
-	blacklist                   = map[Address]struct{}{}
+	ignoreSignerCheckBlockArray = MaintnetConstant.ignoreSignerCheckBlockArray
+	blacklist                   = MaintnetConstant.blacklist
 )
 
 func IsIgnoreSignerCheckBlock(blockNumber uint64) bool {
@@ -160,12 +160,13 @@ func IsInBlacklist(address *Address) bool {
 	return ok
 }
 
+// CopyConstans only handles testnet, devnet, local. It does not
+// handles mainnet since the default value is from mainnet.
 func CopyConstans(chainID uint64) {
 	var c *constant
-	if chainID == MaintnetConstant.chainID {
-		c = &MaintnetConstant
-	} else if chainID == TestnetConstant.chainID {
+	if chainID == TestnetConstant.chainID {
 		c = &TestnetConstant
+		IsTestnet = true
 	} else if chainID == DevnetConstant.chainID {
 		c = &DevnetConstant
 	} else if chainID == localConstant.chainID {
@@ -207,9 +208,10 @@ func CopyConstans(chainID uint64) {
 	LendingRegistrationSMC = c.lendingRegistrationSMC
 	LendingRegistrationSMCTestnet = c.lendingRegistrationSMCTestnet
 
+	// clear destination first to make safe when called again
 	clear(ignoreSignerCheckBlockArray)
-	maps.Copy(ignoreSignerCheckBlockArray, c.ignoreSignerCheckBlockArray)
-
 	clear(blacklist)
+
+	maps.Copy(ignoreSignerCheckBlockArray, c.ignoreSignerCheckBlockArray)
 	maps.Copy(blacklist, c.blacklist)
 }
diff --git a/eth/backend.go b/eth/backend.go
@@ -131,16 +131,18 @@ func New(ctx *node.ServiceContext, config *ethconfig.Config, XDCXServ *XDCx.XDCX
 		return nil, genesisErr
 	}
 
+	networkID := config.NetworkId
+	if networkID == 0 {
+		networkID = chainConfig.ChainId.Uint64()
+	}
+	common.CopyConstans(networkID)
+
 	log.Info(strings.Repeat("-", 153))
 	for _, line := range strings.Split(chainConfig.Description(), "\n") {
 		log.Info(line)
 	}
 	log.Info(strings.Repeat("-", 153))
 
-	networkID := config.NetworkId
-	if networkID == 0 {
-		networkID = chainConfig.ChainId.Uint64()
-	}
 	eth := &Ethereum{
 		config:         config,
 		chainDb:        chainDb,