Merge branch 'main' into lyova-improva-batchcaller

matter-labs · Feb 12, 2025 · f8996a1 · f8996a1
2 parents 0b38f68 + 344053a
commit f8996a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/SsoAccount.sol b/src/SsoAccount.sol
@@ -200,9 +200,9 @@ contract SsoAccount is
     }
 
     if (_transaction.signature.length == 65) {
-      (address signer, ECDSA.RecoverError error) = ECDSA.tryRecover(_signedHash, _transaction.signature);
+      (address signer, ECDSA.RecoverError err) = ECDSA.tryRecover(_signedHash, _transaction.signature);
       return
-        signer == address(0) || error != ECDSA.RecoverError.NoError || !_k1IsOwner(signer)
+        signer == address(0) || err != ECDSA.RecoverError.NoError || !_k1IsOwner(signer)
           ? bytes4(0)
           : ACCOUNT_VALIDATION_SUCCESS_MAGIC;
     }

diff --git a/src/handlers/ERC1271Handler.sol b/src/handlers/ERC1271Handler.sol
@@ -31,9 +31,9 @@ abstract contract ERC1271Handler is IERC1271Upgradeable, EIP712("Sso1271", "1.0.
    */
   function isValidSignature(bytes32 hash, bytes memory signature) external view override returns (bytes4 magicValue) {
     if (signature.length == 65) {
-      (address signer, ECDSA.RecoverError error) = ECDSA.tryRecover(hash, signature);
+      (address signer, ECDSA.RecoverError err) = ECDSA.tryRecover(hash, signature);
       return
-        signer == address(0) || error != ECDSA.RecoverError.NoError || !_k1IsOwner(signer) ? bytes4(0) : _ERC1271_MAGIC;
+        signer == address(0) || err != ECDSA.RecoverError.NoError || !_k1IsOwner(signer) ? bytes4(0) : _ERC1271_MAGIC;
     }
 
     (bytes memory decodedSignature, address validator) = SignatureDecoder.decodeSignatureNoHookData(signature);