viem 2.55.16 → 2.55.17

package/actions/public/fillTransaction.ts

@@ -4,6 +4,7 @@ import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { BaseError } from '../../errors/base.js'
 import { BaseFeeScalarError } from '../../errors/fee.js'
+import { FeePayerNonceMismatchError } from '../../errors/transaction.js'
 import type { ErrorType } from '../../errors/utils.js'
 import type { Account, GetAccountParameter } from '../../types/account.js'
 import type { ExtractCapabilities } from '../../types/capabilities.js'
@@ -194,44 +195,61 @@ export async function fillTransaction<
     // Rewrite fields.
     transaction.data = transaction.input
 
-    // Preference supplied fees (some nodes do not take these preferences).
-    if (transaction.gas) transaction.gas = parameters.gas ?? transaction.gas
-    if (transaction.gasPrice)
-      transaction.gasPrice = parameters.gasPrice ?? transaction.gasPrice
-    if (transaction.maxFeePerBlobGas)
-      transaction.maxFeePerBlobGas =
-        parameters.maxFeePerBlobGas ?? transaction.maxFeePerBlobGas
-    if (transaction.maxFeePerGas)
-      transaction.maxFeePerGas =
-        parameters.maxFeePerGas ?? transaction.maxFeePerGas
-    if (transaction.maxPriorityFeePerGas)
-      transaction.maxPriorityFeePerGas =
-        parameters.maxPriorityFeePerGas ?? transaction.maxPriorityFeePerGas
-    if (typeof transaction.nonce !== 'undefined')
-      transaction.nonce = parameters.nonce ?? transaction.nonce
+    const hasFeePayerSignature =
+      typeof transaction.feePayerSignature !== 'undefined' &&
+      transaction.feePayerSignature !== null
 
