Update dev multisig code

Author: ScreamingHawk

scripts/wallets/DeveloperMultisig.ts

@@ -26,19 +26,25 @@ const V2_SIGNERS = [
   '0xEB5EeE1F1650b821E0d3a87C1341d85b3a16EA72' // tpin@horizon.io
 ]
 
-const makeWalletConfig = (signers: string[], checkpoint: number) => ({
-  threshold: 2,
+const V3_SIGNERS = [
+  ...[...V2_SIGNERS].reverse(),
+  '0x060b5A65ff25366e40b624DBc304fD76CF06BBa7' // wh@horizongames.net
+]
+
+const makeWalletConfig = (signers: string[], threshold: number, checkpoint: number) => ({
+  threshold,
   checkpoint,
   signers: signers.map(address => ({
     address,
     weight: 1
   }))
 })
 
-const WALLET_CONFIG_V1 = makeWalletConfig(V1_SIGNERS, 0)
-const WALLET_CONFIG_V2 = makeWalletConfig(V2_SIGNERS, 1)
+const WALLET_CONFIG_V1 = makeWalletConfig(V1_SIGNERS, 2, 0)
+const WALLET_CONFIG_V2 = makeWalletConfig(V2_SIGNERS, 2, 1)
+const WALLET_CONFIG_V3 = makeWalletConfig(V3_SIGNERS, 3, 2)
 
-const UPDATE_NONCE = BigNumber.from('0x019562960be2000000000000000000000000')
+const UPDATE_TO_V2_NONCE = BigNumber.from('0x019562960be2000000000000000000000000')
 const WALLET_CONFIG_V2_SIGNATURE_PARTS = new Map([
   [
     '0x0C885789f0642CA123008F961d19C9813DA11b24',
@@ -57,6 +63,25 @@ const WALLET_CONFIG_V2_SIGNATURE_PARTS = new Map([
     }
   ]
 ])
+const UPDATE_TO_V3_NONCE = BigNumber.from('0x019562960be2000000000000000000000001')
+const WALLET_CONFIG_V3_SIGNATURE_PARTS = new Map([
+  [
+    '0x0C885789f0642CA123008F961d19C9813DA11b24',
+    {
+      signature:
+        '0xa2834a915327f935930a0c8db6dc6a991c1fe7f6cf5586070d3b751cd6eeaeb852d4a980c6310c207ab8332eec9f7d22b853186a5e8a9db2af02303b7a0b38111c02',
+      isDynamic: false
+    }
+  ],
+  [
+    '0x857CDfb0922bd51ca873340a9325F43F1233BEB8',
+    {
+      signature:
+        '0x1e21820232c87e5398d3fabecae5d5462c68c33b6737b365a9367c5c5316e0aa3cada93a14326268c5fc66808b6cb5a9fe9bcceb7ba32990c4c593eb7fc7e6471c02',
+      isDynamic: false
+    }
+  ]
+])
 
 const EXPECTED_ADDRESS = '0x007a47e6BF40C1e0ed5c01aE42fDC75879140bc4'
 
@@ -91,12 +116,12 @@ export const deployDeveloperMultisig = async (
 
   const chainId = (await provider.getNetwork()).chainId
 
-  const wallet = new Wallet({
+  let wallet = new Wallet({
     coders: {
       signature: v2.signature.SignatureCoder,
       config: v2.config.ConfigCoder
     },
-    context: context,
+    context,
     config: walletConfig,
     chainId,
     address,
@@ -127,25 +152,48 @@ export const deployDeveloperMultisig = async (
     o.info(`Deployed developer multisig wallet at ${wallet.address}`)
   }
 
-  await updateDeveloperMultisig(wallet, o)
+  wallet = await updateDeveloperMultisigToV2(wallet, o)
+  wallet = await updateDeveloperMultisigToV3(wallet, o)
 
   o.succeed(`Deployed and updated developer multisig wallet at ${wallet.address}`)
 
   return wallet
 }
 
-const updateDeveloperMultisig = async (wallet: WalletType, o: ora.Ora): Promise<WalletType> => {
-  const configV2 = v2.coders.config.fromSimple(WALLET_CONFIG_V2)
-  const imageHash = v2.coders.config.imageHashOf(configV2)
+/**
+ * Updates the developer multisig wallet to a new configuration, if not already updated.
+ */
+const updateDeveloperMultisig = async (
+  wallet: WalletType,
+  o: ora.Ora,
+  newConfig: commons.config.SimpleConfig,
+  updateNonce: BigNumber,
+  signatureParts: Map<string, { signature: string; isDynamic: boolean }>
+): Promise<WalletType> => {
+  const updatedconfig = v2.coders.config.fromSimple(newConfig)
+  const imageHash = v2.coders.config.imageHashOf(updatedconfig)
 
-  // Check current image hash on chain
-  const currentImageHash = await wallet.reader().imageHash(wallet.address)
-  if (currentImageHash === imageHash) {
+  // Check if nonce was used before
+  const [nonceSpace, nonce] = commons.transaction.decodeNonce(updateNonce)
+  const currentNonce = await wallet.reader().nonce(wallet.address, nonceSpace)
+  if (currentNonce > nonce) {
     o.info('Developer multisig already updated')
-    wallet.setConfig(configV2)
-    return wallet
+    return new Wallet({
+      coders: {
+        signature: v2.signature.SignatureCoder,
+        config: v2.config.ConfigCoder
+      },
+      context: wallet.context,
+      config: updatedconfig,
+      chainId: wallet.chainId,
+      address: wallet.address,
+      orchestrator: new Orchestrator([]),
+      provider: wallet.provider,
+      relayer: wallet.relayer
+    })
   }
 
+  // Construct transaction
   const transactions = [
     {
       to: wallet.address,
@@ -156,10 +204,15 @@ const updateDeveloperMultisig = async (wallet: WalletType, o: ora.Ora): Promise<
       value: 0
     }
   ]
-  const digest = commons.transaction.digestOfTransactions(UPDATE_NONCE, transactions)
+
+  // Calculate digest and subdigest
+  const digest = commons.transaction.digestOfTransactions(updateNonce, transactions)
   const subdigest = subDigestOf(wallet.address, 0, digest)
+  console.log('subdigest:', subdigest)
 
-  const signature = v2.coders.signature.encodeSigners(wallet.config, WALLET_CONFIG_V2_SIGNATURE_PARTS, [subdigest], 0).encoded
+  // Encode signature
+  const signature = v2.coders.signature.encodeSigners(wallet.config, signatureParts, [subdigest], 0).encoded
+  console.log('signature:', signature, '\n\n\n\n')
 
   const bundle: commons.transaction.SignedTransactionBundle = {
     intent: {
@@ -169,16 +222,56 @@ const updateDeveloperMultisig = async (wallet: WalletType, o: ora.Ora): Promise<
     chainId: wallet.chainId,
     transactions,
     entrypoint: wallet.address,
-    nonce: UPDATE_NONCE,
+    nonce: updateNonce,
     signature
   }
 
+  // Send signed transaction
   const tx = await wallet.sendSignedTransaction(bundle)
   if (!tx) {
-    throw new Error(`Unable to build update configuration transaction for developer multisig wallet at ${wallet.address}`)
+    throw new Error(`Unable to build update configuration to ${imageHash} for developer multisig wallet at ${wallet.address}`)
   }
   await tx.wait()
+  o.info(`Updated developer multisig wallet to ${imageHash} at ${wallet.address}`)
 
-  wallet.setConfig(configV2)
-  return wallet
+  return new Wallet({
+    coders: {
+      signature: v2.signature.SignatureCoder,
+      config: v2.config.ConfigCoder
+    },
+    context: wallet.context,
+    config: updatedconfig,
+    chainId: wallet.chainId,
+    address: wallet.address,
+    orchestrator: new Orchestrator([]),
+    provider: wallet.provider,
+    relayer: wallet.relayer
+  })
 }
+
+const updateDeveloperMultisigToV2 = async (wallet: WalletType, o: ora.Ora): Promise<WalletType> => {
+  return updateDeveloperMultisig(wallet, o, WALLET_CONFIG_V2, UPDATE_TO_V2_NONCE, WALLET_CONFIG_V2_SIGNATURE_PARTS)
+}
+const updateDeveloperMultisigToV3 = async (wallet: WalletType, o: ora.Ora): Promise<WalletType> => {
+  return updateDeveloperMultisig(wallet, o, WALLET_CONFIG_V3, UPDATE_TO_V3_NONCE, WALLET_CONFIG_V3_SIGNATURE_PARTS)
+}
+
+/**
+ * Quick function to check the image hash of WALLET_CONFIG_V3
+ */
+export const checkAllConfigImageHashes = (): void => {
+  const configV1 = v2.coders.config.fromSimple(WALLET_CONFIG_V1)
+  const imageHashV1 = v2.coders.config.imageHashOf(configV1)
+  console.log('WALLET_CONFIG_V1 image hash:', imageHashV1)
+
+  const configV2 = v2.coders.config.fromSimple(WALLET_CONFIG_V2)
+  const imageHashV2 = v2.coders.config.imageHashOf(configV2)
+  console.log('WALLET_CONFIG_V2 image hash:', imageHashV2)
+
+  const configV3 = v2.coders.config.fromSimple(WALLET_CONFIG_V3)
+  const imageHashV3 = v2.coders.config.imageHashOf(configV3)
+  console.log('WALLET_CONFIG_V3 image hash:', imageHashV3)
+}
+
+// Call it to check the image hash
+checkAllConfigImageHashes()