feat: update counterfactual contracts (#3179)

* feat: update counterfactual contracts

* Get contracts addresses from indexer

---------

Co-authored-by: Alexandru Matei <alexandrumatei3693@gmail.com>

Author: amateima

src/common/ContractAddresses.ts

@@ -40,7 +40,6 @@ import SCROLL_GAS_PRICE_ORACLE_ABI from "./abi/ScrollGasPriceOracle.json";
 import IOFT_ABI_FULL from "./abi/IOFT.json";
 import HYPERLIQUID_DEPOSIT_HANDLER_ABI from "./abi/HyperliquidDepositHandler.json";
 import SPOKE_POOL_PERIPHERY_ABI from "./abi/SpokePoolPeriphery.json";
-import COUNTERFACTUAL_DEPOSIT_FACTORY_ABI from "./abi/CounterfactualDepositFactory.json";
 import PERMIT2_ABI from "./abi/Permit2.json";
 export { IOFT_ABI_FULL };
 import HUB_POOL_STORE_ABI from "./abi/HubPoolStore.json";
@@ -249,13 +248,6 @@ export const CONTRACT_ADDRESSES: {
     spokePoolPeriphery: {
       abi: SPOKE_POOL_PERIPHERY_ABI,
     },
-    counterfactualDepositFactory: {
-      address: "0x20e67fBE0150B498048709306cc7729d382F1fB1",
-      abi: COUNTERFACTUAL_DEPOSIT_FACTORY_ABI,
-    },
-    counterfactualDeposit: {
-      address: "0xfb090c119c838CeD214F962F931d5fa38b111E46",
-    },
     permit2: {
       address: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       abi: PERMIT2_ABI,
@@ -495,13 +487,6 @@ export const CONTRACT_ADDRESSES: {
     spokePoolPeriphery: {
       abi: SPOKE_POOL_PERIPHERY_ABI,
     },
-    counterfactualDepositFactory: {
-      address: "0x20e67fBE0150B498048709306cc7729d382F1fB1",
-      abi: COUNTERFACTUAL_DEPOSIT_FACTORY_ABI,
-    },
-    counterfactualDeposit: {
-      address: "0xfb090c119c838CeD214F962F931d5fa38b111E46",
-    },
     sponsoredCCTPDstPeriphery: {
       address: "0xd9dc78b969e9efb1e54b625c33a21aaf2509e6a1",
       abi: SPONSORED_CCTP_DST_PERIPHERY_ABI,
@@ -601,13 +586,6 @@ export const CONTRACT_ADDRESSES: {
     spokePoolPeriphery: {
       abi: SPOKE_POOL_PERIPHERY_ABI,
     },
-    counterfactualDepositFactory: {
-      address: "0x20e67fBE0150B498048709306cc7729d382F1fB1",
-      abi: COUNTERFACTUAL_DEPOSIT_FACTORY_ABI,
-    },
-    counterfactualDeposit: {
-      address: "0xfb090c119c838CeD214F962F931d5fa38b111E46",
-    },
     permit2: {
       address: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       abi: PERMIT2_ABI,

src/deposit-address/DepositAddressHandler.ts

@@ -19,7 +19,6 @@ import {
   toBN,
   getDepositKey,
   assert,
-  getCounterfactualDepositImplementationAddress,
   getNetworkName,
   blockExplorerLink,
 } from "../utils";
@@ -38,8 +37,6 @@ export class DepositAddressHandler {
 
   private providersByChain: { [chainId: number]: Provider } = {};
 
-  private counterfactualDepositFactories: { [chainId: number]: Contract } = {};
-
   /** Per chainId: set of deposit keys already executed (like gasless depositNonces). */
   private observedExecutedDeposits: { [chainId: number]: Set<string> } = {};
 
@@ -99,7 +96,6 @@ export class DepositAddressHandler {
     await forEachAsync(this.config.relayerOriginChains, async (chainId) => {
       const provider = await getProvider(chainId);
       this.providersByChain[chainId] = provider;
-      this.counterfactualDepositFactories[chainId] = getCounterfactualDepositFactory(chainId).connect(provider);
       this.observedExecutedDeposits[chainId] = new Set<string>();
     });
 
@@ -244,7 +240,9 @@ export class DepositAddressHandler {
       return;
     }
 
-    const baseFactoryContract = this.counterfactualDepositFactories[originChainId];
+    const baseFactoryContract = getCounterfactualDepositFactory(
+      depositMessage.counterfactualFactoryContractAddress
+    ).connect(this.providersByChain[originChainId]);
 
     const useDispatcher = this.depositAddressSigners.length > 0;
     const factoryContract = useDispatcher
@@ -272,7 +270,7 @@ export class DepositAddressHandler {
       const _deployTx = buildDeployTx(
         factoryContract,
         originChainId,
-        getCounterfactualDepositImplementationAddress(originChainId),
+        depositMessage.counterfactualDepositContractAddress,
         depositMessage.paramsHash,
         depositMessage.salt
       );

src/interfaces/DepositAddress.ts

@@ -21,6 +21,8 @@ export interface DepositAddressMessage {
   routeParams: RouteParams;
   erc20Transfer: Erc20Transfer;
   salt: string;
+  counterfactualDepositContractAddress: string;
+  counterfactualFactoryContractAddress: string;
 }
 
 // TODO: Add schema for SwapAPI response.

src/utils/ContractUtils.ts

@@ -25,6 +25,7 @@ function getTypechainAbi(contractName: string): readonly JsonFragment[] {
   assert("abi" in factory, `Typechain export ${factoryName} has no abi`);
   return factory.abi as readonly JsonFragment[];
 }
+import COUNTERFACTUAL_DEPOSIT_FACTORY_ABI from "../common/abi/CounterfactualDepositFactory.json";
 
 // Return an ethers contract instance for a deployed contract, imported from the Across-protocol contracts repo.
 export function getDeployedContract(contractName: string, networkId: number, signer?: Signer): Contract {
@@ -38,16 +39,9 @@ export function getDeployedContract(contractName: string, networkId: number, sig
   }
 }
 
-export function getCounterfactualDepositImplementationAddress(chainId: number): string {
-  return CONTRACT_ADDRESSES[chainId].counterfactualDeposit.address;
-}
-
-// For a chain ID and optional CounterfactualDepositFactory address, return a Contract instance with the corresponding ABI.
-export function getCounterfactualDepositFactory(chainId: number, address?: string): Contract {
-  return new Contract(
-    address ?? CONTRACT_ADDRESSES[chainId].counterfactualDepositFactory.address,
-    CONTRACT_ADDRESSES[chainId].counterfactualDepositFactory.abi
-  );
+// For a CounterfactualDepositFactory address, return a Contract instance with the corresponding ABI.
+export function getCounterfactualDepositFactory(address: string): Contract {
+  return new Contract(address, COUNTERFACTUAL_DEPOSIT_FACTORY_ABI);
 }
 
 // For a chain ID and optional SpokePool address, return a Contract instance with the corresponding ABI.