More v3 convert config options

Author: ScreamingHawk

packages/utils/migration/src/migrations/v1/encoder_v1_v3.ts

@@ -9,19 +9,13 @@ import {
 import { AbiFunction, Address, Hex } from 'ox'
 import { UnsignedMigration, VersionedContext } from '../../types.js'
 import { MigrationEncoder } from '../index.js'
-import { createDefaultV3Topology } from '../v3/config.js'
+import { ConvertOptions as V3ConvertOptions, createDefaultV3Topology } from '../v3/config.js'
+
+export type ConvertOptions = V3ConvertOptions
 
 // uint160(keccak256("org.sequence.sdk.migration.v1v3.space.nonce"))
 export const MIGRATION_V1_V3_NONCE_SPACE = '0x9e4d5bdafd978baf1290aff23057245a2a62bef5'
 
-export type ConvertOptions = {
-  loginSigner: {
-    address: Address.Address
-    imageHash?: Hex.Hex
-  }
-  extensions?: V3Extensions.Extensions
-}
-
 export type PrepareOptions = {
   space?: bigint
 }
@@ -53,7 +47,7 @@ export class MigrationEncoder_v1v3
           type: 'nested',
           weight: 1n,
           threshold: 2n,
-          tree: createDefaultV3Topology(options.loginSigner, options.extensions),
+          tree: createDefaultV3Topology(options),
         },
       ],
     }

packages/utils/migration/src/migrations/v3/config.ts

@@ -6,13 +6,18 @@ import {
 } from '@0xsequence/wallet-primitives'
 import { Address, Hex } from 'ox'
 
-export const createDefaultV3Topology = (
+export type ConvertOptions = {
   loginSigner: {
     address: Address.Address
     imageHash?: Hex.Hex
-  },
-  extensions?: V3Extensions.Extensions,
-): V3Config.Topology => {
+  }
+  noWalletGuard?: boolean
+  noSessions?: boolean
+  extensions?: V3Extensions.Extensions
+}
+
+export const createDefaultV3Topology = (options: ConvertOptions): V3Config.Topology => {
+  const { loginSigner, extensions } = options
   // Login topology
   const loginTopology: V3Config.SapientSignerLeaf | V3Config.SignerLeaf = loginSigner.imageHash
     ? {
@@ -28,11 +33,13 @@ export const createDefaultV3Topology = (
       }
 
   // Wallet guard topology
-  const walletGuardTopology: V3Config.SignerLeaf = {
-    type: 'signer',
-    address: '0xa2e70CeaB3Eb145F32d110383B75B330fA4e288a', // Guard wallet signer
-    weight: 1n,
-  }
+  const walletGuardTopology: V3Config.SignerLeaf | undefined = options.noWalletGuard
+    ? undefined
+    : {
+        type: 'signer',
+        address: '0xa2e70CeaB3Eb145F32d110383B75B330fA4e288a', // Guard wallet signer
+        weight: 1n,
+      }
 
   // Placeholder recovery topology
   const recoveryTopology: V3Config.SapientSignerLeaf = {
@@ -43,36 +50,39 @@ export const createDefaultV3Topology = (
   }
 
   // Session topology
-  let sessionsImageHash: Hex.Hex = '0x0000000000000000000000000000000000000000000000000000000000000000'
-  if (!loginSigner.imageHash) {
-    // We can't use the login signer with sessions if it is a sapient signer
-    const sessionsTopology = V3SessionConfig.emptySessionsTopology(loginSigner.address)
-    const sessionsConfig = V3SessionConfig.sessionsTopologyToConfigurationTree(sessionsTopology)
-    sessionsImageHash = V3GenericTree.hash(sessionsConfig)
-  }
-  const sessionTopology: V3Config.SapientSignerLeaf = {
-    type: 'sapient-signer',
-    address: (extensions ?? V3Extensions.Rc3).sessions,
-    weight: 1n,
-    imageHash: sessionsImageHash,
-  }
+  let nestedSessionTopology: V3Config.NestedLeaf | undefined = undefined
+  if (!options.noSessions) {
+    let sessionsImageHash: Hex.Hex = '0x0000000000000000000000000000000000000000000000000000000000000000'
+    if (!loginSigner.imageHash) {
+      // We can't use the login signer with sessions if it is a sapient signer
+      const sessionsTopology = V3SessionConfig.emptySessionsTopology(loginSigner.address)
+      const sessionsConfig = V3SessionConfig.sessionsTopologyToConfigurationTree(sessionsTopology)
+      sessionsImageHash = V3GenericTree.hash(sessionsConfig)
+    }
+    const sessionTopology: V3Config.SapientSignerLeaf = {
+      type: 'sapient-signer',
+      address: (extensions ?? V3Extensions.Rc3).sessions,
+      weight: 1n,
+      imageHash: sessionsImageHash,
+    }
 
-  // Sessions are protected by a guard signer
-  const sessionGuardTopology: V3Config.SignerLeaf = {
-    type: 'signer',
-    address: '0x18002Fc09deF9A47437cc64e270843dE094f5984', // Guard session signer
-    weight: 1n,
-  }
-  const nestedSessionTopology: V3Config.NestedLeaf = {
-    type: 'nested',
-    weight: 255n,
-    threshold: 2n,
-    tree: [sessionTopology, sessionGuardTopology],
+    // Sessions are protected by a guard signer
+    const sessionGuardTopology: V3Config.SignerLeaf = {
+      type: 'signer',
+      address: '0x18002Fc09deF9A47437cc64e270843dE094f5984', // Guard session signer
+      weight: 1n,
+    }
+    nestedSessionTopology = {
+      type: 'nested',
+      weight: 255n,
+      threshold: 2n,
+      tree: [sessionTopology, sessionGuardTopology],
+    }
   }
 
   // Return the wallet topology
   return [
-    [loginTopology, walletGuardTopology],
-    [recoveryTopology, nestedSessionTopology],
+    walletGuardTopology ? [loginTopology, walletGuardTopology] : loginTopology,
+    nestedSessionTopology ? [recoveryTopology, nestedSessionTopology] : recoveryTopology,
   ]
 }