From aab1dd8f06b0dbe9823e80dddcc5b9445bf70792 Mon Sep 17 00:00:00 2001 From: Oleg Date: Mon, 2 Dec 2024 15:18:41 +0000 Subject: [PATCH] cleanup --- contracts/Libraries/ChildPoolStorage.sol | 8 ++++---- contracts/Libraries/InfraStorage.sol | 1 + contracts/Libraries/ParentPoolStorage.sol | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/contracts/Libraries/ChildPoolStorage.sol b/contracts/Libraries/ChildPoolStorage.sol index 32801f4e..ff91d7e4 100644 --- a/contracts/Libraries/ChildPoolStorage.sol +++ b/contracts/Libraries/ChildPoolStorage.sol @@ -13,11 +13,11 @@ contract ChildPoolStorage { uint64[] s_poolChainSelectors; ///@notice Mapping to keep track of allowed pool senders - mapping(uint64 chainSelector => mapping(address conceroContract => bool)) + mapping(uint64 chainSelector => mapping(address conceroContract => bool isAllowed)) public s_isSenderContractAllowed; ///@notice Mapping to keep track of valid pools to transfer in case of liquidation or rebalance - mapping(uint64 chainSelector => address pools) public s_dstPoolByChainSelector; - mapping(bytes32 requestId => bool) public s_distributeLiquidityRequestProcessed; + mapping(uint64 chainSelector => address pool) public s_dstPoolByChainSelector; + mapping(bytes32 requestId => bool isProcessed) public s_distributeLiquidityRequestProcessed; //@notice Prevents CLF from triggering the same withdrawal request more than once - mapping(bytes32 withdrawalId => bool) public s_isWithdrawalRequestTriggered; + mapping(bytes32 withdrawalId => bool isTriggered) public s_isWithdrawalRequestTriggered; } diff --git a/contracts/Libraries/InfraStorage.sol b/contracts/Libraries/InfraStorage.sol index 28fbff6f..fd438bfe 100644 --- a/contracts/Libraries/InfraStorage.sol +++ b/contracts/Libraries/InfraStorage.sol @@ -7,6 +7,7 @@ import {ReentrancyGuard} from "@openzeppelin/contracts/utils/ReentrancyGuard.sol abstract contract InfraStorage is ReentrancyGuard, IInfraStorage { /* STATE VARIABLES */ ///@notice variable to store the Chainlink Function DON Slot ID + //TODO: these 5 need to be moved to immutable and deprecated. uint8 public s_donHostedSecretsSlotId; ///@notice variable to store the Chainlink Function DON Secret Version uint64 public s_donHostedSecretsVersion; diff --git a/contracts/Libraries/ParentPoolStorage.sol b/contracts/Libraries/ParentPoolStorage.sol index c0fb80e2..72d0a3b5 100644 --- a/contracts/Libraries/ParentPoolStorage.sol +++ b/contracts/Libraries/ParentPoolStorage.sol @@ -11,6 +11,7 @@ contract ParentPoolStorage { ///@notice variable to store the amount that will be temporary used by Chainlink Functions uint256 public s_loansInUse; ///@notice variable to store the Chainlink Function DON Slot ID + //TODO: these two need to be moved to immutable and deprecated. uint8 internal s_donHostedSecretsSlotId; ///@notice variable to store the Chainlink Function DON Secret Version uint64 internal s_donHostedSecretsVersion; @@ -61,8 +62,8 @@ contract ParentPoolStorage { IParentPool.DepositOnTheWay[150] internal s_depositsOnTheWayArray; + //TODO: these two need to be moved to immutable and deprecated. bytes32 internal s_collectLiquidityJsCodeHashSum; - bytes32 internal s_distributeLiquidityJsCodeHashSum; ///@notice array to store the withdraw requests of users