Merge pull request #6334 from BitGo/WIN-5969

feat: use common evm sdk in account-lib & coin factory

Author: hitansh-madan

modules/account-lib/package.json

@@ -47,6 +47,7 @@
     "@bitgo/sdk-coin-dot": "^4.3.2",
     "@bitgo/sdk-coin-etc": "^2.3.2",
     "@bitgo/sdk-coin-eth": "^24.6.2",
+    "@bitgo/sdk-coin-evm": "^1.1.0",
     "@bitgo/sdk-coin-flr": "^1.3.2",
     "@bitgo/sdk-coin-hash": "^3.1.2",
     "@bitgo/sdk-coin-hbar": "^2.2.2",

modules/account-lib/src/index.ts

@@ -8,7 +8,7 @@ import {
   accountLibBaseCoin,
   acountLibCrypto,
 } from '@bitgo/sdk-core';
-import { BaseCoin as CoinConfig, coins } from '@bitgo/statics';
+import { BaseCoin as CoinConfig, CoinFeature, coins } from '@bitgo/statics';
 export { Ed25519BIP32, Eddsa };
 
 /**
@@ -173,6 +173,9 @@ export { Icp };
 import * as Flr from '@bitgo/sdk-coin-flr';
 export { Flr };
 
+import * as EvmCoin from '@bitgo/sdk-coin-evm';
+export { EvmCoin };
+
 import * as Sgb from '@bitgo/sdk-coin-sgb';
 export { Sgb };
 
@@ -308,6 +311,12 @@ const coinBuilderMap = {
   tvet: Vet.TransactionBuilderFactory,
 };
 
+coins
+  .filter((coin) => coin.features.includes(CoinFeature.SHARED_EVM_SDK))
+  .forEach((coin) => {
+    coinBuilderMap[coin.name] = EvmCoin.TransactionBuilder;
+  });
+
 /**
  * Get the list of coin tickers supported by this library.
  */

modules/account-lib/test/unit/keyPair/index.ts

@@ -12,7 +12,7 @@ describe('Key Pair Factory', () => {
   describe('coinToKey map initialization', function () {
     const supportedCoinsExceptTestnet = Object.keys(coinModules)
       // TODO(BG-40990): temporarily disable eth2 from the test for bls not initialized error
-      .filter((k) => coinModules[k].KeyPair && k.trim().toLowerCase() !== 'eth2');
+      .filter((k) => coinModules[k].KeyPair && !['eth2', 'evmcoin'].includes(k.trim().toLowerCase()));
 
     supportedCoinsExceptTestnet.forEach((coinName) => {
       it(`should initialize a ${coinName} keyPair map`, () => {

modules/account-lib/tsconfig.json

@@ -52,6 +52,9 @@
     {
       "path": "../sdk-coin-eth"
     },
+    {
+      "path": "../sdk-coin-evm"
+    },
     {
       "path": "../sdk-coin-flr"
     },

modules/bitgo/package.json

@@ -80,6 +80,7 @@
     "@bitgo/sdk-coin-eth": "^24.6.2",
     "@bitgo/sdk-coin-ethlike": "^1.3.2",
     "@bitgo/sdk-coin-ethw": "^20.1.2",
+    "@bitgo/sdk-coin-evm": "^1.1.0",
     "@bitgo/sdk-coin-flr": "^1.3.2",
     "@bitgo/sdk-coin-hash": "^3.1.2",
     "@bitgo/sdk-coin-hbar": "^2.2.2",

modules/bitgo/src/v2/coinFactory.ts

@@ -30,6 +30,7 @@ import {
   SuiTokenConfig,
   AptTokenConfig,
   Sip10TokenConfig,
+  CoinFeature,
 } from '@bitgo/statics';
 import {
   Ada,
@@ -71,6 +72,7 @@ import {
   Eth,
   Ethw,
   EthLikeCoin,
+  EvmCoin,
   Flr,
   TethLikeCoin,
   FiatAED,
@@ -367,6 +369,12 @@ export function registerCoinConstructors(coinFactory: CoinFactory, coinMap: Coin
   coinFactory.register('zeta', Zeta.createInstance);
   coinFactory.register('zketh', Zketh.createInstance);
 
+  coins
+    .filter((coin) => coin.features.includes(CoinFeature.SHARED_EVM_SDK))
+    .forEach((coin) => {
+      coinFactory.register(coin.name, EvmCoin.createInstance);
+    });
+
   const tokens = getFormattedTokens(coinMap);
 
   Erc20Token.createTokenConstructors([...tokens.bitcoin.eth.tokens, ...tokens.testnet.eth.tokens]).forEach(
@@ -488,6 +496,10 @@ export function registerCoinConstructors(coinFactory: CoinFactory, coinMap: Coin
 }
 
 export function getCoinConstructor(coinName: string): CoinConstructor | undefined {
+  const evmCoins = coins.filter((coin) => coin.features.includes(CoinFeature.SHARED_EVM_SDK));
+  if (evmCoins.has(coinName)) {
+    return EvmCoin.createInstance;
+  }
   switch (coinName) {
     case 'ada':
       return Ada.createInstance;

modules/bitgo/src/v2/coins/index.ts

@@ -29,6 +29,7 @@ import { Dot, Tdot } from '@bitgo/sdk-coin-dot';
 import { Eos, EosToken, Teos } from '@bitgo/sdk-coin-eos';
 import { Etc, Tetc } from '@bitgo/sdk-coin-etc';
 import { Erc20Token, Eth, Gteth, Hteth, Teth } from '@bitgo/sdk-coin-eth';
+import { EvmCoin } from '@bitgo/sdk-coin-evm';
 import { Flr, Tflr } from '@bitgo/sdk-coin-flr';
 import { Ethw } from '@bitgo/sdk-coin-ethw';
 import { EthLikeCoin, TethLikeCoin } from '@bitgo/sdk-coin-ethlike';
@@ -103,6 +104,7 @@ export { Erc20Token, Eth, Gteth, Hteth, Teth };
 export { Ethw };
 export { EthLikeCoin, TethLikeCoin };
 export { Etc, Tetc };
+export { EvmCoin };
 export { Flr, Tflr };
 export { Hash, Thash };
 export { Hbar, Thbar };

modules/bitgo/tsconfig.json

@@ -152,6 +152,9 @@
     {
       "path": "../sdk-coin-ethw"
     },
+    {
+      "path": "../sdk-coin-evm"
+    },
     {
       "path": "../sdk-coin-flr"
     },