@@ -59,7 +59,7 @@ index ff596b0c3..000000000
5959- <!-- Make sure that you have reviewed the OpenZeppelin Contracts Contributor Guidelines. -->
6060- <!-- https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/CONTRIBUTING.md -->
6161diff --git a/README.md b/README.md
62- index fa7b4e31e..4799b6376 100644
62+ index 60d0a430a..0e4f91a6d 100644
6363--- a/README.md
6464+++ b/README.md
6565@@ -19,6 +19,9 @@
@@ -110,15 +110,15 @@ index fa7b4e31e..4799b6376 100644
110110 }
111111 ```
112112diff --git a/contracts/package.json b/contracts/package.json
113- index 845e8c403..8dc181b91 100644
113+ index 3682eadeb..4f870d094 100644
114114--- a/contracts/package.json
115115+++ b/contracts/package.json
116116@@ -1,5 +1,5 @@
117117 {
118118- "name": "@openzeppelin/contracts",
119119+ "name": "@openzeppelin/contracts-upgradeable",
120120 "description": "Secure Smart Contract library for Solidity",
121- "version": "5.0.2 ",
121+ "version": "5.2.0 ",
122122 "files": [
123123@@ -13,7 +13,7 @@
124124 },
@@ -140,7 +140,7 @@ index 845e8c403..8dc181b91 100644
140140+ }
141141 }
142142diff --git a/contracts/utils/cryptography/EIP712.sol b/contracts/utils/cryptography/EIP712.sol
143- index 77c4c8990..602467f40 100644
143+ index bcb67c87a..7195c3bbd 100644
144144--- a/contracts/utils/cryptography/EIP712.sol
145145+++ b/contracts/utils/cryptography/EIP712.sol
146146@@ -4,7 +4,6 @@
@@ -151,7 +151,7 @@ index 77c4c8990..602467f40 100644
151151 import {IERC5267} from "../../interfaces/IERC5267.sol";
152152
153153 /**
154- @@ -28,28 +27,18 @@ import {IERC5267} from "../../interfaces/IERC5267.sol";
154+ @@ -28,30 +27,18 @@ import {IERC5267} from "../../interfaces/IERC5267.sol";
155155 * NOTE: In the upgradeable version of this contract, the cached values will correspond to the address, and the domain
156156 * separator of the implementation contract. This will cause the {_domainSeparatorV4} function to always rebuild the
157157 * separator from the immutable values, which is cheaper than accessing a cached version in cold storage.
@@ -177,14 +177,16 @@ index 77c4c8990..602467f40 100644
177177
178178- ShortString private immutable _name;
179179- ShortString private immutable _version;
180+ - // slither-disable-next-line constable-states
180181- string private _nameFallback;
182+ - // slither-disable-next-line constable-states
181183- string private _versionFallback;
182184+ string private _name;
183185+ string private _version;
184186
185187 /**
186188 * @dev Initializes the domain separator and parameter caches.
187- @@ -64 ,29 +53,23 @@ abstract contract EIP712 is IERC5267 {
189+ @@ -66 ,29 +53,23 @@ abstract contract EIP712 is IERC5267 {
188190 * contract upgrade].
189191 */
190192 constructor(string memory name, string memory version) {
@@ -222,7 +224,7 @@ index 77c4c8990..602467f40 100644
222224 }
223225
224226 /**
225- @@ -125 ,6 +108,10 @@ abstract contract EIP712 is IERC5267 {
227+ @@ -127 ,6 +108,10 @@ abstract contract EIP712 is IERC5267 {
226228 uint256[] memory extensions
227229 )
228230 {
@@ -233,7 +235,7 @@ index 77c4c8990..602467f40 100644
233235 return (
234236 hex"0f", // 01111
235237 _EIP712Name(),
236- @@ -139 ,22 +126,62 @@ abstract contract EIP712 is IERC5267 {
238+ @@ -141 ,22 +126,62 @@ abstract contract EIP712 is IERC5267 {
237239 /**
238240 * @dev The name parameter for the EIP712 domain.
239241 *
@@ -307,10 +309,10 @@ index 77c4c8990..602467f40 100644
307309 }
308310 }
309311diff --git a/package.json b/package.json
310- index c4b358e10..96ab2559c 100644
312+ index f9e7d9205..c35020d51 100644
311313--- a/package.json
312314+++ b/package.json
313- @@ -32 ,7 +32 ,7 @@
315+ @@ -34 ,7 +34 ,7 @@
314316 },
315317 "repository": {
316318 "type": "git",
0 commit comments