internal functions for erc1967factory

Author: leekt

gas/ecdsa/report.txt

@@ -7,9 +7,9 @@ Running 8 tests for test/foundry/Kernel.t.sol:KernelTest
 [PASS] test_initialize_twice() (gas: 20885)
 [PASS] test_set_default_validator() (gas: 361374)
 [PASS] test_set_execution() (gas: 411711)
-[PASS] test_validate_signature() (gas: 164810)
+[PASS] test_validate_signature() (gas: 163680)
 [PASS] test_validate_userOp() (gas: 1729466)
-Test result: ok. 8 passed; 0 failed; 0 skipped; finished in 2.77ms
+Test result: ok. 8 passed; 0 failed; 0 skipped; finished in 2.82ms
 | src/Kernel.sol:Kernel contract |                 |       |        |       |         |
 |--------------------------------|-----------------|-------|--------|-------|---------|
 | Deployment Cost                | Deployment Size |       |        |       |         |
@@ -29,11 +29,10 @@ Test result: ok. 8 passed; 0 failed; 0 skipped; finished in 2.77ms
 | src/factory/KernelFactory.sol:KernelFactory contract |                 |        |        |        |         |
 |------------------------------------------------------|-----------------|--------|--------|--------|---------|
 | Deployment Cost                                      | Deployment Size |        |        |        |         |
-| 594023                                               | 3050            |        |        |        |         |
+| 437471                                               | 2268            |        |        |        |         |
 | Function Name                                        | min             | avg    | median | max    | # calls |
-| createAccount                                        | 132097          | 132874 | 132097 | 139097 | 9       |
-| deployDeterministicAndCall                           | 130534          | 131089 | 130534 | 135534 | 9       |
-| setImplementation                                    | 22862           | 22862  | 22862  | 22862  | 8       |
+| createAccount                                        | 130967          | 131744 | 130967 | 137967 | 9       |
+| setImplementation                                    | 22796           | 22796  | 22796  | 22796  | 8       |
 
 
 

src/factory/AdminLessERC1967Factory.sol

@@ -49,7 +49,7 @@ contract AdminLessERC1967Factory {
     /// @dev Deploys a proxy for `implementation`,
     /// and returns its address.
     /// The value passed into this function will be forwarded to the proxy.
-    function deploy(address implementation) public payable returns (address proxy) {
+    function deploy(address implementation) internal returns (address proxy) {
         proxy = deployAndCall(implementation, _emptyData());
     }
 
@@ -58,8 +58,7 @@ contract AdminLessERC1967Factory {
     /// The value passed into this function will be forwarded to the proxy.
     /// Then, calls the proxy with abi encoded `data`.
     function deployAndCall(address implementation, bytes calldata data)
-        public
-        payable
+        internal
         returns (address proxy)
     {
         proxy = _deploy(implementation, bytes32(0), false, data);
@@ -69,8 +68,7 @@ contract AdminLessERC1967Factory {
     /// and returns its deterministic address.
     /// The value passed into this function will be forwarded to the proxy.
     function deployDeterministic(address implementation, bytes32 salt)
-        public
-        payable
+        internal
         returns (address proxy)
     {
         proxy = deployDeterministicAndCall(implementation, salt, _emptyData());
@@ -84,7 +82,7 @@ contract AdminLessERC1967Factory {
         address implementation,
         bytes32 salt,
         bytes calldata data
-    ) public payable returns (address proxy) {
+    ) internal returns (address proxy) {
         /// @solidity memory-safe-assembly
         assembly {
             // If the salt does not start with the zero address or the caller.

src/factory/KernelFactory.sol

@@ -27,7 +27,7 @@ contract KernelFactory is AdminLessERC1967Factory, Ownable{
     {
         require(isAllowedImplementation[_implementation], "KernelFactory: implementation not allowed");
         bytes32 salt = bytes32(uint256(keccak256(abi.encodePacked(_data, _index))) & type(uint96).max);
-        proxy = this.deployDeterministicAndCall(_implementation, salt, _data);
+        proxy = deployDeterministicAndCall(_implementation, salt, _data);
     }
 
     function getAccountAddress(bytes calldata _data, uint256 _index)