AA-521 EntryPoint support for eip-7702

contracts/core/Eip7702Support.sol

@@ -0,0 +1,58 @@
+pragma solidity ^0.8;
+
+import "../interfaces/PackedUserOperation.sol";
+import "../core/UserOperationLib.sol";
+// SPDX-License-Identifier: MIT
+
+// EIP-7702 code prefix. Also, we use this prefix as a marker in the initCode. To specify this account is EIP-7702.
+uint256 constant EIP7702_PREFIX = 0xef0100;
+
+using UserOperationLib for PackedUserOperation;
+
+    //get alternate InitCode (just for hashing) when using EIP-7702
+    function _getEip7702InitCodeOverride(PackedUserOperation calldata userOp) view returns (bytes32) {
+        bytes calldata initCode = userOp.initCode;
+        if (! _isEip7702InitCode(initCode)) {
+            return 0;
+        }
+        address delegate = _getEip7702Delegate(userOp.getSender());
+        if (initCode.length < 20)
+            return keccak256(abi.encodePacked(delegate));
+        else
+            return keccak256(abi.encodePacked(delegate, initCode[20 :]));
+    }
+
+
+    function _isEip7702InitCode(bytes calldata initCode) pure returns (bool) {
+
+        if (initCode.length < 3) {
+            return false;
+        }
+        uint256 initCodeStart;
+        // solhint-disable-next-line no-inline-assembly
+        assembly ("memory-safe") {
+            initCodeStart := calldataload(initCode.offset)
+        }
+        // make sure first 20 bytes of initCode are "0xff0100" (padded with zeros)
+        // initCode can be shorter (e.g. only 3), but then it is already zero-padded.
+        return (initCodeStart >> (256 - 160)) == ((EIP7702_PREFIX << (160 - 24)));
+    }
+
+/**
+ * get the EIP-7702 delegate from contract code.
+ * requires EXTCODECOPY pr: https://github.com/ethereum/EIPs/pull/9248 (not yet merged or implemented)
+ **/
+    function _getEip7702Delegate(address sender) view returns (address) {
+        uint256 senderCode;
+
+        // solhint-disable-next-line no-inline-assembly
+        assembly ("memory-safe") {
+            extcodecopy(sender, 0, 0, 32)
+            senderCode := mload(0)
+        }
+        // senderCode is the first 32 bytes of the sender's code
+        // If it is an EIP-7702 delegate, then top 24 bits are the EIP7702_PREFIX
+        // next 160 bytes are the delegate address
+        require(senderCode >> (256 - 24) == EIP7702_PREFIX, "not an EIP-7702 delegate");
+        return address(uint160(senderCode >> (256 - 160 - 24)));
+    }

contracts/core/EntryPoint.sol

@@ -14,6 +14,7 @@ import "./NonceManager.sol";
 import "./SenderCreator.sol";
 import "./StakeManager.sol";
 import "./UserOperationLib.sol";
+import "./Eip7702Support.sol";
 
 import "@openzeppelin/contracts/utils/ReentrancyGuardTransient.sol";
 import "@openzeppelin/contracts/utils/introspection/ERC165.sol";
