Merge branch 'master' into dl/update-monitor

OffchainLabs · Aug 22, 2024 · 0827d0e · 0827d0e
2 parents 4f32186 + a09a468
commit 0827d0e
Show file tree

Hide file tree

Showing 12 changed files with 229 additions and 32 deletions.
diff --git a/.github/workflows/monitoring.yml b/.github/workflows/monitoring.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Generate chains JSON
       run: yarn workspace arb-token-bridge-ui ${{ steps.config.outputs.generate_command }}
       env:
-        BATCH_POSTER_MONITORING: ${{ inputs.monitor == 'batch-poster' }}
+        INCLUDE_ARB_ONE_AS_CORE_CHAIN: ${{ inputs.monitor != 'retryable' }}
 
     - name: Copy chains JSON to Arbitrum Monitoring
       run: cp ./packages/arb-token-bridge-ui/public/${{ steps.config.outputs.config_file }} ./arbitrum-monitoring/config.json

diff --git a/packages/arb-token-bridge-ui/scripts/generateCoreChainsToMonitor.ts b/packages/arb-token-bridge-ui/scripts/generateCoreChainsToMonitor.ts
@@ -24,9 +24,10 @@ async function generateCoreChainsToMonitor() {
   }
 
   // don't need to monitor arbOne chain in case of retryable-monitoring
