Merge branch 'master' into feat-exponential-backoff

packages/arb-token-bridge-ui/src/components/TransactionHistory/TransactionsTableDetailsSteps.tsx

@@ -21,7 +21,7 @@ import { ExternalLink } from '../common/ExternalLink'
 import { TransferCountdown } from '../common/TransferCountdown'
 import { isDepositReadyToRedeem } from '../../state/app/utils'
 import { Address } from '../../util/AddressUtils'
-import { isTeleportTx } from '../../hooks/useTransactions'
+import { isTeleportTx } from '../../types/Transactions'
 import {
   firstRetryableLegRequiresRedeem,
   secondRetryableLegForTeleportRequiresRedeem

packages/arb-token-bridge-ui/src/components/TransactionHistory/TransactionsTableRowAction.tsx

@@ -18,7 +18,7 @@ import { isDepositReadyToRedeem } from '../../state/app/utils'
 import { useRedeemRetryable } from '../../hooks/useRedeemRetryable'
 import { TransferCountdown } from '../common/TransferCountdown'
 import { getChainIdForRedeemingRetryable } from '../../util/RetryableUtils'
-import { isTeleportTx } from '../../hooks/useTransactions'
+import { isTeleportTx } from '../../types/Transactions'
 import { useRedeemTeleporter } from '../../hooks/useRedeemTeleporter'
 import { sanitizeTokenSymbol } from '../../util/TokenUtils'
 import { formatAmount } from '../../util/NumberUtils'

packages/arb-token-bridge-ui/src/components/TransactionHistory/helpers.ts

@@ -31,7 +31,7 @@ import { getAttestationHashAndMessageFromReceipt } from '../../util/cctp/getAtte
 import { getOutgoingMessageState } from '../../util/withdrawals/helpers'
 import { getUniqueIdOrHashFromEvent } from '../../hooks/useArbTokenBridge'
 import { getProviderForChainId } from '../../token-bridge-sdk/utils'
-import { isTeleportTx } from '../../hooks/useTransactions'
+import { isTeleportTx } from '../../types/Transactions'
 
 const PARENT_CHAIN_TX_DETAILS_OF_CLAIM_TX =
   'arbitrum:bridge:claim:parent:tx:details'

packages/arb-token-bridge-ui/src/components/common/TransferCountdown.tsx

@@ -5,7 +5,7 @@ import {
   useTransferDuration
 } from '../../hooks/useTransferDuration'
 import { isNetwork } from '../../util/networks'
-import { isTeleportTx } from '../../hooks/useTransactions'
+import { isTeleportTx } from '../../types/Transactions'
 
 /**
  * Displays a transfer countdown for a deposit, withdrawal, or cctp.

packages/arb-token-bridge-ui/src/hooks/useRedeemTeleporter.ts

@@ -26,7 +26,7 @@ import { isUserRejectedError } from '../util/isUserRejectedError'
 import { errorToast } from '../components/common/atoms/Toast'
 import { useTransactionHistory } from './useTransactionHistory'
 import { Address } from '../util/AddressUtils'
-import { isTeleportTx, L2ToL3MessageData } from './useTransactions'
+import { isTeleportTx, L2ToL3MessageData } from '../types/Transactions'
 import { UseRedeemRetryableResult } from './useRedeemRetryable'
 import { getUpdatedTeleportTransfer } from '../components/TransactionHistory/helpers'
 

packages/arb-token-bridge-ui/src/hooks/useTransactionHistory.ts

@@ -17,7 +17,7 @@ import {
   L2ToL1EventResultPlus,
   WithdrawalInitiated
 } from './arbTokenBridge.types'
-import { isTeleportTx, Transaction } from './useTransactions'
+import { isTeleportTx, Transaction } from '../types/Transactions'
 import { MergedTransaction } from '../state/app/state'
 import {
   isCustomDestinationAddressTx,

packages/arb-token-bridge-ui/src/state/app/state.ts

@@ -10,7 +10,7 @@ import {
   ChildToParentMessageData,
   L2ToL3MessageData,
   TxnType
-} from '../../hooks/useTransactions'
+} from '../../types/Transactions'
 import { ConnectionState } from '../../util'
 import { CCTPSupportedChainId } from '../cctpState'
 import { Address } from '../../util/AddressUtils'

packages/arb-token-bridge-ui/src/state/app/utils.ts

@@ -17,7 +17,7 @@ import {
   isTeleportTx,
   TeleporterTransaction,
   Transaction
-} from '../../hooks/useTransactions'
+} from '../../types/Transactions'
 import { getUniqueIdOrHashFromEvent } from '../../hooks/useArbTokenBridge'
 import {
   firstRetryableLegRequiresRedeem,

packages/arb-token-bridge-ui/src/hooks/useTransactions.ts → packages/arb-token-bridge-ui/src/types/Transactions.ts

@@ -1,6 +1,7 @@
-import { AssetType } from './arbTokenBridge.types'
 import { BigNumber } from 'ethers'
 import { ParentToChildMessageStatus } from '@arbitrum/sdk'
+
+import { AssetType } from '../hooks/arbTokenBridge.types'
 import {
   MergedTransaction,
   TeleporterMergedTransaction
@@ -24,22 +25,6 @@ export type TxnType =
   | 'deposit-l2-ticket-created' // unused; keeping for cache backwrads compatability
   | 'approve-l2'
 
-export const txnTypeToLayer = (txnType: TxnType): 1 | 2 => {
-  switch (txnType) {
-    case 'deposit':
-    case 'deposit-l1':
-    case 'outbox':
-    case 'approve':
-      return 1
-    case 'deposit-l2':
-    case 'withdraw':
-    case 'deposit-l2-auto-redeem':
-    case 'deposit-l2-ticket-created':
-    case 'approve-l2':
-      return 2
-  }
-}
-
 export interface ParentToChildMessageData {
   status: ParentToChildMessageStatus
   retryableCreationTxID: string
@@ -93,20 +78,6 @@ export interface TeleporterTransaction extends Transaction {
   l2ToL3MsgData: L2ToL3MessageData
 }
 
-export interface NewTransaction extends TransactionBase {
-  status: 'pending'
-}
-
-export interface FailedTransaction extends TransactionBase {
-  status: 'failure'
-}
-
-// TODO: enforce this type restriction
-export interface DepositTransaction extends Transaction {
-  parentToChildMsgData: ParentToChildMessageData
-  type: 'deposit' | 'deposit-l1'
-}
-
 export function isTeleportTx(
   tx: Transaction | MergedTransaction
 ): tx is TeleporterTransaction | TeleporterMergedTransaction {

packages/arb-token-bridge-ui/src/util/RetryableUtils.ts

@@ -12,7 +12,7 @@ import {
   TeleporterMergedTransaction
 } from '../state/app/state'
 import { normalizeTimestamp } from '../state/app/utils'
-import { isTeleportTx } from '../hooks/useTransactions'
+import { isTeleportTx } from '../types/Transactions'
 
 type GetRetryableTicketParams = {
   parentChainTxHash: string

packages/arb-token-bridge-ui/src/util/WithdrawOnlyUtils.ts

@@ -223,6 +223,18 @@ export const withdrawOnlyTokens: { [chainId: number]: WithdrawOnlyToken[] } = {
       l2CustomAddr: '',
       l1Address: '0x6982508145454Ce325dDbE47a25d4ec3d2311933',
       l2Address: '0x35E6A59F786d9266c7961eA28c7b768B33959cbB'
+    },
+    {
+      symbol: 'cbBTC',
+      l2CustomAddr: '',
+      l1Address: '0xcbb7c0000ab88b473b1f5afd9ef808440eed33bf',
+      l2Address: '0x4A605F93288e95db40cE72934b888641D9689a48'
+    },
+    {
+      symbol: 'NST',
+      l2CustomAddr: '',
+      l1Address: '0x70Bef3bB2f001dA2fDDb207dAe696cD9FAFf3f5d',
+      l2Address: '0xd5A1a674F0DA33A4147a8Cd96143E598e738c7FF'
     }
   ],
   [ChainId.ArbitrumNova]: []

packages/arb-token-bridge-ui/src/util/deposits/fetchDeposits.ts

@@ -6,7 +6,7 @@ import {
   FetchDepositsFromSubgraphResult
 } from './fetchDepositsFromSubgraph'
 import { AssetType } from '../../hooks/arbTokenBridge.types'
-import { Transaction } from '../../hooks/useTransactions'
+import { Transaction } from '../../types/Transactions'
 import { defaultErc20Decimals } from '../../defaults'
 import { fetchNativeCurrency } from '../../hooks/useNativeCurrency'
 import {

packages/arb-token-bridge-ui/src/util/deposits/helpers.ts

@@ -18,7 +18,7 @@ import {
   Transaction,
   TxnStatus,
   TeleporterTransaction
-} from '../../hooks/useTransactions'
+} from '../../types/Transactions'
 import { fetchErc20Data } from '../TokenUtils'
 import {
   getL2ConfigForTeleport,

packages/arb-token-bridge-ui/src/util/teleports/helpers.ts

@@ -10,7 +10,7 @@ import { MergedTransaction } from '../../state/app/state'
 import { FetchEthTeleportsFromSubgraphResult } from './fetchEthTeleportsFromSubgraph'
 import { TeleportFromSubgraph } from './fetchTeleports'
 import { AssetType } from '../../hooks/arbTokenBridge.types'
-import { Transaction } from '../../hooks/useTransactions'
+import { Transaction } from '../../types/Transactions'
 import { transformDeposit } from '../../state/app/utils'
 import { updateAdditionalDepositData } from '../deposits/helpers'
 import { fetchErc20Data } from '../TokenUtils'

packages/arb-token-bridge-ui/src/util/withdrawals/fetchWithdrawals.ts

@@ -87,7 +87,7 @@ export async function fetchWithdrawals({
   const ethWithdrawalsFromEventLogs = await backOff(() =>
     fetchETHWithdrawalsFromEventLogs({
       receiver,
-      fromBlock: toBlock! + 1,
+      fromBlock: toBlock + 1,
       toBlock: 'latest',
       l2Provider: l2Provider
     })