diff --git a/services/wallet/common/const.go b/services/wallet/common/const.go index 49b7f9ab5..c742bb976 100644 --- a/services/wallet/common/const.go +++ b/services/wallet/common/const.go @@ -14,16 +14,18 @@ const ( type ChainID uint64 const ( - UnknownChainID uint64 = 0 - EthereumMainnet uint64 = 1 - EthereumGoerli uint64 = 5 - EthereumSepolia uint64 = 11155111 - OptimismMainnet uint64 = 10 - OptimismGoerli uint64 = 420 - OptimismSepolia uint64 = 11155420 - ArbitrumMainnet uint64 = 42161 - ArbitrumGoerli uint64 = 421613 - ArbitrumSepolia uint64 = 421614 + UnknownChainID uint64 = 0 + EthereumMainnet uint64 = 1 + EthereumGoerli uint64 = 5 + EthereumSepolia uint64 = 11155111 + OptimismMainnet uint64 = 10 + OptimismGoerli uint64 = 420 + OptimismSepolia uint64 = 11155420 + ArbitrumMainnet uint64 = 42161 + ArbitrumGoerli uint64 = 421613 + ArbitrumSepolia uint64 = 421614 + BinanceChainID uint64 = 56 // obsolete? + BinanceTestChainID uint64 = 97 // obsolete? ) type ContractType byte diff --git a/services/wallet/transfer/commands.go b/services/wallet/transfer/commands.go index 276717197..43ce64f66 100644 --- a/services/wallet/transfer/commands.go +++ b/services/wallet/transfer/commands.go @@ -47,16 +47,14 @@ const ( var ( // This will work only for binance testnet as mainnet doesn't support // archival request. - binanceChainErc20BatchSize = big.NewInt(5000) - goerliErc20BatchSize = big.NewInt(100000) - goerliErc20ArbitrumBatchSize = big.NewInt(10000) - goerliErc20OptimismBatchSize = big.NewInt(10000) - erc20BatchSize = big.NewInt(500000) - binancChainID = uint64(56) - goerliChainID = uint64(5) - goerliArbitrumChainID = uint64(421613) - goerliOptimismChainID = uint64(420) - binanceTestChainID = uint64(97) + binanceChainErc20BatchSize = big.NewInt(5000) + goerliErc20BatchSize = big.NewInt(100000) + goerliErc20ArbitrumBatchSize = big.NewInt(10000) + goerliErc20OptimismBatchSize = big.NewInt(10000) + sepoliaErc20BatchSize = big.NewInt(100000) + sepoliaErc20ArbitrumBatchSize = big.NewInt(10000) + sepoliaErc20OptimismBatchSize = big.NewInt(10000) + erc20BatchSize = big.NewInt(100000) transfersRetryInterval = 5 * time.Second ) @@ -134,23 +132,26 @@ func (c *erc20HistoricalCommand) Command() async.Command { } func getErc20BatchSize(chainID uint64) *big.Int { - if isBinanceChain(chainID) { - return binanceChainErc20BatchSize - } - - if chainID == goerliChainID { + switch chainID { + case w_common.EthereumSepolia: + return sepoliaErc20BatchSize + case w_common.OptimismSepolia: + return sepoliaErc20OptimismBatchSize + case w_common.ArbitrumSepolia: + return sepoliaErc20ArbitrumBatchSize + case w_common.EthereumGoerli: return goerliErc20BatchSize - } - - if chainID == goerliOptimismChainID { + case w_common.OptimismGoerli: return goerliErc20OptimismBatchSize - } - - if chainID == goerliArbitrumChainID { + case w_common.ArbitrumGoerli: return goerliErc20ArbitrumBatchSize + case w_common.BinanceChainID: + return binanceChainErc20BatchSize + case w_common.BinanceTestChainID: + return binanceChainErc20BatchSize + default: + return erc20BatchSize } - - return erc20BatchSize } func (c *erc20HistoricalCommand) Run(ctx context.Context) (err error) { @@ -608,10 +609,6 @@ func loadTransfers(ctx context.Context, blockDAO *BlockDAO, db *Database, return nil } -func isBinanceChain(chainID uint64) bool { - return chainID == binancChainID || chainID == binanceTestChainID -} - // Ensure 1 DBHeader per Block Hash func uniqueHeaderPerBlockHash(allHeaders []*DBHeader) []*DBHeader { uniqHeadersByHash := map[common.Hash]*DBHeader{}