viem 2.51.3 → 2.52.2

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,