refactor: check if v4 factory is defined

TICKET: WP-6461

Author: danielzhao122

modules/abstract-eth/src/abstractEthLikeNewCoins.ts

@@ -2732,16 +2732,18 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
     return {};
   }
 
-  getFactoryAndImplContractAddresses(walletVersion: number | undefined): {
+  getForwarderFactoryAndImplContractAddresses(walletVersion: number | undefined): {
     forwarderFactoryAddress: string;
     forwarderImplementationAddress: string;
   } {
     const ethNetwork = this.getNetwork();
     if (walletVersion && (walletVersion === 5 || walletVersion === 4)) {
-      return {
-        forwarderFactoryAddress: ethNetwork?.walletV4ForwarderFactoryAddress as string,
-        forwarderImplementationAddress: ethNetwork?.walletV4ForwarderImplementationAddress as string,
-      };
+      if (ethNetwork?.walletV4ForwarderFactoryAddress && ethNetwork?.walletV4ForwarderImplementationAddress) {
+        return {
+          forwarderFactoryAddress: ethNetwork?.walletV4ForwarderFactoryAddress as string,
+          forwarderImplementationAddress: ethNetwork?.walletV4ForwarderImplementationAddress as string,
+        };
+      }
     }
     return {
       forwarderFactoryAddress: ethNetwork?.forwarderFactoryAddress as string,
@@ -2795,9 +2797,8 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
         );
       }
 
-      const { forwarderFactoryAddress, forwarderImplementationAddress } = this.getFactoryAndImplContractAddresses(
-        params.walletVersion
-      );
+      const { forwarderFactoryAddress, forwarderImplementationAddress } =
+        this.getForwarderFactoryAndImplContractAddresses(params.walletVersion);
       const initcode = getProxyInitcode(forwarderImplementationAddress);
       const saltBuffer = ethUtil.setLengthLeft(
         Buffer.from(ethUtil.padToEven(ethUtil.stripHexPrefix(coinSpecific.salt || '')), 'hex'),

modules/sdk-coin-polygon/test/unit/polygon.ts

@@ -1315,4 +1315,49 @@ describe('Polygon', function () {
       );
     });
   });
+
+  describe('Test isWalletAddress', function () {
+    it('verify address for tpolygon', async function () {
+      const keychains = [
+        {
+          id: '6920c05e0b195abd8ed0bb0a5df32cdc',
+          source: 'user',
+          type: 'tss',
+          commonKeychain:
+            '02f929f92c25eaccb0e3ebaa0f5ed900c5ad30ba94f8444dc89c94e12f01aa5371522d810b8918ecc9e41eb901352df1c7977420fbaf9b8617f61b780b32b2ccad',
+        },
+        {
+          id: '6920c05e93c3b1c9e5006bf00a3cf016',
+          source: 'backup',
+          type: 'tss',
+          commonKeychain:
+            '02f929f92c25eaccb0e3ebaa0f5ed900c5ad30ba94f8444dc89c94e12f01aa5371522d810b8918ecc9e41eb901352df1c7977420fbaf9b8617f61b780b32b2ccad',
+        },
+        {
+          id: '6920c05d9ebee0100ec4a8aa7e300c02',
+          source: 'bitgo',
+          type: 'tss',
+          commonKeychain:
+            '02f929f92c25eaccb0e3ebaa0f5ed900c5ad30ba94f8444dc89c94e12f01aa5371522d810b8918ecc9e41eb901352df1c7977420fbaf9b8617f61b780b32b2ccad',
+        },
+      ];
+
+      const params = {
+        address: '0x4e9fc44697f4135455157396485f6fe8f909752f',
+        baseAddress: '0x8cf5ebd51585d159c4a1ca36178f9ad0fd7a594c',
+        coinSpecific: {
+          salt: '0xd',
+          forwarderVersion: 4,
+          feeAddress: '0x44dcb3504e323a3d70142036a99e2d4bba3f2270',
+        },
+        keychains,
+        index: 13,
+        walletVersion: 5,
+      };
+
+      const coin = bitgo.coin('tpolygon');
+      const isWalletAddr = await coin.isWalletAddress(params);
+      isWalletAddr.should.equal(true);
+    });
+  });
 });

