From f8b5c3fccc82d94178e08d3f8490b179ce512340 Mon Sep 17 00:00:00 2001 From: zugdev Date: Wed, 16 Oct 2024 21:09:06 -0300 Subject: [PATCH] test(storage-workflow): should pass if core / diamond storage is changed without collision --- packages/contracts/src/dollar/core/ERC20Ubiquity.sol | 4 +++- packages/contracts/src/dollar/libraries/LibAppStorage.sol | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/contracts/src/dollar/core/ERC20Ubiquity.sol b/packages/contracts/src/dollar/core/ERC20Ubiquity.sol index 87f6652ce..6389fb3ff 100644 --- a/packages/contracts/src/dollar/core/ERC20Ubiquity.sol +++ b/packages/contracts/src/dollar/core/ERC20Ubiquity.sol @@ -25,8 +25,10 @@ abstract contract ERC20Ubiquity is ERC20PermitUpgradeable, ERC20PausableUpgradeable { + // this is a non-colliding change + /// @notice Token symbol - string private test; // _symbol + string private _symbol; /// @notice Access control interface IAccessControl public accessControl; diff --git a/packages/contracts/src/dollar/libraries/LibAppStorage.sol b/packages/contracts/src/dollar/libraries/LibAppStorage.sol index 1d69aa98f..a4670bc1e 100644 --- a/packages/contracts/src/dollar/libraries/LibAppStorage.sol +++ b/packages/contracts/src/dollar/libraries/LibAppStorage.sol @@ -7,8 +7,10 @@ import "./Constants.sol"; /// @notice Shared struct used as a storage in the `LibAppStorage` library struct AppStorage { + // this is a non-colliding change + // reentrancy guard - uint256 test; //reentrancyStatus + uint256 reentrancyStatus; // others address dollarTokenAddress; address creditNftAddress;