-  const chains = process.env.BATCH_POSTER_MONITORING
-    ? [arbOneChain, novaChain]
-    : [novaChain]
+  const chains =
+    process.env.INCLUDE_ARB_ONE_AS_CORE_CHAIN === 'true'
+      ? [arbOneChain, novaChain]
+      : [novaChain]
 
   // make the chain data compatible with that required by the monitoring script
   const coreChainsToMonitor = chains.map(coreChain =>

diff --git a/packages/arb-token-bridge-ui/src/components/TransactionHistory/TransactionHistoryTable.tsx b/packages/arb-token-bridge-ui/src/components/TransactionHistory/TransactionHistoryTable.tsx
@@ -31,6 +31,14 @@ import { TransactionsTableRow } from './TransactionsTableRow'
 import { EmptyTransactionHistory } from './EmptyTransactionHistory'
 import { Address } from '../../util/AddressUtils'
 
+export const BatchTransferEthTooltip = ({ children }: PropsWithChildren) => {
+  return (
+    <Tooltip content="This is any additional ETH you might have deposited along with your ERC-20, plus the refunded excess gas fee.">
+      {children}
+    </Tooltip>
+  )
+}
+
 export const ContentWrapper = ({
   children,
   className = ''

diff --git a/packages/arb-token-bridge-ui/src/components/TransactionHistory/TransactionsTableDetails.tsx b/packages/arb-token-bridge-ui/src/components/TransactionHistory/TransactionsTableDetails.tsx
@@ -6,6 +6,7 @@ import Image from 'next/image'
 import dayjs from 'dayjs'
 import CctpLogoColor from '@/images/CctpLogoColor.svg'
 import ArbitrumLogo from '@/images/ArbitrumLogo.svg'
+import EthereumLogoRoundLight from '@/images/EthereumLogoRoundLight.svg'
 
 import { useTxDetailsStore } from './TransactionHistory'
 import { getExplorerUrl, getNetworkName, isNetwork } from '../../util/networks'
@@ -22,6 +23,8 @@ import { shortenAddress } from '../../util/CommonUtils'
 import { isTxCompleted } from './helpers'
 import { Address } from '../../util/AddressUtils'
 import { sanitizeTokenSymbol } from '../../util/TokenUtils'
+import { isBatchTransfer } from '../../util/TokenDepositUtils'
+import { BatchTransferEthTooltip } from './TransactionHistoryTable'
 
 const DetailsBox = ({
   children,
@@ -135,17 +138,41 @@ export const TransactionsTableDetails = ({
                       <span>{dayjs(tx.createdAt).format('MMMM DD, YYYY')}</span>
                       <span>{dayjs(tx.createdAt).format('h:mma')}</span>
                     </div>
-                    <div className="flex items-center space-x-2">
-                      <TransactionsTableTokenImage tx={tx} />
-                      <span>
-                        {formatAmount(Number(tx.value), {
-                          symbol: tokenSymbol
-                        })}
-                      </span>
-                      {showPriceInUsd && (
-                        <span className="text-white/70">
-                          {formatUSD(ethToUSD(Number(tx.value)))}
+                    <div className="flex flex-col space-y-1">
+                      <div className="flex items-center space-x-2">
+                        <TransactionsTableTokenImage tx={tx} />
+                        <span>
+                          {formatAmount(Number(tx.value), {
+                            symbol: tokenSymbol
+                          })}
                         </span>
+                        {showPriceInUsd && (
+                          <span className="text-white/70">
+                            {formatUSD(ethToUSD(Number(tx.value)))}
+                          </span>
+                        )}
+                      </div>
+                      {isBatchTransfer(tx) && (
+                        <BatchTransferEthTooltip>
+                          <div className="flex items-center space-x-2">
+                            <Image
+                              height={20}
+                              width={20}
+                              alt="ETH logo"
+                              src={EthereumLogoRoundLight}
+                            />
+                            <span className="ml-2">
+                              {formatAmount(Number(tx.value2), {
+                                symbol: ether.symbol
+                              })}
+                            </span>
+                            {isNetwork(tx.sourceChainId).isEthereumMainnet && (
+                              <span className="text-white/70">
+                                {formatUSD(ethToUSD(Number(tx.value2)))}
+                              </span>
+                            )}
+                          </div>
+                        </BatchTransferEthTooltip>
                       )}
                     </div>
                   </div>

diff --git a/packages/arb-token-bridge-ui/src/components/TransactionHistory/TransactionsTableRow.tsx b/packages/arb-token-bridge-ui/src/components/TransactionHistory/TransactionsTableRow.tsx
@@ -7,6 +7,8 @@ import {
   CheckCircleIcon,
   XCircleIcon
 } from '@heroicons/react/24/outline'
+import EthereumLogoRoundLight from '@/images/EthereumLogoRoundLight.svg'
+import Image from 'next/image'
 
 import { DepositStatus, MergedTransaction } from '../../state/app/state'
 import { formatAmount } from '../../util/NumberUtils'
@@ -28,6 +30,9 @@ import { TransactionsTableTokenImage } from './TransactionsTableTokenImage'
 import { useTxDetailsStore } from './TransactionHistory'
 import { TransactionsTableExternalLink } from './TransactionsTableExternalLink'
 import { Address } from '../../util/AddressUtils'
+import { ether } from '../../constants'
+import { isBatchTransfer } from '../../util/TokenDepositUtils'
+import { BatchTransferEthTooltip } from './TransactionHistoryTable'
 
 const StatusLabel = ({ tx }: { tx: MergedTransaction }) => {
   const { sourceChainId, destinationChainId } = tx
@@ -170,18 +175,37 @@ export function TransactionsTableRow({
       )}
     >
       <div className="pr-3 align-middle">{txRelativeTime}</div>
-      <div className="flex items-center pr-3 align-middle">
-        <TransactionsTableExternalLink
-          href={`${getExplorerUrl(sourceChainId)}/token/${tx.tokenAddress}`}
-          disabled={!tx.tokenAddress}
-        >
-          <TransactionsTableTokenImage tx={tx} />
-          <span className="ml-2">
-            {formatAmount(Number(tx.value), {
-              symbol: tokenSymbol
-            })}
-          </span>
-        </TransactionsTableExternalLink>
+      <div className="flex flex-col space-y-1">
+        <div className="flex items-center pr-3 align-middle">
+          <TransactionsTableExternalLink
+            href={`${getExplorerUrl(sourceChainId)}/token/${tx.tokenAddress}`}
+            disabled={!tx.tokenAddress}
+          >
+            <TransactionsTableTokenImage tx={tx} />
+            <span className="ml-2">
+              {formatAmount(Number(tx.value), {
+                symbol: tokenSymbol
+              })}
+            </span>
+          </TransactionsTableExternalLink>
+        </div>
+        {isBatchTransfer(tx) && (
+          <BatchTransferEthTooltip>
+            <div className="flex items-center pr-3 align-middle">
+              <Image
+                height={20}
+                width={20}
+                alt="ETH logo"
+                src={EthereumLogoRoundLight}
+              />
+              <span className="ml-2">
+                {formatAmount(Number(tx.value2), {
+                  symbol: ether.symbol
+                })}
+              </span>
+            </div>
+          </BatchTransferEthTooltip>
+        )}
       </div>
       <div className="flex items-center space-x-2">
         <TransactionsTableExternalLink

diff --git a/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanel.tsx b/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanel.tsx
@@ -1,7 +1,7 @@
 import dayjs from 'dayjs'
 import { useState, useMemo } from 'react'
 import Tippy from '@tippyjs/react'
-import { BigNumber, constants, utils } from 'ethers'
+import { constants, utils } from 'ethers'
 import { useLatest } from 'react-use'
 import { useAccount, useChainId, useSigner } from 'wagmi'
 import { TransactionResponse } from '@ethersproject/providers'
@@ -930,6 +930,8 @@ export function TransferPanel() {
 
     const { sourceChainTransaction } = bridgeTransfer
 
+    const isBatchTransfer = isBatchTransferSupported && Number(amount2) > 0
+
     const timestampCreated = Math.floor(Date.now() / 1000).toString()
 
     const txHistoryCompatibleObject = convertBridgeSdkToMergedTransaction({
@@ -941,6 +943,7 @@ export function TransferPanel() {
       destinationAddress,
       nativeCurrency,
       amount: amountBigNumber,
+      amount2: isBatchTransfer ? utils.parseEther(amount2) : undefined,
       timestampCreated
     })
 
@@ -959,6 +962,7 @@ export function TransferPanel() {
           destinationAddress,
           nativeCurrency,
           amount: amountBigNumber,
+          amount2: isBatchTransfer ? utils.parseEther(amount2) : undefined,
           timestampCreated
         })
       )

diff --git a/packages/arb-token-bridge-ui/src/components/TransferPanel/bridgeSdkConversionUtils.ts b/packages/arb-token-bridge-ui/src/components/TransferPanel/bridgeSdkConversionUtils.ts
@@ -23,6 +23,7 @@ type SdkToUiConversionProps = {
   destinationAddress?: string
   nativeCurrency: NativeCurrency
   amount: BigNumber
+  amount2?: BigNumber
   timestampCreated: string
 }
 
@@ -34,7 +35,8 @@ export const convertBridgeSdkToMergedTransaction = ({
   walletAddress,
   destinationAddress,
   nativeCurrency,
-  amount
+  amount,
+  amount2
 }: SdkToUiConversionProps): MergedTransaction => {
   const { transferType } = bridgeTransfer
   const isDeposit =
@@ -57,6 +59,7 @@ export const convertBridgeSdkToMergedTransaction = ({
       amount,
       selectedToken ? selectedToken.decimals : nativeCurrency.decimals
     ),
+    value2: amount2 ? utils.formatEther(amount2) : undefined,
     depositStatus: isDeposit ? DepositStatus.L1_PENDING : undefined,
     uniqueId: null,
     isWithdrawal: !isDeposit,
@@ -78,6 +81,7 @@ export const convertBridgeSdkToPendingDepositTransaction = ({
   nativeCurrency,
   destinationAddress,
   amount,
+  amount2,
   timestampCreated
 }: SdkToUiConversionProps): Deposit => {
   const transaction =
@@ -95,6 +99,7 @@ export const convertBridgeSdkToPendingDepositTransaction = ({
       amount,
       selectedToken ? selectedToken.decimals : nativeCurrency.decimals
     ),
+    value2: amount2 ? utils.formatEther(amount2) : undefined,
     parentChainId,
     childChainId,
     direction: 'deposit',

diff --git a/packages/arb-token-bridge-ui/src/hooks/useTransactions.ts b/packages/arb-token-bridge-ui/src/hooks/useTransactions.ts
@@ -89,6 +89,7 @@ type TransactionBase = {
   type: TxnType
   status?: TxnStatus
   value: string | null
+  value2?: string
   txID?: string
   assetName: string
   assetType: AssetType

diff --git a/packages/arb-token-bridge-ui/src/state/app/state.ts b/packages/arb-token-bridge-ui/src/state/app/state.ts
@@ -53,6 +53,7 @@ export interface MergedTransaction {
   asset: string
   assetType: AssetType
   value: string | null
+  value2?: string
   uniqueId: BigNumber | null
   isWithdrawal: boolean
   blockNum: number | null

diff --git a/packages/arb-token-bridge-ui/src/state/app/utils.ts b/packages/arb-token-bridge-ui/src/state/app/utils.ts
@@ -153,6 +153,7 @@ export const transformDeposit = (
     asset: tx.assetName || '',
     assetType: tx.assetType,
     value: tx.value,
+    value2: tx.value2,
     uniqueId: null, // not needed
     isWithdrawal: false,
     blockNum: tx.blockNumber || null,

diff --git a/packages/arb-token-bridge-ui/src/util/TokenDepositUtils.ts b/packages/arb-token-bridge-ui/src/util/TokenDepositUtils.ts
@@ -8,10 +8,12 @@ import {
   fetchErc20ParentChainGatewayAddress,
   getL2ERC20Address
 } from './TokenUtils'
-import { DepositGasEstimates } from '../hooks/arbTokenBridge.types'
+import { AssetType, DepositGasEstimates } from '../hooks/arbTokenBridge.types'
 import { addressIsSmartContract } from './AddressUtils'
 import { getChainIdFromProvider } from '../token-bridge-sdk/utils'
 import { captureSentryErrorWithExtraData } from './SentryUtils'
+import { MergedTransaction } from '../state/app/state'
+import { isExperimentalFeatureEnabled } from '.'
 
 async function fetchTokenFallbackGasEstimates({
   inboxAddress,
@@ -216,3 +218,14 @@ async function addressIsCustomGatewayToken({
     childChainNetwork.tokenBridge?.parentCustomGateway.toLowerCase()
   )
 }
+
+export function isBatchTransfer(tx: MergedTransaction) {
+  return (
+    isExperimentalFeatureEnabled('batch') &&
+    !tx.isCctp &&
+    !tx.isWithdrawal &&
+    tx.assetType === AssetType.ERC20 &&
+    typeof tx.value2 !== 'undefined' &&
+    Number(tx.value2) > 0
+  )
+}