viem 2.47.5 → 2.47.10

package/tempo/chainConfig.ts

@@ -1,3 +1,6 @@
+import * as Address from 'ox/Address'
+import * as Hex from 'ox/Hex'
+import * as PublicKey from 'ox/PublicKey'
 import { SignatureEnvelope, type TokenId } from 'ox/tempo'
 import { getCode } from '../actions/public/getCode.js'
 import { verifyHash } from '../actions/public/verifyHash.js'
@@ -8,9 +11,12 @@ import { defineTransaction } from '../utils/formatters/transaction.js'
 import { defineTransactionReceipt } from '../utils/formatters/transactionReceipt.js'
 import { defineTransactionRequest } from '../utils/formatters/transactionRequest.js'
 import { getAction } from '../utils/getAction.js'
+import { keccak256 } from '../utils/hash/keccak256.js'
 import type { SerializeTransactionFn } from '../utils/transaction/serializeTransaction.js'
 import type { Account } from './Account.js'
+import { getMetadata } from './actions/accessKey.js'
 import * as Formatters from './Formatters.js'
+import type { Hardfork } from './Hardfork.js'
 import * as Concurrent from './internal/concurrent.js'
 import * as Transaction from './Transaction.js'
 
@@ -20,6 +26,7 @@ export const chainConfig = {
   blockTime: 1_000,
   extendSchema: extendSchema<{
     feeToken?: TokenId.TokenIdOrAddress | undefined
+    hardfork?: Hardfork | undefined
   }>(),
   formatters: {
     transaction: defineTransaction({
@@ -42,13 +49,15 @@ export const chainConfig = {
           | undefined
       }
 
-      // FIXME: node does not account for fee payer + key authorization combinartion; bump gas for now.
+      // FIXME: node estimates gas with secp256k1 dummy sig + null feePayerSignature.
+      // Actual tx has larger keychain/webAuthn sigs + real fee payer sig, costing more intrinsic gas.
       if (phase === 'afterFillParameters') {
-        if (
-          request.feePayer &&
-          request.keyAuthorization?.signature.type === 'webAuthn'
-        )
-          request.gas = (request.gas ?? 0n) + 20_000n
+        if (request.feePayer) {
+          if (request.keyAuthorization?.signature.type === 'webAuthn')
+            request.gas = (request.gas ?? 0n) + 20_000n
+          else if (request.account?.source === 'accessKey')
+            request.gas = (request.gas ?? 0n) + 10_000n
+        }
         return request as unknown as typeof r
       }
 
@@ -89,18 +98,53 @@ export const chainConfig = {
       Transaction.serialize(transaction, signature)) as SerializeTransactionFn,
   },
   async verifyHash(client, parameters) {
-    const { address, hash, signature } = parameters
+    const { address, hash, signature, mode } = parameters
+
+    const envelope = (() => {
+      if (typeof signature !== 'string') return
+      try {
+        return SignatureEnvelope.deserialize(signature)
+      } catch {
+        return undefined
+      }
+    })()
 
     // `verifyHash` supports "signature envelopes" (a Tempo proposal) to natively verify arbitrary
     // envelope-compatible (WebAuthn, P256, etc.) signatures.
-    // We can directly verify stateless, non-keychain signature envelopes without a
-    // network request to the chain.
-    if (
-      typeof signature === 'string' &&
-      signature.endsWith(SignatureEnvelope.magicBytes.slice(2))
-    ) {
-      const envelope = SignatureEnvelope.deserialize(signature)
-      if (envelope.type !== 'keychain') {
+    if (envelope) {
+      // Access key (keychain) signature verification: check the key is
+      // authorized, not expired, and not revoked on the AccountKeychain.
+      if (envelope?.type === 'keychain' && mode === 'allowAccessKey') {
+        const accessKeyAddress = Address.fromPublicKey(
+          PublicKey.from(envelope.inner.publicKey as PublicKey.PublicKey),
+        )
+
+        const keyInfo = await getMetadata(client, {
+          account: address,
+          accessKey: accessKeyAddress,
+          blockNumber: parameters.blockNumber,
+          blockTag: parameters.blockTag,
+        } as never)
+
+        if (keyInfo.isRevoked) return false
+        if (keyInfo.expiry <= BigInt(Math.floor(Date.now() / 1000)))
+          return false
+
+        // For v2 keychain envelopes, the inner signature signs
+        // keccak256(0x04 || hash || userAddress).
+        const innerPayload =
+          envelope.version === 'v2'
+            ? keccak256(Hex.concat('0x04', hash, address))
+            : hash
+        return SignatureEnvelope.verify(envelope.inner, {
+          address: accessKeyAddress,
+          payload: innerPayload,
+        })
+      }
+
+      // Stateless, non-keychain signature envelopes (P256, WebAuthn) can be
+      // verified directly without a network request.
+      if (envelope.type === 'p256' || envelope.type === 'webAuthn') {
         const code = await getCode(client, {
           address,
           blockNumber: parameters.blockNumber,

package/tempo/index.ts

@@ -21,6 +21,7 @@ export {
   decorator as tempoActions,
 } from './Decorator.js'
 export * as Formatters from './Formatters.js'
+export * as Hardfork from './Hardfork.js'
 export * as P256 from './P256.js'
 export * as Secp256k1 from './Secp256k1.js'
 export * as TokenIds from './TokenIds.js'

package/tsconfig.json

@@ -5,6 +5,6 @@
   "compilerOptions": {
     "composite": true,
     "noEmit": true,
-    "baseUrl": ".",
+    "types": ["node"]
   }
 }

package/utils/rpc/http.ts

@@ -155,6 +155,14 @@ export function getHttpRpcClient(
         }
 
         if (!response.ok) {
+          // If the response body contains a valid JSON-RPC error, return it
+          // so it flows through the normal RPC error handling pipeline.
+          if (
+            typeof data.error?.code === 'number' &&
+            typeof data.error?.message === 'string'
+          )
+            return data
+
           throw new HttpRequestError({
             body,
             details: stringify(data.error) || response.statusText,

package/_cjs/chains/definitions/tempoAndantino.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tempoAndantino = void 0;
-const chainConfig_js_1 = require("../../tempo/chainConfig.js");
-const defineChain_js_1 = require("../../utils/chain/defineChain.js");
-exports.tempoAndantino = (0, defineChain_js_1.defineChain)({
-    ...chainConfig_js_1.chainConfig,
-    id: 42429,
-    blockExplorers: {
-        default: {
-            name: 'Tempo Explorer',
-            url: 'https://explore.testnet.tempo.xyz',
-        },
-    },
-    name: 'Tempo Testnet (Andantino)',
-    nativeCurrency: {
-        name: 'USD',
-        symbol: 'USD',
-        decimals: 6,
-    },
-    rpcUrls: {
-        default: {
-            http: ['https://rpc.testnet.tempo.xyz'],
-            webSocket: ['wss://rpc.testnet.tempo.xyz'],
-        },
-    },
-});
-//# sourceMappingURL=tempoAndantino.js.map

package/_cjs/chains/definitions/tempoAndantino.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tempoAndantino.js","sourceRoot":"","sources":["../../../chains/definitions/tempoAndantino.ts"],"names":[],"mappings":";;;AAAA,+DAAwD;AACxD,qEAA8D;AAEjD,QAAA,cAAc,GAAiB,IAAA,4BAAW,EAAC;IACtD,GAAG,4BAAW;IACd,EAAE,EAAE,KAAK;IACT,cAAc,EAAE;QACd,OAAO,EAAE;YACP,IAAI,EAAE,gBAAgB;YACtB,GAAG,EAAE,mCAAmC;SACzC;KACF;IACD,IAAI,EAAE,2BAA2B;IACjC,cAAc,EAAE;QACd,IAAI,EAAE,KAAK;QACX,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,CAAC;KACZ;IACD,OAAO,EAAE;QACP,OAAO,EAAE;YACP,IAAI,EAAE,CAAC,+BAA+B,CAAC;YACvC,SAAS,EAAE,CAAC,6BAA6B,CAAC;SAC3C;KACF;CACF,CAAC,CAAA"}

package/_esm/chains/definitions/tempoAndantino.js

@@ -1,25 +0,0 @@
-import { chainConfig } from '../../tempo/chainConfig.js';
-import { defineChain } from '../../utils/chain/defineChain.js';
-export const tempoAndantino = /*#__PURE__*/ defineChain({
-    ...chainConfig,
-    id: 42429,
-    blockExplorers: {
-        default: {
-            name: 'Tempo Explorer',
-            url: 'https://explore.testnet.tempo.xyz',
-        },
-    },
-    name: 'Tempo Testnet (Andantino)',
-    nativeCurrency: {
-        name: 'USD',
-        symbol: 'USD',
-        decimals: 6,
-    },
-    rpcUrls: {
-        default: {
-            http: ['https://rpc.testnet.tempo.xyz'],
-            webSocket: ['wss://rpc.testnet.tempo.xyz'],
-        },
-    },
-});
-//# sourceMappingURL=tempoAndantino.js.map

package/_esm/chains/definitions/tempoAndantino.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tempoAndantino.js","sourceRoot":"","sources":["../../../chains/definitions/tempoAndantino.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAE9D,MAAM,CAAC,MAAM,cAAc,GAAG,aAAa,CAAC,WAAW,CAAC;IACtD,GAAG,WAAW;IACd,EAAE,EAAE,KAAK;IACT,cAAc,EAAE;QACd,OAAO,EAAE;YACP,IAAI,EAAE,gBAAgB;YACtB,GAAG,EAAE,mCAAmC;SACzC;KACF;IACD,IAAI,EAAE,2BAA2B;IACjC,cAAc,EAAE;QACd,IAAI,EAAE,KAAK;QACX,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,CAAC;KACZ;IACD,OAAO,EAAE;QACP,OAAO,EAAE;YACP,IAAI,EAAE,CAAC,+BAA+B,CAAC;YACvC,SAAS,EAAE,CAAC,6BAA6B,CAAC;SAC3C;KACF;CACF,CAAC,CAAA"}