@@ -378,8 +379,9 @@ contract EntryPoint is IEntryPoint, StakeManager, NonceManager, ReentrancyGuardT
     function getUserOpHash(
         PackedUserOperation calldata userOp
     ) public view returns (bytes32) {
+        bytes32 overrideInitCode = _getEip7702InitCodeOverride(userOp);
         return
-            MessageHashUtils.toTypedDataHash(getDomainSeparatorV4(), userOp.hash());
+            MessageHashUtils.toTypedDataHash(getDomainSeparatorV4(), userOp.hash(overrideInitCode));
     }
 
     /**
@@ -441,6 +443,11 @@ contract EntryPoint is IEntryPoint, StakeManager, NonceManager, ReentrancyGuardT
     ) internal {
         if (initCode.length != 0) {
             address sender = opInfo.mUserOp.sender;
+            if ( _isEip7702InitCode(initCode) ) {
+                //already validated it is an EIP-7702 delegate (and hence, already has code)
+                senderCreator().initEip7702Sender(sender, initCode[20:]);
+                return;
+            }
             if (sender.code.length != 0)
                 revert FailedOp(opIndex, "AA10 sender already constructed");
             address sender1 = senderCreator().createSender{

contracts/core/EntryPointSimulations.sol

@@ -192,7 +192,7 @@ contract EntryPointSimulations is EntryPoint, IEntryPointSimulations {
 
     //slightly stricter gas limit than the real EntryPoint
     function _getVerificationGasLimit(uint256 verificationGasLimit) internal pure virtual override returns (uint256) {
-        return verificationGasLimit - 300;
+        return verificationGasLimit - 350;
     }
 
 

contracts/core/SenderCreator.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.23;
 
 import "../interfaces/ISenderCreator.sol";
+import "../utils/Exec.sol";
 
 /**
  * Helper contract for EntryPoint, to call userOp.initCode from a "neutral" address,
@@ -23,10 +24,9 @@ contract SenderCreator is ISenderCreator {
     function createSender(
         bytes calldata initCode
     ) external returns (address sender) {
-        if (msg.sender != entryPoint) {
-            revert("AA97 should call from EntryPoint");
-        }
+        require(msg.sender == entryPoint, "AA97 should call from EntryPoint");
         address factory = address(bytes20(initCode[0:20]));
+
         bytes memory initCallData = initCode[20:];
         bool success;
         /* solhint-disable no-inline-assembly */
@@ -40,10 +40,22 @@ contract SenderCreator is ISenderCreator {
                 0,
                 32
             )
-            sender := mload(0)
-        }
-        if (!success) {
-            sender = address(0);
+            if success {
+                sender := mload(0)
+            }
         }
     }
+
+    // use initCode to initialize an EIP-7702 account
+    // caller (EntryPoint) already verified it is an EIP-7702 account.
+    function initEip7702Sender(
+        address sender,
+        bytes calldata initCode
+    ) external {
+        require(msg.sender == entryPoint, "AA97 should call from EntryPoint");
+        bytes memory initCallData = initCode[20 :];
+        // solhint-disable-next-line avoid-low-level-calls
+        bool success = Exec.call(sender, 0, initCallData, gasleft());
+        require(success, "AA13 EIP7702 sender init failed");
+    }
 }

contracts/core/UserOperationLib.sol

@@ -58,10 +58,22 @@ library UserOperationLib {
      */
     function encode(
         PackedUserOperation calldata userOp
+    ) internal pure returns (bytes memory ret) {
+        return encode(userOp, "");
+    }
+
+    /**
+     * Pack the user operation data into bytes for hashing.
+     * @param userOp - The user operation data.
+     * @param overrideInitCode - If set, encode this instead of the initCode field in the userOp.
+     */
+    function encode(
+        PackedUserOperation calldata userOp,
+        bytes32 overrideInitCode
     ) internal pure returns (bytes memory ret) {
         address sender = getSender(userOp);
         uint256 nonce = userOp.nonce;
-        bytes32 hashInitCode = calldataKeccak(userOp.initCode);
+        bytes32 hashInitCode = overrideInitCode==0 ? calldataKeccak(userOp.initCode) : overrideInitCode;
         bytes32 hashCallData = calldataKeccak(userOp.callData);
         bytes32 accountGasLimits = userOp.accountGasLimits;
         uint256 preVerificationGas = userOp.preVerificationGas;
@@ -136,10 +148,12 @@ library UserOperationLib {
     /**
      * Hash the user operation data.
      * @param userOp - The user operation data.
+     * @param overrideInitCode - If set, the initCode will be replaced with this value just for hashing.
      */
     function hash(
-        PackedUserOperation calldata userOp
+        PackedUserOperation calldata userOp,
+        bytes32 overrideInitCode
     ) internal pure returns (bytes32) {
-        return keccak256(encode(userOp));
+        return keccak256(encode(userOp, overrideInitCode));
     }
 }

contracts/interfaces/ISenderCreator.sol

@@ -8,4 +8,7 @@ interface ISenderCreator {
      * @return sender Address of the newly created sender contract.
      */
     function createSender(bytes calldata initCode) external returns (address sender);
+
+    // call initCode to initialize an EIP-7702 account
+    function initEip7702Sender(address sender, bytes calldata initCode) external;
 }

contracts/test/TestUtil.sol

@@ -8,7 +8,7 @@ contract TestUtil {
     using UserOperationLib for PackedUserOperation;
 
     function encodeUserOp(PackedUserOperation calldata op) external pure returns (bytes memory){
-        return op.encode();
+        return op.encode(0);
     }
 
 }

reports/gas-checker.txt

@@ -2,7 +2,7 @@
    the destination is "account.entryPoint()", which is known to be "hot" address used by this account
    it little higher than EOA call: its an exec from entrypoint (or account owner) into account contract, verifying msg.sender and exec to target)
 ╔══════════════════════════╤════════╗
-║ gas estimate "simple"    │  29259 ║
+║ gas estimate "simple"    │  29247 ║
 ╟──────────────────────────┼────────╢
 ║ gas estimate "big tx 5k" │ 114702 ║
 ╚══════════════════════════╧════════╝
@@ -12,44 +12,44 @@
 ║                                │       │               │     (delta for │        (compared to ║
 ║                                │       │               │    one UserOp) │     account.exec()) ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple                         │     1 │         77450 │                │                     ║
+║ simple                         │     1 │         77779 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple - diff from previous    │     2 │               │          41598 │               12339 ║
+║ simple - diff from previous    │     2 │               │          41951 │               12704 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple                         │    10 │        451980 │                │                     ║
+║ simple                         │    10 │        455462 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple - diff from previous    │    11 │               │          41659 │               12400 ║
+║ simple - diff from previous    │    11 │               │          41976 │               12729 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple paymaster               │     1 │         83281 │                │                     ║
+║ simple paymaster               │     1 │         83634 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple paymaster with diff     │     2 │               │          40142 │               10883 ║
+║ simple paymaster with diff     │     2 │               │          40483 │               11236 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple paymaster               │    10 │        444666 │                │                     ║
+║ simple paymaster               │    10 │        448196 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ simple paymaster with diff     │    11 │               │          40163 │               10904 ║
+║ simple paymaster with diff     │    11 │               │          40528 │               11281 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ big tx 5k                      │     1 │        167209 │                │                     ║
+║ big tx 5k                      │     1 │        167526 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ big tx - diff from previous    │     2 │               │         130799 │               16097 ║
+║ big tx - diff from previous    │     2 │               │         131212 │               16510 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ big tx 5k                      │    10 │       1344654 │                │                     ║
+║ big tx 5k                      │    10 │       1348136 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ big tx - diff from previous    │    11 │               │         130872 │               16170 ║
+║ big tx - diff from previous    │    11 │               │         131225 │               16523 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ paymaster+postOp               │     1 │         84458 │                │                     ║
+║ paymaster+postOp               │     1 │         84811 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ paymaster+postOp with diff     │     2 │               │          41306 │               12047 ║
+║ paymaster+postOp with diff     │     2 │               │          41671 │               12424 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ paymaster+postOp               │    10 │        456393 │                │                     ║
+║ paymaster+postOp               │    10 │        459971 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ paymaster+postOp with diff     │    11 │               │          41381 │               12122 ║
+║ paymaster+postOp with diff     │    11 │               │          41734 │               12487 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ token paymaster                │     1 │        121572 │                │                     ║
+║ token paymaster                │     1 │        121925 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ token paymaster with diff      │     2 │               │          61130 │               31871 ║
+║ token paymaster with diff      │     2 │               │          61483 │               32236 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ token paymaster                │    10 │        671901 │                │                     ║
+║ token paymaster                │    10 │        675467 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ token paymaster with diff      │    11 │               │          61200 │               31941 ║
+║ token paymaster with diff      │    11 │               │          61565 │               32318 ║
 ╚════════════════════════════════╧═══════╧═══════════════╧════════════════╧═════════════════════╝
 

src/Create2Factory.ts

@@ -102,7 +102,11 @@ export class Create2Factory {
       to: Create2Factory.factoryDeployer,
       value: BigNumber.from(Create2Factory.factoryDeploymentFee)
     })
-    await this.provider.sendTransaction(Create2Factory.factoryTx)
+    // first tx.. can't "wait" for it.
+    await new Promise(resolve => setTimeout(resolve, 100))
+
+    await this.provider.sendTransaction(Create2Factory.factoryTx).then(async tx => tx.wait())
+
     if (!await this._isFactoryDeployed()) {
       throw new Error('fatal: failed to deploy deterministic deployer')
     }