From 2a2711ad644332a958d66b715ab4335c28b00386 Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Tue, 18 Feb 2025 14:31:26 +0800 Subject: [PATCH] cmd, common, eth: copy constants after get chain id --- cmd/utils/flags.go | 1 - common/constants.go | 11 ++++++----- common/constants/constants.go.devnet | 11 ++++++----- common/constants/constants.go.local | 11 ++++++----- common/constants/constants.go.testnet | 11 ++++++----- eth/backend.go | 10 ++++++---- 6 files changed, 30 insertions(+), 25 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 4be3e939bd..82393aa306 100644 --- 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 index 7fc0e2268b..4280c57f0f 100644 --- 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 { diff --git a/common/constants/constants.go.devnet b/common/constants/constants.go.devnet index 7fc0e2268b..4280c57f0f 100644 --- 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 { diff --git a/common/constants/constants.go.local b/common/constants/constants.go.local index 7fc0e2268b..4280c57f0f 100644 --- 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 { diff --git a/common/constants/constants.go.testnet b/common/constants/constants.go.testnet index 7fc0e2268b..4280c57f0f 100644 --- 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 { diff --git a/eth/backend.go b/eth/backend.go index 6634a4ee78..687d763f44 100644 --- 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,