fix problem with missing function in ECDSA library

Certora · Jan 12, 2025 · d26b7e3 · d26b7e3
1 parent 508bf50
commit d26b7e3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/security/certora/confs/verifyGovernance.conf b/security/certora/confs/verifyGovernance.conf
@@ -14,8 +14,8 @@
         "aave-delivery-infrastructure/=lib/adi-deploy/lib/aave-delivery-infrastructure/src",
         "solidity-utils/=lib/adi-deploy/lib/aave-delivery-infrastructure/lib/solidity-utils/src",
         "forge-std/=lib/adi-deploy/lib/aave-helpers/lib/forge-std/src",
-//        "openzeppelin-contracts/=lib/adi-deploy/lib/aave-delivery-infrastructure/lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts",
-        "openzeppelin-contracts/=lib/adi-deploy/lib/aave-delivery-infrastructure/lib/openzeppelin-contracts",
+          "openzeppelin-contracts/=lib/adi-deploy/lib/aave-delivery-infrastructure/lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts",
+//        "openzeppelin-contracts/=lib/adi-deploy/lib/aave-delivery-infrastructure/lib/openzeppelin-contracts",
         "aave-helpers/=lib/adi-deploy/lib/aave-helpers/src",
         "aave-address-book/=lib/adi-deploy/lib/aave-helpers/lib/aave-address-book/src",
         "aave-v3-origin/=lib/adi-deploy/lib/aave-helpers/lib/aave-address-book/lib/aave-v3-origin/src",

diff --git a/security/certora/confs/verifyGovernancePowerStrategy.conf b/security/certora/confs/verifyGovernancePowerStrategy.conf
@@ -11,8 +11,8 @@
         "aave-delivery-infrastructure/=lib/adi-deploy/lib/aave-delivery-infrastructure/src",
         "solidity-utils/=lib/adi-deploy/lib/aave-delivery-infrastructure/lib/solidity-utils/src",
         "forge-std/=lib/adi-deploy/lib/aave-helpers/lib/forge-std/src",
-//        "openzeppelin-contracts/=lib/adi-deploy/lib/aave-delivery-infrastructure/lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts",
-        "openzeppelin-contracts/=lib/adi-deploy/lib/aave-delivery-infrastructure/lib/openzeppelin-contracts",
+        "openzeppelin-contracts/=lib/adi-deploy/lib/aave-delivery-infrastructure/lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts",
+//        "openzeppelin-contracts/=lib/adi-deploy/lib/aave-delivery-infrastructure/lib/openzeppelin-contracts",
         "aave-helpers/=lib/adi-deploy/lib/aave-helpers/src",
         "aave-address-book/=lib/adi-deploy/lib/aave-helpers/lib/aave-address-book/src",
         "aave-v3-origin/=lib/adi-deploy/lib/aave-helpers/lib/aave-address-book/lib/aave-v3-origin/src",

diff --git a/security/certora/harness/aave-token-v3/BaseDelegation.sol b/security/certora/harness/aave-token-v3/BaseDelegation.sol
@@ -7,6 +7,7 @@ import {SafeCast72} from './utils/SafeCast72.sol';
 //import {IGovernancePowerDelegationToken} from './interfaces/IGovernancePowerDelegationToken.sol';
 import {IGovernancePowerDelegationToken} from 'src/contracts/dataHelpers/interfaces/IGovernancePowerDelegationToken.sol';
 import {DelegationMode} from './DelegationAwareBalance.sol';
+import {MessageHashUtils} from 'openzeppelin-contracts/contracts/utils/cryptography/MessageHashUtils.sol';
 
 /**
  * @notice The contract implements generic delegation functionality for the upcoming governance v3
@@ -152,7 +153,7 @@ abstract contract BaseDelegation is IGovernancePowerDelegationToken {
     require(delegator != address(0), 'INVALID_OWNER');
     //solium-disable-next-line
     require(block.timestamp <= deadline, 'INVALID_EXPIRATION');
-    bytes32 digest = ECDSA.toTypedDataHash(
+    bytes32 digest = MessageHashUtils.toTypedDataHash(
       _getDomainSeparator(),
       keccak256(
         abi.encode(
@@ -182,7 +183,7 @@ abstract contract BaseDelegation is IGovernancePowerDelegationToken {
     require(delegator != address(0), 'INVALID_OWNER');
     //solium-disable-next-line
     require(block.timestamp <= deadline, 'INVALID_EXPIRATION');
-    bytes32 digest = ECDSA.toTypedDataHash(
+    bytes32 digest = MessageHashUtils.toTypedDataHash(
       _getDomainSeparator(),
       keccak256(
         abi.encode(DELEGATE_TYPEHASH, delegator, delegatee, _incrementNonces(delegator), deadline)

diff --git a/security/certora/harness/aave-token-v3/utils/EIP712.sol b/security/certora/harness/aave-token-v3/utils/EIP712.sol
@@ -8,6 +8,7 @@ pragma solidity ^0.8.10;
 import {ECDSA} from 'openzeppelin-contracts/contracts/utils/cryptography/ECDSA.sol';
 import {ShortStrings, ShortString} from 'openzeppelin-contracts/contracts/utils/ShortStrings.sol';
 import {IERC5267} from 'openzeppelin-contracts/contracts/interfaces/IERC5267.sol';
+import {MessageHashUtils} from 'openzeppelin-contracts/contracts/utils/cryptography/MessageHashUtils.sol';
 
 /**
  * @dev https://eips.ethereum.org/EIPS/eip-712[EIP 712] is a standard for hashing and signing of typed structured data.
@@ -109,7 +110,7 @@ abstract contract EIP712 is IERC5267 {
    * ```
    */
   function _hashTypedDataV4(bytes32 structHash) internal view virtual returns (bytes32) {
-    return ECDSA.toTypedDataHash(_domainSeparatorV4(), structHash);
+    return MessageHashUtils.toTypedDataHash(_domainSeparatorV4(), structHash);
   }
 
   /**

diff --git a/security/certora/scripts/run-all-execution.sh b/security/certora/scripts/run-all-execution.sh
@@ -1,4 +1,4 @@
-CMN="--compilation_steps_only"
+#CMN="--compilation_steps_only"
 
 
 

diff --git a/security/certora/scripts/run-all-voting.sh b/security/certora/scripts/run-all-voting.sh
@@ -1,4 +1,4 @@
-CMN="--compilation_steps_only"
+#CMN="--compilation_steps_only"
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		CMN="--compilation_steps_only"
		#CMN="--compilation_steps_only"



Expand Down