From 358a62d652592ab9b48c87e5edab49f71a25d733 Mon Sep 17 00:00:00 2001 From: Arr00 <13561405+arr00@users.noreply.github.com> Date: Mon, 3 Feb 2025 16:38:51 -0500 Subject: [PATCH 1/4] use previous slither release --- .github/workflows/checks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index a4eea0a2bf3..d709a4fb523 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -119,6 +119,8 @@ jobs: - name: Set up environment uses: ./.github/actions/setup - uses: crytic/slither-action@v0.4.0 + with: + slither-version: 0.10.4 codespell: runs-on: ubuntu-latest From a57d2c2e3c9c6a635c75ac42bba473e22fb9e962 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Tue, 4 Feb 2025 10:47:33 +0100 Subject: [PATCH 2/4] Revert "use previous slither release" This reverts commit 358a62d652592ab9b48c87e5edab49f71a25d733. --- .github/workflows/checks.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index d709a4fb523..a4eea0a2bf3 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -119,8 +119,6 @@ jobs: - name: Set up environment uses: ./.github/actions/setup - uses: crytic/slither-action@v0.4.0 - with: - slither-version: 0.10.4 codespell: runs-on: ubuntu-latest From 324dfa0a9a37564d24a218731e5e93ccbd7b2945 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Tue, 4 Feb 2025 10:49:36 +0100 Subject: [PATCH 3/4] slither false positive --- contracts/utils/cryptography/EIP712.sol | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contracts/utils/cryptography/EIP712.sol b/contracts/utils/cryptography/EIP712.sol index 03d3326ce51..bcb67c87a26 100644 --- a/contracts/utils/cryptography/EIP712.sol +++ b/contracts/utils/cryptography/EIP712.sol @@ -48,7 +48,9 @@ abstract contract EIP712 is IERC5267 { ShortString private immutable _name; ShortString private immutable _version; + // slither-disable-next-line constable-states string private _nameFallback; + // slither-disable-next-line constable-states string private _versionFallback; /** From bac0e3fa1697462e06b3ec68a6dda08f529b6d2a Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Tue, 4 Feb 2025 10:53:15 +0100 Subject: [PATCH 4/4] fix upgradeable patch --- scripts/upgradeable/upgradeable.patch | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/scripts/upgradeable/upgradeable.patch b/scripts/upgradeable/upgradeable.patch index 458ecd43580..5d54ef4203e 100644 --- a/scripts/upgradeable/upgradeable.patch +++ b/scripts/upgradeable/upgradeable.patch @@ -59,7 +59,7 @@ index ff596b0c3..000000000 - - diff --git a/README.md b/README.md -index fa7b4e31e..4799b6376 100644 +index 60d0a430a..0e4f91a6d 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,9 @@ @@ -110,7 +110,7 @@ index fa7b4e31e..4799b6376 100644 } ``` diff --git a/contracts/package.json b/contracts/package.json -index 845e8c403..8dc181b91 100644 +index 3682eadeb..4f870d094 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,5 +1,5 @@ @@ -118,7 +118,7 @@ index 845e8c403..8dc181b91 100644 - "name": "@openzeppelin/contracts", + "name": "@openzeppelin/contracts-upgradeable", "description": "Secure Smart Contract library for Solidity", - "version": "5.0.2", + "version": "5.2.0", "files": [ @@ -13,7 +13,7 @@ }, @@ -140,7 +140,7 @@ index 845e8c403..8dc181b91 100644 + } } diff --git a/contracts/utils/cryptography/EIP712.sol b/contracts/utils/cryptography/EIP712.sol -index 77c4c8990..602467f40 100644 +index bcb67c87a..7195c3bbd 100644 --- a/contracts/utils/cryptography/EIP712.sol +++ b/contracts/utils/cryptography/EIP712.sol @@ -4,7 +4,6 @@ @@ -151,7 +151,7 @@ index 77c4c8990..602467f40 100644 import {IERC5267} from "../../interfaces/IERC5267.sol"; /** -@@ -28,28 +27,18 @@ import {IERC5267} from "../../interfaces/IERC5267.sol"; +@@ -28,30 +27,18 @@ 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 * 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. @@ -177,14 +177,16 @@ index 77c4c8990..602467f40 100644 - ShortString private immutable _name; - ShortString private immutable _version; +- // slither-disable-next-line constable-states - string private _nameFallback; +- // slither-disable-next-line constable-states - string private _versionFallback; + string private _name; + string private _version; /** * @dev Initializes the domain separator and parameter caches. -@@ -64,29 +53,23 @@ abstract contract EIP712 is IERC5267 { +@@ -66,29 +53,23 @@ abstract contract EIP712 is IERC5267 { * contract upgrade]. */ constructor(string memory name, string memory version) { @@ -222,7 +224,7 @@ index 77c4c8990..602467f40 100644 } /** -@@ -125,6 +108,10 @@ abstract contract EIP712 is IERC5267 { +@@ -127,6 +108,10 @@ abstract contract EIP712 is IERC5267 { uint256[] memory extensions ) { @@ -233,7 +235,7 @@ index 77c4c8990..602467f40 100644 return ( hex"0f", // 01111 _EIP712Name(), -@@ -139,22 +126,62 @@ abstract contract EIP712 is IERC5267 { +@@ -141,22 +126,62 @@ abstract contract EIP712 is IERC5267 { /** * @dev The name parameter for the EIP712 domain. * @@ -307,10 +309,10 @@ index 77c4c8990..602467f40 100644 } } diff --git a/package.json b/package.json -index c4b358e10..96ab2559c 100644 +index f9e7d9205..c35020d51 100644 --- a/package.json +++ b/package.json -@@ -32,7 +32,7 @@ +@@ -34,7 +34,7 @@ }, "repository": { "type": "git",