viem 3.0.0-next.13 → 3.0.0-next.14

package/src/tempo/actions/{multisig → accounts}/getConfig.ts

@@ -1,9 +1,9 @@
 import type { Address, Errors } from 'ox'
-import { MultisigConfig } from 'ox/tempo'
+import { AccountConfig } from 'ox/tempo'
 import type * as Client from '../../../core/Client.js'
 
 /**
- * Gets the current cached config for a multisig account.
+ * Gets the current cached config for a configurable account.
  *
  * The coordinator reads the account's current onchain commitment and returns
  * the matching config from its store. It returns `null` when the config is not
@@ -11,7 +11,7 @@ import type * as Client from '../../../core/Client.js'
  *
  * @example
  * ```ts
- * const config = await client.multisig.getConfig({
+ * const config = await client.accounts.getConfig({
  *   address: '0x...',
  * })
  * ```
@@ -25,21 +25,21 @@ export async function getConfig(
   parameters: getConfig.Options,
 ): Promise<getConfig.ReturnType> {
   const config = await client.request({
-    method: 'multisig_getConfig',
+    method: 'account_getConfig',
     params: [{ address: parameters.address }],
   })
-  return config ? MultisigConfig.fromRpc(config as MultisigConfig.Rpc) : null
+  return config ? AccountConfig.fromRpc(config as AccountConfig.Rpc) : null
 }
 
 export declare namespace getConfig {
   /** Parameters for {@link getConfig}. */
   export type Options = {
-    /** Multisig account address. */
+    /** Configurable account address. */
     address: Address.Address
   }
 
   /** Return value for {@link getConfig}. */
-  export type ReturnType = MultisigConfig.Config | null
+  export type ReturnType = AccountConfig.Config | null
 
   /** Error type for {@link getConfig}. */
   export type ErrorType = Errors.GlobalErrorType

package/src/tempo/actions/{multisig → accounts}/getConfigCommitment.ts

@@ -9,7 +9,7 @@ import type { ReadParameters } from '../../internal/types.js'
 import { defineCall } from '../../internal/utils.js'
 
 /**
- * Gets the current configuration commitment for a native multisig account.
+ * Gets the current configuration commitment for a configurable account.
  *
  * @example
  * ```ts
@@ -22,7 +22,7 @@ import { defineCall } from '../../internal/utils.js'
  *   transport: http(),
  * })
  *
- * const commitment = await Actions.multisig.getConfigCommitment(client, {
+ * const commitment = await Actions.accounts.getConfigCommitment(client, {
  *   account: '0x...',
  * })
  * ```
@@ -50,7 +50,7 @@ export namespace getConfigCommitment {
   export type Options = ReadParameters & Args
 
   export type Args = {
-    /** Initialized multisig account address. */
+    /** Initialized configurable account address. */
     account: Address.Address
   }
 

package/src/tempo/actions/{multisig → accounts}/getOperation.ts

@@ -1,9 +1,9 @@
 import type { Errors, Hex } from 'ox'
-import { MultisigOperation } from 'ox/tempo'
+import { AccountOperation } from 'ox/tempo'
 import type * as Client from '../../../core/Client.js'
 
 /**
- * Gets a coordinated multisig operation by its hash.
+ * Gets a coordinated account operation by its hash.
  *
  * @param client - Client.
  * @param parameters - Parameters.
@@ -14,23 +14,23 @@ export async function getOperation(
   parameters: getOperation.Options,
 ): Promise<getOperation.ReturnType> {
   const operation = await client.request({
-    method: 'multisig_getOperation',
+    method: 'account_getOperation',
     params: [parameters.hash],
   })
   return operation
-    ? MultisigOperation.fromRpc(operation as MultisigOperation.Rpc)
+    ? AccountOperation.fromRpc(operation as AccountOperation.Rpc)
     : null
 }
 
 export declare namespace getOperation {
   /** Parameters for {@link getOperation}. */
   export type Options = {
-    /** Multisig operation hash. */
+    /** Account operation hash. */
     hash: Hex.Hex
   }
 
   /** Return value for {@link getOperation}. */
-  export type ReturnType = MultisigOperation.Operation | null
+  export type ReturnType = AccountOperation.Operation | null
 
   /** Error type for {@link getOperation}. */
   export type ErrorType = Errors.GlobalErrorType

