Remove stale SignerManager (OpenZeppelin#760)

Author: andrew-fleming

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Consolidate the duplicate multisig signer registries onto `Signer`, removing `SignerManager` (#760)
 - Rename the contract-compilation scripts and Turbo tasks from `compact` / `compact:*` to `compile` / `compile:*`, and the Biome scripts from `fmt-and-lint` / `fmt-and-lint:*` to `lint` / `lint:*`. (#680)
 - Rename the native shielded token supply extensions to `NativeShieldedTokenPublicSupply` / `NativeShieldedTokenFamilyPublicSupply` (and the shared `NativeShieldedTokenPublicSupplyCore`), making explicit that they track supply on-chain and matching the `ConfidentialFungibleTokenPublicSupply` naming. (#710)
 

contracts/src/multisig/Signer.compact

@@ -66,8 +66,6 @@ module Signer<T> {
    * and an initial set of signers.
    * If used, it should only be called in the contract's constructor.
    *
-   * @circuitInfo k=11, rows=1815
-   *
    * Requirements:
    *
    * - If used, can only be called once (in the constructor).
@@ -98,8 +96,6 @@ module Signer<T> {
   /**
    * @description Asserts that the given caller is an active signer.
    *
-   * @circuitInfo k=10, rows=585
-   *
    * Requirements:
    *
    * - Contract must be initialized.
@@ -116,7 +112,7 @@ module Signer<T> {
   /**
    * @description Asserts that the given approval count meets the threshold.
    *
-   * @circuitInfo k=9, rows=54
+   * @circuitInfo k=9, rows=56
    *
    * Requirements:
    *
@@ -138,7 +134,7 @@ module Signer<T> {
   /**
    * @description Returns the current signer count.
    *
-   * @circuitInfo k=6, rows=26
+   * @circuitInfo k=6, rows=28
    *
    * Requirements:
    *
@@ -154,7 +150,7 @@ module Signer<T> {
   /**
    * @description Returns the approval threshold.
    *
-   * @circuitInfo k=6, rows=26
+   * @circuitInfo k=6, rows=28
    *
    * Requirements:
    *
@@ -170,8 +166,6 @@ module Signer<T> {
   /**
    * @description Returns whether the given account is an active signer.
    *
-   * @circuitInfo k=10, rows=605
-   *
    * @param {T} account - The account to check.
    * @returns {Boolean} True if the account is an active signer.
    */
@@ -188,8 +182,6 @@ module Signer<T> {
    * The consuming contract must gate this behind its own
    * authorization policy.
    *
-   * @circuitInfo k=10, rows=598
-   *
    * Requirements:
    *
    * - `signer` must not already be an active signer.
@@ -214,8 +206,6 @@ module Signer<T> {
    * The consuming contract must gate this behind its own
    * authorization policy.
    *
-   * @circuitInfo k=10, rows=612
-   *
    * Requirements:
    *
    * - `signer` must be an active signer.

contracts/src/multisig/SignerManager.compact

@@ -5,7 +5,7 @@ pragma language_version >= 0.23.0;
 
 /**
  * @module ShieldedMultiSig
- * @description A shielded multisig preset composing `SignerManager`,
+ * @description A shielded multisig preset composing `Signer`,
  * `ProposalManager`, and `ShieldedTreasury`. Signers approve proposals that
  * transfer shielded tokens out of the treasury once the configured threshold
  * is met.
@@ -29,7 +29,7 @@ import CompactStandardLibrary;
 
 import "../ProposalManager" prefix Proposal_;
 import "../ShieldedTreasury" prefix Treasury_;
-import "../SignerManager"<Either<ZswapCoinPublicKey, ContractAddress>> prefix Signer_;
+import "../Signer"<Either<ZswapCoinPublicKey, ContractAddress>> prefix Signer_;
 
 // ─── State ───────────────────────────────────────────────────────────────
 
@@ -212,7 +212,7 @@ export circuit getSentTotal(color: Bytes<32>): Uint<128> {
   return Treasury_getSentTotal(color);
 }
 
-// ISignerManager
+// ISigner
 
 export circuit getSignerCount(): Uint<8> {
   return Signer_getSignerCount();

contracts/src/multisig/presets/ShieldedMultiSig.compact

@@ -24,7 +24,7 @@ import CompactStandardLibrary;
 
 import "../ProposalManager" prefix Proposal_;
 import "../ShieldedTreasuryStateless" prefix Treasury_;
-import "../SignerManager"<Bytes<32>> prefix Signer_;
+import "../Signer"<Bytes<32>> prefix Signer_;
 
 // ─── Types ──────────────────────────────────────────────────────
 

contracts/src/multisig/presets/ShieldedMultiSigV2.compact

@@ -82,13 +82,13 @@ describe('ShieldedMultiSig', () => {
     it('should fail with zero threshold', async () => {
       await expect(
         ShieldedMultiSigSimulator.create(SIGNERS, 0n),
-      ).rejects.toThrow('SignerManager: threshold must be > 0');
+      ).rejects.toThrow('Signer: threshold must not be zero');
     });
 
     it('should fail with threshold exceeding signer count', async () => {
       await expect(
         ShieldedMultiSigSimulator.create(SIGNERS, 4n),
-      ).rejects.toThrow('SignerManager: threshold exceeds signer count');
+      ).rejects.toThrow('Signer: threshold exceeds signer count');
     });
   });
 
@@ -206,7 +206,7 @@ describe('ShieldedMultiSig', () => {
             multisig
               .as('OTHER')
               .createShieldedProposal(to, COLOR, PROPOSAL_AMOUNT),
-          ).rejects.toThrow('SignerManager: not a signer');
+          ).rejects.toThrow('Signer: not a signer');
         });
 
         it('should fail with zero amount', async () => {
@@ -273,7 +273,7 @@ describe('ShieldedMultiSig', () => {
         it('should fail for non-signer', async () => {
           await expect(
             multisig.as('OTHER').approveProposal(proposalId),
-          ).rejects.toThrow('SignerManager: not a signer');
+          ).rejects.toThrow('Signer: not a signer');
         });
 
         it('should fail for double approval', async () => {
@@ -324,7 +324,7 @@ describe('ShieldedMultiSig', () => {
         it('should fail for non-signer', async () => {
           await expect(
             multisig.as('OTHER').revokeApproval(proposalId),
-          ).rejects.toThrow('SignerManager: not a signer');
+          ).rejects.toThrow('Signer: not a signer');
         });
 
         it('should fail if not yet approved', async () => {
@@ -421,7 +421,7 @@ describe('ShieldedMultiSig', () => {
           await multisig.as('SIGNER1').approveProposal(id2);
 
           await expect(multisig.executeShieldedProposal(id2)).rejects.toThrow(
-            'SignerManager: threshold not met',
+            'Signer: threshold not met',
           );
         });
 

contracts/src/multisig/test/ShieldedMultiSig.test.ts

@@ -99,7 +99,7 @@ describe('ShieldedMultiSigV2', () => {
           SIGNER_COMMITMENTS,
           0n,
         ),
-      ).rejects.toThrow('SignerManager: threshold must be > 0');
+      ).rejects.toThrow('Signer: threshold must not be zero');
     });
 
     it('should fail with threshold greater than 2', async () => {
@@ -192,7 +192,7 @@ describe('ShieldedMultiSigV2', () => {
             [PK1, NON_SIGNER_PK],
             [DUMMY_SIG, DUMMY_SIG],
           ),
-        ).rejects.toThrow('SignerManager: not a signer');
+        ).rejects.toThrow('Signer: not a signer');
       });
     });
   });