Simplify code and reuse types

0xsequence · Dec 13, 2023 · 6deda1b · 6deda1b
1 parent 5950339
commit 6deda1b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 32 deletions.
diff --git a/packages/core/src/v1/config.ts b/packages/core/src/v1/config.ts
@@ -2,6 +2,7 @@ import { ethers } from 'ethers'
 import { walletContracts } from '@0xsequence/abi'
 import { commons } from '..'
 import { encodeSigners } from './signature'
+import { SimpleConfig } from '../commons/config'
 
 export type AddressMember = {
   weight: ethers.BigNumberish
@@ -49,12 +50,7 @@ export const ConfigCoder: commons.config.ConfigCoder<WalletConfig> = {
     return config.signers.map(s => ({ address: s.address, weight: ethers.BigNumber.from(s.weight).toNumber() }))
   },
 
-  fromSimple: (config: {
-    threshold: ethers.BigNumberish
-    checkpoint: ethers.BigNumberish
-    signers: { address: string; weight: ethers.BigNumberish }[]
-    subdigests?: string[]
-  }): WalletConfig => {
+  fromSimple: (config: SimpleConfig): WalletConfig => {
     if (!ethers.constants.Zero.eq(config.checkpoint)) {
       throw new Error('v1 wallet config does not support checkpoint')
     }

diff --git a/packages/core/src/v2/config.ts b/packages/core/src/v2/config.ts
@@ -2,6 +2,7 @@ import { ethers } from 'ethers'
 import { walletContracts } from '@0xsequence/abi'
 import { commons } from '..'
 import { encodeSigners } from './signature'
+import { SimpleConfig } from '../commons/config'
 
 //
 // Tree typings - leaves
@@ -434,33 +435,10 @@ export const ConfigCoder: commons.config.ConfigCoder<WalletConfig> = {
     return signersOf(config.tree)
   },
 
-  fromSimple: (config: {
-    threshold: ethers.BigNumberish
-    checkpoint: ethers.BigNumberish
-    signers: { address: string; weight: ethers.BigNumberish }[]
-    subdigests?: string[]
-  }): WalletConfig => {
-    let members: SimpleConfigMember[] = config.signers.map(signer => {
-      return {
-        address: signer.address,
-        weight: signer.weight
-      }
-    })
-
-    if (config.subdigests) {
-      members = members.concat(
-        config.subdigests.map(subdigest => {
-          return {
-            subdigest
-          }
-        })
-      )
-    }
-
+  fromSimple: (config: SimpleConfig): WalletConfig => {
     return toWalletConfig({
-      threshold: config.threshold,
-      checkpoint: config.checkpoint,
-      members
+      ...config,
+      members: [...config.signers, ...(config.subdigests ?? []).map(subdigest => ({ subdigest }))]
     })
   },