modules/statics/src/networks.ts

@@ -1186,6 +1186,8 @@ class Polygon extends Mainnet implements EthereumNetwork {
   batcherContractAddress = '0x3e1e5d78e44f15593b3b61ed278f12c27f0ff33e';
   nativeCoinOperationHashPrefix = 'POLYGON';
   tokenOperationHashPrefix = 'POLYGON-ERC20';
+  walletV4ForwarderFactoryAddress = '0x37996e762fa8b671869740c79eb33f625b3bf92a';
+  walletV4ForwarderImplementationAddress = '0xd5fe1c1f216b775dfd30638fa7164d41321ef79b';
 }
 
 class PolygonTestnet extends Testnet implements EthereumNetwork {
@@ -1201,6 +1203,8 @@ class PolygonTestnet extends Testnet implements EthereumNetwork {
   batcherContractAddress = '0x3e1e5d78e44f15593b3b61ed278f12c27f0ff33e';
   nativeCoinOperationHashPrefix = 'POLYGON';
   tokenOperationHashPrefix = 'POLYGON-ERC20';
+  walletV4ForwarderFactoryAddress = '0x37996e762fa8b671869740c79eb33f625b3bf92a';
+  walletV4ForwarderImplementationAddress = '0xd5fe1c1f216b775dfd30638fa7164d41321ef79b';
 }
 
 class Optimism extends Mainnet implements EthereumNetwork {
@@ -1215,6 +1219,8 @@ class Optimism extends Mainnet implements EthereumNetwork {
   forwarderImplementationAddress = '0xd5fe1c1f216b775dfd30638fa7164d41321ef79b';
   walletFactoryAddress = '0x809ee567e413543af1caebcdb247f6a67eafc8dd';
   walletImplementationAddress = '0x944fef03af368414f29dc31a72061b8d64f568d2';
+  walletV4ForwarderFactoryAddress = '0x37996e762fa8b671869740c79eb33f625b3bf92a';
+  walletV4ForwarderImplementationAddress = '0xd5fe1c1f216b775dfd30638fa7164d41321ef79b';
   batcherContractAddress = '0xebe27913fcc7510eadf10643a8f86bf5492a9541';
 }
 
@@ -1230,6 +1236,8 @@ class OptimismTestnet extends Testnet implements EthereumNetwork {
   forwarderImplementationAddress = '0xd5fe1c1f216b775dfd30638fa7164d41321ef79b';
   walletFactoryAddress = '0x809ee567e413543af1caebcdb247f6a67eafc8dd';
   walletImplementationAddress = '0x944fef03af368414f29dc31a72061b8d64f568d2';
+  walletV4ForwarderFactoryAddress = '0x37996e762fa8b671869740c79eb33f625b3bf92a';
+  walletV4ForwarderImplementationAddress = '0xd5fe1c1f216b775dfd30638fa7164d41321ef79b';
   batcherContractAddress = '0xebe27913fcc7510eadf10643a8f86bf5492a9541';
 }
 
@@ -1253,6 +1261,8 @@ class ZkSyncTestnet extends Testnet implements EthereumNetwork {
   tokenOperationHashPrefix = '300-ERC20';
   forwarderFactoryAddress = '0xdd498702f44c4da08eb9e08d3f015eefe5cb71fc';
   forwarderImplementationAddress = '0xbe69cae311191fb45e648ed20847f06fad2dbab4';
+  walletV4ForwarderFactoryAddress = '0x37996e762fa8b671869740c79eb33f625b3bf92a';
+  walletV4ForwarderImplementationAddress = '0xd5fe1c1f216b775dfd30638fa7164d41321ef79b';
   walletFactoryAddress = '0x4550e1e7616d3364877fc6c9324938dab678621a';
   walletImplementationAddress = '0x92db2759d1dca129a0d9d46877f361be819184c4';
 }