@@ -110,15 +110,15 @@ index 60d0a430a..0e4f91a6d 100644
110
110
}
111
111
```
112
112
diff --git a/contracts/package.json b/contracts/package.json
113
- index 3682eadeb..4f870d094 100644
113
+ index 70ae73bc2..ef659873f 100644
114
114
--- a/contracts/package.json
115
115
+++ b/contracts/package.json
116
116
@@ -1,5 +1,5 @@
117
117
{
118
118
- "name": "@openzeppelin/contracts",
119
119
+ "name": "@openzeppelin/contracts-upgradeable",
120
120
"description": "Secure Smart Contract library for Solidity",
121
- "version": "5.2 .0",
121
+ "version": "5.3 .0",
122
122
"files": [
123
123
@@ -13,7 +13,7 @@
124
124
},
@@ -140,7 +140,7 @@ index 3682eadeb..4f870d094 100644
140
140
+ }
141
141
}
142
142
diff --git a/contracts/utils/cryptography/EIP712.sol b/contracts/utils/cryptography/EIP712.sol
143
- index bcb67c87a..7195c3bbd 100644
143
+ index c39954e35..fe681f87a 100644
144
144
--- a/contracts/utils/cryptography/EIP712.sol
145
145
+++ b/contracts/utils/cryptography/EIP712.sol
146
146
@@ -4,7 +4,6 @@
@@ -151,12 +151,17 @@ index bcb67c87a..7195c3bbd 100644
151
151
import {IERC5267} from "../../interfaces/IERC5267.sol";
152
152
153
153
/**
154
- @@ -28,30 +27,18 @@ import {IERC5267} from "../../interfaces/IERC5267.sol";
155
- * NOTE: In the upgradeable version of this contract, the cached values will correspond to the address, and the domain
156
- * separator of the implementation contract. This will cause the {_domainSeparatorV4} function to always rebuild the
157
- * separator from the immutable values, which is cheaper than accessing a cached version in cold storage.
154
+ @@ -25,33 +24,20 @@ import {IERC5267} from "../../interfaces/IERC5267.sol";
155
+ * NOTE: This contract implements the version of the encoding known as "v4", as implemented by the JSON RPC method
156
+ * https://docs.metamask.io/guide/signing-data.html[`eth_signTypedDataV4` in MetaMask].
157
+ *
158
+ - * NOTE: In the upgradeable version of this contract, the cached values will correspond to the address, and the domain
159
+ - * separator of the implementation contract. This will cause the {_domainSeparatorV4} function to always rebuild the
160
+ - * separator from the immutable values, which is cheaper than accessing a cached version in cold storage.
158
161
- *
159
162
- * @custom:oz-upgrades-unsafe-allow state-variable-immutable
163
+ + * NOTE: The upgradeable version of this contract does not use an immutable cache and recomputes the domain separator
164
+ + * each time {_domainSeparatorV4} is called. That is cheaper than accessing a cached version in cold storage.
160
165
*/
161
166
abstract contract EIP712 is IERC5267 {
162
167
- using ShortStrings for *;
@@ -186,7 +191,7 @@ index bcb67c87a..7195c3bbd 100644
186
191
187
192
/**
188
193
* @dev Initializes the domain separator and parameter caches.
189
- @@ -66,29 +53 ,23 @@ abstract contract EIP712 is IERC5267 {
194
+ @@ -66,29 +52 ,23 @@ abstract contract EIP712 is IERC5267 {
190
195
* contract upgrade].
191
196
*/
192
197
constructor(string memory name, string memory version) {
@@ -224,7 +229,7 @@ index bcb67c87a..7195c3bbd 100644
224
229
}
225
230
226
231
/**
227
- @@ -127 ,6 +108 ,10 @@ abstract contract EIP712 is IERC5267 {
232
+ @@ -125 ,6 +105 ,10 @@ abstract contract EIP712 is IERC5267 {
228
233
uint256[] memory extensions
229
234
)
230
235
{
@@ -235,7 +240,7 @@ index bcb67c87a..7195c3bbd 100644
235
240
return (
236
241
hex"0f", // 01111
237
242
_EIP712Name(),
238
- @@ -141 ,22 +126 ,62 @@ abstract contract EIP712 is IERC5267 {
243
+ @@ -139 ,22 +123 ,62 @@ abstract contract EIP712 is IERC5267 {
239
244
/**
240
245
* @dev The name parameter for the EIP712 domain.
241
246
*
@@ -309,7 +314,7 @@ index bcb67c87a..7195c3bbd 100644
309
314
}
310
315
}
311
316
diff --git a/package.json b/package.json
312
- index f9e7d9205..c35020d51 100644
317
+ index eeeaf0bcd..65581c544 100644
313
318
--- a/package.json
314
319
+++ b/package.json
315
320
@@ -34,7 +34,7 @@
0 commit comments