fix: some more details with the Nitro changes in the CLI

Author: pcarranzav

cli/commands/bridge/to-l1.ts

@@ -4,12 +4,7 @@ import { getAddressBook } from '../../address-book'
 import { getProvider, sendTransaction, toGRT } from '../../network'
 import { chainIdIsL2 } from '../../utils'
 import { loadAddressBookContract } from '../../contracts'
-import {
-  L2TransactionReceipt,
-  getL2Network,
-  L2ToL1MessageStatus,
-  L2ToL1MessageWriter,
-} from '@arbitrum/sdk'
+import { L2TransactionReceipt, L2ToL1MessageStatus, L2ToL1MessageWriter } from '@arbitrum/sdk'
 import { L2GraphTokenGateway } from '../../../build/types/L2GraphTokenGateway'
 import { BigNumber } from 'ethers'
 import { JsonRpcProvider } from '@ethersproject/providers'
@@ -99,9 +94,7 @@ export const startSendToL1 = async (cli: CLIEnvironment, cliArgs: CLIArgs): Prom
     params,
   )
   const l2Receipt = new L2TransactionReceipt(receipt)
-  const l2ToL1Message = (
-    await l2Receipt.getL2ToL1Messages(cli.wallet, await getL2Network(l2Provider))
-  )[0]
+  const l2ToL1Message = (await l2Receipt.getL2ToL1Messages(cli.wallet))[0]
 
   logger.info(`The transaction generated an L2 to L1 message in outbox with eth block number:`)
   logger.info(l2ToL1Message.event.ethBlockNum.toString())
@@ -157,9 +150,7 @@ export const finishSendToL1 = async (
 
   const l2Receipt = new L2TransactionReceipt(receipt)
   logger.info(`Getting L2 to L1 message...`)
-  const l2ToL1Message = (
-    await l2Receipt.getL2ToL1Messages(cli.wallet, await getL2Network(l2Provider))
-  )[0]
+  const l2ToL1Message = (await l2Receipt.getL2ToL1Messages(cli.wallet))[0]
 
   if (wait) {
     const retryDelayMs = cliArgs.retryDelaySeconds ? cliArgs.retryDelaySeconds * 1000 : 60000

cli/commands/bridge/to-l2.ts

@@ -1,7 +1,7 @@
 import { loadEnv, CLIArgs, CLIEnvironment } from '../../env'
 import { logger } from '../../logging'
 import { getProvider, sendTransaction, toGRT } from '../../network'
-import { utils } from 'ethers'
+import { BigNumber, utils } from 'ethers'
 import { parseEther } from '@ethersproject/units'
 import {
   L1TransactionReceipt,
@@ -32,7 +32,12 @@ const checkAndRedeemMessage = async (l1ToL2Message: L1ToL2MessageWriter) => {
     logAutoRedeemReason(autoRedeemRec)
     logger.info('Attempting to redeem...')
     await l1ToL2Message.redeem()
-    l2TxHash = (await l1ToL2Message.getSuccessfulRedeem()).transactionHash
+    const redeemAttempt = await l1ToL2Message.getSuccessfulRedeem()
+    if (redeemAttempt.status == L1ToL2MessageStatus.REDEEMED) {
+      l2TxHash = redeemAttempt.l2TxReceipt ? redeemAttempt.l2TxReceipt.transactionHash : 'null'
+    } else {
+      throw new Error(`Unexpected L1ToL2MessageStatus after redeem attempt: ${res.status}`)
+    }
   } else if (res.status != L1ToL2MessageStatus.REDEEMED) {
     throw new Error(`Unexpected L1ToL2MessageStatus ${res.status}`)
   }
@@ -72,18 +77,19 @@ export const sendToL2 = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<v
   logger.info('Estimating retryable ticket gas:')
   const baseFee = (await cli.wallet.provider.getBlock('latest')).baseFeePerGas
   const gasEstimator = new L1ToL2MessageGasEstimator(l2Provider)
-  const gasParams = await gasEstimator.estimateMessage(
+  const gasParams = await gasEstimator.estimateAll(
     gateway.address,
     l2Dest,
     depositCalldata,
     parseEther('0'),
-    baseFee,
+    baseFee as BigNumber,
     gateway.address,
     gateway.address,
+    cli.wallet.provider,
   )
-  const maxGas = gasParams.maxGasBid
-  const gasPriceBid = gasParams.maxGasPriceBid
-  const maxSubmissionPrice = gasParams.maxSubmissionPriceBid
+  const maxGas = gasParams.gasLimit
+  const gasPriceBid = gasParams.maxFeePerGas
+  const maxSubmissionPrice = gasParams.maxSubmissionFee
   logger.info(
     `Using max gas: ${maxGas}, gas price bid: ${gasPriceBid}, max submission price: ${maxSubmissionPrice}`,
   )
@@ -100,7 +106,7 @@ export const sendToL2 = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<v
     value: ethValue,
   })
   const l1Receipt = new L1TransactionReceipt(receipt)
-  const l1ToL2Message = await l1Receipt.getL1ToL2Message(cli.wallet.connect(l2Provider))
+  const l1ToL2Message = await l1Receipt.getL1ToL2Messages(cli.wallet.connect(l2Provider))[0]
 
   logger.info('Waiting for message to propagate to L2...')
   try {

package.json

@@ -15,7 +15,7 @@
     "ethers": "^5.6.0"
   },
   "devDependencies": {
-    "@arbitrum/sdk": "^3.0.0-beta.5",
+    "@arbitrum/sdk": "^3.0.0-beta.6",
     "@commitlint/cli": "^13.2.1",
     "@commitlint/config-conventional": "^13.2.0",
     "@defi-wonderland/smock": "^2.0.7",

yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@arbitrum/sdk@^3.0.0-beta.5":
-  version "3.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@arbitrum/sdk/-/sdk-3.0.0-beta.5.tgz#ef1c81de58db9e76defb4a1971274316a375133b"
-  integrity sha512-qeNdK7es4uKRFciz4zznPEnGRZaAHkrwNqUN1F4U6d4i8olhK0KMdSodx2ZjajBvVVwOo5kFsw5ocAaTvkf28g==
+"@arbitrum/sdk@^3.0.0-beta.6":
+  version "3.0.0-beta.6"
+  resolved "https://registry.yarnpkg.com/@arbitrum/sdk/-/sdk-3.0.0-beta.6.tgz#a36c3e39a7358396b5533f3288125107da6ae59e"
+  integrity sha512-kPCfgj72MeyVcIXQKoztLO29UTcpSbXFzc/S0oDgVNNcHcXp1hWUJqqkVRg0O43P2yKjZRT/I94K0Nj2nZNiiQ==
   dependencies:
     "@ethersproject/address" "^5.0.8"
     "@ethersproject/bignumber" "^5.1.1"