viem 2.56.6 → 2.56.7

package/tempo/Transaction.ts

@@ -42,7 +42,8 @@ import {
   parseTransaction as viem_parseTransaction,
 } from '../utils/transaction/parseTransaction.js'
 import { serializeTransaction as viem_serializeTransaction } from '../utils/transaction/serializeTransaction.js'
-import type { MultisigAccount, RootAccount } from './Account.js'
+import type { RootAccount } from './Account.js'
+import { parseApproval } from './multisig/Signature.js'
 
 export type Transaction<
   bigintType = bigint,
@@ -135,7 +136,7 @@ export type TransactionRequestTempo<
     keyAuthorization?: KeyAuthorization.Signed<quantity, index> | undefined
     multisigSimulation?: MultisigSimulation.Spec | undefined
     nonceKey?: 'expiring' | quantity | undefined
-    owner?: MultisigAccount | RootAccount | undefined
+    owner?: RootAccount | undefined
     signatures?: readonly SignatureEnvelope.Serialized[] | undefined
     validBefore?: index | undefined
     validAfter?: index | undefined
@@ -155,17 +156,30 @@ export type TransactionSerializableTempo<
     chainId: number
     feeToken?: Address | bigint | undefined
     feePayerSignature?: viem_Signature | null | undefined
-    from?: Address | undefined
     keyAuthorization?: KeyAuthorization.Signed<quantity, index> | undefined
-    multisigSimulation?: MultisigSimulation.Spec | undefined
     nonceKey?: quantity | undefined
-    owner?: MultisigAccount | RootAccount | undefined
+    owner?: RootAccount | undefined
     signature?: SignatureEnvelope.SignatureEnvelope<quantity, index> | undefined
-    signatures?: readonly SignatureEnvelope.Serialized[] | undefined
     validBefore?: index | undefined
     validAfter?: index | undefined
     type?: 'tempo' | undefined
-  }
+  } & (
+    | {
+        from: Address
+        multisigSimulation?: MultisigSimulation.Spec | undefined
+        signatures?: readonly SignatureEnvelope.Serialized[] | undefined
+      }
+    | {
+        from?: Address | undefined
+        multisigSimulation?: undefined
+        signatures?: readonly SignatureEnvelope.Serialized[] | undefined
+      }
+    | {
+        from?: Address | undefined
+        multisigSimulation?: MultisigSimulation.Spec | undefined
+        signatures?: undefined
+      }
+  )
 
 export type TransactionSerialized<
   type extends TransactionType = TransactionType,
