diff --git a/modules/statics/src/coins.ts b/modules/statics/src/coins.ts index d2e704b858..4ea9e62458 100644 --- a/modules/statics/src/coins.ts +++ b/modules/statics/src/coins.ts @@ -52,14 +52,11 @@ export const coins = CoinMap.fromCoins([ // Maps family -> coin name (e.g., 'ip' -> 'ip') const erc20ChainToNameMap: Record = {}; -// TODO: remove ip and hypeeevm coins here and remove other evm coins from switch block, once changes are tested (Ticket: https://bitgoinc.atlassian.net/browse/WIN-7835) -const enabledEvmCoins = ['ip', 'hypeevm', 'plume']; allCoinsAndTokens.forEach((coin) => { if ( coin.features.includes(CoinFeature.SUPPORTS_ERC20) && coin.network.type === NetworkType.MAINNET && - !coin.isToken && - enabledEvmCoins.includes(coin.family) + !coin.isToken ) { erc20ChainToNameMap[coin.family] = coin.name; } diff --git a/modules/statics/src/tokenConfig.ts b/modules/statics/src/tokenConfig.ts index 2c69a9e3c8..60c7b76128 100644 --- a/modules/statics/src/tokenConfig.ts +++ b/modules/statics/src/tokenConfig.ts @@ -1162,12 +1162,9 @@ export const getEthLikeTokens = (network: 'Mainnet' | 'Testnet', tokenType: Toke } const ethLikeTokenMap = {} as EthLikeTokenMap; - // TODO: add IP token here and test changes (Ticket: https://bitgoinc.atlassian.net/browse/WIN-7835) - const enabledChains = ['ip', 'hypeevm', 'plume'] as string[]; coins.forEach((coin) => { - // TODO: remove enabled chains once changes are done (Ticket: https://bitgoinc.atlassian.net/browse/WIN-7835) - if (coin instanceof AccountCoin && coin.features.includes(feature) && enabledChains.includes(coin.family)) { + if (coin instanceof AccountCoin && coin.features.includes(feature)) { const coinName = coin.family; const coinNameForNetwork = network === 'Testnet' ? `t${coinName}` : coinName; diff --git a/modules/statics/test/unit/tokenConfigTests.ts b/modules/statics/test/unit/tokenConfigTests.ts index bdcfb410f4..b7f4adc649 100644 --- a/modules/statics/test/unit/tokenConfigTests.ts +++ b/modules/statics/test/unit/tokenConfigTests.ts @@ -312,11 +312,11 @@ describe('EthLike Token Config Functions', function () { }); describe('getEthLikeTokens', function () { - it('should return a map with tokens for enabled chains', function () { + it('should return a map with tokens for EVM chains supporting ERC20', function () { const result = getEthLikeTokens('Mainnet', TokenTypeEnum.ERC20); result.should.be.an.Object(); - // The function filters by enabledChains which currently includes 'ip' and 'hypeevm' + // The function includes all EVM chains with SUPPORTS_ERC20 feature if (result.ip) { result.ip.should.have.property('tokens'); result.ip.tokens.should.be.an.Array(); @@ -390,22 +390,6 @@ describe('EthLike Token Config Functions', function () { }); }); - it('should only include tokens from enabled chains', function () { - const mainnetResult = getEthLikeTokens('Mainnet', TokenTypeEnum.ERC20); - const testnetResult = getEthLikeTokens('Testnet', TokenTypeEnum.ERC20); - - // Current implementation enables 'ip' and 'hypeevm' chains - const enabledChains = ['ip', 'hypeevm', 'plume']; - - Object.keys(mainnetResult).forEach((family) => { - enabledChains.should.containEql(family); - }); - - Object.keys(testnetResult).forEach((family) => { - enabledChains.should.containEql(family); - }); - }); - it('should return empty tokens array for chains without tokens', function () { const result = getEthLikeTokens('Mainnet', TokenTypeEnum.ERC20);