viem 2.52.0 → 2.53.1

package/tempo/Transaction.ts

@@ -7,6 +7,7 @@ import * as Signature from 'ox/Signature'
 import {
   type AuthorizationTempo,
   type KeyAuthorization,
+  type MultisigConfig,
   type TransactionReceipt as ox_TransactionReceipt,
   SignatureEnvelope,
   type TempoAddress,
@@ -124,7 +125,9 @@ export type TransactionRequestTempo<
     feePayer?: Account | true | undefined
     feeToken?: TempoAddress.Address | bigint | undefined
     keyAuthorization?: KeyAuthorization.Signed<quantity, index> | undefined
+    multisig?: MultisigConfig.Config<index> | undefined
     nonceKey?: 'expiring' | quantity | undefined
+    signatures?: readonly SignatureEnvelope.Serialized[] | undefined
     validBefore?: index | undefined
     validAfter?: index | undefined
   }
@@ -145,8 +148,10 @@ export type TransactionSerializableTempo<
     feePayerSignature?: viem_Signature | null | undefined
     from?: Address | undefined
     keyAuthorization?: KeyAuthorization.Signed<quantity, index> | undefined
+    multisig?: MultisigConfig.Config<index> | undefined
     nonceKey?: quantity | undefined
     signature?: SignatureEnvelope.SignatureEnvelope<quantity, index> | undefined
+    signatures?: readonly SignatureEnvelope.Serialized[] | undefined
     validBefore?: index | undefined
     validAfter?: index | undefined
     type?: 'tempo' | undefined
