diff --git a/src/createTokenBridge-ethers.ts b/src/createTokenBridge-ethers.ts index 21019f20..e3e014dc 100644 --- a/src/createTokenBridge-ethers.ts +++ b/src/createTokenBridge-ethers.ts @@ -27,7 +27,7 @@ const L2AtomicTokenBridgeFactory__factory = NamedFactoryInstance(L2AtomicTokenBr export type CreateTokenBridgeGetInputsResult = { inbox: Address; maxGasForContracts: bigint; - gasPrice: bigint; + maxGasPrice: bigint; retryableFee: bigint; }; @@ -53,9 +53,6 @@ export async function createTokenBridgeGetInputs< ); const l1TokenBridgeCreator = L1AtomicTokenBridgeCreator__factory.connect(l1Provider); - //// gasPrice - const gasPrice = await l2Provider.getGasPrice(); - //// run retryable estimate for deploying L2 factory const deployFactoryGasParams = await getEstimateForDeployingFactory( l1DeployerAddress, @@ -150,8 +147,8 @@ export async function createTokenBridgeGetInputs< const maxGasPrice = retryableGasOverrides && retryableGasOverrides.maxGasPrice - ? retryableGasOverrides.maxGasPrice - : gasPrice; + ? BigNumber.from(retryableGasOverrides.maxGasPrice) + : await l2Provider.getGasPrice(); let retryableFee = maxSubmissionCostForFactory .add(maxSubmissionCostForContracts) @@ -164,7 +161,7 @@ export async function createTokenBridgeGetInputs< return { inbox: inbox as Address, maxGasForContracts: maxGasForContracts.toBigInt(), - gasPrice: gasPrice.toBigInt(), + maxGasPrice: maxGasPrice.toBigInt(), retryableFee: retryableFee.toBigInt(), }; } diff --git a/src/createTokenBridgePrepareTransactionRequest.ts b/src/createTokenBridgePrepareTransactionRequest.ts index b5c04f34..63d6d2df 100644 --- a/src/createTokenBridgePrepareTransactionRequest.ts +++ b/src/createTokenBridgePrepareTransactionRequest.ts @@ -53,7 +53,7 @@ export async function createTokenBridgePrepareTransactionRequest< const tokenBridgeCreatorAddress = tokenBridgeCreatorAddressOverride ?? getTokenBridgeCreatorAddress(parentChainPublicClient); - const { inbox, maxGasForContracts, gasPrice, retryableFee } = await createTokenBridgeGetInputs( + const { inbox, maxGasForContracts, maxGasPrice, retryableFee } = await createTokenBridgeGetInputs( account, parentChainPublicClient, orbitChainPublicClient, @@ -74,7 +74,7 @@ export async function createTokenBridgePrepareTransactionRequest< data: encodeFunctionData({ abi: tokenBridgeCreatorABI, functionName: 'createTokenBridge', - args: [inbox, params.rollupOwner, maxGasForContracts, gasPrice], + args: [inbox, params.rollupOwner, maxGasForContracts, maxGasPrice], }), value: chainUsesCustomFee ? 0n : retryableFee, account: account,