@@ -381,10 +395,11 @@ async function serializeTempo(
 
     const payload = TxTempo.getSignPayload(TxTempo.from(transaction_sender_ox))
     const signatures = transaction.signatures.map((approval) =>
-      SignatureEnvelope.from(approval),
+      parseApproval(approval),
     )
     const config = MultisigConfig.from(multisigSimulation.config)
-    const account = multisigSimulation.account
+    const account = transaction.from
+    if (!account) throw new Error('A multisig sender is required for signing.')
     const sorted = SignatureEnvelope.sortMultisigApprovals({
       account,
       config,

package/tempo/actions/accessKey.ts

@@ -48,6 +48,7 @@ import type {
   WriteParameters,
 } from '../internal/types.js'
 import { defineCall } from '../internal/utils.js'
+import { parseApproval } from '../multisig/Signature.js'
 import type { TransactionReceipt } from '../Transaction.js'
 import { getConfig } from './multisig.js'
 
@@ -1240,7 +1241,7 @@ export async function signAuthorization<
         signature: SignatureEnvelope.from({
           account: account.address,
           config,
-          signatures: [SignatureEnvelope.from(signature)],
+          signatures: [parseApproval(signature)],
         }),
         type,
         ...(witness ? { witness } : {}),
@@ -1323,7 +1324,7 @@ export namespace signAuthorization {
     /** Multisig account being authorized. */
     account: Address | MultisigAccount
     /** Local owner that approves the authorization. */
-    owner: RootAccount | MultisigAccount
+    owner: RootAccount
   }
 
   /** Coordinated key authorization parameters. */
@@ -1333,7 +1334,7 @@ export namespace signAuthorization {
         /** Stored multisig operation hash. */
         hash: Hex
         /** Local owner that approves the authorization. */
-        owner: RootAccount | MultisigAccount
+        owner: RootAccount
       }
   >
 

package/tempo/chainConfig.ts

@@ -85,10 +85,7 @@ export const chainConfig = {
           throw new Error(
             'A local owner account is required to approve a stored multisig transaction.',
           )
-        if (
-          request.owner.source !== 'root' &&
-          request.owner.source !== 'multisig'
-        )
+        if (request.owner.source !== 'root')
           throw new Error(
             'A Tempo owner account is required to approve a stored multisig transaction.',
           )
@@ -125,7 +122,6 @@ export const chainConfig = {
           account: request.account,
           from: operation.account,
           multisigSimulation: getMultisigSimulation({
-            account: operation.account,
             config: operation.config,
             local: request.account,
           }),
@@ -168,11 +164,7 @@ export const chainConfig = {
         throw new Error(
           'A local owner account is required to approve a multisig transaction.',
         )
-      if (
-        request.owner &&
-        request.owner.source !== 'root' &&
-        request.owner.source !== 'multisig'
-      )
+      if (request.owner && request.owner.source !== 'root')
         throw new Error(
           'A Tempo owner account is required to approve a multisig transaction.',
         )
@@ -206,7 +198,6 @@ export const chainConfig = {
           )
         request.from = account
         request.multisigSimulation = getMultisigSimulation({
-          account,
           config,
           local,
         })
@@ -409,48 +400,18 @@ export type ChainConfig = typeof chainConfig
 
 /** Builds a bounded multisig spec for gas simulation. */
 function getMultisigSimulation(options: {
-  account: Address
   config: MultisigConfig.Config
   local?: MultisigAccount | undefined
 }): MultisigSimulation.Spec {
-  const { account, config, local } = options
+  const { config, local } = options
   return {
-    account,
     approvals: selectOwners(config).map((owner) => {
       const localOwner = local?.owners.find((account) =>
         isAddressEqual(account.address, owner.owner),
       )
-      if (localOwner?.source === 'multisig') {
-        const nested = localOwner as MultisigAccount
-        if (!nested.config)
-          throw new Error(
-            'A nested multisig config is required for gas estimation.',
-          )
-        return {
-          type: 'multisig',
-          spec: {
-            account: nested.address,
-            approvals: selectOwners(nested.config).map((owner) => {
-              const nestedOwner = nested.owners.find((account) =>
-                isAddressEqual(account.address, owner.owner),
-              )
-              if (nestedOwner?.source === 'multisig')
-                throw new Error(
-                  'Multisig simulation nesting exceeds depth two.',
-                )
-              return {
-                ...getSimulationKey(nestedOwner),
-                owner: owner.owner,
-              }
-            }),
-            config: nested.config,
-          },
-        }
-      }
       return {
         ...getSimulationKey(localOwner),
         owner: owner.owner,
-        type: 'primitive',
       }
     }),
     config,

package/tempo/multisig/Config.ts

@@ -4,12 +4,13 @@ import type * as Hex from 'ox/Hex'
 import * as Json from 'ox/Json'
 import { MultisigConfig } from 'ox/tempo'
 import { BaseError } from '../../errors/base.js'
+import { nativeMultisigFactory } from '../Addresses.js'
 import type * as Store from '../Store.js'
 
 /** A valid 48-owner config is much smaller; 64 KiB bounds hostile store parsing work. */
 const maxStoredValueLength = 65_536
 
-/** Zero commitment used before an account records its first config update. */
+/** Zero commitment used before an account is initialized. */
 const zeroCommitment = `0x${'00'.repeat(32)}` as const
 
 /** Reads a cached multisig config. */
@@ -43,7 +44,14 @@ export async function write(
   const { address, commitment } = options
   const config = MultisigConfig.from(options.config)
   assertKey({ address, commitment, config })
-  await store.setItem(key({ address, commitment }), serialize(config))
+  const value = serialize(config)
+  await store.setItem(key({ address, commitment }), value)
+  // Initialization commits the version-zero config without changing its version.
+  if (commitment.toLowerCase() === zeroCommitment)
+    await store.setItem(
+      key({ address, commitment: MultisigConfig.getCommitment(config) }),
+      value,
+    )
 }
 
 export declare namespace write {
@@ -69,11 +77,13 @@ function assertKey(options: {
     throw new InvalidStoreValueError()
   if (config.version === 0n) {
     if (
-      commitment.toLowerCase() !== zeroCommitment ||
-      !Address.isEqual(MultisigConfig.getAddress(config), address)
+      !Address.isEqual(
+        MultisigConfig.getAddress(config, { factory: nativeMultisigFactory }),
+        address,
+      )
     )
       throw new InvalidStoreValueError()
-    return
+    if (commitment.toLowerCase() === zeroCommitment) return
   }
   if (
     MultisigConfig.getCommitment(config).toLowerCase() !==

package/tempo/multisig/Signature.ts

@@ -0,0 +1,11 @@
+import { SignatureEnvelope } from 'ox/tempo'
+
+/** Parses a primitive multisig owner approval. */
+export function parseApproval(
+  signature: SignatureEnvelope.Serialized,
+): SignatureEnvelope.Primitive {
+  const approval = SignatureEnvelope.from(signature)
+  if (approval.type === 'multisig' || approval.type === 'keychain')
+    throw new Error('Multisig owners must use primitive signatures.')
+  return approval
+}

package/tokens/definitions/cirbtc.ts

@@ -11,6 +11,7 @@ import { defineToken } from '../defineToken.js'
 export const cirbtc = /*#__PURE__*/ defineToken({
   addresses: {
     1: '0x72DFB2E44f59C5AD2bAFE84314E5b99a7cd5075E', // mainnet
+    5042: '0x171A4217b86A807A64eB94757Db6849fb4bDbAA0', // arc
     5042002: '0xf0C4a4CE82A5746AbAAd9425360Ab04fbBA432BF', // arcTestnet
     11155111: '0x3a3fe695F684Bf9b9e43CF43C2b895Ea5e392bB3', // sepolia
   },

package/tokens/definitions/eurc.ts

@@ -15,6 +15,7 @@ export const eurc = /*#__PURE__*/ defineToken({
     338: '0x31f7538adb53cF16350e6B0c89d03D91b7D12c46', // cronosTestnet
     480: '0x1C60ba0A0eD1019e8Eb035E6daF4155A5cE2380B', // worldchain
     4801: '0xe479EcA5740Ac65d6E1823bea2f1C08Bc14e954F', // worldchainSepolia
+    5042: '0xbEf5f6d51CB62b58e6A8f77868681825C6fe21c1', // arc
     8453: '0x60a3E35Cc302bFA44Cb288Bc5a4F316Fdb1adb42', // base
     43113: '0x5E44db7996c682E92a960b65AC713a54AD815c6B', // avalancheFuji
     43114: '0xC891EB4cbdEFf6e073e859e987815Ed1505c2ACD', // avalanche