@@ -170,12 +175,16 @@ export function getType(
   if (
     (account?.keyType && account.keyType !== 'secp256k1') ||
     account?.source === 'accessKey' ||
+    account?.source === 'multisig' ||
     typeof transaction.calls !== 'undefined' ||
     typeof transaction.feePayer !== 'undefined' ||
+    typeof transaction.feePayerSignature !== 'undefined' ||
     typeof transaction.feeToken !== 'undefined' ||
     typeof transaction.keyAuthorization !== 'undefined' ||
+    typeof transaction.multisig !== 'undefined' ||
     typeof transaction.nonceKey !== 'undefined' ||
     typeof transaction.signature !== 'undefined' ||
+    typeof transaction.signatures !== 'undefined' ||
     typeof transaction.validBefore !== 'undefined' ||
     typeof transaction.validAfter !== 'undefined'
   )
@@ -337,6 +346,39 @@ async function serializeTempo(
   // the fee payer.
   if (shouldStripFeeTokenForSponsorship) delete transaction_ox.feeToken
 
+  // Native multisig (TIP-1061): combine the collected owner approvals into the
+  // multisig signature envelope and serialize the broadcast transaction. The
+  // approvals are recovered against the multisig owner digest and ordered into
+  // the strictly-ascending owner address order the node requires.
+  //
+  // Bootstrap (`init`) is auto-detected from the nonce: the protocol requires
+  // (and consumes) nonce `0` for the first transaction from a derived account,
+  // so `nonce == 0` uniquely identifies a bootstrap. This matches the serialized
+  // nonce above (a falsy `nonce` serializes as `0`). The owner approval digest
+  // doesn't commit to `init`, so attaching it here (rather than at owner-signing)
+  // is safe.
+  // NOTE: fee-payer + multisig is handled in a later phase.
+  if (transaction.multisig && transaction.signatures && !feePayer) {
+    const payload = TxTempo.getSignPayload(TxTempo.from(transaction_ox))
+    const signatures = transaction.signatures.map((approval) =>
+      SignatureEnvelope.from(approval),
+    )
+    const sorted = SignatureEnvelope.sortMultisigApprovals({
+      payload,
+      signatures,
+      genesisConfig: transaction.multisig,
+    })
+    const signature = SignatureEnvelope.from({
+      genesisConfig: transaction.multisig,
+      signatures: sorted,
+      ...(nonce ? {} : { init: true }),
+    })
+    return TxTempo.serialize(transaction_ox, {
+      feePayerSignature: undefined,
+      signature,
+    })
+  }
+
   if (signature && typeof transaction.feePayer === 'object') {
     const tx = TxTempo.from(transaction_ox, {
       signature,

package/tempo/chainConfig.ts

@@ -1,5 +1,6 @@
+import type { Address } from 'abitype'
 import * as Hex from 'ox/Hex'
-import { SignatureEnvelope, type TokenId } from 'ox/tempo'
+import { MultisigConfig, SignatureEnvelope, type TokenId } from 'ox/tempo'
 import { getCode } from '../actions/public/getCode.js'
 import { verifyHash } from '../actions/public/verifyHash.js'
 import { maxUint256 } from '../constants/number.js'
@@ -12,7 +13,7 @@ import { defineTransactionRequest } from '../utils/formatters/transactionRequest
 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 type { Account, MultisigAccount } from './Account.js'
 import { getMetadata } from './actions/accessKey.js'
 import * as Formatters from './Formatters.js'
 import type { Hardfork } from './Hardfork.js'
@@ -42,13 +43,16 @@ export const chainConfig = {
   prepareTransactionRequest: [
     async (r, { client, phase }) => {
       const request = r as Transaction.TransactionRequest & {
-        account?: Account | undefined
+        account?: Account | MultisigAccount | undefined
         chainId?: number | undefined
         chain?:
           | (Chain & {
               feeToken?: TokenId.TokenIdOrAddress | undefined
             })
           | undefined
+        from?: Address | undefined
+        multisig?: MultisigConfig.Config | undefined
+        signatures?: readonly unknown[] | undefined
       }
 
       // FIXME: node estimates gas with secp256k1 dummy sig + null feePayerSignature.
@@ -60,9 +64,34 @@ export const chainConfig = {
           else if (request.account?.source === 'accessKey')
             request.gas = (request.gas ?? 0n) + 10_000n
         }
+
         return request as unknown as typeof r
       }
 
+      // Native multisig (TIP-1061). The transaction sender is the derived
+      // multisig account, not a signing account (owner accounts only contribute
+      // approvals later via `signTransaction`). Derive the sender from the
+      // config; core fills nonce/gas/fees for it via `request.from`, and the
+      // serializer auto-detects bootstrap (`init`) from `nonce == 0`.
+      //
+      // The config is taken from an explicit `multisig` field, or inferred from
+      // a multisig account (so callers can just pass `account` to
+      // `prepareTransactionRequest` without also passing `multisig`).
+      const multisig =
+        request.multisig ??
+        (request.account?.source === 'multisig'
+          ? (request.account as MultisigAccount).config
+          : undefined)
+      if (multisig) {
+        request.multisig = multisig
+        request.from = MultisigConfig.getAddress(multisig)
+        // A non-multisig `account` (e.g. the client's default) isn't the sender,
+        // so drop it: core then fills nonce/gas/fees for the multisig sender via
+        // `request.from`. A multisig account *is* the sender — keep it so the
+        // prepared request can be sent without re-passing `account`.
+        if (request.account?.source !== 'multisig') delete request.account
+      }
+
       if (
         !request.keyAuthorization &&
         request.account?.source === 'accessKey'

package/tempo/index.ts

@@ -13,6 +13,7 @@ export type {
 } from 'ox/tempo'
 export {
   Channel,
+  MultisigConfig,
   Period,
   ReceivePolicyReceipt,
   TempoAddress,
@@ -21,12 +22,42 @@ export {
   VirtualAddress,
   VirtualMaster,
 } from 'ox/tempo'
+export {
+  type CustomTransport,
+  type CustomTransportConfig,
+  type CustomTransportErrorType,
+  custom,
+} from '../clients/transports/custom.js'
+export {
+  type FallbackTransport,
+  type FallbackTransportConfig,
+  type FallbackTransportErrorType,
+  fallback,
+} from '../clients/transports/fallback.js'
+export {
+  type HttpTransport,
+  type HttpTransportConfig,
+  type HttpTransportErrorType,
+  http,
+} from '../clients/transports/http.js'
+export {
+  type WebSocketTransport,
+  type WebSocketTransportConfig,
+  type WebSocketTransportErrorType,
+  webSocket,
+} from '../clients/transports/webSocket.js'
 export * as Abis from './Abis.js'
 export * as Account from './Account.js'
 export * as Addresses from './Addresses.js'
 export * as Actions from './actions/index.js'
 export * as Capabilities from './Capabilities.js'
 export * as Chain from './Chain.js'
+export {
+  type Client,
+  type ClientConfig,
+  type CreateClientErrorType,
+  createClient,
+} from './Client.js'
 export {
   type Decorator as TempoActions,
   decorator as tempoActions,
@@ -37,6 +68,10 @@ export * as Formatters from './Formatters.js'
 export * as Hardfork from './Hardfork.js'
 export * as KeyAuthorizationManager from './KeyAuthorizationManager.js'
 export * as P256 from './P256.js'
+/** @experimental */
+export * as Scopes from './Scopes.js'
+/** @experimental */
+export * as Selectors from './Selectors.js'
 export * as Storage from './Storage.js'
 export * as TokenIds from './TokenIds.js'
 // Export types required for inference.