feat: update to support entrypoint v0.8.0

dancoombs · dancoombs · commit 5dc91c1d2317 · 2025-12-18T18:35:29.000-06:00
diff --git a/.gitmodules b/.gitmodules
@@ -5,11 +5,11 @@
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/openzeppelin/openzeppelin-contracts
-	branch = release-v5.0
+	branch = release-v5.1
 [submodule "lib/account-abstraction"]
 	path = lib/account-abstraction
 	url = https://github.com/eth-infinitism/account-abstraction
-	branch = releases/v0.7
+	branch = releases/v0.8
 [submodule "lib/modular-account"]
 	path = lib/modular-account
 	url = https://github.com/alchemyplatform/modular-account
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
   "solidity.packageDefaultDependenciesContractsDirectory": "src",
   "solidity.packageDefaultDependenciesDirectory": "lib",
-  "solidity.compileUsingRemoteVersion": "v0.8.23",
+  "solidity.compileUsingRemoteVersion": "v0.8.28",
   "editor.formatOnSave": true,
   "[solidity]": {
     "editor.defaultFormatter": "JuanBlanco.solidity"
diff --git a/foundry.lock b/foundry.lock
@@ -0,0 +1,26 @@
+{
+  "lib/account-abstraction": {
+    "branch": {
+      "name": "releases/v0.8",
+      "rev": "4cbc06072cdc19fd60f285c5997f4f7f57a588de"
+    }
+  },
+  "lib/forge-std": {
+    "branch": {
+      "name": "v1",
+      "rev": "ae570fec082bfe1c1f45b0acca4a2b4f84d345ce"
+    }
+  },
+  "lib/modular-account": {
+    "branch": {
+      "name": "v1.0.x",
+      "rev": "1ceb7935b3d8642283f0dc8fd0a7a7f00132be9d"
+    }
+  },
+  "lib/openzeppelin-contracts": {
+    "branch": {
+      "name": "release-v5.1",
+      "rev": "69c8def5f222ff96f2b5beff05dfba996368aa79"
+    }
+  }
+}
diff --git a/foundry.toml b/foundry.toml
@@ -1,6 +1,6 @@
 [profile.default]
-solc = '0.8.23'
-evm_version = 'paris'
+solc = '0.8.28'
+evm_version = 'cancun'
 via_ir = true
 src = 'src'
 out = 'out'
diff --git a/lib/account-abstraction b/lib/account-abstraction
@@ -1 +1 @@
-Subproject commit 7af70c8993a6f42973f520ae0752386a5032abe7
+Subproject commit 4cbc06072cdc19fd60f285c5997f4f7f57a588de
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
@@ -1 +1 @@
-Subproject commit dbb6104ce834628e473d2173bbc9d47f81a9eec3
+Subproject commit 69c8def5f222ff96f2b5beff05dfba996368aa79
diff --git a/script/Deploy_LightAccountFactory.s.sol b/script/Deploy_LightAccountFactory.s.sol
@@ -41,7 +41,9 @@ contract Deploy_LightAccountFactory is Script {
 
         LightAccountFactory factory = new LightAccountFactory{
             salt: 0x00000000000000000000000000000000000000005f1ffd9d31306e056bcc959b
-        }(owner, entryPoint);
+        }(
+            owner, entryPoint
+        );
 
         // Deployed address check
         if (address(factory) != 0x0000000000400CdFef5E2714E63d8040b700BC24) {
diff --git a/script/Deploy_MultiOwnerLightAccountFactory.s.sol b/script/Deploy_MultiOwnerLightAccountFactory.s.sol
@@ -22,8 +22,9 @@ contract Deploy_MultiOwnerLightAccountFactory is Script {
         vm.startBroadcast();
 
         // Init code hash check
-        bytes32 initCodeHash =
-            keccak256(abi.encodePacked(type(MultiOwnerLightAccountFactory).creationCode, abi.encode(owner, entryPoint)));
+        bytes32 initCodeHash = keccak256(
+            abi.encodePacked(type(MultiOwnerLightAccountFactory).creationCode, abi.encode(owner, entryPoint))
+        );
 
         if (initCodeHash != 0x69e0f4a2942425638860e9982bd32f08941a082681e53208de970099f18252cc) {
             revert InitCodeHashMismatch(initCodeHash);
@@ -41,7 +42,9 @@ contract Deploy_MultiOwnerLightAccountFactory is Script {
 
         MultiOwnerLightAccountFactory factory = new MultiOwnerLightAccountFactory{
             salt: 0x0000000000000000000000000000000000000000bb3ab048b3f4ef2620ea0163
-        }(owner, entryPoint);
+        }(
+            owner, entryPoint
+        );
 
         // Deployed address check
         if (address(factory) != 0x000000000019d2Ee9F2729A65AfE20bb0020AefC) {
diff --git a/script/GetInitCodeHash.s.sol b/script/GetInitCodeHash.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.28;
 
 import {Script} from "forge-std/Script.sol";
 import {console} from "forge-std/Test.sol";
diff --git a/src/LightAccount.sol b/src/LightAccount.sol
@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.28;
 
 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";
 import {SIG_VALIDATION_FAILED} from "account-abstraction/core/Helpers.sol";
 import {IEntryPoint} from "account-abstraction/interfaces/IEntryPoint.sol";
@@ -35,7 +34,6 @@ import {CustomSlotInitializable} from "./common/CustomSlotInitializable.sol";
 /// 5. Uses custom errors.
 contract LightAccount is BaseLightAccount, CustomSlotInitializable {
     using ECDSA for bytes32;
-    using MessageHashUtils for bytes32;
 
     /// @dev The version used for namespaced storage is not linked to the release version of the contract. Storage
     /// versions will be updated only when storage layout changes are made.
@@ -127,10 +125,7 @@ contract LightAccount is BaseLightAccount, CustomSlotInitializable {
         }
         uint8 signatureType = uint8(userOp.signature[0]);
         if (signatureType == uint8(SignatureType.EOA)) {
-            // EOA signature
-            bytes32 signedHash = userOpHash.toEthSignedMessageHash();
-            bytes memory signature = userOp.signature[1:];
-            return _successToValidationData(_isValidEOAOwnerSignature(signedHash, signature));
+            return _successToValidationData(_isValidEOAOwnerSignature(userOpHash, userOp.signature[1:]));
         } else if (signatureType == uint8(SignatureType.CONTRACT)) {
             // Contract signature without address
             bytes memory signature = userOp.signature[1:];
diff --git a/src/LightAccountFactory.sol b/src/LightAccountFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.28;
 
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {IEntryPoint} from "account-abstraction/interfaces/IEntryPoint.sol";
diff --git a/src/MultiOwnerLightAccount.sol b/src/MultiOwnerLightAccount.sol
@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.28;
 
 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";
 import {IEntryPoint} from "account-abstraction/interfaces/IEntryPoint.sol";
 import {PackedUserOperation} from "account-abstraction/interfaces/PackedUserOperation.sol";
@@ -18,7 +17,6 @@ import {CustomSlotInitializable} from "./common/CustomSlotInitializable.sol";
 /// and the `updateOwners` method can be used to add or remove owners.
 contract MultiOwnerLightAccount is BaseLightAccount, CustomSlotInitializable {
     using ECDSA for bytes32;
-    using MessageHashUtils for bytes32;
     using LinkedListSetLib for LinkedListSet;
     using CastLib for address;
     using CastLib for SetValue[];
@@ -141,10 +139,7 @@ contract MultiOwnerLightAccount is BaseLightAccount, CustomSlotInitializable {
         }
         uint8 signatureType = uint8(userOp.signature[0]);
         if (signatureType == uint8(SignatureType.EOA)) {
-            // EOA signature
-            bytes32 signedHash = userOpHash.toEthSignedMessageHash();
-            bytes memory signature = userOp.signature[1:];
-            return _successToValidationData(_isValidEOAOwnerSignature(signedHash, signature));
+            return _successToValidationData(_isValidEOAOwnerSignature(userOpHash, userOp.signature[1:]));
         } else if (signatureType == uint8(SignatureType.CONTRACT_WITH_ADDR)) {
             // Contract signature with address
             address contractOwner = address(bytes20(userOp.signature[1:21]));
diff --git a/src/MultiOwnerLightAccountFactory.sol b/src/MultiOwnerLightAccountFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.28;
 
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {IEntryPoint} from "account-abstraction/interfaces/IEntryPoint.sol";
diff --git a/src/common/BaseLightAccount.sol b/src/common/BaseLightAccount.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.28;
 
 import {BaseAccount} from "account-abstraction/core/BaseAccount.sol";
 import {SIG_VALIDATION_FAILED, SIG_VALIDATION_SUCCESS} from "account-abstraction/core/Helpers.sol";
 import {IEntryPoint} from "account-abstraction/interfaces/IEntryPoint.sol";
 import {PackedUserOperation} from "account-abstraction/interfaces/PackedUserOperation.sol";
-import {TokenCallbackHandler} from "account-abstraction/samples/callback/TokenCallbackHandler.sol";
+import {TokenCallbackHandler} from "account-abstraction/accounts/callback/TokenCallbackHandler.sol";
 
 import {UUPSUpgradeable} from "../external/solady/UUPSUpgradeable.sol";
 import {ERC1271} from "./ERC1271.sol";
@@ -39,7 +39,7 @@ abstract contract BaseLightAccount is BaseAccount, TokenCallbackHandler, UUPSUpg
     /// @param dest The target of the transaction.
     /// @param value The amount of wei sent in the transaction.
     /// @param func The transaction's calldata.
-    function execute(address dest, uint256 value, bytes calldata func) external virtual onlyAuthorized {
+    function execute(address dest, uint256 value, bytes calldata func) external virtual override onlyAuthorized {
         _call(dest, value, func);
     }
 
diff --git a/src/common/BaseLightAccountFactory.sol b/src/common/BaseLightAccountFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.28;
 
 import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
diff --git a/src/common/CustomSlotInitializable.sol b/src/common/CustomSlotInitializable.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (proxy/utils/Initializable.sol)
 
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.28;
 
 /// @dev Identical to OpenZeppelin's `Initializable`, except that custom storage slots can be used.
 ///
diff --git a/src/common/ERC1271.sol b/src/common/ERC1271.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.28;
 
 import {EIP712} from "../external/solady/EIP712.sol";
 
diff --git a/test/CustomSlotInitializable.t.sol b/test/CustomSlotInitializable.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.28;
 
 import "forge-std/Test.sol";
 
diff --git a/test/LightAccount.t.sol b/test/LightAccount.t.sol
@@ -1,15 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.28;
 
 import "forge-std/Test.sol";
 
 import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";
 import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 import {EntryPoint} from "account-abstraction/core/EntryPoint.sol";
 import {IEntryPoint} from "account-abstraction/interfaces/IEntryPoint.sol";
 import {PackedUserOperation} from "account-abstraction/interfaces/PackedUserOperation.sol";
-import {SimpleAccount} from "account-abstraction/samples/SimpleAccount.sol";
+import {SimpleAccount} from "account-abstraction/accounts/SimpleAccount.sol";
 
 import {BaseLightAccount} from "../src/common/BaseLightAccount.sol";
 import {LightAccount} from "../src/LightAccount.sol";
@@ -18,7 +17,6 @@ import {LightAccountFactory} from "../src/LightAccountFactory.sol";
 contract LightAccountTest is Test {
     using stdStorage for StdStorage;
     using ECDSA for bytes32;
-    using MessageHashUtils for bytes32;
 
     uint256 public constant EOA_PRIVATE_KEY = 1;
     address payable public constant BENEFICIARY = payable(address(0xbe9ef1c1a2ee));
@@ -503,8 +501,9 @@ contract LightAccountTest is Test {
         vm.prank(eoaAddress);
         address expected = vm.computeCreateAddress(address(account), vm.getNonce(address(account)));
 
-        address returnedAddress =
-            account.performCreate(0, abi.encodePacked(type(LightAccount).creationCode, abi.encode(address(entryPoint))));
+        address returnedAddress = account.performCreate(
+            0, abi.encodePacked(type(LightAccount).creationCode, abi.encode(address(entryPoint)))
+        );
         assertEq(address(LightAccount(payable(expected)).entryPoint()), address(entryPoint));
         assertEq(returnedAddress, expected);
     }
@@ -577,9 +576,8 @@ contract LightAccountTest is Test {
         returns (PackedUserOperation memory)
     {
         PackedUserOperation memory op = _getUnsignedOp(callData);
-        op.signature = abi.encodePacked(
-            BaseLightAccount.SignatureType.EOA, _sign(privateKey, entryPoint.getUserOpHash(op).toEthSignedMessageHash())
-        );
+        op.signature =
+            abi.encodePacked(BaseLightAccount.SignatureType.EOA, _sign(privateKey, entryPoint.getUserOpHash(op)));
         return op;
     }
 
diff --git a/test/LightAccountFactory.t.sol b/test/LightAccountFactory.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.28;
 
 import "forge-std/Test.sol";
 
diff --git a/test/MultiOwnerLightAccount.t.sol b/test/MultiOwnerLightAccount.t.sol
@@ -1,15 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.28;
 
 import "forge-std/Test.sol";
 
 import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";
 import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 import {EntryPoint} from "account-abstraction/core/EntryPoint.sol";
 import {IEntryPoint} from "account-abstraction/interfaces/IEntryPoint.sol";
 import {PackedUserOperation} from "account-abstraction/interfaces/PackedUserOperation.sol";
-import {SimpleAccount} from "account-abstraction/samples/SimpleAccount.sol";
+import {SimpleAccount} from "account-abstraction/accounts/SimpleAccount.sol";
 import {SENTINEL_VALUE} from "modular-account/libraries/Constants.sol";
 import {LinkedListSet, LinkedListSetLib} from "modular-account/libraries/LinkedListSetLib.sol";
 
@@ -20,7 +19,6 @@ import {MultiOwnerLightAccountFactory} from "../src/MultiOwnerLightAccountFactor
 contract MultiOwnerLightAccountTest is Test {
     using stdStorage for StdStorage;
     using ECDSA for bytes32;
-    using MessageHashUtils for bytes32;
     using LinkedListSetLib for LinkedListSet;
 
     uint256 public constant EOA_PRIVATE_KEY = 1;
@@ -655,9 +653,8 @@ contract MultiOwnerLightAccountTest is Test {
         returns (PackedUserOperation memory)
     {
         PackedUserOperation memory op = _getUnsignedOp(callData);
-        op.signature = abi.encodePacked(
-            BaseLightAccount.SignatureType.EOA, _sign(privateKey, entryPoint.getUserOpHash(op).toEthSignedMessageHash())
-        );
+        op.signature =
+            abi.encodePacked(BaseLightAccount.SignatureType.EOA, _sign(privateKey, entryPoint.getUserOpHash(op)));
         return op;
     }
 
diff --git a/test/MultiOwnerLightAccountFactory.t.sol b/test/MultiOwnerLightAccountFactory.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.28;
 
 import "forge-std/Test.sol";
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"solidity.packageDefaultDependenciesContractsDirectory": "src",`
`3`	`3`	`"solidity.packageDefaultDependenciesDirectory": "lib",`
`4`		`- "solidity.compileUsingRemoteVersion": "v0.8.23",`
	`4`	`+ "solidity.compileUsingRemoteVersion": "v0.8.28",`
`5`	`5`	`"editor.formatOnSave": true,`
`6`	`6`	`"[solidity]": {`
`7`	`7`	`"editor.defaultFormatter": "JuanBlanco.solidity"`