-    // Build fee multiplier function.
-    const feeMultiplier = await (async () => {
-      if (typeof chain?.fees?.baseFeeMultiplier === 'function') {
-        const block = await getAction(client, getBlock, 'getBlock')({})
-        return chain.fees.baseFeeMultiplier({
-          block,
-          client,
-          request: parameters,
-        } as ChainFeesFnParameters)
-      }
-      return chain?.fees?.baseFeeMultiplier ?? 1.2
-    })()
-    if (feeMultiplier < 1) throw new BaseFeeScalarError()
+    if (
+      hasFeePayerSignature &&
+      typeof nonce !== 'undefined' &&
+      transaction.nonce !== nonce
+    )
+      throw new FeePayerNonceMismatchError({
+        filledNonce: transaction.nonce,
+        requestedNonce: nonce,
+      })
+
+    // A fee payer signature commits to the filled transaction, so preserve
+    // its signed fields regardless of who produced the signature.
+    // https://tips.sh/0001#fee-payer-signature
+    if (!hasFeePayerSignature) {
+      // Preference supplied fees (some nodes do not take these preferences).
+      if (transaction.gas) transaction.gas = parameters.gas ?? transaction.gas
+      if (transaction.gasPrice)
+        transaction.gasPrice = parameters.gasPrice ?? transaction.gasPrice
+      if (transaction.maxFeePerBlobGas)
+        transaction.maxFeePerBlobGas =
+          parameters.maxFeePerBlobGas ?? transaction.maxFeePerBlobGas
+      if (transaction.maxFeePerGas)
+        transaction.maxFeePerGas =
+          parameters.maxFeePerGas ?? transaction.maxFeePerGas
+      if (transaction.maxPriorityFeePerGas)
+        transaction.maxPriorityFeePerGas =
+          parameters.maxPriorityFeePerGas ?? transaction.maxPriorityFeePerGas
+      if (typeof transaction.nonce !== 'undefined')
+        transaction.nonce = parameters.nonce ?? transaction.nonce
+
+      // Build fee multiplier function.
+      const feeMultiplier = await (async () => {
+        if (typeof chain?.fees?.baseFeeMultiplier === 'function') {
+          const block = await getAction(client, getBlock, 'getBlock')({})
+          return chain.fees.baseFeeMultiplier({
+            block,
+            client,
+            request: parameters,
+          } as ChainFeesFnParameters)
+        }
+        return chain?.fees?.baseFeeMultiplier ?? 1.2
+      })()
+      if (feeMultiplier < 1) throw new BaseFeeScalarError()
 
-    const decimals = feeMultiplier.toString().split('.')[1]?.length ?? 0
-    const denominator = 10 ** decimals
-    const multiplyFee = (base: bigint) =>
-      (base * BigInt(Math.round(feeMultiplier * denominator))) /
-      BigInt(denominator)
+      const decimals = feeMultiplier.toString().split('.')[1]?.length ?? 0
+      const denominator = 10 ** decimals
+      const multiplyFee = (base: bigint) =>
+        (base * BigInt(Math.round(feeMultiplier * denominator))) /
+        BigInt(denominator)
 
-    // Apply fee multiplier.
-    if (!transaction.feePayerSignature) {
+      // Apply fee multiplier.
       if (transaction.maxFeePerGas && !parameters.maxFeePerGas)
         transaction.maxFeePerGas = multiplyFee(transaction.maxFeePerGas)
       if (transaction.gasPrice && !parameters.gasPrice)

package/actions/wallet/prepareTransactionRequest.ts

@@ -29,6 +29,7 @@ import {
   Eip1559FeesNotSupportedError,
   MaxFeePerGasTooLowError,
 } from '../../errors/fee.js'
+import { FeePayerNonceMismatchError } from '../../errors/transaction.js'
 import type { DeriveAccount, GetAccountParameter } from '../../types/account.js'
 import type { Block } from '../../types/block.js'
 import type { ExtractCapabilities } from '../../types/capabilities.js'
@@ -509,6 +510,11 @@ export async function prepareTransactionRequest<
 
           if (error.name !== 'TransactionExecutionError') return request
 
+          const nonceMismatch = error.walk?.(
+            (error) => error instanceof FeePayerNonceMismatchError,
+          )
+          if (nonceMismatch) throw e
+
           const executionReverted = error.walk?.((e) => {
             const error = e as BaseError
             return error.name === 'ExecutionRevertedError'

package/chains/definitions/hausTestnet.ts

@@ -0,0 +1,24 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const hausTestnet = /*#__PURE__*/ defineChain({
+  id: 2_443,
+  name: 'Haus Chain Testnet',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'Haus',
+    symbol: 'HAUS',
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://rpc-testnet.hausserver.xyz'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Haus Chain Testnet Explorer',
+      url: 'https://explorer-testnet.hausserver.xyz',
+      apiUrl: 'https://explorer-testnet.hausserver.xyz/api',
+    },
+  },
+  testnet: true,
+})

package/chains/index.ts

@@ -267,6 +267,7 @@ export { hardhat } from './definitions/hardhat.js'
 export { harmonyOne } from './definitions/harmonyOne.js'
 export { hashkey } from './definitions/hashKeyChain.js'
 export { hashkeyTestnet } from './definitions/hashkeyChainTestnet.js'
+export { hausTestnet } from './definitions/hausTestnet.js'
 export { haustTestnet } from './definitions/haustTestnet.js'
 export { hedera } from './definitions/hedera.js'
 export { hederaPreviewnet } from './definitions/hederaPreviewnet.js'

package/errors/transaction.ts

@@ -42,6 +42,27 @@ export class FeeConflictError extends BaseError {
   }
 }
 
+export type FeePayerNonceMismatchErrorType = FeePayerNonceMismatchError & {
+  name: 'FeePayerNonceMismatchError'
+}
+export class FeePayerNonceMismatchError extends BaseError {
+  constructor({
+    filledNonce,
+    requestedNonce,
+  }: {
+    filledNonce: number | undefined
+    requestedNonce: number
+  }) {
+    super('The filled transaction nonce does not match the requested nonce.', {
+      metaMessages: [
+        `Requested Nonce: ${requestedNonce}`,
+        `Filled Nonce: ${filledNonce}`,
+      ],
+      name: 'FeePayerNonceMismatchError',
+    })
+  }
+}
+
 export type InvalidLegacyVErrorType = InvalidLegacyVError & {
   name: 'InvalidLegacyVError'
 }

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.55.16'
+export const version = '2.55.17'

package/index.ts

@@ -1036,6 +1036,8 @@ export {
 export {
   FeeConflictError,
   type FeeConflictErrorType,
+  FeePayerNonceMismatchError,
+  type FeePayerNonceMismatchErrorType,
   InvalidLegacyVError,
   type InvalidLegacyVErrorType,
   InvalidSerializableTransactionError,

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.17",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",