@0xsequence/wallet-primitives 3.0.0-beta.17 → 3.0.0-beta.19

package/src/config.ts

@@ -2,7 +2,6 @@ import { Address, Bytes, Hash, Hex } from 'ox'
 import {
   isRawConfig,
   isRawNestedLeaf,
-  isRawNode,
   isRawSignerLeaf,
   isSignedSapientSignerLeaf,
   isSignedSignerLeaf,
@@ -55,6 +54,49 @@ export type Leaf = SignerLeaf | SapientSignerLeaf | SubdigestLeaf | AnyAddressSu
 
 export type Topology = Node | Leaf
 
+/** Encoded topology types for JSON serialization */
+type EncodedSignerLeaf = {
+  type: 'signer'
+  address: Address.Address
+  weight: string
+}
+
+type EncodedSapientSignerLeaf = {
+  type: 'sapient-signer'
+  address: Address.Address
+  weight: string
+  imageHash: Hex.Hex
+}
+
+type EncodedSubdigestLeaf = {
+  type: 'subdigest'
+  digest: Hex.Hex
+}
+
+type EncodedAnyAddressSubdigestLeaf = {
+  type: 'any-address-subdigest'
+  digest: Hex.Hex
+}
+
+type EncodedNestedLeaf = {
+  type: 'nested'
+  tree: EncodedTopology
+  weight: string
+  threshold: string
+}
+
+type EncodedNodeLeaf = Hex.Hex
+
+export type EncodedLeaf =
+  | EncodedSignerLeaf
+  | EncodedSapientSignerLeaf
+  | EncodedSubdigestLeaf
+  | EncodedAnyAddressSubdigestLeaf
+  | EncodedNestedLeaf
+  | EncodedNodeLeaf
+export type EncodedNode = [EncodedTopology, EncodedTopology]
+export type EncodedTopology = EncodedNode | EncodedLeaf
+
 export type Config = {
   threshold: bigint
   checkpoint: bigint
@@ -62,39 +104,39 @@ export type Config = {
   checkpointer?: Address.Address
 }
 
-export function isSignerLeaf(cand: any): cand is SignerLeaf {
-  return typeof cand === 'object' && cand !== null && cand.type === 'signer'
+export function isSignerLeaf(cand: unknown): cand is SignerLeaf {
+  return typeof cand === 'object' && cand !== null && 'type' in cand && cand.type === 'signer'
 }
 
-export function isSapientSignerLeaf(cand: any): cand is SapientSignerLeaf {
-  return typeof cand === 'object' && cand !== null && cand.type === 'sapient-signer'
+export function isSapientSignerLeaf(cand: unknown): cand is SapientSignerLeaf {
+  return typeof cand === 'object' && cand !== null && 'type' in cand && cand.type === 'sapient-signer'
 }
 
-export function isSubdigestLeaf(cand: any): cand is SubdigestLeaf {
-  return typeof cand === 'object' && cand !== null && cand.type === 'subdigest'
+export function isSubdigestLeaf(cand: unknown): cand is SubdigestLeaf {
+  return typeof cand === 'object' && cand !== null && 'type' in cand && cand.type === 'subdigest'
 }
 
-export function isAnyAddressSubdigestLeaf(cand: any): cand is AnyAddressSubdigestLeaf {
-  return typeof cand === 'object' && cand !== null && cand.type === 'any-address-subdigest'
+export function isAnyAddressSubdigestLeaf(cand: unknown): cand is AnyAddressSubdigestLeaf {
+  return typeof cand === 'object' && cand !== null && 'type' in cand && cand.type === 'any-address-subdigest'
 }
 
-export function isNodeLeaf(cand: any): cand is NodeLeaf {
-  return Hex.validate(cand) && cand.length === 66
+export function isNodeLeaf(cand: unknown): cand is NodeLeaf {
+  return typeof cand === 'string' && Hex.validate(cand) && cand.length === 66
 }
 
-export function isNestedLeaf(cand: any): cand is NestedLeaf {
-  return typeof cand === 'object' && cand !== null && cand.type === 'nested'
+export function isNestedLeaf(cand: unknown): cand is NestedLeaf {
+  return typeof cand === 'object' && cand !== null && 'type' in cand && cand.type === 'nested'
 }
 
-export function isNode(cand: any): cand is Node {
+export function isNode(cand: unknown): cand is Node {
   return Array.isArray(cand) && cand.length === 2 && isTopology(cand[0]) && isTopology(cand[1])
 }
 
-export function isConfig(cand: any): cand is Config {
-  return typeof cand === 'object' && 'threshold' in cand && 'checkpoint' in cand && 'topology' in cand
+export function isConfig(cand: unknown): cand is Config {
+  return typeof cand === 'object' && cand !== null && 'threshold' in cand && 'checkpoint' in cand && 'topology' in cand
 }
 
-export function isLeaf(cand: Topology): cand is Leaf {
+export function isLeaf(cand: unknown): cand is Leaf {
   return (
     isSignerLeaf(cand) ||
     isSapientSignerLeaf(cand) ||
@@ -105,7 +147,7 @@ export function isLeaf(cand: Topology): cand is Leaf {
   )
 }
 
-export function isTopology(cand: any): cand is Topology {
+export function isTopology(cand: unknown): cand is Topology {
   return isNode(cand) || isLeaf(cand)
 }
 
@@ -310,7 +352,7 @@ export function configFromJson(json: string): Config {
   }
 }
 
-function encodeTopology(top: Topology): any {
+function encodeTopology(top: Topology): EncodedTopology {
   if (isNode(top)) {
     return [encodeTopology(top[0]), encodeTopology(top[1])]
   } else if (isSignerLeaf(top)) {
@@ -350,7 +392,7 @@ function encodeTopology(top: Topology): any {
   throw new Error('Invalid topology')
 }
 
-function decodeTopology(obj: any): Topology {
+function decodeTopology(obj: EncodedTopology): Topology {
   if (Array.isArray(obj)) {
     if (obj.length !== 2) {
       throw new Error('Invalid node structure in JSON')

package/src/extensions/recovery.ts

@@ -1,7 +1,6 @@
 import { Abi, AbiFunction, Address, Bytes, Hex, Provider } from 'ox'
 import * as GenericTree from '../generic-tree.js'
 import { Signature } from '../index.js'
-import * as Network from '../network.js'
 import * as Payload from '../payload.js'
 import { packRSY } from '../utils.js'
 
@@ -56,21 +55,21 @@ export type Tree = Branch | GenericTree.Node | RecoveryLeaf
 /**
  * Type guard to check if a value is a RecoveryLeaf
  */
-export function isRecoveryLeaf(cand: any): cand is RecoveryLeaf {
-  return typeof cand === 'object' && cand !== null && cand.type === 'leaf'
+export function isRecoveryLeaf(cand: unknown): cand is RecoveryLeaf {
+  return typeof cand === 'object' && cand !== null && 'type' in cand && cand.type === 'leaf'
 }
 
 /**
  * Type guard to check if a value is a Node (pair of subtrees)
  */
-export function isBranch(cand: any): cand is Branch {
+export function isBranch(cand: unknown): cand is Branch {
   return Array.isArray(cand) && cand.length === 2 && isTree(cand[0]) && isTree(cand[1])
 }
 
 /**
  * Type guard to check if a value is a Topology
  */
-export function isTree(cand: any): cand is Tree {
+export function isTree(cand: unknown): cand is Tree {
   return isRecoveryLeaf(cand) || GenericTree.isNode(cand) || isBranch(cand)
 }
 
@@ -437,10 +436,10 @@ export function fromGenericTree(tree: GenericTree.Tree): Tree {
  */
 export function encodeCalldata(
   wallet: Address.Address,
-  payload: Payload.Recovery<any>,
+  payload: Payload.Recovery<Payload.MayRecoveryPayload>,
   signer: Address.Address,
   signature: Signature.SignatureOfSignerLeaf,
-) {
+): Hex.Hex {
   let signatureBytes: Hex.Hex
 
   if (signature.type === 'erc1271') {

package/src/network.ts

@@ -1,3 +1,8 @@
+import { Address } from 'ox'
+
+const DEFAULT_MULTICALL3_ADDRESS: Address.Address = '0xcA11bde05977b3631167028862bE2a173976CA11'
+const SEQUENCE_MULTICALL3_ADDRESS: Address.Address = '0xae96419a81516f063744206d4b5E36f3168280f8'
+
 export enum NetworkType {
   MAINNET = 'mainnet',
   TESTNET = 'testnet',
@@ -21,8 +26,11 @@ export interface Network {
     name: string
     decimals: number
   }
-  ensAddress?: string
   deprecated?: true
+  contracts?: {
+    multicall3?: Address.Address
+    ensUniversalResolver?: Address.Address
+  }
 }
 
 export const ChainId = {
@@ -160,7 +168,10 @@ export const ALL: Network[] = [
       name: 'Ether',
       decimals: 18,
     },
-    ensAddress: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e',
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+      ensUniversalResolver: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e',
+    },
   },
   {
     chainId: ChainId.SEPOLIA,
@@ -178,6 +189,9 @@ export const ALL: Network[] = [
       name: 'Sepolia Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.POLYGON,
@@ -195,6 +209,9 @@ export const ALL: Network[] = [
       name: 'POL',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.POLYGON_AMOY,
@@ -212,6 +229,9 @@ export const ALL: Network[] = [
       name: 'Amoy POL',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.POLYGON_ZKEVM,
@@ -229,6 +249,9 @@ export const ALL: Network[] = [
       name: 'Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.BSC,
@@ -246,6 +269,9 @@ export const ALL: Network[] = [
       name: 'BNB',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.BSC_TESTNET,
@@ -263,6 +289,9 @@ export const ALL: Network[] = [
       name: 'Testnet BNB',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.OPTIMISM,
@@ -280,6 +309,9 @@ export const ALL: Network[] = [
       name: 'Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.OPTIMISM_SEPOLIA,
@@ -297,6 +329,9 @@ export const ALL: Network[] = [
       name: 'Sepolia Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.ARBITRUM,
@@ -314,6 +349,9 @@ export const ALL: Network[] = [
       name: 'Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.ARBITRUM_SEPOLIA,
@@ -331,6 +369,9 @@ export const ALL: Network[] = [
       name: 'Sepolia Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.ARBITRUM_NOVA,
@@ -348,6 +389,9 @@ export const ALL: Network[] = [
       name: 'Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.AVALANCHE,
@@ -365,6 +409,9 @@ export const ALL: Network[] = [
       name: 'AVAX',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.AVALANCHE_TESTNET,
@@ -382,6 +429,9 @@ export const ALL: Network[] = [
       name: 'Testnet AVAX',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.GNOSIS,
@@ -399,6 +449,9 @@ export const ALL: Network[] = [
       name: 'XDAI',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.BASE,
@@ -416,6 +469,9 @@ export const ALL: Network[] = [
       name: 'Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.BASE_SEPOLIA,
@@ -433,6 +489,9 @@ export const ALL: Network[] = [
       name: 'Sepolia Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.HOMEVERSE,
@@ -450,6 +509,9 @@ export const ALL: Network[] = [
       name: 'OAS',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.HOMEVERSE_TESTNET,
@@ -467,6 +529,9 @@ export const ALL: Network[] = [
       name: 'Testnet OAS',
       decimals: 18,
     },
+    contracts: {
+      multicall3: SEQUENCE_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.XAI,
@@ -484,6 +549,9 @@ export const ALL: Network[] = [
       name: 'XAI',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.XAI_SEPOLIA,
@@ -501,6 +569,9 @@ export const ALL: Network[] = [
       name: 'Sepolia XAI',
       decimals: 18,
     },
+    contracts: {
+      multicall3: SEQUENCE_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.B3,
@@ -518,6 +589,9 @@ export const ALL: Network[] = [
       name: 'Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.B3_SEPOLIA,
@@ -535,6 +609,9 @@ export const ALL: Network[] = [
       name: 'Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.APECHAIN,
@@ -552,6 +629,9 @@ export const ALL: Network[] = [
       name: 'ApeCoin',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.APECHAIN_TESTNET,
@@ -569,6 +649,9 @@ export const ALL: Network[] = [
       name: 'ApeCoin',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.BLAST,
@@ -586,6 +669,9 @@ export const ALL: Network[] = [
       name: 'Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.BLAST_SEPOLIA,
@@ -603,6 +689,9 @@ export const ALL: Network[] = [
       name: 'Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.TELOS,
@@ -620,6 +709,9 @@ export const ALL: Network[] = [
       name: 'TLOS',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.TELOS_TESTNET,
@@ -637,6 +729,9 @@ export const ALL: Network[] = [
       name: 'TLOS',
       decimals: 18,
     },
+    contracts: {
+      multicall3: SEQUENCE_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.SKALE_NEBULA,
@@ -654,6 +749,9 @@ export const ALL: Network[] = [
       name: 'SKALE Fuel',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.SKALE_NEBULA_TESTNET,
@@ -671,6 +769,9 @@ export const ALL: Network[] = [
       name: 'SKALE Fuel',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.SONEIUM,
@@ -688,6 +789,9 @@ export const ALL: Network[] = [
       name: 'Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.SONEIUM_MINATO,
@@ -705,6 +809,9 @@ export const ALL: Network[] = [
       name: 'Ether',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.TOY_TESTNET,
@@ -722,6 +829,9 @@ export const ALL: Network[] = [
       name: 'TOY',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.IMMUTABLE_ZKEVM,
@@ -739,6 +849,9 @@ export const ALL: Network[] = [
       name: 'IMX',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.IMMUTABLE_ZKEVM_TESTNET,
@@ -756,6 +869,9 @@ export const ALL: Network[] = [
       name: 'IMX',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.MOONBEAM,
@@ -773,6 +889,9 @@ export const ALL: Network[] = [
       name: 'GLMR',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.MOONBASE_ALPHA,
@@ -790,6 +909,9 @@ export const ALL: Network[] = [
       name: 'GLMR',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.ETHERLINK,
@@ -807,6 +929,9 @@ export const ALL: Network[] = [
       name: 'Tez',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.ETHERLINK_SHADOWNET_TESTNET,
@@ -824,6 +949,9 @@ export const ALL: Network[] = [
       name: 'Tez',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.MONAD,
@@ -841,6 +969,9 @@ export const ALL: Network[] = [
       name: 'MON',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
   {
     chainId: ChainId.MONAD_TESTNET,
@@ -858,6 +989,9 @@ export const ALL: Network[] = [
       name: 'MON',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
 
   {
@@ -876,6 +1010,9 @@ export const ALL: Network[] = [
       name: 'SOMI',
       decimals: 18,
     },
+    contracts: {
+      multicall3: SEQUENCE_MULTICALL3_ADDRESS,
+    },
   },
 
   {
@@ -894,6 +1031,9 @@ export const ALL: Network[] = [
       name: 'STT',
       decimals: 18,
     },
+    contracts: {
+      multicall3: SEQUENCE_MULTICALL3_ADDRESS,
+    },
   },
 
   {
@@ -912,6 +1052,9 @@ export const ALL: Network[] = [
       name: 'TCENT',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
 
   {
@@ -930,6 +1073,9 @@ export const ALL: Network[] = [
       name: 'ETH',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
 
   {
@@ -948,6 +1094,9 @@ export const ALL: Network[] = [
       name: 'SAND',
       decimals: 18,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
 
   {
@@ -966,6 +1115,9 @@ export const ALL: Network[] = [
       name: 'USDC',
       decimals: 6,
     },
+    contracts: {
+      multicall3: DEFAULT_MULTICALL3_ADDRESS,
+    },
   },
 
   {

package/src/payload.ts

@@ -1,7 +1,7 @@
 import { AbiFunction, AbiParameters, Address, Bytes, Hash, Hex } from 'ox'
 import { getSignPayload } from 'ox/TypedData'
 import { EXECUTE_USER_OP, RECOVER_SAPIENT_SIGNATURE } from './constants.js'
-import { Attestation, Network } from './index.js'
+import { Attestation } from './index.js'
 import { minBytesFor } from './utils.js'
 import { UserOperation } from 'ox/erc4337'