Add multisig to Account Wizard (#527)

Author: ernestognw

packages/core/solidity/src/account.test.ts

@@ -50,7 +50,7 @@ test('account API assert defaults', async t => {
   t.is(account.print(account.defaults), account.print());
 });
 
-for (const signer of [false, 'ERC7702', 'ECDSA', 'P256', 'RSA'] as const) {
+for (const signer of [false, 'ERC7702', 'ECDSA', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] as const) {
   let title = 'Account';
   if (signer) {
     title += ` with Signer${signer}`;

packages/core/solidity/src/account.test.ts.md

@@ -86,6 +86,7 @@ function addParents(c: ContractBuilder, opts: AccountOptions): void {
   addSignatureValidation(c, opts);
   addERC7579Modules(c, opts);
   addSigner(c, opts.signer ?? false);
+  addMultisigFunctions(c, opts);
   addBatchedExecution(c, opts);
   addERC721Holder(c, opts);
   addERC1155Holder(c, opts);
@@ -175,6 +176,23 @@ function addERC7579Modules(c: ContractBuilder, opts: AccountOptions): void {
   );
 }
 
+function addMultisigFunctions(c: ContractBuilder, opts: AccountOptions): void {
+  switch (opts.signer) {
+    case 'MultisigWeighted':
+      c.addFunctionCode(
+        `_setSignerWeights(${functions.setSignerWeights.args.map(({ name }) => name).join(', ')});`,
+        functions.setSignerWeights,
+      );
+    // eslint-disable-next-line no-fallthrough
+    case 'Multisig':
+      c.addFunctionCode(`_addSigners(${functions.addSigners.args[0]!.name});`, functions.addSigners);
+      c.addFunctionCode(`_removeSigners(${functions.removeSigners.args[0]!.name});`, functions.removeSigners);
+      c.addFunctionCode(`_setThreshold(${functions.setThreshold.args[0]!.name});`, functions.setThreshold);
+      break;
+    default:
+  }
+}
+
 function addEIP712(c: ContractBuilder, opts: AccountOptions): void {
   if (opts.signatureValidation != 'ERC7739') return;
   c.addParent(
@@ -198,7 +216,7 @@ function overrideRawSignatureValidation(c: ContractBuilder, opts: AccountOptions
     c.setFunctionBody(['// Custom validation logic', 'return false;'], signerFunctions._rawSignatureValidation);
   }
 
-  // Disambiguate between Signer and AccountERC7579
+  // Dissambiguate between Signer and AccountERC7579
   if (opts.signer && opts.ERC7579Modules) {
     c.addImportOnly({
       name: 'AbstractSigner',
@@ -247,5 +265,24 @@ const functions = {
       returns: ['bool'],
       mutability: 'view' as const,
     },
+    addSigners: {
+      kind: 'public' as const,
+      args: [{ name: 'signers', type: 'bytes[] memory' }],
+    },
+    removeSigners: {
+      kind: 'public' as const,
+      args: [{ name: 'signers', type: 'bytes[] memory' }],
+    },
+    setThreshold: {
+      kind: 'public' as const,
+      args: [{ name: 'threshold', type: 'uint256' }],
+    },
+    setSignerWeights: {
+      kind: 'public' as const,
+      args: [
+        { name: 'signers', type: 'bytes[] memory' },
+        { name: 'weights', type: 'uint256[] memory' },
+      ],
+    },
   }),
 };

packages/core/solidity/src/account.test.ts.snap

@@ -7,7 +7,7 @@ const account = {
   signatureValidation: [false, 'ERC1271', 'ERC7739'] as const,
   ERC721Holder: [false, true] as const,
   ERC1155Holder: [false, true] as const,
-  signer: ['ERC7702', 'ECDSA', 'P256', 'RSA'] as const,
+  signer: ['ERC7702', 'ECDSA', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] as const,
   batchedExecution: [false, true] as const,
   ERC7579Modules: [false, 'AccountERC7579', 'AccountERC7579Hooked'] as const,
   access: [false] as const,

packages/core/solidity/src/account.ts

@@ -1,7 +1,7 @@
 import type { ContractBuilder } from './contract';
 import { defineFunctions } from './utils/define-functions';
 
-export const SignerOptions = [false, 'ERC7702', 'ECDSA', 'P256', 'RSA'] as const;
+export const SignerOptions = [false, 'ERC7702', 'ECDSA', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] as const;
 export type SignerOptions = (typeof SignerOptions)[number];
 
 export function addSigner(c: ContractBuilder, signer: SignerOptions): void {
@@ -19,13 +19,30 @@ export function addSigner(c: ContractBuilder, signer: SignerOptions): void {
   });
   const fn = signerFunctions[`initialize${signer}`];
   c.addModifier('initializer', fn);
-  c.addFunctionCode(
-    `_setSigner(${fn.args
-      .map(({ name }) => name)
-      .join(', ')
-      .trimEnd()});`,
-    fn,
-  );
+
+  const args = fn.args;
+
+  switch (signer) {
+    case 'Multisig':
+      c.addFunctionCode(`_addSigners(${args[0]!.name});`, fn);
+      c.addFunctionCode(`_setThreshold(${args[1]!.name});`, fn);
+      break;
+    case 'MultisigWeighted':
+      c.addFunctionCode(`_addSigners(${args[0]!.name});`, fn);
+      c.addFunctionCode(`_setSignerWeights(${args[0]!.name}, ${args[1]!.name});`, fn);
+      c.addFunctionCode(`_setThreshold(${args[2]!.name});`, fn);
+      break;
+    case 'ECDSA':
+    case 'P256':
+    case 'RSA':
+      c.addFunctionCode(
+        `_setSigner(${fn.args
+          .map(({ name }) => name)
+          .join(', ')
+          .trimEnd()});`,
+        fn,
+      );
+  }
 }
 
 const parents = {
@@ -45,6 +62,14 @@ const parents = {
     name: 'SignerRSA',
     path: '@openzeppelin/community-contracts/contracts/utils/cryptography/SignerRSA.sol',
   },
+  Multisig: {
+    name: 'MultiSignerERC7913',
+    path: '@openzeppelin/community-contracts/contracts/utils/cryptography/MultiSignerERC7913.sol',
+  },
+  MultisigWeighted: {
+    name: 'MultiSignerERC7913Weighted',
+    path: '@openzeppelin/community-contracts/contracts/utils/cryptography/MultiSignerERC7913Weighted.sol',
+  },
 };
 
 export const signerFunctions = {
@@ -67,6 +92,21 @@ export const signerFunctions = {
         { name: 'n', type: 'bytes memory' },
       ],
     },
+    initializeMultisig: {
+      kind: 'public' as const,
+      args: [
+        { name: 'signers', type: 'bytes[] memory' },
+        { name: 'threshold', type: 'uint256' },
+      ],
+    },
+    initializeMultisigWeighted: {
+      kind: 'public' as const,
+      args: [
+        { name: 'signers', type: 'bytes[] memory' },
+        { name: 'weights', type: 'uint256[] memory' },
+        { name: 'threshold', type: 'uint256' },
+      ],
+    },
     _rawSignatureValidation: {
       kind: 'internal' as const,
       args: [

packages/core/solidity/src/generate/account.ts

@@ -209,9 +209,15 @@ export const solidityAccountAIFunctionDefinition = {
       signer: {
         anyOf: [
           { type: 'boolean', enum: [false] },
-          { type: 'string', enum: ['ECDSA', 'ERC7702', 'P256', 'RSA'] },
+          { type: 'string', enum: ['ECDSA', 'ERC7702', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] },
         ],
-        description: 'Defines the signature verification algorithm used by the account to verify user operations.',
+        description: `Defines the signature verification algorithm used by the account to verify user operations. Options:
+        - ECDSA: Standard Ethereum signature validation using secp256k1, validates signatures against a specified owner address
+        - ERC7702: Special ECDSA validation using account's own address as signer, enables EOAs to delegate execution rights
+        - P256: NIST P-256 curve (secp256r1) validation for integration with Passkeys and HSMs
+        - RSA: RSA PKCS#1 v1.5 signature validation (RFC8017) for PKI systems and HSMs
+        - Multisig: ERC-7913 multisignature requiring minimum number of signatures from authorized signers
+        - MultisigWeighted: ERC-7913 weighted multisignature where signers have different voting weights`,
       },
       batchedExecution: {
         type: 'boolean',

packages/core/solidity/src/signer.ts

@@ -176,6 +176,25 @@
         rights to the account while maintaining their native signature verification.
       </HelpTooltip>
     </label>
+    <label class:checked={opts.signer === 'Multisig'}>
+      <input type="radio" bind:group={opts.signer} value="Multisig" />
+      Multisig*
+      <HelpTooltip link="https://docs.openzeppelin.com/community-contracts/multisig-account#multisignererc7913">
+        ERC-7913 multisignature validation requiring a minimum number of signatures to approve operations. The contract
+        maintains a set of authorized signers and validates that the number of valid signatures meets the threshold
+        requirement.
+      </HelpTooltip>
+    </label>
+    <label class:checked={opts.signer === 'MultisigWeighted'}>
+      <input type="radio" bind:group={opts.signer} value="MultisigWeighted" />
+      Multisig Weighted*
+      <HelpTooltip
+        link="https://docs.openzeppelin.com/community-contracts/0.0.1/multisig-account#multisignererc7913weighted"
+      >
+        Weighted version of ERC-7913 multisignature validation. Signers have different voting weights, allowing for
+        flexible governance. The total weight of valid signatures must meet the threshold requirement.
+      </HelpTooltip>
+    </label>
     <label class:checked={opts.signer === 'P256'}>
       <input type="radio" bind:group={opts.signer} value="P256" />
       P256

packages/ui/api/ai-assistant/function-definitions/solidity.ts

@@ -7,11 +7,6 @@
   resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30"
   integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==
 
-"@axelar-network/axelar-gmp-sdk-solidity@^6.0.6":
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/@axelar-network/axelar-gmp-sdk-solidity/-/axelar-gmp-sdk-solidity-6.0.6.tgz#6559394df9b551978ca8843a9cdf3dc89eacdcd4"
-  integrity sha512-XIcDlr1HoYSqcxuvvusILmiqerh2bL9NJLwU4lFBAJK5E/st/q3Em9ropBBZML9iuUZ+hDsch8Ev9rMO+ulaSQ==
-
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
   version "7.26.2"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
@@ -570,9 +565,7 @@
 
 "@openzeppelin/community-contracts@https://github.com/OpenZeppelin/openzeppelin-community-contracts":
   version "0.0.1"
-  resolved "https://github.com/OpenZeppelin/openzeppelin-community-contracts#30ed769d7b65723ebe1194398f2b644b6679fb98"
-  dependencies:
-    "@axelar-network/axelar-gmp-sdk-solidity" "^6.0.6"
+  resolved "https://github.com/OpenZeppelin/openzeppelin-community-contracts#de17c8ee4b0329867f7219fbc401707be9518ff1"
 
 "@openzeppelin/contracts-upgradeable@^5.3.0":
   version "5.3.0"