package/src/tempo/actions/{multisig → accounts}/updateConfig.ts

@@ -1,20 +1,20 @@
 import type { Address, Errors } from 'ox'
 import { AbiEvent } from 'ox'
-import { MultisigConfig } from 'ox/tempo'
+import { AccountConfig } from 'ox/tempo'
 import type * as Account from '../../../core/Account.js'
 import type * as Chain from '../../../core/Chain.js'
 import type * as Client from '../../../core/Client.js'
 import { write } from '../../../core/actions/contract/write.js'
 import { writeSync } from '../../../core/actions/contract/writeSync.js'
 import * as Abis from '../../Abis.js'
-import { fromMultisig, type MultisigAccount } from '../../Account.js'
+import { type ConfigurableAccount, fromConfig } from '../../Account.js'
 import * as Addresses from '../../Addresses.js'
 import type { WriteParameters } from '../../internal/types.js'
 import { defineCall, dispatchWrite } from '../../internal/utils.js'
 import { getConfig } from './getConfig.js'
 
 /**
- * Replaces the current configuration for a native multisig account.
+ * Replaces the current configuration for a configurable account.
  *
  * The transaction must be authorized directly by the account's current owner
  * quorum. Local owner-signing flows can include {@link updateConfig.call} in a
@@ -30,7 +30,7 @@ import { getConfig } from './getConfig.js'
  * const owner = Account.fromSecp256k1(
  *   '0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80',
  * )
- * const account = Account.fromMultisig({
+ * const account = Account.fromConfig({
  *   address: 'infer',
  *   owners: [owner],
  * })
@@ -44,7 +44,7 @@ import { getConfig } from './getConfig.js'
  *   to: account.address,
  * })
  *
- * const hash = await Actions.multisig.updateConfig(client, {
+ * const hash = await Actions.accounts.updateConfig(client, {
  *   account,
  *   nextConfig: {
  *     owners: [{ owner: owner.address, weight: 1 }],
@@ -70,16 +70,16 @@ export async function updateConfig<
 export namespace updateConfig {
   export type Options = WriteParameters & {
     /** Complete current config. Inferred from the account or coordinator when omitted. */
-    currentConfig?: MultisigConfig.Config | undefined
+    currentConfig?: AccountConfig.Config | undefined
     /** Replacement owners and threshold. */
-    nextConfig: Pick<MultisigConfig.Config, 'owners' | 'threshold'>
+    nextConfig: Pick<AccountConfig.Config, 'owners' | 'threshold'>
   }
 
   export type Args = {
     /** Complete current config. */
-    currentConfig: MultisigConfig.Config
+    currentConfig: AccountConfig.Config
     /** Replacement owners and threshold. */
-    nextConfig: Pick<MultisigConfig.Config, 'owners' | 'threshold'>
+    nextConfig: Pick<AccountConfig.Config, 'owners' | 'threshold'>
   }
 
   export type ReturnType = write.ReturnType
