diff --git a/script/Deploy_LightAccountFactory.s.sol b/script/Deploy_LightAccountFactory.s.sol index 43bd70c..fc2f8f3 100644 --- a/script/Deploy_LightAccountFactory.s.sol +++ b/script/Deploy_LightAccountFactory.s.sol @@ -26,7 +26,7 @@ contract Deploy_LightAccountFactory is Script { abi.encodePacked(type(LightAccountFactory).creationCode, bytes32(uint256(uint160(address(entryPoint))))) ); - if (initCodeHash != 0x08e92270ef11b274ba72e946be8f8354062a3320a6c91d522e7437299d96104b) { + if (initCodeHash != 0x2ad62a8bb3850247ef0c4f04e30b584e6eee7caa0e063745e90956653b90eb84) { revert InitCodeHashMismatch(initCodeHash); } diff --git a/src/LightAccount.sol b/src/LightAccount.sol index 0723f80..e32bb93 100644 --- a/src/LightAccount.sol +++ b/src/LightAccount.sol @@ -58,11 +58,9 @@ contract LightAccount is BaseAccount, TokenCallbackHandler, UUPSUpgradeable, Cus // bytes4(keccak256("isValidSignature(bytes32,bytes)")) bytes4 internal constant _1271_MAGIC_VALUE = 0x1626ba7e; IEntryPoint private immutable _entryPoint; - // keccak256( - // "EIP712Domain(uint256 chainId,address verifyingContract)" - // ); + // keccak256("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)") bytes32 private constant DOMAIN_SEPARATOR_TYPEHASH = - 0x47e79534a245952e8b16893a336b85a3d9ea9fa8c573f3d803afb92a79469218; + 0x8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f; // keccak256("LightAccountMessage(bytes message)"); bytes32 private constant LA_MSG_TYPEHASH = 0x5e3baca2936049843f06038876a12f03627b5edc98025751ecf2ac7562640199; diff --git a/test/LightAccount.t.sol b/test/LightAccount.t.sol index 12a0db2..fb14114 100644 --- a/test/LightAccount.t.sol +++ b/test/LightAccount.t.sol @@ -285,7 +285,7 @@ contract LightAccountTest is Test { bytes32(uint256(uint160(0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789))) ) ), - 0x08e92270ef11b274ba72e946be8f8354062a3320a6c91d522e7437299d96104b + 0x2ad62a8bb3850247ef0c4f04e30b584e6eee7caa0e063745e90956653b90eb84 ); }