Prevent 'initializeOnUpgrade' of LiquidityPool from being called twic…

…e, add the unused gap var and add initialization for added variables
etherfi-protocol · Jan 2, 2025 · cca361e · cca361e
1 parent c85e920
commit cca361e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/LiquidityPool.sol b/src/LiquidityPool.sol
@@ -138,7 +138,7 @@ contract LiquidityPool is Initializable, OwnableUpgradeable, UUPSUpgradeable, IL
     }
 
     function initializeOnUpgrade(address _auctionManager, address _liquifier) external onlyOwner { 
-        require(_auctionManager != address(0) && _liquifier != address(0), "Invalid params");
+        require(_auctionManager != address(0) && _liquifier != address(0) && address(auctionManager) == address(0) && address(liquifier) == address(0), "Invalid");
 
         auctionManager = IAuctionManager(_auctionManager);
         liquifier = ILiquifier(_liquifier);

diff --git a/src/WithdrawRequestNFT.sol b/src/WithdrawRequestNFT.sol
@@ -29,6 +29,7 @@ contract WithdrawRequestNFT is ERC721Upgradeable, UUPSUpgradeable, OwnableUpgrad
     uint32 public nextRequestId;
     uint32 public lastFinalizedRequestId;
     uint16 public shareRemainderSplitToTreasuryInBps;
+    uint16 public _unused_gap;
 
     // inclusive
     uint32 public currentRequestIdToScanFromForShareRemainder;
@@ -78,10 +79,15 @@ contract WithdrawRequestNFT is ERC721Upgradeable, UUPSUpgradeable, OwnableUpgrad
         paused = true; // make sure the contract is paused after the upgrade
         pauser = _pauser;
 
+        _unused_gap = 0;
+
         shareRemainderSplitToTreasuryInBps = _shareRemainderSplitToTreasuryInBps;
 
         currentRequestIdToScanFromForShareRemainder = 1;
         lastRequestIdToScanUntilForShareRemainder = nextRequestId - 1;
+
+        aggregateSumOfEEthShare = 0;
+        totalRemainderEEthShares = 0;
     }
 
     /// @notice creates a withdraw request and issues an associated NFT to the recipient