NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update EIP712 upgradeable patch file (#5690)

Browse Source 
Co-authored-by: ernestognw <ernestognw@gmail.com>
This commit is contained in:
Nick Verner
2025-05-22 12:32:56 -06:00
committed by GitHub
parent 48bd2864c6
commit 8e3ea8b48d
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/upgradeable/upgradeable.patch
View File

@ -110,7 +110,7 @@ index 60d0a430a..0e4f91a6d 100644
} }
``` ```
diff --git a/contracts/package.json b/contracts/package.json diff --git a/contracts/package.json b/contracts/package.json
index 3682eadeb..4f870d094 100644 index 70ae73bc2..ef659873f 100644
--- a/contracts/package.json --- a/contracts/package.json
+++ b/contracts/package.json +++ b/contracts/package.json
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
@ -118,7 +118,7 @@ index 3682eadeb..4f870d094 100644
- "name": "@openzeppelin/contracts", - "name": "@openzeppelin/contracts",
+ "name": "@openzeppelin/contracts-upgradeable", + "name": "@openzeppelin/contracts-upgradeable",
"description": "Secure Smart Contract library for Solidity", "description": "Secure Smart Contract library for Solidity",
"version": "5.2.0", "version": "5.3.0",
"files": [ "files": [
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
}, },
@ -140,7 +140,7 @@ index 3682eadeb..4f870d094 100644
+ } + }
} }
diff --git a/contracts/utils/cryptography/EIP712.sol b/contracts/utils/cryptography/EIP712.sol diff --git a/contracts/utils/cryptography/EIP712.sol b/contracts/utils/cryptography/EIP712.sol
index bcb67c87a..7195c3bbd 100644 index c39954e35..fe681f87a 100644
--- a/contracts/utils/cryptography/EIP712.sol --- a/contracts/utils/cryptography/EIP712.sol
+++ b/contracts/utils/cryptography/EIP712.sol +++ b/contracts/utils/cryptography/EIP712.sol
@@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
@ -151,12 +151,17 @@ index bcb67c87a..7195c3bbd 100644
import {IERC5267} from "../../interfaces/IERC5267.sol"; import {IERC5267} from "../../interfaces/IERC5267.sol";
/** /**
@@ -28,30 +27,18 @@ import {IERC5267} from "../../interfaces/IERC5267.sol"; @@ -25,33 +24,20 @@ import {IERC5267} from "../../interfaces/IERC5267.sol";
* NOTE: In the upgradeable version of this contract, the cached values will correspond to the address, and the domain * NOTE: This contract implements the version of the encoding known as "v4", as implemented by the JSON RPC method
* separator of the implementation contract. This will cause the {_domainSeparatorV4} function to always rebuild the * https://docs.metamask.io/guide/signing-data.html[`eth_signTypedDataV4` in MetaMask].
* separator from the immutable values, which is cheaper than accessing a cached version in cold storage. *
- * NOTE: In the upgradeable version of this contract, the cached values will correspond to the address, and the domain
- * separator of the implementation contract. This will cause the {_domainSeparatorV4} function to always rebuild the
- * separator from the immutable values, which is cheaper than accessing a cached version in cold storage.
- * - *
- * @custom:oz-upgrades-unsafe-allow state-variable-immutable - * @custom:oz-upgrades-unsafe-allow state-variable-immutable
+ * NOTE: The upgradeable version of this contract does not use an immutable cache and recomputes the domain separator
+ * each time {_domainSeparatorV4} is called. That is cheaper than accessing a cached version in cold storage.
*/ */
abstract contract EIP712 is IERC5267 { abstract contract EIP712 is IERC5267 {
- using ShortStrings for *; - using ShortStrings for *;
@ -186,7 +191,7 @@ index bcb67c87a..7195c3bbd 100644
/** /**
* @dev Initializes the domain separator and parameter caches. * @dev Initializes the domain separator and parameter caches.
@@ -66,29 +53,23 @@ abstract contract EIP712 is IERC5267 { @@ -66,29 +52,23 @@ abstract contract EIP712 is IERC5267 {
* contract upgrade]. * contract upgrade].
*/ */
constructor(string memory name, string memory version) { constructor(string memory name, string memory version) {
@ -224,7 +229,7 @@ index bcb67c87a..7195c3bbd 100644
} }
/** /**
@@ -127,6 +108,10 @@ abstract contract EIP712 is IERC5267 { @@ -125,6 +105,10 @@ abstract contract EIP712 is IERC5267 {
uint256[] memory extensions uint256[] memory extensions
) )
{ {
@ -235,7 +240,7 @@ index bcb67c87a..7195c3bbd 100644
return ( return (
hex"0f", // 01111 hex"0f", // 01111
_EIP712Name(), _EIP712Name(),
@@ -141,22 +126,62 @@ abstract contract EIP712 is IERC5267 { @@ -139,22 +123,62 @@ abstract contract EIP712 is IERC5267 {
/** /**
* @dev The name parameter for the EIP712 domain. * @dev The name parameter for the EIP712 domain.
* *
@ -309,7 +314,7 @@ index bcb67c87a..7195c3bbd 100644
} }
} }
diff --git a/package.json b/package.json diff --git a/package.json b/package.json
index f9e7d9205..c35020d51 100644 index eeeaf0bcd..65581c544 100644
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@