viem 2.56.1 → 2.56.3

package/tempo/Formatters.ts

@@ -3,6 +3,7 @@
 import type { Address } from 'abitype'
 import * as Hex from 'ox/Hex'
 import {
+  MultisigOperation,
   Transaction as ox_Transaction,
   TransactionRequest as ox_TransactionRequest,
 } from 'ox/tempo'
@@ -11,7 +12,7 @@ import { parseAccount } from '../accounts/utils/parseAccount.js'
 import { formatTransaction as viem_formatTransaction } from '../utils/formatters/transaction.js'
 import { formatTransactionReceipt as viem_formatTransactionReceipt } from '../utils/formatters/transactionReceipt.js'
 import { formatTransactionRequest as viem_formatTransactionRequest } from '../utils/formatters/transactionRequest.js'
-import type { Account } from './Account.js'
+import type { Account, MultisigAccount } from './Account.js'
 import {
   isTempo,
   type Transaction,
@@ -32,6 +33,7 @@ export function formatTransaction(
     transaction.blockTimestamp == null
       ? undefined
       : BigInt(transaction.blockTimestamp)
+  const multisig = transaction.multisig
   const {
     feePayerSignature,
     gasPrice: _,
@@ -51,6 +53,7 @@ export function formatTransaction(
           yParity: feePayerSignature.yParity,
         }
       : undefined,
+    multisig: formatMultisig(multisig),
     nonce: Number(nonce),
     typeHex:
       ox_Transaction.toRpcType[
@@ -63,7 +66,23 @@ export function formatTransaction(
 export function formatTransactionReceipt(
   receipt: TransactionReceiptRpc,
 ): TransactionReceipt {
-  return viem_formatTransactionReceipt(receipt as never)
+  const transactionReceipt = viem_formatTransactionReceipt(receipt as never)
+  return {
+    ...transactionReceipt,
+    multisig: formatMultisig(receipt.multisig),
+    ...(receipt.status === 'pending'
+      ? { status: 'pending', type: 'tempo' }
+      : {}),
+  } as never
+}
+
+/** Formats a transaction operation attached to an RPC result. */
+function formatMultisig(value: MultisigOperation.TransactionRpc | undefined) {
+  if (!value) return undefined
+  const operation = MultisigOperation.fromRpc(value)
+  if (operation.type !== 'transaction')
+    throw new Error('Expected a multisig transaction operation.')
+  return operation
 }
 
 export function formatTransactionRequest(
@@ -79,12 +98,22 @@ export function formatTransactionRequest(
     keyData?: Hex.Hex | undefined
     keyId?: Address | undefined
     keyType?: 'p256' | 'secp256k1' | 'webAuthn' | undefined
-    multisig?: unknown
+    owner?: viem_Account | MultisigAccount | Address | undefined
     signatures?: unknown
   }
   const account = request.account
     ? parseAccount<Account | viem_Account | Address>(request.account)
     : undefined
+  const owner = request.owner
+    ? parseAccount<Account | MultisigAccount | viem_Account | Address>(
+        request.owner,
+      )
+    : undefined
+
+  if (owner?.type === 'json-rpc')
+    throw new Error(
+      'A local owner account is required to approve a multisig transaction.',
+    )
 
   // If the request is not a Tempo transaction, route to Viem formatter.
   if (!isTempo(request))
@@ -119,16 +148,7 @@ export function formatTransactionRequest(
     delete request.feeToken
 
   // Client-only TIP-1061 fields drive local signing and envelope assembly.
-  // `multisigInit` and `multisigSignatureCount` remain wire fields for gas modeling.
-  const {
-    multisig: _multisig,
-    multisigInit,
-    multisigOwnerStates: _multisigOwnerStates,
-    multisigSignatureCount,
-    multisigVersion: _multisigVersion,
-    signatures: _signatures,
-    ...rpcRequest
-  } = request
+  const { owner: _owner, signatures: _signatures, ...rpcRequest } = request
 
   const rpc = ox_TransactionRequest.toRpc({
     ...rpcRequest,
@@ -144,9 +164,9 @@ export function formatTransactionRequest(
   rpc.data = undefined
   rpc.value = undefined
 
+  const signer = owner ?? account
   const [keyType, keyData] = (() => {
-    const type =
-      account && 'keyType' in account ? account.keyType : account?.source
+    const type = signer && 'keyType' in signer ? signer.keyType : signer?.source
     if (!type) return [request.keyType, shimKeyData(request.keyData)]
     if (type === 'webAuthn')
       // Send a 2-byte big-endian length hint (1400 = 0x0578) instead of a
@@ -159,22 +179,20 @@ export function formatTransactionRequest(
   })()
 
   const keyId =
-    account && 'accessKeyAddress' in account
-      ? account.accessKeyAddress
+    signer && 'accessKeyAddress' in signer
+      ? signer.accessKeyAddress
       : request.keyId
 
   if (account) rpc.from = account.address
 
   return {
     ...rpc,
-    ...(multisigInit ? { multisigInit } : {}),
-    ...(typeof multisigSignatureCount !== 'undefined'
-      ? { multisigSignatureCount }
-      : {}),
     ...(request.capabilities ? { capabilities: request.capabilities } : {}),
     ...(keyData ? { keyData } : {}),
     ...(keyId ? { keyId } : {}),
     ...(keyType ? { keyType } : {}),
+    // Keep the key visible to `extract`; the undefined value never reaches JSON-RPC.
+    ...(request.owner ? { owner: undefined } : {}),
     ...(typeof request.feePayer !== 'undefined'
       ? {
           feePayer: