Merge pull request #49 from EnsoBuild/fix-enso-receiver-signer

fix: use correct eth signed message on enso receiver

Author: PeterMPhillips

src/delegate/EnsoReceiver.sol

@@ -7,10 +7,10 @@ import { IERC4337CloneInitializer } from "../factory/interfaces/IERC4337CloneIni
 import { IERC20, Withdrawable } from "../utils/Withdrawable.sol";
 import { SIG_VALIDATION_FAILED, SIG_VALIDATION_SUCCESS } from "account-abstraction-v7/core/Helpers.sol";
 import { IAccount, PackedUserOperation } from "account-abstraction-v7/interfaces/IAccount.sol";
-
 import { Initializable } from "openzeppelin-contracts/proxy/utils/Initializable.sol";
 import { ReentrancyGuardTransient } from "openzeppelin-contracts/utils/ReentrancyGuardTransient.sol";
 import { ECDSA } from "openzeppelin-contracts/utils/cryptography/ECDSA.sol";
+import { MessageHashUtils } from "openzeppelin-contracts/utils/cryptography/MessageHashUtils.sol";
 import { SignatureChecker } from "openzeppelin-contracts/utils/cryptography/SignatureChecker.sol";
 
 contract EnsoReceiver is
@@ -105,7 +105,8 @@ contract EnsoReceiver is
         // First attempt ECDSA recovery to support EOAs and EIP-7702 accounts, which may have contract code but still
         // use standard ECDSA signatures.
         // If ECDSA recovery fails, fall back to ERC-1271 for traditional smart contract wallets.
-        (address recovered, ECDSA.RecoverError errors,) = ECDSA.tryRecover(userOpHash, userOp.signature);
+        bytes32 ethSignedMessageHash = MessageHashUtils.toEthSignedMessageHash(userOpHash);
+        (address recovered, ECDSA.RecoverError errors,) = ECDSA.tryRecover(ethSignedMessageHash, userOp.signature);
         if (errors == ECDSA.RecoverError.NoError && recovered == signer) {
             return SIG_VALIDATION_SUCCESS;
         }

test/fork/enso-checkout/Checkout_EOA_EntryPointV7_Fork_Test.t.sol

@@ -7,9 +7,7 @@ import { ERC4337CloneFactory } from "../../../src/factory/ERC4337CloneFactory.so
 import { SignaturePaymaster } from "../../../src/paymaster/SignaturePaymaster.sol";
 import { Shortcut } from "../../shortcuts/ShortcutDataTypes.sol";
 import { ShortcutsEthereum } from "../../shortcuts/ShortcutsEthereum.sol";
-
 import { PackedUserOperationLib } from "../../utils/AccountAbstraction.sol";
-
 import { TokenBalanceHelper } from "../../utils/TokenBalanceHelper.sol";
 import { EntryPoint } from "account-abstraction-v7/core/EntryPoint.sol";
 import { IEntryPoint, PackedUserOperation } from "account-abstraction-v7/interfaces/IEntryPoint.sol";
