chore: left out code from last commit

TICKET: WP-6461

Author: danielzhao122

modules/abstract-eth/src/abstractEthLikeNewCoins.ts

@@ -372,6 +372,7 @@ interface PresignTransactionOptions extends TransactionPrebuild, BasePresignTran
 interface EthAddressCoinSpecifics extends AddressCoinSpecific {
   forwarderVersion: number;
   salt?: string;
+  feeAddress?: string;
 }
 
 export const DEFAULT_SCAN_FACTOR = 20;
@@ -2731,6 +2732,23 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
     return {};
   }
 
+  getFactoryAndImplContractAddresses(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,
+      };
+    }
+    return {
+      forwarderFactoryAddress: ethNetwork?.forwarderFactoryAddress as string,
+      forwarderImplementationAddress: ethNetwork?.forwarderImplementationAddress as string,
+    };
+  }
+
   /**
    * Make sure an address is a wallet address and throw an error if it's not.
    * @param {Object} params
@@ -2777,19 +2795,22 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
         );
       }
 
-      const ethNetwork = this.getNetwork();
-      const forwarderFactoryAddress = ethNetwork?.forwarderFactoryAddress as string;
-      const forwarderImplementationAddress = ethNetwork?.forwarderImplementationAddress as string;
-
+      const { forwarderFactoryAddress, forwarderImplementationAddress } = this.getFactoryAndImplContractAddresses(
+        params.walletVersion
+      );
       const initcode = getProxyInitcode(forwarderImplementationAddress);
       const saltBuffer = ethUtil.setLengthLeft(
         Buffer.from(ethUtil.padToEven(ethUtil.stripHexPrefix(coinSpecific.salt || '')), 'hex'),
         32
       );
 
-      // Hash the wallet base address with the given salt, so the address directly relies on the base address
+      const { createForwarderParams, createForwarderTypes } =
+        forwarderVersion === 4
+          ? getCreateForwarderParamsAndTypes(baseAddress, saltBuffer, coinSpecific.feeAddress)
+          : getCreateForwarderParamsAndTypes(baseAddress, saltBuffer);
+
       const calculationSalt = optionalDeps.ethUtil.bufferToHex(
-        optionalDeps.ethAbi.soliditySHA3(['address', 'bytes32'], [baseAddress, saltBuffer])
+        optionalDeps.ethAbi.soliditySHA3(createForwarderTypes, createForwarderParams)
       );
 
       expectedAddress = calculateForwarderV1Address(forwarderFactoryAddress, calculationSalt, initcode);