@@ -108,9 +108,9 @@ export namespace updateConfig {
       if (
         typeof accountValue === 'object' &&
         'source' in accountValue &&
-        accountValue.source === 'multisig'
+        accountValue.source === 'configurable'
       )
-        return accountValue as MultisigAccount
+        return accountValue as ConfigurableAccount
       return undefined
     })()
     const config = (() => {
@@ -126,22 +126,22 @@ export namespace updateConfig {
       return undefined
     })()
     const currentConfig = await (async () => {
-      if (config) return MultisigConfig.from(config)
+      if (config) return AccountConfig.from(config)
       if (!address)
         throw new Error(
-          'A multisig account address or current config is required.',
+          'A configurable account address or current config is required.',
         )
       const cachedConfig = await getConfig(client, { address })
       if (!cachedConfig)
         throw new Error(
-          `No current multisig config is cached for account ${address}. Provide the current config.`,
+          `No current account config is cached for account ${address}. Provide the current config.`,
         )
       return cachedConfig
     })()
     const resolvedAccount = (() => {
       if (account) return { ...account, config: currentConfig }
       if (typeof accountValue === 'object') return accountValue
-      if (address) return fromMultisig({ address, ...currentConfig })
+      if (address) return fromConfig({ address, ...currentConfig })
       return undefined
     })()
     return dispatchWrite(action, client, {
@@ -161,11 +161,11 @@ export namespace updateConfig {
    *
    * @example
    * ```ts
-   * import { Actions, type MultisigConfig } from 'viem/tempo'
+   * import { type AccountConfig, Actions } from 'viem/tempo'
    *
-   * declare const currentConfig: MultisigConfig.Config
+   * declare const currentConfig: AccountConfig.Config
    *
-   * const call = Actions.multisig.updateConfig.call({
+   * const call = Actions.accounts.updateConfig.call({
    *   currentConfig,
    *   nextConfig: {
    *     owners: [{ owner: '0x...', weight: 1 }],
@@ -174,17 +174,12 @@ export namespace updateConfig {
    * })
    * ```
    *
-   * @param args - Current and replacement multisig configurations.
+   * @param args - Current and replacement account configurations.
    * @returns The call.
    */
   export function call(args: Args) {
-    const currentConfig = MultisigConfig.from(args.currentConfig)
-    const nextConfig = MultisigConfig.from({
-      owners: args.nextConfig.owners,
-      salt: currentConfig.salt,
-      threshold: args.nextConfig.threshold,
-      version: currentConfig.version + 1n,
-    })
+    const currentConfig = AccountConfig.from(args.currentConfig)
+    const nextConfig = AccountConfig.update(currentConfig, args.nextConfig)
     return defineCall({
       address: Addresses.nativeMultisig,
       abi: Abis.nativeMultisig,

package/src/tempo/actions/{multisig → accounts}/updateConfigSync.ts

@@ -1,5 +1,5 @@
 import type { Address } from 'ox'
-import { MultisigConfig } from 'ox/tempo'
+import { AccountConfig } from 'ox/tempo'
 import type * as Account from '../../../core/Account.js'
 import type * as Chain from '../../../core/Chain.js'
 import type * as Client from '../../../core/Client.js'
@@ -8,16 +8,16 @@ import type { TransactionReceipt } from '../../chainConfig.js'
 import { updateConfig } from './updateConfig.js'
 
 /**
- * Replaces a native multisig configuration and waits for confirmation.
+ * Replaces a configurable account configuration and waits for confirmation.
  *
  * @example
  * ```ts
  * import { createWalletClient, custom, type EIP1193Provider } from 'viem'
  * import { tempo } from 'viem/chains'
- * import { Actions, type MultisigConfig } from 'viem/tempo'
+ * import { type AccountConfig, Actions } from 'viem/tempo'
  *
  * declare const provider: EIP1193Provider
- * declare const currentConfig: MultisigConfig.Config
+ * declare const currentConfig: AccountConfig.Config
  *
  * const client = createWalletClient({
  *   account: '0x...',
@@ -25,7 +25,7 @@ import { updateConfig } from './updateConfig.js'
  *   transport: custom(provider),
  * })
  *
- * const { receipt } = await Actions.multisig.updateConfigSync(client, {
+ * const { receipt } = await Actions.accounts.updateConfigSync(client, {
  *   currentConfig,
  *   nextConfig: {
  *     owners: [{ owner: '0x...', weight: 1 }],
@@ -55,7 +55,7 @@ export async function updateConfigSync<
   const { args } = updateConfig.extractEvent(receipt.logs)
   return {
     account: args.account,
-    config: MultisigConfig.from({
+    config: AccountConfig.from({
       owners: args.owners,
       salt: args.salt,
       threshold: args.threshold,
@@ -72,7 +72,7 @@ export namespace updateConfigSync {
 
   export type ReturnType = {
     account: Address.Address
-    config: MultisigConfig.Config
+    config: AccountConfig.Config
     receipt: TransactionReceipt
   }
 

package/src/tempo/actions/index.ts

@@ -1,5 +1,7 @@
 // biome-ignore lint/performance/noBarrelFile: namespace module
 export * as accessKey from './accessKey/index.js'
+/** Configurable account configuration and approval actions. */
+export * as accounts from './accounts/index.js'
 export * as amm from './amm/index.js'
 export * as channel from './channel/index.js'
 export * as dex from './dex/index.js'
@@ -15,6 +17,3 @@ export * as validator from './validator/index.js'
 export * as virtualAddress from './virtualAddress/index.js'
 export * as wallet from './wallet/index.js'
 export * as zone from './zone/index.js'
-
-/** Native multisig configuration and approval actions. */
-export * as multisig from './multisig/index.js'