feat: block upgrades in 7702 account

erc6900 · Feb 3, 2025 · f9215cd · f9215cd
1 parent 64571c5
commit f9215cd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/account/ReferenceModularAccount.sol b/src/account/ReferenceModularAccount.sol
@@ -305,6 +305,7 @@ contract ReferenceModularAccount is
     function upgradeToAndCall(address newImplementation, bytes memory data)
         public
         payable
+        virtual
         override
         onlyProxy
         wrapNativeFunction

diff --git a/src/account/SemiModularAccount7702.sol b/src/account/SemiModularAccount7702.sol
@@ -6,13 +6,20 @@ import {SemiModularAccount} from "./SemiModularAccount.sol";
 import {IEntryPoint} from "@eth-infinitism/account-abstraction/interfaces/IEntryPoint.sol";
 
 contract SemiModularAccount7702 is SemiModularAccount {
+    error UpgradeNotAllowed();
+
     constructor(IEntryPoint anEntryPoint) SemiModularAccount(anEntryPoint) {}
 
     /// @inheritdoc IModularAccount
     function accountId() external pure virtual override returns (string memory) {
         return "erc6900.reference-semi-modular-account-7702.0.8.0";
     }
 
+    /// @dev To prevent accidental self-calls, upgrades are disabled in 7702 accounts.
+    function upgradeToAndCall(address, bytes memory) public payable override {
+        revert UpgradeNotAllowed();
+    }
+
     /// @dev If the fallback signer is set in storage, ignore the 7702 signer.
     function _retrieveFallbackSignerUnchecked(SemiModularAccountStorage storage _storage)
         internal