viem 2.55.16 → 2.55.18

package/op-stack/abis.ts

@@ -46,6 +46,20 @@ export const gasPriceOracleAbi = [
     stateMutability: 'view',
     type: 'function',
   },
+  {
+    inputs: [{ internalType: 'uint256', name: '_gasUsed', type: 'uint256' }],
+    name: 'getOperatorFee',
+    outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'isJovian',
+    outputs: [{ internalType: 'bool', name: '', type: 'bool' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
   {
     inputs: [],
     name: 'l1BaseFee',

package/op-stack/actions/estimateOperatorFee.ts

@@ -18,7 +18,7 @@ import type { TransactionRequestEIP1559 } from '../../types/transaction.js'
 import type { RequestErrorType } from '../../utils/buildRequest.js'
 import { getChainContractAddress } from '../../utils/chain/getChainContractAddress.js'
 import type { HexToNumberErrorType } from '../../utils/encoding/fromHex.js'
-import { l1BlockAbi } from '../abis.js'
+import { gasPriceOracleAbi, l1BlockAbi } from '../abis.js'
 import { contracts } from '../contracts.js'
 
 export type EstimateOperatorFeeParameters<
@@ -28,7 +28,12 @@ export type EstimateOperatorFeeParameters<
 > = Omit<TransactionRequestEIP1559, 'from'> &
   GetAccountParameter<TAccount> &
   GetChainParameter<TChain, TChainOverride> & {
-    /** L1 block attributes contract address. */
+    /** Gas price oracle address. */
+    gasPriceOracleAddress?: Address | undefined
+    /**
+     * L1 block attributes contract address.
+     * @deprecated Use `gasPriceOracleAddress` instead.
+     */
     l1BlockAddress?: Address | undefined
   }
 
@@ -46,7 +51,6 @@ export type EstimateOperatorFeeErrorType =
  *
  * Operator fees are part of the Isthmus upgrade and allow OP Stack operators
  * to recover costs related to Alt-DA, ZK proving, or custom gas tokens.
- * Returns 0 for pre-Isthmus chains or when operator fee functions don't exist.
  *
  * @param client - Client to use
  * @param parameters - {@link EstimateOperatorFeeParameters}
@@ -75,45 +79,55 @@ export async function estimateOperatorFee<
   client: Client<Transport, TChain, TAccount>,
   args: EstimateOperatorFeeParameters<TChain, TAccount, TChainOverride>,
 ): Promise<EstimateOperatorFeeReturnType> {
-  const { chain = client.chain, l1BlockAddress: l1BlockAddress_ } = args
+  const {
+    chain = client.chain,
+    gasPriceOracleAddress: gasPriceOracleAddress_,
+    l1BlockAddress,
+  } = args
 
-  const l1BlockAddress = (() => {
-    if (l1BlockAddress_) return l1BlockAddress_
-    if (chain?.contracts?.l1Block)
+  const gasPriceOracleAddress = (() => {
+    if (gasPriceOracleAddress_) return gasPriceOracleAddress_
+    if (chain)
       return getChainContractAddress({
         chain,
-        contract: 'l1Block',
+        contract: 'gasPriceOracle',
       })
-    return contracts.l1Block.address
-  })()
+    return contracts.gasPriceOracle.address
+  })() as Address
 
-  // Try to get operator fee parameters. If any of these calls fail,
-  // it means this is a pre-Isthmus chain and operator fees don't apply
-  try {
-    // Get operator fee parameters first to fail fast if not supported
-    const [operatorFeeScalar, operatorFeeConstant] = await Promise.all([
-      readContract(client, {
-        abi: l1BlockAbi,
-        address: l1BlockAddress,
-        functionName: 'operatorFeeScalar',
-      }),
-      readContract(client, {
-        abi: l1BlockAbi,
-        address: l1BlockAddress,
-        functionName: 'operatorFeeConstant',
-      }),
-    ])
+  const gasUsed = await estimateGas(client, args as EstimateGasParameters)
 
-    // Estimate gas for the actual transaction
-    const gasUsed = await estimateGas(client, args as EstimateGasParameters)
+  if (l1BlockAddress) {
+    // `isJovian` is unavailable on Isthmus Gas Price Oracle implementations.
+    const [operatorFeeScalar, operatorFeeConstant, isJovian] =
+      await Promise.all([
+        readContract(client, {
+          abi: l1BlockAbi,
+          address: l1BlockAddress,
+          functionName: 'operatorFeeScalar',
+        }),
+        readContract(client, {
+          abi: l1BlockAbi,
+          address: l1BlockAddress,
+          functionName: 'operatorFeeConstant',
+        }),
+        readContract(client, {
+          abi: gasPriceOracleAbi,
+          address: gasPriceOracleAddress,
+          functionName: 'isJovian',
+        }).catch(() => false),
+      ])
 
-    // Calculate operator fee: saturatingAdd(saturatingMul(gasUsed, scalar) / 1e6, constant)
-    // Using saturating arithmetic to prevent overflow
-    const scaledFee = (gasUsed * BigInt(operatorFeeScalar)) / 1_000_000n
-    return scaledFee + BigInt(operatorFeeConstant)
-  } catch {
-    // If any call fails, this is likely a pre-Isthmus chain or the contract
-    // doesn't support these functions. Return 0 for operator fee.
-    return 0n
+    const scalar = BigInt(operatorFeeScalar)
+    const constant = BigInt(operatorFeeConstant)
+    if (isJovian) return gasUsed * scalar * 100n + constant
+    return (gasUsed * scalar) / 1_000_000n + constant
   }
+
+  return readContract(client, {
+    abi: gasPriceOracleAbi,
+    address: gasPriceOracleAddress,
+    functionName: 'getOperatorFee',
+    args: [gasUsed],
+  })
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "2.55.16",
+  "version": "2.55.18",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",

package/tempo/Decorator.ts

@@ -1926,8 +1926,8 @@ type DecoratorBase<
      *   assetToken: '0x...',
      *   gateway: '0x...',
      *   recipient: '0x...',
-     *   recoveryRecipient: '0x...',
      *   shareAmountMin: 99_500_000n,
+     *   tempoRefundRecipient: '0x...',
      *   vault: '0x...',
      *   vaultAssetAmountMin: 99_000_000n,
      *   zoneId: 7,
@@ -2157,9 +2157,9 @@ type DecoratorBase<
      * const prepared = await parentClient.earn.privateRedeem.prepare({
      *   gateway: '0x...',
      *   recipient: '0x...',
-     *   recoveryRecipient: '0x...',
      *   shareAmount: 100_000_000n,
      *   slippageBps: 50,
+     *   tempoRefundRecipient: '0x...',
      *   vault: '0x...',
      *   zoneId: 7,
      * })

package/tempo/actions/earn.ts

@@ -968,8 +968,8 @@ export namespace depositSharesSync {
  *   assetToken: '0x...',
  *   gateway: '0x...',
  *   recipient: '0x...',
- *   recoveryRecipient: '0x...',
  *   shareAmountMin: 99_500_000n,
+ *   tempoRefundRecipient: '0x...',
  *   vault: '0x...',
  *   vaultAssetAmountMin: 99_000_000n,
  *   zoneId: 7,
@@ -1019,11 +1019,11 @@ export namespace privateDeposit {
       actionId = Hex.random(32),
       assetAmount,
       callbackGas = zoneGatewayCallbackGas,
-      fallbackRecipient = parameters.recoveryRecipient,
+      tempoRefundRecipient,
+      fallbackRecipient = tempoRefundRecipient,
       gateway,
       portalAddress: portalAddress_,
       recipient,
-      recoveryRecipient,
       returnMemo,
       vault,
       withdrawalMemo,
@@ -1062,7 +1062,11 @@ export namespace privateDeposit {
         minEarnShares: shareAmountMin,
         minOutputAmount: 0n,
         minVaultAssets: parameters.vaultAssetAmountMin ?? assetAmount,
-        zoneReturn: { encrypted, keyIndex, refundRecipient: recoveryRecipient },
+        zoneReturn: {
+          encrypted,
+          keyIndex,
+          refundRecipient: tempoRefundRecipient,
+        },
       },
     ])
     return {
@@ -2346,9 +2350,9 @@ export namespace redeemSync {
  * const prepared = await Actions.earn.privateRedeem.prepare(parentClient, {
  *   gateway: '0x...',
  *   recipient: '0x...',
- *   recoveryRecipient: '0x...',
  *   shareAmount: 100_000_000n,
  *   slippageBps: 50,
+ *   tempoRefundRecipient: '0x...',
  *   vault: '0x...',
  *   zoneId: 7,
  * })
@@ -2396,11 +2400,11 @@ export namespace privateRedeem {
     const {
       actionId = Hex.random(32),
       callbackGas = zoneGatewayCallbackGas,
-      fallbackRecipient = parameters.recoveryRecipient,
+      tempoRefundRecipient,
+      fallbackRecipient = tempoRefundRecipient,
       gateway,
       portalAddress: portalAddress_,
       recipient,
-      recoveryRecipient,
       returnMemo,
       shareAmount,
       vault,
@@ -2456,7 +2460,11 @@ export namespace privateRedeem {
         minEarnShares: 0n,
         minOutputAmount: assetAmountMin,
         minVaultAssets: assetAmountMin,
-        zoneReturn: { encrypted, keyIndex, refundRecipient: recoveryRecipient },
+        zoneReturn: {
+          encrypted,
+          keyIndex,
+          refundRecipient: tempoRefundRecipient,
+        },
       },
     ])
     return {
@@ -3016,7 +3024,7 @@ type PrivatePreparationParameters = {
   actionId?: Hex.Hex | undefined
   /** Gas reserved for the parent-chain callback. @default `10_000_000n` */
   callbackGas?: bigint | undefined
-  /** Public recipient if the parent-chain callback fails. @default `recoveryRecipient` */
+  /** Public recipient if the parent-chain callback fails. @default `tempoRefundRecipient` */
   fallbackRecipient?: Address | undefined
   /** Zone gateway address. */
   gateway: Address
@@ -3024,10 +3032,10 @@ type PrivatePreparationParameters = {
   portalAddress?: Address | undefined
   /** Encrypted recipient for the returned tokens. */
   recipient: Address
-  /** Public recipient if the encrypted return fails. */
-  recoveryRecipient: Address
   /** Optional memo encrypted with the returned Zone deposit. */
   returnMemo?: Hex.Hex | undefined
+  /** Refund recipient on the parent chain if the return deposit bounces. */
+  tempoRefundRecipient: Address
   /** Vault address. */
   vault: Address
   /** Optional memo attached to the Zone withdrawal. */

package/tempo/actions/zone.ts

@@ -76,8 +76,6 @@ export type EncryptedPayload = {
 export type PreparedEncryptedDeposit = {
   /** Amount of tokens to deposit. */
   amount: bigint
-  /** Refund recipient on the parent chain if the deposit bounces. */
-  bouncebackRecipient: Address
   /** Parent chain ID (e.g. `42431` for moderato). */
   chainId: number
   /** Encrypted deposit payload. */
@@ -88,6 +86,8 @@ export type PreparedEncryptedDeposit = {
   portalAddress: Address
   /** Address that will call the Zone portal. */
   sender: Address
+  /** Refund recipient on the parent chain if the deposit bounces. */
+  tempoRefundRecipient: Address
   /** Token address or ID to deposit. */
   token: TokenId.TokenIdOrAddress
   /** Zone ID (e.g. `7`). */
@@ -153,12 +153,13 @@ export async function deposit<
   if (!account_) throw new Error('`account` is required.')
 
   const recipient = parameters.recipient ?? account_.address
-  const bouncebackRecipient = parameters.bouncebackRecipient ?? account_.address
+  const tempoRefundRecipient =
+    parameters.tempoRefundRecipient ?? account_.address
   const args = {
     ...parameters,
-    bouncebackRecipient,
     chainId,
     recipient,
+    tempoRefundRecipient,
   }
   return sendTransaction(client, {
     ...rest,
@@ -172,18 +173,16 @@ export namespace deposit {
     chain extends Chain | undefined = Chain | undefined,
     account extends Account | undefined = Account | undefined,
   > = WriteParameters<chain, account> &
-    Omit<Args, 'bouncebackRecipient' | 'chainId' | 'recipient'> & {
-      /** Refund recipient on the parent chain. @default `account.address` */
-      bouncebackRecipient?: Address | undefined
+    Omit<Args, 'chainId' | 'recipient' | 'tempoRefundRecipient'> & {
       /** Recipient address in the zone. @default `account.address` */
       recipient?: Address | undefined
+      /** Refund recipient on the parent chain. @default `account.address` */
+      tempoRefundRecipient?: Address | undefined
     }
 
   export type Args = {
     /** Amount of tokens to deposit. */
     amount: bigint
-    /** Refund recipient on the parent chain if the deposit bounces. */
-    bouncebackRecipient: Address
     /** Parent chain ID (e.g. `42431` for moderato). */
     chainId: number
     /** Optional deposit memo. @default `0x00...00` */
@@ -192,6 +191,8 @@ export namespace deposit {
     portalAddress?: Address | undefined
     /** Recipient address in the zone. */
     recipient: Address
+    /** Refund recipient on the parent chain if the deposit bounces. */
+    tempoRefundRecipient: Address
     /** Token address or ID to deposit. */
     token: TokenId.TokenIdOrAddress
     /** Zone ID (e.g. `7`). */
@@ -212,10 +213,10 @@ export namespace deposit {
   export function calls(args: Args) {
     const {
       amount,
-      bouncebackRecipient,
       chainId,
       memo = zeroHash,
       recipient,
+      tempoRefundRecipient,
       token,
       zoneId,
     } = args
@@ -232,7 +233,7 @@ export namespace deposit {
       address: portalAddress,
       abi: ZoneAbis.zonePortal,
       functionName: 'deposit',
-      args: [tokenAddress, recipient, amount, memo, bouncebackRecipient],
+      args: [tokenAddress, recipient, amount, memo, tempoRefundRecipient],
     })
     return [approveCall, depositCall]
   }
@@ -286,12 +287,13 @@ export async function depositSync<
   if (!account_) throw new Error('`account` is required.')
 
   const recipient = parameters.recipient ?? account_.address
-  const bouncebackRecipient = parameters.bouncebackRecipient ?? account_.address
+  const tempoRefundRecipient =
+    parameters.tempoRefundRecipient ?? account_.address
   const args = {
     ...parameters,
-    bouncebackRecipient,
     chainId,
     recipient,
+    tempoRefundRecipient,
   }
   const receipt = await sendTransactionSync(client, {
     ...rest,
@@ -478,7 +480,8 @@ export async function encryptedDeposit<
   const account_ = account ? parseAccount(account) : undefined
   if (!account_) throw new Error('`account` is required.')
 
-  const bouncebackRecipient = parameters.bouncebackRecipient ?? account_.address
+  const tempoRefundRecipient =
+    parameters.tempoRefundRecipient ?? account_.address
 
   if ('encrypted' in parameters) {
     if (parameters.chainId !== chainId) {
@@ -490,7 +493,7 @@ export async function encryptedDeposit<
       ...pickWriteParameters(parameters as never),
       calls: encryptedDeposit.calls({
         ...parameters,
-        bouncebackRecipient,
+        tempoRefundRecipient,
       }),
     } as never) as never
   }
@@ -499,11 +502,11 @@ export async function encryptedDeposit<
 
   const prepared = await encryptedDeposit.prepare(client, {
     amount: parameters.amount,
-    bouncebackRecipient,
     memo: parameters.memo,
     portalAddress: parameters.portalAddress,
     recipient,
     sender: account_.address,
+    tempoRefundRecipient,
     token: parameters.token,
     zoneId: parameters.zoneId,
   })
@@ -522,16 +525,16 @@ export namespace encryptedDeposit {
     (
       | (Omit<
           Args,
-          | 'bouncebackRecipient'
           | 'chainId'
           | 'encrypted'
           | 'keyIndex'
           | 'recipient'
+          | 'tempoRefundRecipient'
         > & {
-          /** Refund recipient on the parent chain. @default `account.address` */
-          bouncebackRecipient?: Address | undefined
           /** Recipient address in the zone. @default `account.address` */
           recipient?: Address | undefined
+          /** Refund recipient on the parent chain. @default `account.address` */
+          tempoRefundRecipient?: Address | undefined
         })
       | PreparedEncryptedDeposit
     )
@@ -539,8 +542,6 @@ export namespace encryptedDeposit {
   export type Args = {
     /** Amount of tokens to deposit. */
     amount: bigint
-    /** Refund recipient on the parent chain if the deposit bounces. */
-    bouncebackRecipient: Address
     /** Parent chain ID (e.g. `42431` for moderato). */
     chainId: number
     /** Encrypted deposit payload. */
@@ -553,6 +554,8 @@ export namespace encryptedDeposit {
     portalAddress?: Address | undefined
     /** Recipient address in the zone. */
     recipient: Address
+    /** Refund recipient on the parent chain if the deposit bounces. */
+    tempoRefundRecipient: Address
     /** Token address or ID to deposit. */
     token: TokenId.TokenIdOrAddress
     /** Zone ID (e.g. `7`). */
@@ -581,9 +584,9 @@ export namespace encryptedDeposit {
    * const prepared = await Actions.zone.encryptedDeposit.prepare(client, {
    *   token: '0x20c0...0001',
    *   amount: 1_000_000n,
-   *   bouncebackRecipient: '0x...',
    *   recipient: '0x...',
    *   sender: '0x...',
+   *   tempoRefundRecipient: '0x...',
    *   zoneId: 7,
    * })
    * ```
@@ -604,11 +607,11 @@ export namespace encryptedDeposit {
 
     const {
       amount,
-      bouncebackRecipient,
       memo,
       portalAddress: portalAddress_,
       recipient,
       sender: sender_ = client.account?.address,
+      tempoRefundRecipient,
       token,
       zoneId,
       ...rest
@@ -634,12 +637,12 @@ export namespace encryptedDeposit {
 
     return {
       amount,
-      bouncebackRecipient,
       chainId,
       encrypted,
       keyIndex,
       portalAddress,
       sender,
+      tempoRefundRecipient,
       token,
       zoneId,
     }
@@ -661,8 +664,6 @@ export namespace encryptedDeposit {
     export type Args = {
       /** Amount of tokens to deposit. */
       amount: bigint
-      /** Refund recipient on the parent chain if the deposit bounces. */
-      bouncebackRecipient: Address
       /** Optional deposit memo. @default `0x00...00` */
       memo?: Hex.Hex | undefined
       /** Zone portal address. @default resolved via the portal registry. */
@@ -671,6 +672,8 @@ export namespace encryptedDeposit {
       recipient: Address
       /** Address that will call the Zone portal. */
       sender: Address
+      /** Refund recipient on the parent chain if the deposit bounces. */
+      tempoRefundRecipient: Address
       /** Token address or ID to deposit. */
       token: TokenId.TokenIdOrAddress
       /** Zone ID (e.g. `7`). */
@@ -796,10 +799,10 @@ export namespace encryptedDeposit {
   export function calls(args: Args | PreparedEncryptedDeposit) {
     const {
       amount,
-      bouncebackRecipient,
       chainId,
       encrypted,
       keyIndex,
+      tempoRefundRecipient,
       token,
       zoneId,
     } = args
@@ -828,7 +831,7 @@ export namespace encryptedDeposit {
         amount,
         keyIndex,
         encryptedPayload,
-        bouncebackRecipient,
+        tempoRefundRecipient,
       ],
     })
     return [approveCall, depositCall]
@@ -882,7 +885,8 @@ export async function encryptedDepositSync<
   const account_ = account ? parseAccount(account) : undefined
   if (!account_) throw new Error('`account` is required.')
 
-  const bouncebackRecipient = parameters.bouncebackRecipient ?? account_.address
+  const tempoRefundRecipient =
+    parameters.tempoRefundRecipient ?? account_.address
 
   if ('encrypted' in parameters) {
     if (parameters.chainId !== chainId) {
@@ -896,7 +900,7 @@ export async function encryptedDepositSync<
       throwOnReceiptRevert,
       calls: encryptedDeposit.calls({
         ...parameters,
-        bouncebackRecipient,
+        tempoRefundRecipient,
       }),
     } as never)
     return { receipt }
@@ -906,11 +910,11 @@ export async function encryptedDepositSync<
 
   const prepared = await encryptedDeposit.prepare(client, {
     amount: parameters.amount,
-    bouncebackRecipient,
     memo: parameters.memo,
     portalAddress: parameters.portalAddress,
     recipient,
     sender: account_.address,
+    tempoRefundRecipient,
     token: parameters.token,
     zoneId: parameters.zoneId,
   })

package/tempo/zones/Abis.ts

@@ -121,7 +121,7 @@ export const zonePortal = [
       { name: 'to', type: 'address' },
       { name: 'amount', type: 'uint128' },
       { name: 'memo', type: 'bytes32' },
-      { name: 'bouncebackRecipient', type: 'address' },
+      { name: 'tempoRefundRecipient', type: 'address' },
     ],
     outputs: [{ name: '', type: 'bytes32' }],
   },
@@ -144,7 +144,7 @@ export const zonePortal = [
           { name: 'tag', type: 'bytes16' },
         ],
       },
-      { name: 'bouncebackRecipient', type: 'address' },
+      { name: 'tempoRefundRecipient', type: 'address' },
     ],
     outputs: [{ name: '', type: 'bytes32' }],
   },