Closes AP-727, AP-791: EndowmentMultiSig proxy admin update & update EndowmentMultiSigFactory's registrar on new Registrar deployment

contracts/core/accounts/lib/LibAccounts.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import {IterableMappingAddr} from "../../../lib/IterableMappingAddr.sol";
 import {AccountStorage} from "../storage.sol";
 
 library LibAccounts {

contracts/lib/IterableMappingAddr.sol

@@ -2,9 +2,6 @@
 pragma solidity ^0.8.19;
 
 contract IterableMappingAddr {
-  error NonExistentKey(address key);
-  error DecrAmountExceedsValue(address key, uint256 currVal, uint256 decrVal);
-
   struct Map {
     address[] keys;
     mapping(address => bool) values;

contracts/multisigs/endowment-multisig/EndowmentMultiSigFactory.sol

@@ -7,63 +7,68 @@ import {IEndowmentMultiSigFactory} from "./interfaces/IEndowmentMultiSigFactory.
 import {ProxyContract} from "../../core/proxy.sol";
 import {IRegistrar} from "../../core/registrar/interfaces/IRegistrar.sol";
 import {RegistrarStorage} from "../../core/registrar/storage.sol";
+import {Validator} from "../../core/validator.sol";
+import {IterableMappingAddr} from "../../lib/IterableMappingAddr.sol";
 
 /// @title Multisignature wallet factory - Allows creation of multisigs wallet.
-/// @author Stefan George - <stefan.george@consensys.net>
-contract EndowmentMultiSigFactory is IEndowmentMultiSigFactory, Ownable {
-  /*
-   *  Events
-   */
-  event ContractInstantiated(address sender, address instantiation);
-  event ImplementationUpdated(address implementationAddress);
-  event ProxyAdminUpdated(address admin);
-
-  /*
-   *  Storage
-   */
-  mapping(address => bool) public isInstantiation;
-  mapping(address => address[]) public instantiations;
-  mapping(uint256 => address) public endowmentIdToMultisig;
+contract EndowmentMultiSigFactory is IEndowmentMultiSigFactory, Ownable, IterableMappingAddr {
+  /*////////////////////////////////////////////////
+                        STORAGE
+  */ ///////////////////////////////////////////////
+  IterableMappingAddr.Map endowmentMultiSigs;
 
   address public implementationAddress;
-  address public proxyAdmin;
+  address proxyAdmin;
   IRegistrar registrar;
 
-  constructor(address _implementationAddress, address _proxyAdmin, address _registrar) {
-    require(_implementationAddress != address(0), "Invalid Address");
-    require(_proxyAdmin != address(0), "Invalid Address");
-    require(_registrar != address(0), "Invalid Address");
-
-    registrar = IRegistrar(_registrar);
-    implementationAddress = _implementationAddress;
-    emit ImplementationUpdated(_implementationAddress);
-
-    proxyAdmin = _proxyAdmin;
-    emit ProxyAdminUpdated(_proxyAdmin);
+  constructor(address _implementationAddress, address _proxyAdmin, address registrarAddress) {
+    updateImplementation(_implementationAddress);
+    updateProxyAdmin(_proxyAdmin);
+    updateRegistrar(registrarAddress);
   }
 
+  /*////////////////////////////////////////////////
+                        MODIFIERS
+  */ ///////////////////////////////////////////////
+
   modifier onlyAccountsContract() {
     RegistrarStorage.Config memory registrarConfig = registrar.queryConfig();
-    require(msg.sender == registrarConfig.accountsContract, "Only Accounts Contract");
+    if (msg.sender != registrarConfig.accountsContract) {
+      revert OnlyAccountsContract();
+    }
     _;
   }
 
-  /*
-   * Public functions
-   */
-  /// @dev Returns number of instantiations by creator.
-  /// @param creator Contract creator.
-  /// @return Returns number of instantiations by creator.
-  function getInstantiationCount(address creator) public view returns (uint256) {
-    return instantiations[creator].length;
+  /*////////////////////////////////////////////////
+                        IMPLEMENTATION
+  */ ///////////////////////////////////////////////
+
+  /// @notice Get all EndowmentMultiSig proxy contract instantiations.
+  /// @return Array of instantiation addresses.
+  function getInstantiations() external view returns (address[] memory) {
+    return endowmentMultiSigs.keys;
+  }
+
+  /// @notice Get stored registrar address.
+  /// @return address of the stored registrar.
+  function getRegistrar() external view returns (address) {
+    return address(registrar);
+  }
+
+  /// @notice Get proxy admin address.
+  /// @return address of the proxy admin.
+  function getProxyAdmin() external view returns (address) {
+    return proxyAdmin;
   }
 
   /**
    * @dev Updates the implementation address
    * @param _implementationAddress The address of the new implementation
    */
   function updateImplementation(address _implementationAddress) public onlyOwner {
-    require(_implementationAddress != address(0), "Invalid Address");
+    if (!Validator.addressChecker(_implementationAddress)) {
+      revert InvalidAddress("_implementationAddress");
+    }
     implementationAddress = _implementationAddress;
     emit ImplementationUpdated(_implementationAddress);
   }
@@ -73,11 +78,25 @@ contract EndowmentMultiSigFactory is IEndowmentMultiSigFactory, Ownable {
    * @param _proxyAdmin The address of the new proxy admin
    */
   function updateProxyAdmin(address _proxyAdmin) public onlyOwner {
-    require(_proxyAdmin != address(0), "Invalid Address");
+    if (!Validator.addressChecker(_proxyAdmin)) {
+      revert InvalidAddress("_proxyAdmin");
+    }
     proxyAdmin = _proxyAdmin;
     emit ProxyAdminUpdated(_proxyAdmin);
   }
 
+  /**
+   * @dev Updates the registrar address
+   * @param registrarAddress The address of the new registrar
+   */
+  function updateRegistrar(address registrarAddress) public onlyOwner {
+    if (!Validator.addressChecker(registrarAddress)) {
+      revert InvalidAddress("registrarAddress");
+    }
+    registrar = IRegistrar(registrarAddress);
+    emit RegistrarUpdated(registrarAddress);
+  }
+
   /** @dev Create a new multisig wallet for an endowment
    * @param endowmentId the endowment id
    * @param emitterAddress the emitter of the multisig
@@ -113,18 +132,15 @@ contract EndowmentMultiSigFactory is IEndowmentMultiSigFactory, Ownable {
     );
 
     register(wallet);
-    // also store address of multisig in endowmentIdToMultisig
-    endowmentIdToMultisig[endowmentId] = wallet;
   }
 
   /*
    * Internal functions
    */
   /// @dev Registers contract in factory registry.
-  /// @param instantiation Address of contract instantiation.
+  /// @param instantiation Address of EndowmentMultiSig proxy contract instantiation.
   function register(address instantiation) internal {
-    isInstantiation[instantiation] = true;
-    instantiations[msg.sender].push(instantiation);
+    IterableMappingAddr.set(endowmentMultiSigs, instantiation, true);
     emit ContractInstantiated(msg.sender, instantiation);
   }
 }

contracts/multisigs/endowment-multisig/interfaces/IEndowmentMultiSigFactory.sol

@@ -2,6 +2,23 @@
 pragma solidity ^0.8.19;
 
 interface IEndowmentMultiSigFactory {
+  /*////////////////////////////////////////////////
+                        EVENTS
+  */ ///////////////////////////////////////////////
+  event ContractInstantiated(address sender, address instantiation);
+  event ImplementationUpdated(address implementationAddress);
+  event ProxyAdminUpdated(address admin);
+  event RegistrarUpdated(address registrar);
+
+  /*////////////////////////////////////////////////
+                        ERRORS
+  */ ///////////////////////////////////////////////
+  error InvalidAddress(string param);
+  error OnlyAccountsContract();
+
+  /*////////////////////////////////////////////////
+                    EXTERNAL FUNCTIONS
+  */ ////////////////////////////////////////////////
   function create(
     uint256 endowmentId,
     address emitterAddress,
@@ -14,5 +31,17 @@ interface IEndowmentMultiSigFactory {
 
   function updateProxyAdmin(address proxyAdminAddress) external;
 
-  function endowmentIdToMultisig(uint256 endowmentId) external returns (address);
+  function updateRegistrar(address registrarAddress) external;
+
+  /// @notice Get all EndowmentMultiSig proxy contract instantiations.
+  /// @return Array of instantiation addresses.
+  function getInstantiations() external view returns (address[] memory);
+
+  /// @notice Get stored registrar address.
+  /// @return address of the stored registrar.
+  function getRegistrar() external view returns (address);
+
+  /// @notice Get proxy admin address.
+  /// @return address of the proxy admin.
+  function getProxyAdmin() external view returns (address);
 }

tasks/deploy/deployRegistrar.ts

@@ -106,6 +106,11 @@ task(
         apTeamSignerPkey: taskArgs.apTeamSignerPkey,
         yes: true,
       });
+      await hre.run("manage:endowmentMultiSigFactory:updateRegistrar", {
+        registrar: registrar.proxy.contract.address,
+        apTeamSignerPkey: taskArgs.apTeamSignerPkey,
+        yes: true,
+      });
 
       if (!isLocalNetwork(hre) && !taskArgs.skipVerify) {
         await verify(hre, registrar.implementation);

tasks/helpers/submitMultiSigTx.ts

@@ -5,19 +5,19 @@ import {filterEvents, logger} from "utils";
 /**
  * Submits a transaction to the designated Multisig contract and executes it if possible.
  * @param msAddress address of the Multisig contract
- * @param owner signer representing one of the Multisig owners
+ * @param msOwner signer representing one of the Multisig owners
  * @param destination transaction target address
  * @param data transaction data payload
  * @returns boolean value indicating whether the transaction was executed or not (i.e. is pending confirmation by other owners)
  */
 export async function submitMultiSigTx(
   msAddress: string,
-  owner: Signer,
+  msOwner: Signer,
   destination: string,
   data: BytesLike
 ): Promise<boolean> {
   logger.out(`Submitting transaction to Multisig at address: ${msAddress}...`);
-  const multisig = IMultiSigGeneric__factory.connect(msAddress, owner);
+  const multisig = IMultiSigGeneric__factory.connect(msAddress, msOwner);
   const feeData = await multisig.provider.getFeeData();
   const tx = await multisig.submitTransaction(destination, 0, data, "0x", {
     gasPrice: feeData.gasPrice ?? undefined,