fix: virtual multisig

paritytech · Mar 9, 2023 · 5594f9f · 5594f9f
1 parent dca6dd5
commit 5594f9f
Showing 1 changed file with 33 additions and 2 deletions.
diff --git a/patterns/multisig/VirtualMultisigRune.ts b/patterns/multisig/VirtualMultisigRune.ts
@@ -219,6 +219,29 @@ export class VirtualMultisigRune<out U, out C extends Chain = Chain>
       .dbgStatus("Existential deposits:")
       .finalized()
 
+    const ownershipSwapCalls2 = Rune
+      .tuple([deployer, memberAccountIds, memberProxies, stashProxy, multisig.address])
+      .map(([deployer, memberAccountIds, memberProxies, stashProxy, multisigAddress]) =>
+        Rune.array([
+          ...replaceDelegateCalls(
+            chain,
+            MultiAddress.Id(stashProxy),
+            deployer.address,
+            multisigAddress,
+          ),
+          ...memberProxies.flatMap((proxy, i) =>
+            replaceDelegateCalls(
+              chain,
+              MultiAddress.Id(proxy),
+              deployer.address,
+              MultiAddress.Id(memberAccountIds[i]!),
+            )
+          ),
+        ])
+      )
+      .into(MetaRune)
+      .flat()
+
     const ownershipSwapCalls = Rune
       .tuple([deployer, memberAccountIds, memberProxies, stashProxy, multisig.address])
       .map(([deployer, memberAccountIds, memberProxies, stashProxy, multisigAddress]) =>
@@ -231,8 +254,16 @@ export class VirtualMultisigRune<out U, out C extends Chain = Chain>
           ),
           // TODO: ensure that this supports other address types / revisit source of deployer accountId
           ...memberProxies
-            .filter((_, i) => !equals(memberAccountIds[i]!, deployer.address.value!))
-            .flatMap((proxy, i) =>
+            .map((proxy, i) => [proxy, i] as const)
+            .filter(([_, i]) => {
+              console.log(
+                hex.encode(memberAccountIds[i]!),
+                hex.encode(deployer.address.value!),
+                !equals(memberAccountIds[i]!, deployer.address.value!),
+              )
+              return !equals(memberAccountIds[i]!, deployer.address.value!)
+            })
+            .flatMap(([proxy, i]) =>
               replaceDelegateCalls(
                 chain,
                 MultiAddress.Id(proxy),