viem 2.55.15 → 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.15",
+  "version": "2.55.17",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",

package/utils/siwe/parseSiweMessage.ts

@@ -3,6 +3,21 @@ import type { Address } from 'abitype'
 import type { ExactPartial, Prettify } from '../../types/utils.js'
 import type { SiweMessage } from './types.js'
 
+const siweDateTimeRegex =
+  /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})$/
+
+function isValidSiweDateTime(value: string): boolean {
+  if (!siweDateTimeRegex.test(value)) return false
+  return !Number.isNaN(new Date(value).getTime())
+}
+
+function parseSiweDateTime(value: string): Date {
+  // Reject non-RFC-3339 / non-EIP-4361 date-time strings before Date coercion
+  // (JS Date accepts many non-SIWE forms that would otherwise look "valid").
+  if (!isValidSiweDateTime(value)) return new Date(Number.NaN)
+  return new Date(value)
+}
+
 /**
  * @description Parses EIP-4361 formatted message into message fields object.
  *
@@ -36,9 +51,11 @@ export function parseSiweMessage(
     ...prefix,
     ...suffix,
     ...(chainId ? { chainId: Number(chainId) } : {}),
-    ...(expirationTime ? { expirationTime: new Date(expirationTime) } : {}),
-    ...(issuedAt ? { issuedAt: new Date(issuedAt) } : {}),
-    ...(notBefore ? { notBefore: new Date(notBefore) } : {}),
+    ...(expirationTime
+      ? { expirationTime: parseSiweDateTime(expirationTime) }
+      : {}),
+    ...(issuedAt ? { issuedAt: parseSiweDateTime(issuedAt) } : {}),
+    ...(notBefore ? { notBefore: parseSiweDateTime(notBefore) } : {}),
     ...(requestId ? { requestId } : {}),
     ...(resources ? { resources } : {}),
     ...(scheme ? { scheme } : {}),

package/utils/siwe/validateSiweMessage.ts

@@ -57,8 +57,19 @@ export function validateSiweMessage(
   if (nonce && message.nonce !== nonce) return false
   if (scheme && message.scheme !== scheme) return false
 
-  if (message.expirationTime && time >= message.expirationTime) return false
-  if (message.notBefore && time < message.notBefore) return false
+  // Invalid `time` makes both lifetime comparisons false in JS; reject first.
+  if (Number.isNaN(time.getTime())) return false
+
+  // Invalid Date (e.g. non-RFC-3339 SIWE timestamp coerced at parse) is truthy;
+  // comparisons against it are always false and previously skipped checks.
+  if (message.expirationTime) {
+    if (Number.isNaN(message.expirationTime.getTime())) return false
+    if (time >= message.expirationTime) return false
+  }
+  if (message.notBefore) {
+    if (Number.isNaN(message.notBefore.getTime())) return false
+    if (time < message.notBefore) return false
+  }
 
   try {
     if (!message.address) return false