upgrade to latest account-abstraction contracts

contracts/base/Account.sol

@@ -14,22 +14,22 @@ abstract contract Account is BaseAccount {
     // return value in case of signature validation success, with no time-range.
     uint256 private constant SIG_VALIDATION_SUCCEEDED = 0;
 
-    uint256 private _nonce = 0;
-
     /**
-     * @dev Hard-code the ERC4337 entry point contract address for gas efficiency
+     * @dev Hard-code the ERC4337 entry point contract address so it cannot be changed by anyone
      */
     IEntryPoint private constant _entryPoint =
         IEntryPoint(0x0576a174D229E3cFA37253523E645A78A0C91B57);
 
     /// @inheritdoc BaseAccount
-    function nonce() public view virtual override returns (uint256) {
-        return _nonce;
+    function entryPoint() public view virtual override returns (IEntryPoint) {
+        return _entryPoint;
     }
 
     /// @inheritdoc BaseAccount
-    function entryPoint() public view virtual override returns (IEntryPoint) {
-        return _entryPoint;
+    function _validateNonce(uint256 nonce) internal view virtual override {
+        // First 192 bits are the sequence key, remaining 64 bits are the sequence number
+        // We only use the nonce sequence with key 0, so no out-of-order nonce is possible.
+        require(nonce < type(uint64).max, "Invalid nonce");
     }
 
     /**
@@ -59,15 +59,4 @@ abstract contract Account is BaseAccount {
         bytes32 hash,
         bytes memory signature
     ) public view virtual returns (bytes4 magicValue);
-
-    /**
-     * @dev Validate the current nonce matches the UserOperation nonce, then increment nonce to prevent replay of this user operation.
-     * Called only if initCode is empty (since "nonce" field is used as "salt" on account creation)
-     * @param userOp The user operation to validate.
-     */
-    function _validateAndUpdateNonce(
-        UserOperation calldata userOp
-    ) internal virtual override {
-        require(_nonce++ == userOp.nonce, "Invalid nonce");
-    }
 }

package.json

@@ -42,7 +42,7 @@
   },
   "homepage": "https://github.com/gnosis/mech#readme",
   "devDependencies": {
-    "@account-abstraction/contracts": "^0.5.0",
+    "@account-abstraction/contracts": "^0.6.0",
     "@ambire/signature-validator": "^1.1.0",
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/bytes": "^5.7.0",

yarn.lock

@@ -5,10 +5,10 @@ __metadata:
   version: 6
   cacheKey: 8
 
-"@account-abstraction/contracts@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "@account-abstraction/contracts@npm:0.5.0"
-  checksum: 792a82e9ac3dac2d0c6b92133998b567acfc980aea6bb6d51377d95039a2a4c8cbd764c02ebe4d16ea7f7e18ff0724a0ae41970ba2b1bbcaf89e9bf875806ec5
+"@account-abstraction/contracts@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "@account-abstraction/contracts@npm:0.6.0"
+  checksum: 745e838e2cb04c89a9c0df11d022c1d604b1e440c9cd65c2014edd9b1056809fec2e363b42ec09883d49dbe09f9597d8339c90d57763a1621fb515edf5fef35d
   languageName: node
   linkType: hard
 
@@ -14042,7 +14042,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "mech-contracts@workspace:."
   dependencies:
-    "@account-abstraction/contracts": ^0.5.0
+    "@account-abstraction/contracts": ^0.6.0
     "@ambire/signature-validator": ^1.1.0
     "@ethersproject/abi": ^5.7.0
     "@ethersproject/bytes": ^5.7.0