feat complete

rhinestonewtf · Jun 25, 2024 · bdc70ea · bdc70ea
1 parent e2f60c3
commit bdc70ea
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/MultiOwnable.sol b/src/MultiOwnable.sol
@@ -69,15 +69,22 @@ contract MultiChainValidator is ERC7579ValidatorBase {
      * Handles the uninstallation of the module and clears the threshold and owners
      * @dev the data parameter is not used
      */
-    function onUninstall(bytes calldata) external override { }
+    function onUninstall(bytes calldata) external override {
+        FlatBytesLib.Bytes storage $local = owners[msg.sender];
+        $local.clear();
+    }
 
     /**
      * Checks if the module is initialized
      *
      * @param smartAccount address of the smart account
      * @return true if the module is initialized, false otherwise
      */
-    function isInitialized(address smartAccount) public view returns (bool) { }
+    function isInitialized(address smartAccount) public view returns (bool) {
+        bytes32 slot = getOwnerSlot(smartAccount);
+        bytes memory value = SloadLib.sload(L1SELF, slot);
+        return value.length != 0;
+    }
 
     /**
      * Sets the threshold for the account
@@ -138,6 +145,7 @@ contract MultiChainValidator is ERC7579ValidatorBase {
     {
         // todo use getSender lib
         bytes32 slot = getOwnerSlot(userOp.sender);
+        // sload from L1, fallback if L1 has no data set
         bytes memory value = SloadLib.sload(L1SELF, slot);
         Owner memory signer = abi.decode(value, (Owner));
 
@@ -208,7 +216,7 @@ contract MultiChainValidator is ERC7579ValidatorBase {
      * @return name of the module
      */
     function name() external pure virtual returns (string memory) {
-        return "OwnableValidator";
+        return "OwnableValidatorL1Sload";
     }
 
     /**

diff --git a/src/SloadLib.sol b/src/SloadLib.sol
@@ -13,15 +13,22 @@ library SloadLib {
         return l1BlockNum;
     }
 
-    function retrieveFromL1(address target, bytes32 slot) internal returns (bytes memory ret) {
+    function retrieveFromL1(
+        address target,
+        bytes32 slot
+    )
+        internal
+        view
+        returns (bytes memory ret)
+    {
         uint256 l1BlockNum = IL1Blocks(L1BLOCKS_PRECOMPILE).latestBlockNumber();
         bytes memory input = abi.encodePacked(l1BlockNum, target, slot);
         bool success;
-        (success, ret) = L1SLOAD_PRECOMPILE.call(input);
+        (success, ret) = L1SLOAD_PRECOMPILE.staticcall(input);
         require(success, "SloadLib: retrieveFromL1 failed");
     }
 
-    function sload(address target, bytes32 slot) internal returns (bytes memory ret) {
+    function sload(address target, bytes32 slot) internal view returns (bytes memory ret) {
         FlatBytesLib.Bytes storage local;
 
         assembly {