Merge pull request #182 from bcnmy/feat/SMA-346-fixes-upon-audit

SMA 346 Multi owner ECDSA fixes upon audit
bcnmy · Dec 13, 2023 · 0f7b799 · 0f7b799
2 parents 44fdb23 + dee4956
commit 0f7b799
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/contracts/smart-account/interfaces/modules/IMultiOwnedECDSAModule.sol b/contracts/smart-account/interfaces/modules/IMultiOwnedECDSAModule.sol
@@ -20,6 +20,7 @@ interface IMultiOwnedECDSAModule {
     );
 
     error AlreadyInitedForSmartAccount(address smartAccount);
+    error NoOwnersToAdd();
     error WrongSignatureLength();
     error NotEOA(address account);
     error ZeroAddressNotAllowedAsOwner();

diff --git a/contracts/smart-account/modules/MultiOwnedECDSAModule.sol b/contracts/smart-account/modules/MultiOwnedECDSAModule.sol
@@ -44,6 +44,7 @@ contract MultiOwnedECDSAModule is
             revert AlreadyInitedForSmartAccount(msg.sender);
         }
         uint256 ownersToAdd = eoaOwners.length;
+        if (ownersToAdd == 0) revert NoOwnersToAdd();
         for (uint256 i; i < ownersToAdd; ) {
             if (eoaOwners[i] == address(0))
                 revert ZeroAddressNotAllowedAsOwner();
@@ -67,7 +68,7 @@ contract MultiOwnedECDSAModule is
         address owner,
         address newOwner
     ) external override {
-        if (_isSmartContract(newOwner)) revert NotEOA(owner);
+        if (_isSmartContract(newOwner)) revert NotEOA(newOwner);
         if (newOwner == address(0)) revert ZeroAddressNotAllowedAsOwner();
         if (owner == address(0)) revert ZeroAddressNotAllowedAsOwner();
         if (owner == newOwner)
@@ -96,7 +97,7 @@ contract MultiOwnedECDSAModule is
     function removeOwner(address owner) external override {
         if (!_smartAccountOwners[owner][msg.sender])
             revert NotAnOwner(owner, msg.sender);
-        _transferOwnership(msg.sender, owner, address(0));
+        _smartAccountOwners[owner][msg.sender] = false;
         unchecked {
             --numberOfOwners[msg.sender];
         }