Merge branch 'dev' into feat/v3.1-rc3

Author: leekt

broadcast/DeployECDSA.s.sol/11155111/run-latest.json

@@ -1,20 +1,22 @@
 {
   "transactions": [
     {
-      "hash": "0x9803b4ddc4b3ef54acc03d828a762ab711f0c1764134b5692f66dd22bb249b9f",
+      "hash": "0x8562ad26e46f807af71418ec082c720698f553e8eba477999545a42408ffa4a4",
       "transactionType": "CREATE2",
       "contractName": "ECDSAValidator",
-      "contractAddress": "0x845adb2c711129d4f3966735ed98a9f09fc4ce57",
+      "contractAddress": "0x8104e3ad430ea6d354d013a6789fdfc71e671c43",
       "function": null,
       "arguments": null,
       "transaction": {
         "from": "0x9775137314fe595c943712b0b336327dfa80ae8a",
         "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c",
-        "gas": "0x9fafe",
+        "gas": "0xa28d7",
         "value": "0x0",
-        "input": "0x00000000000000000000000000000000000000000000000000000000000000006080806040523460155761071b908161001b8239f35b600080fdfe608060408181526004918236101561001657600080fd5b600090813560e01c908163173bf7da1461043a57816320709efc14610403575080636d61fe701461034a5780638a91b0e3146102d4578063970032031461028e578063d60b347f14610240578063d68f602514610124578063ecd05961146100e55763f551e2ee1461008757600080fd5b346100e25760603660031901126100e2576100a061049e565b506044359067ffffffffffffffff82116100e257506100c76020936100d09236910161046b565b906024356105e5565b90516001600160e01b03199091168152f35b80fd5b50919034610120576020366003190112610120576020925081359160018314928315610116575b5050519015158152f35b149150388061010c565b8280fd5b509160603660031901126101205761013a61049e565b9267ffffffffffffffff6044358181116101205761015b903690850161046b565b505033825260208281528483205490956001600160a01b039182169116036101f157835192858401918211848310176101de575083949291945283815282519382859384528251928382860152825b8481106101c857505050828201840152601f01601f19168101030190f35b81810183015188820188015287955082016101aa565b634e487b7160e01b835260419052602482fd5b835162461bcd60e51b8152808401869052602360248201527f454344534156616c696461746f723a2073656e646572206973206e6f74206f776044820152623732b960e91b6064820152608490fd5b50903461028a57602036600319011261028a5760209061028161026161049e565b6001600160a01b0390811660009081526020819052604090205416151590565b90519015158152f35b5080fd5b506003199082823601126100e25783359167ffffffffffffffff831161028a576101209083360301126100e257506020926102cd91602435910161051d565b9051908152f35b5091602036600319011261012057803567ffffffffffffffff811161034657610300903690830161046b565b5050336000908152602081905260409020546001600160a01b031615610330575081903382528160205281205580f35b602491519063f91bd6f160e01b82523390820152fd5b8380fd5b5091602036600319011261012057803567ffffffffffffffff811161034657610376903690830161046b565b33600090815260208190526040902054919290916001600160a01b03166103ec5750601411610120573560601c90338352826020528220816bffffffffffffffffffffffff60a01b825416179055337fa5e1f8b4009110f5525798d04ae2125421a12d0590aa52c13682ff1bd3c492ca8380a380f35b6024908451906393360fbf60e01b82523390820152fd5b90508234610120576020366003190112610120576020926001600160a01b0391908261042d61049e565b1681528085522054168152f35b8285602036600319011261028a5780359067ffffffffffffffff8211610120576104669136910161046b565b505080f35b9181601f840112156104995782359167ffffffffffffffff8311610499576020838186019501011161049957565b600080fd5b600435906001600160a01b038216820361049957565b92919267ffffffffffffffff918281116105075760405192601f8201601f19908116603f011684019081118482101761050757604052829481845281830111610499578281602093846000960137010152565b634e487b7160e01b600052604160045260246000fd5b3360009081526020819052604081205490926001600160a01b03918216926101008101359036819003601e19018212156105e1570180359067ffffffffffffffff82116105e1576020019181360383136105e157836105866105803685876104b4565b8361067d565b1685146105d9576105ca926105c4916020527b19457468657265756d205369676e6564204d6573736167653a0a33328752603c6004209236916104b4565b9061067d565b16036105d35790565b50600190565b505050505090565b8580fd5b919033600052600060205260018060a01b0391826040600020541693836106106105803685876104b4565b16851461066c5761064f926105c4916020527b19457468657265756d205369676e6564204d6573736167653a0a3332600052603c6004209236916104b4565b160361066057630b135d3f60e11b90565b6001600160e01b031990565b50630b135d3f60e11b949350505050565b919091602060016080600082948390604080998151986106bb575b5050505afa51923d156106ad57600060605252565b638baa579f6000526004601cfd5b8492835287808201518352828251146106fb5760418251146106e4575050509050388881610698565b60609384830151901a905201519052388881610698565b9250015190601b8260ff1c019052848060ff1b031660605238888161069856",
-        "nonce": "0x45",
-        "chainId": "0xaa36a7"
+        "input": "0x00000000000000000000000000000000000000000000000000000000000000006080806040523461001657610740908161001c8239f35b600080fdfe608060408181526004918236101561001657600080fd5b600090813560e01c90816320709efc14610459575080636d61fe70146103a05780638a91b0e31461032e57806397003203146102e8578063aacbd72a1461028e578063d60b347f14610240578063d68f602514610124578063ecd05961146100e55763f551e2ee1461008757600080fd5b346100e25760603660031901126100e2576100a0610490565b506044359067ffffffffffffffff82116100e257506100c76020936100d0923691016104ab565b9060243561060a565b90516001600160e01b03199091168152f35b80fd5b50919034610120576020366003190112610120576020925081359160018314928315610116575b5050519015158152f35b149150388061010c565b8280fd5b509160603660031901126101205761013a610490565b9267ffffffffffffffff6044358181116101205761015b90369085016104ab565b505033825260208281528483205490956001600160a01b039182169116036101f157835192858401918211848310176101de575083949291945283815282519382859384528251928382860152825b8481106101c857505050828201840152601f01601f19168101030190f35b81810183015188820188015287955082016101aa565b634e487b7160e01b835260419052602482fd5b835162461bcd60e51b8152808401869052602360248201527f454344534156616c696461746f723a2073656e646572206973206e6f74206f776044820152623732b960e91b6064820152608490fd5b50903461028a57602036600319011261028a57602090610281610261610490565b6001600160a01b0390811660009081526020819052604090205416151590565b90519015158152f35b5080fd5b5082606036600319011261028a5767ffffffffffffffff9080358281116102e4576102bc90369083016104ab565b50506024358015150361012057604435918211610120576102df913691016104ab565b505080f35b8380fd5b506003199082823601126100e25783359167ffffffffffffffff831161028a576101209083360301126100e25750602092610327916024359101610542565b9051908152f35b5091602036600319011261012057803567ffffffffffffffff81116102e45761035a90369083016104ab565b5050336000908152602081905260409020546001600160a01b03161561038a575081903382528160205281205580f35b602491519063f91bd6f160e01b82523390820152fd5b5091602036600319011261012057803567ffffffffffffffff81116102e4576103cc90369083016104ab565b33600090815260208190526040902054919290916001600160a01b03166104425750601411610120573560601c90338352826020528220816bffffffffffffffffffffffff60a01b825416179055337fa5e1f8b4009110f5525798d04ae2125421a12d0590aa52c13682ff1bd3c492ca8380a380f35b6024908451906393360fbf60e01b82523390820152fd5b90508234610120576020366003190112610120576020926001600160a01b03919082610483610490565b1681528085522054168152f35b600435906001600160a01b03821682036104a657565b600080fd5b9181601f840112156104a65782359167ffffffffffffffff83116104a657602083818601950101116104a657565b92919267ffffffffffffffff9182811161052c5760405192601f8201601f19908116603f011684019081118482101761052c576040528294818452818301116104a6578281602093846000960137010152565b634e487b7160e01b600052604160045260246000fd5b3360009081526020819052604081205490926001600160a01b03918216926101008101359036819003601e1901821215610606570180359067ffffffffffffffff82116106065760200191813603831361060657836105ab6105a53685876104d9565b836106a2565b1685146105fe576105ef926105e9916020527b19457468657265756d205369676e6564204d6573736167653a0a33328752603c6004209236916104d9565b906106a2565b16036105f85790565b50600190565b505050505090565b8580fd5b919033600052600060205260018060a01b0391826040600020541693836106356105a53685876104d9565b16851461069157610674926105e9916020527b19457468657265756d205369676e6564204d6573736167653a0a3332600052603c6004209236916104d9565b160361068557630b135d3f60e11b90565b6001600160e01b031990565b50630b135d3f60e11b949350505050565b919091602060016080600082948390604080998151986106e0575b5050505afa51923d156106d257600060605252565b638baa579f6000526004601cfd5b8492835287808201518352828251146107205760418251146107095750505090503888816106bd565b60609384830151901a9052015190523888816106bd565b9250015190601b8260ff1c019052848060ff1b03166060523888816106bd56",
+        "nonce": "0x3e",
+        "chainId": "0xaa36a7",
+        "accessList": null,
+        "type": null
       },
       "additionalContracts": [],
       "isFixedGasLimit": false
@@ -23,25 +25,25 @@
   "receipts": [
     {
       "status": "0x1",
-      "cumulativeGasUsed": "0xb578d9",
+      "cumulativeGasUsed": "0xaf2a76",
       "logs": [],
       "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
       "type": "0x2",
-      "transactionHash": "0x9803b4ddc4b3ef54acc03d828a762ab711f0c1764134b5692f66dd22bb249b9f",
-      "transactionIndex": "0x51",
-      "blockHash": "0xb4650a875f62666e5c1d1525cbb634af43376ea7ed4a8cf9994547f472ea1e4c",
-      "blockNumber": "0x58db5c",
-      "gasUsed": "0x6d375",
-      "effectiveGasPrice": "0x836fb6b6f",
+      "transactionHash": "0x8562ad26e46f807af71418ec082c720698f553e8eba477999545a42408ffa4a4",
+      "transactionIndex": "0x42",
+      "blockHash": "0x05be0f541009e1f0df7b4c62fdfe876fb76559f2d962acd90cb8f1afb24bfefe",
+      "blockNumber": "0x569a7d",
+      "gasUsed": "0x6f2d1",
+      "effectiveGasPrice": "0x66b60fa8",
       "from": "0x9775137314fe595c943712b0b336327dfa80ae8a",
       "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c",
-      "contractAddress": "0x845adb2c711129d4f3966735ed98a9f09fc4ce57"
+      "contractAddress": "0x8104e3ad430ea6d354d013a6789fdfc71e671c43"
     }
   ],
   "libraries": [],
   "pending": [],
   "returns": {},
-  "timestamp": 1714676307,
+  "timestamp": 1712847787,
   "chain": 11155111,
-  "commit": "8f7fd99"
+  "commit": "f8be0c5"
 }

broadcast/DeployKernel.s.sol/11155111/run-latest.json

@@ -84,7 +84,7 @@ contract Kernel is IAccount, IAccountExecute, IERC7579Account, ValidationManager
             if (validator.isModuleType(4)) {
                 bytes memory ret = IHook(address(validator)).preCheck(msg.sender, msg.value, msg.data);
                 _;
-                IHook(address(validator)).postCheck(ret);
+                IHook(address(validator)).postCheck(ret, true, hex""); // TODO don't support try catch hook here
             } else {
                 revert InvalidCaller();
             }
@@ -121,28 +121,6 @@ contract Kernel is IAccount, IAccountExecute, IERC7579Account, ValidationManager
         }
     }
 
