Merge branch 'master' into typo-fixes

Author: ernestognw

.github/workflows/formal-verification.yml

@@ -36,7 +36,7 @@ jobs:
       - name: identify specs that need to be run
         id: arguments
         run: |
-          if [[ ${{ github.event_name }} = 'pull_request' ]];
+          if [[ ${{ github.event_name }} = 'pull_request' && ${{ contains(github.event.pull_request.labels.*.name, 'formal-verification-force-all') }} = 'false' ]];
           then
             RESULT=$(git diff ${{ github.event.pull_request.head.sha }}..${{ github.event.pull_request.base.sha }} --name-only certora/specs/*.spec | while IFS= read -r file; do [[ -f $file ]] && basename "${file%.spec}"; done | tr "\n" " ")
           else

contracts/metatx/ERC2771Forwarder.sol

@@ -232,7 +232,7 @@ contract ERC2771Forwarder is EIP712, Nonces {
                     keccak256(request.data)
                 )
             )
-        ).tryRecover(request.signature);
+        ).tryRecoverCalldata(request.signature);
 
         return (err == ECDSA.RecoverError.NoError, recovered);
     }

contracts/utils/cryptography/signers/SignerECDSA.sol

@@ -50,7 +50,7 @@ abstract contract SignerECDSA is AbstractSigner {
         bytes32 hash,
         bytes calldata signature
     ) internal view virtual override returns (bool) {
-        (address recovered, ECDSA.RecoverError err, ) = ECDSA.tryRecover(hash, signature);
+        (address recovered, ECDSA.RecoverError err, ) = ECDSA.tryRecoverCalldata(hash, signature);
         return signer() == recovered && err == ECDSA.RecoverError.NoError;
     }
 }

contracts/utils/cryptography/signers/SignerEIP7702.sol

@@ -19,7 +19,7 @@ abstract contract SignerEIP7702 is AbstractSigner {
         bytes32 hash,
         bytes calldata signature
     ) internal view virtual override returns (bool) {
-        (address recovered, ECDSA.RecoverError err, ) = ECDSA.tryRecover(hash, signature);
+        (address recovered, ECDSA.RecoverError err, ) = ECDSA.tryRecoverCalldata(hash, signature);
         return address(this) == recovered && err == ECDSA.RecoverError.NoError;
     }
 }

fv-requirements.txt

@@ -1,4 +1,4 @@
-certora-cli==8.1.1
+certora-cli==8.3.0
 # File uses a custom name (fv-requirements.txt) so that it isn't picked by Netlify's build
 # whose latest Python version is 0.3.8, incompatible with most recent versions of Halmos
 halmos==0.3.3