fix: make multisig e2e tests pass (#615)

alchemyplatform · Apr 30, 2024 · 08cf8d8 · 08cf8d8
1 parent fd8fbfb
commit 08cf8d8
Show file tree

Hide file tree

Showing 28 changed files with 627 additions and 228 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -4,6 +4,7 @@
     "es2021": true,
     "node": true
   },
+  "plugins": ["import"],
   "parserOptions": {
     "sourceType": "module"
   },

diff --git a/packages/accounts/plugindefs/multisig/abi.ts b/packages/accounts/plugindefs/multisig/abi.ts
@@ -50,7 +50,7 @@ export const MultisigPluginAbi = [
     ],
     outputs: [
       {
-        name: "failed",
+        name: "success",
         type: "bool",
         internalType: "bool",
       },
@@ -932,7 +932,7 @@ export const MultisigPluginAbi = [
   },
   {
     type: "error",
-    name: "InvalidGasValues",
+    name: "InvalidAddress",
     inputs: [],
   },
   {
@@ -945,6 +945,11 @@ export const MultisigPluginAbi = [
     name: "InvalidMaxPriorityFeePerGas",
     inputs: [],
   },
+  {
+    type: "error",
+    name: "InvalidNumSigsOnActualGas",
+    inputs: [],
+  },
   {
     type: "error",
     name: "InvalidOwner",

diff --git a/packages/accounts/src/msca/abis/MultisigModularAccountFactory.ts b/packages/accounts/src/msca/abis/MultisigModularAccountFactory.ts
@@ -114,8 +114,8 @@ export const MultisigModularAccountFactoryAbi = [
       },
       {
         name: "threshold",
-        type: "uint256",
-        internalType: "uint256",
+        type: "uint128",
+        internalType: "uint128",
       },
     ],
     outputs: [

diff --git a/packages/accounts/src/msca/account/multisigAccount.ts b/packages/accounts/src/msca/account/multisigAccount.ts
@@ -27,7 +27,11 @@ export const MULTISIG_ACCOUNT_SOURCE = "MultisigModularAccount";
 
 export type MultisigModularAccount<
   TSigner extends SmartAccountSigner = SmartAccountSigner
-> = SmartContractAccountWithSigner<typeof MULTISIG_ACCOUNT_SOURCE, TSigner> & {
+> = SmartContractAccountWithSigner<
+  typeof MULTISIG_ACCOUNT_SOURCE,
+  TSigner,
+  "0.6.0"
+> & {
   getLocalThreshold: () => bigint;
 };