rhinestonewtf · kopy-kat · Jul 8, 2024 · Jun 17, 2024 · Jun 17, 2024 · Jun 17, 2024
diff --git a/.solhintignore b/.solhintignore
@@ -1,2 +1,3 @@
 node_modules/
 test/
+src/utils/Safe7579UserOperationBuilder.sol
diff --git a/audits/ackee-blockchain-rhinestone-safe7579-report.pdf b/audits/ackee-blockchain-rhinestone-safe7579-report.pdf
diff --git a/broadcast/Deploy.s.sol/11155111/run-1715275639.json b/broadcast/Deploy.s.sol/11155111/run-1715275639.json
diff --git a/broadcast/Deploy.s.sol/11155111/run-latest.json b/broadcast/Deploy.s.sol/11155111/run-latest.json
diff --git a/package.json b/package.json
@@ -26,9 +26,12 @@
     "test:optimized": "pnpm run build:optimized && FOUNDRY_PROFILE=test-optimized forge test"
   },
   "dependencies": {
-    "@rhinestone/module-bases": "github:rhinestonewtf/module-bases",
     "@ERC4337/account-abstraction": "github:kopy-kat/account-abstraction#develop",
+    "@ERC4337/account-abstraction-v0.6": "github:eth-infinitism/account-abstraction#v0.6.0",
+    "@rhinestone/erc4337-validation": "0.0.1-alpha.2",
+    "@rhinestone/module-bases": "github:rhinestonewtf/module-bases",
     "@rhinestone/sentinellist": "github:rhinestonewtf/sentinellist",
+    "@rhinestone/checknsignatures": "github:rhinestonewtf/checknsignatures",
     "@safe-global/safe-contracts": "^1.4.1",
     "ds-test": "github:dapphub/ds-test",
     "erc7579": "github:erc7579/erc7579-implementation",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -5,6 +5,11 @@
 import { Safe7579 } from "src/Safe7579.sol";
 import { Safe7579Launchpad } from "src/Safe7579Launchpad.sol";
 import { IERC7484 } from "src/interfaces/IERC7484.sol";
+import { MockRegistry } from "test/mocks/MockRegistry.sol";
+import { Safe } from "@safe-global/safe-contracts/contracts/Safe.sol";
+import { SafeProxyFactory } from
+    "@safe-global/safe-contracts/contracts/proxies/SafeProxyFactory.sol";
+import { MockValidator } from "test/mocks/MockValidator.sol";
 
 /**
  * @title Deploy
@@ -15,10 +20,16 @@
         bytes32 salt = bytes32(uint256(0));
 
         address entryPoint = address(0x0000000071727De22E5E9d8BAf0edAc6f37da032);
-        IERC7484 registry = IERC7484(0xe0cde9239d16bEf05e62Bbf7aA93e420f464c826);
+        IERC7484 registry = IERC7484(0x25A4b2F363678E13A0A5DB79b712dE00347a593E);
 
         vm.startBroadcast(vm.envUint("PK"));
 
+        // new MockValidator{ salt: salt }();
+
+        // new Safe{ salt: salt }();
+        // new SafeProxyFactory{ salt: salt }();
+
+        // IERC7484 registry = new MockRegistry{ salt: salt }();
         new Safe7579{ salt: salt }();
         new Safe7579Launchpad{ salt: salt }(entryPoint, registry);
 

diff --git a/src/ISafe7579.sol b/src/ISafe7579.sol
@@ -2,18 +2,18 @@
 pragma solidity ^0.8.20;
 
 import "./DataTypes.sol";
-import { IERC7579Account } from "./interfaces//IERC7579Account.sol";
-
+import { IERC7579Account } from "./interfaces/IERC7579Account.sol";
 import { ModeCode } from "./lib/ModeLib.sol";
 import { PackedUserOperation } from
     "@ERC4337/account-abstraction/contracts/core/UserOperationLib.sol";
+import { ISafeOp } from "./interfaces/ISafeOp.sol";
 
 /**
  * @title ERC7579 Adapter for Safe accounts.
  * creates full ERC7579 compliance to Safe accounts
  * @author rhinestone | zeroknots.eth, Konrad Kopp (@kopy-kat)
  */
-interface ISafe7579 is IERC7579Account {
+interface ISafe7579 is IERC7579Account, ISafeOp {
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                         Validation                         */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
@@ -30,7 +30,6 @@ interface ISafe7579 is IERC7579Account {
         uint256 missingAccountFunds
     )
         external
-        payable
         returns (uint256 packedValidSig);
 
     /**
@@ -71,7 +70,7 @@ interface ISafe7579 is IERC7579Account {
      * @param mode The encoded execution mode of the transaction. See ModeLib.sol for details
      * @param executionCalldata The encoded execution call data
      */
-    function execute(ModeCode mode, bytes memory executionCalldata) external payable;
+    function execute(ModeCode mode, bytes memory executionCalldata) external;
 
     /**
      * @dev Executes a transaction on behalf of the Safe account.
@@ -95,7 +94,6 @@ interface ISafe7579 is IERC7579Account {
         bytes memory executionCalldata
     )
         external
-        payable
         returns (bytes[] memory returnDatas);
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
@@ -117,13 +115,7 @@ interface ISafe7579 is IERC7579Account {
      * @param initData arbitrary data that may be required on the module during `onInstall`
      * initialization.
      */
-    function installModule(
-        uint256 moduleType,
-        address module,
-        bytes memory initData
-    )
-        external
-        payable;
+    function installModule(uint256 moduleType, address module, bytes memory initData) external;
 
     /**
      * Uninstalls a Module of a certain type on the smart account.
@@ -142,8 +134,7 @@ interface ISafe7579 is IERC7579Account {
         address module,
         bytes memory deInitData
     )
-        external
-        payable;
+        external;
 
     /**
      * Function to check if the account has a certain module installed
@@ -190,8 +181,7 @@ interface ISafe7579 is IERC7579Account {
         ModuleInit[] memory hooks,
         RegistryInit memory registryInit
     )
-        external
-        payable;
+        external;
 
     /**
      * This function is intended to be called by Launchpad.validateUserOp()
@@ -201,7 +191,7 @@ interface ISafe7579 is IERC7579Account {
      * @dev Note: this function DOES NOT call onInstall() on the validator modules or emit
      * ModuleInstalled events. this has to be done by the launchpad
      */
-    function launchpadValidators(ModuleInit[] memory validators) external payable;
+    function initializeAccountWithValidators(ModuleInit[] memory validators) external;
 
     /**
      * Configure the Safe7579 with a IERC7484 registry
@@ -214,8 +204,8 @@ interface ISafe7579 is IERC7579Account {
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                   Query Account Details                    */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
-    function getValidatorPaginated(
-        address start,
+    function getValidatorsPaginated(
+        address cursor,
         uint256 pageSize
     )
         external
@@ -243,14 +233,7 @@ interface ISafe7579 is IERC7579Account {
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                        Query Misc                          */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
-    function supportsExecutionMode(ModeCode encodedMode) external pure returns (bool supported);
-    function supportsModule(uint256 moduleTypeId) external pure returns (bool);
-    function accountId() external view returns (string memory accountImplementationId);
 
-    /**
-     * Domain Separator for EIP-712.
-     */
-    function domainSeparator() external view returns (bytes32);
     /**
      * Safe7579 is using validator selection encoding in the userop nonce.
      * to make it easier for SDKs / devs to integrate, this function can be
@@ -264,18 +247,16 @@ interface ISafe7579 is IERC7579Account {
     /*                       Custom Errors                        */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
     error InvalidModule(address module);
-    error LinkedListError();
-    error InitializerError();
-    error ValidatorStorageHelperError();
+    error InvalidModuleType(address module, uint256 moduleType);
 
     // fallback handlers
     error InvalidInput();
+    error InvalidCallType(CallType callType);
     error NoFallbackHandler(bytes4 msgSig);
     error InvalidFallbackHandler(bytes4 msgSig);
     error FallbackInstalled(bytes4 msgSig);
 
     // Hooks
-    error HookPostCheckFailed();
     error HookAlreadyInstalled(address currentHook);
     error InvalidHookType();