@@ -161,7 +159,8 @@ contract Checkout_EOA_EntryPointV7_Fork_Test is Test, TokenBalanceHelper {
 
         // UserOp.signature - Sign the userOpHash with EOA_1's private key
         bytes32 userOpHash = s_entryPoint.getUserOpHash(userOp);
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(uint256(EOA_1_PK), userOpHash);
+        bytes32 ethSignedUserOpHash = MessageHashUtils.toEthSignedMessageHash(userOpHash);
+        (uint8 v, bytes32 r, bytes32 s) = vm.sign(uint256(EOA_1_PK), ethSignedUserOpHash);
         bytes memory signature = abi.encodePacked(r, s, v);
         userOp.signature = signature;
 
@@ -257,13 +256,13 @@ contract Checkout_EOA_EntryPointV7_Fork_Test is Test, TokenBalanceHelper {
         assertBalanceDiff(
             balancePreEntryPointPaymaster,
             balancePostEntryPointPaymaster,
-            -2_064_097_182_089_268,
+            -2_064_454_742_903_391,
             "EntryPoint Paymaster balance (ETH)"
         );
         assertBalanceDiff(
             balancePreEntryPointTokenIn,
             balancePostEntryPointTokenIn,
-            -2_064_097_182_089_268,
+            -2_064_454_742_903_391,
             "EntryPoint TokenIn (ETH)"
         );
         assertBalanceDiff(balancePreEntryPointTokenOut, balancePostEntryPointTokenOut, 0, "EntryPoint TokenOut (WETH)");
@@ -345,7 +344,8 @@ contract Checkout_EOA_EntryPointV7_Fork_Test is Test, TokenBalanceHelper {
 
         // UserOp.signature - Sign the userOpHash with EOA_1's private key
         bytes32 userOpHash = s_entryPoint.getUserOpHash(userOp);
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(uint256(EOA_1_PK), userOpHash);
+        bytes32 ethSignedUserOpHash = MessageHashUtils.toEthSignedMessageHash(userOpHash);
+        (uint8 v, bytes32 r, bytes32 s) = vm.sign(uint256(EOA_1_PK), ethSignedUserOpHash);
         bytes memory signature = abi.encodePacked(r, s, v);
         userOp.signature = signature;
 
@@ -435,13 +435,13 @@ contract Checkout_EOA_EntryPointV7_Fork_Test is Test, TokenBalanceHelper {
         assertBalanceDiff(
             balancePreEntryPointPaymaster,
             balancePostEntryPointPaymaster,
-            -1_820_822_410_271_403,
+            -1_821_179_971_085_526,
             "EntryPoint Paymaster balance (ETH)"
         );
         assertBalanceDiff(
             balancePreEntryPointTokenIn,
             balancePostEntryPointTokenIn,
-            -1_820_822_410_271_403,
+            -1_821_179_971_085_526,
             "EntryPoint TokenIn (ETH)"
         );
         assertBalanceDiff(balancePreEntryPointTokenOut, balancePostEntryPointTokenOut, 0, "EntryPoint TokenOut (WETH)");
@@ -518,7 +518,8 @@ contract Checkout_EOA_EntryPointV7_Fork_Test is Test, TokenBalanceHelper {
 
         // UserOp.signature - Sign the userOpHash with EOA_1's private key
         bytes32 userOpHash = s_entryPoint.getUserOpHash(userOp);
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(uint256(EOA_1_PK), userOpHash);
+        bytes32 ethSignedUserOpHash = MessageHashUtils.toEthSignedMessageHash(userOpHash);
+        (uint8 v, bytes32 r, bytes32 s) = vm.sign(uint256(EOA_1_PK), ethSignedUserOpHash);
         bytes memory signature = abi.encodePacked(r, s, v);
         userOp.signature = signature;
 
@@ -602,7 +603,8 @@ contract Checkout_EOA_EntryPointV7_Fork_Test is Test, TokenBalanceHelper {
 
         // UserOp.signature - Sign the userOpHash with EOA_1's private key
         bytes32 userOpHash = s_entryPoint.getUserOpHash(userOp);
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(uint256(EOA_1_PK), userOpHash);
+        bytes32 ethSignedUserOpHash = MessageHashUtils.toEthSignedMessageHash(userOpHash);
+        (uint8 v, bytes32 r, bytes32 s) = vm.sign(uint256(EOA_1_PK), ethSignedUserOpHash);
         bytes memory signature = abi.encodePacked(r, s, v);
         userOp.signature = signature;
 

test/fork/enso-checkout/Checkout_SmartWallet_EntryPointV7_Fork_Test.t.sol

@@ -7,7 +7,7 @@ import { ERC4337CloneFactory } from "../../../src/factory/ERC4337CloneFactory.so
 import { SignaturePaymaster } from "../../../src/paymaster/SignaturePaymaster.sol";
 import { Shortcut } from "../../shortcuts/ShortcutDataTypes.sol";
 import { ShortcutsEthereum } from "../../shortcuts/ShortcutsEthereum.sol";
-
+import { PackedUserOperationLib } from "../../utils/AccountAbstraction.sol";
 import { TokenBalanceHelper } from "../../utils/TokenBalanceHelper.sol";
 import { EntryPoint } from "account-abstraction-v7/core/EntryPoint.sol";
 import { IEntryPoint, PackedUserOperation } from "account-abstraction-v7/interfaces/IEntryPoint.sol";
@@ -17,13 +17,10 @@ import { MessageHashUtils } from "openzeppelin-contracts/utils/cryptography/Mess
 import { Safe } from "safe-smart-account-1.5.0/Safe.sol";
 import { ExtensibleFallbackHandler } from "safe-smart-account-1.5.0/handler/ExtensibleFallbackHandler.sol";
 import { ERC1271 } from "safe-smart-account-1.5.0/handler/extensible/SignatureVerifierMuxer.sol";
-
 import { SignMessageLib } from "safe-smart-account-1.5.0/libraries/SignMessageLib.sol";
 import { SafeProxy } from "safe-smart-account-1.5.0/proxies/SafeProxy.sol";
 import { SafeProxyFactory } from "safe-smart-account-1.5.0/proxies/SafeProxyFactory.sol";
 
-import { PackedUserOperationLib } from "../../utils/AccountAbstraction.sol";
-
 contract Checkout_SmartWallet_EntryPointV7_Fork_Test is Test, TokenBalanceHelper {
     using SafeERC20 for IERC20;
 
@@ -344,13 +341,13 @@ contract Checkout_SmartWallet_EntryPointV7_Fork_Test is Test, TokenBalanceHelper
         assertBalanceDiff(
             balancePreEntryPointPaymaster,
             balancePostEntryPointPaymaster,
-            -2_136_959_537_241_825,
+            -2_137_317_098_055_948,
             "EntryPoint Paymaster balance (ETH)"
         );
         assertBalanceDiff(
             balancePreEntryPointTokenIn,
             balancePostEntryPointTokenIn,
-            -2_136_959_537_241_825,
+            -2_137_317_098_055_948,
             "EntryPoint TokenIn (ETH)"
         );
         assertBalanceDiff(balancePreEntryPointTokenOut, balancePostEntryPointTokenOut, 0, "EntryPoint TokenOut (WETH)");

test/unit/concrete/delegate/ensoReceiver/validateUserOp.t.sol

@@ -8,6 +8,7 @@ import { SIG_VALIDATION_FAILED, SIG_VALIDATION_SUCCESS } from "account-abstracti
 import { PackedUserOperation } from "account-abstraction-v7/interfaces/IEntryPoint.sol";
 import { console2 } from "forge-std-1.9.7/Test.sol";
 import { Ownable } from "openzeppelin-contracts/access/Ownable2Step.sol";
+import { MessageHashUtils } from "openzeppelin-contracts/utils/cryptography/MessageHashUtils.sol";
 
 contract MinimalERC1271 {
     bytes4 internal constant EIP1271_MAGIC_VALUE = 0x1626ba7e;
@@ -162,8 +163,8 @@ contract EnsoReceiver_ValidateUserOp_Unit_Concrete_Test is EnsoReceiver_Unit_Con
         userOp.nonce = isUnorderedNonce ? type(uint64).max : 0;
 
         bytes32 userOpHash = s_entryPoint.getUserOpHash(userOp);
-
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(uint256(signerPk), userOpHash);
+        bytes32 ethSignedUserOpHash = MessageHashUtils.toEthSignedMessageHash(userOpHash);
+        (uint8 v, bytes32 r, bytes32 s) = vm.sign(uint256(signerPk), ethSignedUserOpHash);
         bytes memory signature = abi.encodePacked(r, s, v);
         userOp.signature = signature;