-    function changeRootValidator(
-        ValidationId _rootValidator,
-        IHook hook,
-        bytes calldata validatorData,
-        bytes calldata hookData
-    ) external payable onlyEntryPointOrSelfOrRoot {
-        ValidationStorage storage vs = _validationStorage();
-        if (ValidationId.unwrap(_rootValidator) == bytes21(0)) {
-            revert InvalidValidator();
-        }
-        ValidationType vType = ValidatorLib.getType(_rootValidator);
-        if (vType != VALIDATION_TYPE_VALIDATOR && vType != VALIDATION_TYPE_PERMISSION) {
-            revert InvalidValidationType();
-        }
-        _setRootValidator(_rootValidator);
-        if (_validationStorage().validationConfig[_rootValidator].hook == IHook(address(0))) {
-            // when new rootValidator is not installed yet
-            ValidationConfig memory config = ValidationConfig({nonce: uint32(vs.currentNonce), hook: hook});
-            _installValidation(_rootValidator, config, validatorData, hookData);
-        }
-    }
-
     function upgradeTo(address _newImplementation) external payable onlyEntryPointOrSelfOrRoot {
         assembly {
             sstore(ERC1967_IMPLEMENTATION_SLOT, _newImplementation)
@@ -184,16 +162,8 @@ contract Kernel is IAccount, IAccountExecute, IERC7579Account, ValidationManager
         } else {
             // action installed
             bytes memory context;
-            if (
-                address(config.hook) != address(1) && address(config.hook) != 0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF
-            ) {
+            if (address(config.hook) != address(1)) {
                 context = _doPreHook(config.hook, msg.value, msg.data);
-            } else if (address(config.hook) == 0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF) {
-                // for selector manager, address(0) for the hook will default to type(address).max,
-                // and this will only allow entrypoints to interact
-                if (msg.sender != address(entrypoint)) {
-                    revert InvalidCaller();
-                }
             }
             // execute action
             if (config.callType == CALLTYPE_SINGLE) {
@@ -203,10 +173,8 @@ contract Kernel is IAccount, IAccountExecute, IERC7579Account, ValidationManager
             } else {
                 revert NotSupportedCallType();
             }
-            if (
-                address(config.hook) != address(1) && address(config.hook) != 0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF
-            ) {
-                _doPostHook(config.hook, context);
+            if (address(config.hook) != address(1)) {
+                _doPostHook(config.hook, context, success, result);
             }
         }
         if (!success) {
@@ -290,7 +258,7 @@ contract Kernel is IAccount, IAccountExecute, IERC7579Account, ValidationManager
         }
         (bool success, bytes memory ret) = ExecLib.executeDelegatecall(address(this), userOp.callData[4:]);
         if (address(hook) != address(1)) {
-            _doPostHook(hook, context);
+            _doPostHook(hook, context, success, ret);
         } else if (!success) {
             revert ExecutionReverted();
         }
@@ -312,7 +280,7 @@ contract Kernel is IAccount, IAccountExecute, IERC7579Account, ValidationManager
         }
         returnData = ExecLib.execute(execMode, executionCalldata);
         if (address(hook) != address(1)) {
-            _doPostHook(hook, context);
+            _doPostHook(hook, context, true, abi.encode(returnData));
         }
     }
 
@@ -361,14 +329,11 @@ contract Kernel is IAccount, IAccountExecute, IERC7579Account, ValidationManager
                 ValidationConfig({nonce: vs.currentNonce, hook: IHook(address(bytes20(initData[0:20])))});
             bytes calldata validatorData;
             bytes calldata hookData;
-            bytes calldata selectorData;
             assembly {
                 validatorData.offset := add(add(initData.offset, 52), calldataload(add(initData.offset, 20)))
                 validatorData.length := calldataload(sub(validatorData.offset, 32))
                 hookData.offset := add(add(initData.offset, 52), calldataload(add(initData.offset, 52)))
                 hookData.length := calldataload(sub(hookData.offset, 32))
-                selectorData.offset := add(add(initData.offset, 52), calldataload(add(initData.offset, 84)))
-                selectorData.length := calldataload(sub(selectorData.offset, 32))
             }
             _installValidation(vId, config, validatorData, hookData);
             if (selectorData.length == 4) {
@@ -525,7 +490,7 @@ contract Kernel is IAccount, IAccountExecute, IERC7579Account, ValidationManager
     }
 
     function accountId() external pure override returns (string memory accountImplementationId) {
-        return "kernel.advanced.v0.3.1";
+        return "kernel.advanced.v0.3.0-beta";
     }
 
     function supportsExecutionMode(ExecMode mode) external pure override returns (bool) {

src/Kernel.sol

@@ -17,10 +17,10 @@ abstract contract HookManager {
         context = hook.preCheck(msg.sender, value, callData);
     }
 
-    function _doPostHook(IHook hook, bytes memory context) internal {
+    function _doPostHook(IHook hook, bytes memory context, bool success, bytes memory result) internal {
         // bool success,
         // bytes memory result
-        hook.postCheck(context);
+        hook.postCheck(context, success, result);
     }
 
     // @notice if hook is not initialized before, kernel will call hook.onInstall no matter what flag it shows, with hookData[1:]

src/core/HookManager.sol

@@ -37,7 +37,7 @@ abstract contract SelectorManager {
 
     function _installSelector(bytes4 selector, address target, IHook hook, bytes calldata selectorData) internal {
         if (address(hook) == address(0)) {
-            hook = IHook(address(0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF));
+            hook = IHook(address(1));
         }
         SelectorConfig storage ss = _selectorConfig(selector);
         // we are going to install only through call/delegatecall

src/core/SelectorManager.sol

@@ -69,12 +69,30 @@ interface IValidator is IModule {
 interface IExecutor is IModule {}
 
 interface IHook is IModule {
-    function preCheck(address msgSender, uint256 msgValue, bytes calldata msgData)
+    /**
+     * @dev Called by the smart account before execution
+     * @param msgSender the address that called the smart account
+     * @param value the value that was sent to the smart account
+     * @param msgData the data that was sent to the smart account
+     *
+     * MAY return arbitrary data in the `hookData` return value
+     */
+    function preCheck(address msgSender, uint256 value, bytes calldata msgData)
         external
         payable
         returns (bytes memory hookData);
 
-    function postCheck(bytes calldata hookData) external payable;
+    /**
+     * @dev Called by the smart account after execution
+     * @param hookData the data that was returned by the `preCheck` function
+     * @param executionSuccess whether the execution(s) was (were) successful
+     * @param executionReturn the return/revert data of the execution(s)
+     *
+     * MAY validate the `hookData` to validate transaction context of the `preCheck` function
+     */
+    function postCheck(bytes calldata hookData, bool executionSuccess, bytes calldata executionReturn)
+        external
+        payable;
 }
 
 interface IFallback is IModule {}

src/interfaces/IERC7579Modules.sol

@@ -34,7 +34,7 @@ contract MockHook is IHook {
         return data[msg.sender];
     }
 
-    function postCheck(bytes calldata hookData) external payable override {
+    function postCheck(bytes calldata hookData, bool success, bytes memory res) external payable override {
         postHookData[msg.sender] = hookData;
     }
 }

src/mock/MockHook.sol

@@ -73,7 +73,10 @@ contract MockValidator is IValidator, IHook {
         return hex"";
     }
 
-    function postCheck(bytes calldata hookData) external payable {
+    function postCheck(bytes calldata hookData, bool executionSuccess, bytes calldata executionReturn)
+        external
+        payable
+    {
         return;
     }
 }