Use the new TokenBridgeCreator override to fix the failing integratio…

…n test
OffchainLabs · Feb 28, 2024 · d428e9a · d428e9a
1 parent 3ed5f2e
commit d428e9a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/createTokenBridge.integration.test.ts b/src/createTokenBridge.integration.test.ts
@@ -3,7 +3,6 @@ import {
   createPublicClient,
   encodeFunctionData,
   http,
-  maxInt256,
   parseEther,
   zeroAddress,
   parseAbi,
@@ -17,7 +16,6 @@ import { createTokenBridgePrepareTransactionReceipt } from './createTokenBridgeP
 import { deployTokenBridgeCreator } from './createTokenBridge-testHelpers';
 import {
   CreateTokenBridgeEnoughCustomFeeTokenAllowanceParams,
-  createTokenBridgeEnoughCustomFeeTokenAllowance,
 } from './createTokenBridgeEnoughCustomFeeTokenAllowance';
 import { createTokenBridgePrepareCustomFeeTokenApprovalTransactionRequest } from './createTokenBridgePrepareCustomFeeTokenApprovalTransactionRequest';
 import { erc20 } from './contracts';
@@ -176,6 +174,7 @@ it(`successfully deploys token bridge contracts through token bridge creator`, a
         base: 100_000n,
       },
     },
+    tokenBridgeCreatorAddressOverride: tokenBridgeCreator,
   });
 
   // sign and send the transaction

diff --git a/src/createTokenBridgePrepareSetWethGatewayTransactionRequest.ts b/src/createTokenBridgePrepareSetWethGatewayTransactionRequest.ts
@@ -1,27 +1,31 @@
 import { Address, PublicClient, encodeFunctionData, parseAbi } from 'viem';
 
-import { validParentChainId } from './types/ParentChain';
 import { isCustomFeeTokenChain } from './utils/isCustomFeeTokenChain';
 import { upgradeExecutorEncodeFunctionData } from './upgradeExecutor';
 import { createTokenBridgeFetchTokenBridgeContracts } from './createTokenBridgeFetchTokenBridgeContracts';
 import { createRollupFetchCoreContracts } from './createRollupFetchCoreContracts';
 import { publicClientToProvider } from './ethers-compat/publicClientToProvider';
 import { getEstimateForSettingGateway } from './createTokenBridge-ethers';
 import { GasOverrideOptions, applyPercentIncrease } from './utils/gasOverrides';
+import { Prettify } from './types/utils';
+import { validParentChainId } from './types/ParentChain';
+import { WithTokenBridgeCreatorAddressOverride } from './types/createTokenBridgeTypes';
 
 export type TransactionRequestRetryableGasOverrides = {
   gasLimit?: GasOverrideOptions;
   maxFeePerGas?: GasOverrideOptions;
   maxSubmissionCost?: GasOverrideOptions;
 };
 
-export type CreateTokenBridgePrepareRegisterWethGatewayTransactionRequestParams = {
-  rollup: Address;
-  parentChainPublicClient: PublicClient;
-  orbitChainPublicClient: PublicClient;
-  account: Address;
-  retryableGasOverrides?: TransactionRequestRetryableGasOverrides;
-};
+export type CreateTokenBridgePrepareRegisterWethGatewayTransactionRequestParams = Prettify<
+  WithTokenBridgeCreatorAddressOverride<{
+    rollup: Address;
+    parentChainPublicClient: PublicClient;
+    orbitChainPublicClient: PublicClient;
+    account: Address;
+    retryableGasOverrides?: TransactionRequestRetryableGasOverrides;
+  }>
+>;
 
 const parentChainGatewayRouterAbi = [
   {
@@ -90,6 +94,7 @@ export async function createTokenBridgePrepareSetWethGatewayTransactionRequest({
   orbitChainPublicClient,
   account,
   retryableGasOverrides,
+  tokenBridgeCreatorAddressOverride,
 }: CreateTokenBridgePrepareRegisterWethGatewayTransactionRequestParams) {
   const chainId = parentChainPublicClient.chain?.id;
 
@@ -118,6 +123,7 @@ export async function createTokenBridgePrepareSetWethGatewayTransactionRequest({
   const tokenBridgeContracts = await createTokenBridgeFetchTokenBridgeContracts({
     inbox,
     parentChainPublicClient,
+    tokenBridgeCreatorAddressOverride,
   });
 
   // check whether the weth gateway is already registered in the router