refactor: update logic to be more similar to settle

pancakeswap · Mar 22, 2024 · 7b07b9d · 7b07b9d
1 parent 6a4cb02
commit 7b07b9d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.forge-snapshots/VaultTest#Vault.snap b/.forge-snapshots/VaultTest#Vault.snap
@@ -1 +1 @@
-7069
+7049
diff --git a/.forge-snapshots/VaultTest#testSettleAndMintRefund_WithMint.snap b/.forge-snapshots/VaultTest#testSettleAndMintRefund_WithMint.snap
@@ -1 +1 @@
-73023
+72621
diff --git a/.forge-snapshots/VaultTest#testSettleAndMintRefund_WithoutMint.snap b/.forge-snapshots/VaultTest#testSettleAndMintRefund_WithoutMint.snap
@@ -1 +1 @@
-34513
+34111
diff --git a/src/Vault.sol b/src/Vault.sol
@@ -133,8 +133,9 @@ contract Vault is IVault, VaultToken, Ownable {
         isLocked
         returns (uint256 paid, uint256 refund)
     {
-        paid = currency.balanceOfSelf() - reservesOfVault[currency];
-        reservesOfVault[currency] += paid;
+        uint256 reservesBefore = reservesOfVault[currency];
+        reservesOfVault[currency] = currency.balanceOfSelf();
+        paid = reservesOfVault[currency] - reservesBefore;
 
         int256 currentDelta = SettlementGuard.getCurrencyDelta(msg.sender, currency);
         if (currentDelta >= 0 && paid > currentDelta.toUint256()) {