pancakeswap · ChefMist · Mar 21, 2024 · Mar 20, 2024 · Mar 20, 2024 · Mar 21, 2024
diff --git a/.forge-snapshots/BinPoolManagerTest#testBurnNativeCurrency.snap b/.forge-snapshots/BinPoolManagerTest#testBurnNativeCurrency.snap
@@ -1 +1 @@
-92310
+92245
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasBurnHalfBin.snap b/.forge-snapshots/BinPoolManagerTest#testGasBurnHalfBin.snap
@@ -1 +1 @@
-67502
+67437
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasBurnNineBins.snap b/.forge-snapshots/BinPoolManagerTest#testGasBurnNineBins.snap
@@ -1 +1 @@
-151057
+150992
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasBurnOneBin.snap b/.forge-snapshots/BinPoolManagerTest#testGasBurnOneBin.snap
@@ -1 +1 @@
-68681
+68616
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasDonate.snap b/.forge-snapshots/BinPoolManagerTest#testGasDonate.snap
@@ -1 +1 @@
-53973
+53952
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-1.snap b/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-1.snap
@@ -1 +1 @@
-968068
+968047
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-2.snap b/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-2.snap
@@ -1 +1 @@
-121582
+121561
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-1.snap b/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-1.snap
@@ -1 +1 @@
-337258
+337237
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-2.snap b/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-2.snap
@@ -1 +1 @@
-56319
+56298
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasSwapMultipleBins.snap b/.forge-snapshots/BinPoolManagerTest#testGasSwapMultipleBins.snap
@@ -1 +1 @@
-93083
+93040
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasSwapOverBigBinIdGate.snap b/.forge-snapshots/BinPoolManagerTest#testGasSwapOverBigBinIdGate.snap
@@ -1 +1 @@
-95068
+95025
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasSwapSingleBin.snap b/.forge-snapshots/BinPoolManagerTest#testGasSwapSingleBin.snap
@@ -1 +1 @@
-74512
+74469
diff --git a/.forge-snapshots/BinPoolManagerTest#testMintNativeCurrency.snap b/.forge-snapshots/BinPoolManagerTest#testMintNativeCurrency.snap
@@ -1 +1 @@
-318966
+318945
diff --git a/.forge-snapshots/BinPoolManagerTest#testNoOpGas_Burn.snap b/.forge-snapshots/BinPoolManagerTest#testNoOpGas_Burn.snap
@@ -1 +1 @@
-41941
+41876
diff --git a/.forge-snapshots/BinPoolManagerTest#testNoOpGas_Donate.snap b/.forge-snapshots/BinPoolManagerTest#testNoOpGas_Donate.snap
@@ -1 +1 @@
-19558
+19493
diff --git a/.forge-snapshots/BinPoolManagerTest#testNoOpGas_Mint.snap b/.forge-snapshots/BinPoolManagerTest#testNoOpGas_Mint.snap
@@ -1 +1 @@
-37410
+37345
diff --git a/.forge-snapshots/BinPoolManagerTest#testNoOpGas_Swap.snap b/.forge-snapshots/BinPoolManagerTest#testNoOpGas_Swap.snap
@@ -1 +1 @@
-22764
+22699
diff --git a/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromEmpty.snap b/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromEmpty.snap
@@ -1 +1 @@
-348473
+348452
diff --git a/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromNonEmpty.snap b/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromNonEmpty.snap
@@ -1 +1 @@
-61021
+61000
diff --git a/.forge-snapshots/CLPoolManagerTest#addLiquidity_nativeToken.snap b/.forge-snapshots/CLPoolManagerTest#addLiquidity_nativeToken.snap
@@ -1 +1 @@
-241433
+241390
diff --git a/.forge-snapshots/CLPoolManagerTest#donateBothTokens.snap b/.forge-snapshots/CLPoolManagerTest#donateBothTokens.snap
@@ -1 +1 @@
-84159
+84138
diff --git a/.forge-snapshots/CLPoolManagerTest#gasDonateOneToken.snap b/.forge-snapshots/CLPoolManagerTest#gasDonateOneToken.snap
@@ -1 +1 @@
-53488
+53445
diff --git a/.forge-snapshots/CLPoolManagerTest#removeLiquidity_toNonEmpty.snap b/.forge-snapshots/CLPoolManagerTest#removeLiquidity_toNonEmpty.snap
@@ -1 +1 @@
-43387
+43322
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_againstLiquidity.snap b/.forge-snapshots/CLPoolManagerTest#swap_againstLiquidity.snap
@@ -1 +1 @@
-56488
+56445
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_leaveSurplusTokenInVault.snap b/.forge-snapshots/CLPoolManagerTest#swap_leaveSurplusTokenInVault.snap
@@ -1 +1 @@
-104597
+104554
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_runOutOfLiquidity.snap b/.forge-snapshots/CLPoolManagerTest#swap_runOutOfLiquidity.snap
@@ -1 +1 @@
-25044312
+25044269
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_simple.snap b/.forge-snapshots/CLPoolManagerTest#swap_simple.snap
@@ -1 +1 @@
-36401
+36336
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_useSurplusTokenAsInput.snap b/.forge-snapshots/CLPoolManagerTest#swap_useSurplusTokenAsInput.snap
@@ -1 +1 @@
-103140
+103030
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_withHooks.snap b/.forge-snapshots/CLPoolManagerTest#swap_withHooks.snap
@@ -1 +1 @@
-42051
+41986
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_withNative.snap b/.forge-snapshots/CLPoolManagerTest#swap_withNative.snap
@@ -1 +1 @@
-36404
+36339
diff --git a/.forge-snapshots/CLPoolManagerTest#testNoOp_gas_Donate.snap b/.forge-snapshots/CLPoolManagerTest#testNoOp_gas_Donate.snap
@@ -1 +1 @@
-19513
+19448
diff --git a/.forge-snapshots/CLPoolManagerTest#testNoOp_gas_ModifyPosition.snap b/.forge-snapshots/CLPoolManagerTest#testNoOp_gas_ModifyPosition.snap
@@ -1 +1 @@
-27680
+27615
diff --git a/.forge-snapshots/CLPoolManagerTest#testNoOp_gas_Swap.snap b/.forge-snapshots/CLPoolManagerTest#testNoOp_gas_Swap.snap
@@ -1 +1 @@
-21962
+21897
diff --git a/.forge-snapshots/VaultTest#Vault.snap b/.forge-snapshots/VaultTest#Vault.snap
@@ -1 +1 @@
-6762
+7016
diff --git a/.forge-snapshots/VaultTest#lockSettledWhenAddLiquidity.snap b/.forge-snapshots/VaultTest#lockSettledWhenAddLiquidity.snap
@@ -0,0 +1 @@
+122519
diff --git a/.forge-snapshots/VaultTest#lockSettledWhenFlashloan.snap b/.forge-snapshots/VaultTest#lockSettledWhenFlashloan.snap
@@ -1 +1 @@
-158832
+158811
diff --git a/.forge-snapshots/VaultTest#lockSettledWhenMultiHopSwap.snap b/.forge-snapshots/VaultTest#lockSettledWhenMultiHopSwap.snap
@@ -1 +1 @@
-47017
+46974
diff --git a/.forge-snapshots/VaultTest#lockSettledWhenSwap.snap b/.forge-snapshots/VaultTest#lockSettledWhenSwap.snap
@@ -1 +1 @@
-47016
+46973
diff --git a/.forge-snapshots/VaultTest#registerPoolManager.snap b/.forge-snapshots/VaultTest#registerPoolManager.snap
@@ -1 +1 @@
-24484
+24506
diff --git a/.forge-snapshots/VaultTest#testLock_NoOp.snap b/.forge-snapshots/VaultTest#testLock_NoOp.snap
@@ -1 +1 @@
-11502
+11532
diff --git a/.forge-snapshots/VaultTest#testSettleAndRefund_WithErc20Transfer.snap b/.forge-snapshots/VaultTest#testSettleAndRefund_WithErc20Transfer.snap
@@ -0,0 +1 @@
+75609
diff --git a/.forge-snapshots/VaultTest#testSettleAndRefund_WithoutErc20Transfer.snap b/.forge-snapshots/VaultTest#testSettleAndRefund_WithoutErc20Transfer.snap
@@ -0,0 +1 @@
+33010
diff --git a/src/Vault.sol b/src/Vault.sol
@@ -118,14 +118,30 @@ contract Vault is IVault, VaultToken, Ownable {
     }
 
     /// @inheritdoc IVault
-    function settle(Currency currency) external payable override isLocked returns (uint256 paid) {
+    function settle(Currency currency) public payable override isLocked returns (uint256 paid) {
         uint256 reservesBefore = reservesOfVault[currency];
         reservesOfVault[currency] = currency.balanceOfSelf();
         paid = reservesOfVault[currency] - reservesBefore;
         // subtraction must be safe
         SettlementGuard.accountDelta(msg.sender, currency, -(paid.toInt128()));
     }
 
+    function settleAndRefund(Currency currency) external payable isLocked returns (uint256 paid, uint256 refund) {
+        paid = settle(currency);
+
+        int256 afterCurrencyDelta = SettlementGuard.getCurrencyDelta(msg.sender, currency);
+        if (afterCurrencyDelta < 0) {
+            /// If user currencyDelta is negative (vault owes owner) after settle: either user have overpaid
+            /// or someone have transfer token to the vault.
+            refund = uint256(-afterCurrencyDelta);
+
+            /// thus refund msg.sender and update accountDelta
+            SettlementGuard.accountDelta(msg.sender, currency, refund.toInt128());
+            reservesOfVault[currency] -= refund;
+            currency.transfer(msg.sender, refund);
+        }
+    }
+
     /// @inheritdoc IVault
     function settleFor(Currency currency, address target, uint256 amount) external isLocked {
         /// @notice settle all outstanding debt if amount is 0

diff --git a/src/interfaces/IVault.sol b/src/interfaces/IVault.sol
@@ -67,6 +67,9 @@ interface IVault is IVaultToken {
     /// @notice Called by the user to pay what is owed
     function settle(Currency token) external payable returns (uint256 paid);
 
+    /// @notice Called by the user to pay what is owed. If the payment is more than the debt, the surplus is refunded
+    function settleAndRefund(Currency token) external payable returns (uint256 paid, uint256 refund);
+
     /// @notice move the delta from target to the msg.sender, only payment delta can be moved
     /// @param currency The currency to settle
     /// @param target The address whose delta will be updated

diff --git a/test/vault/FakePoolManagerRouter.sol b/test/vault/FakePoolManagerRouter.sol
@@ -128,6 +128,9 @@ contract FakePoolManagerRouter {
             // settle ETH
             vault.settle{value: 5 ether}(CurrencyLibrary.NATIVE);
             vault.take(CurrencyLibrary.NATIVE, address(this), 5 ether);
+        } else if (data[0] == 0x18) {
+            vault.settleAndRefund(poolKey.currency0);
+            vault.settleAndRefund(poolKey.currency1);
         }
 
         return "";

diff --git a/test/vault/Vault.t.sol b/test/vault/Vault.t.sol
@@ -173,6 +173,38 @@ contract VaultTest is Test, GasSnapshot {
         vault.lock(hex"02");
     }
 
+    function testSettleAndRefund_WithErc20Transfer() public {
+        // simulate someone transferred token to vault
+        currency0.transfer(address(vault), 10 ether);
+        assertEq(IERC20(Currency.unwrap(currency0)).balanceOf(address(fakePoolManagerRouter)), 0 ether);
+        assertEq(IERC20(Currency.unwrap(currency1)).balanceOf(address(fakePoolManagerRouter)), 0 ether);
+
+        // settle and refund
+        vm.prank(address(fakePoolManagerRouter));
+        snapStart("VaultTest#testSettleAndRefund_WithErc20Transfer");
+        vault.lock(hex"18");
+        snapEnd();
+
+        // verify
+        assertEq(IERC20(Currency.unwrap(currency0)).balanceOf(address(fakePoolManagerRouter)), 10 ether);
+        assertEq(IERC20(Currency.unwrap(currency1)).balanceOf(address(fakePoolManagerRouter)), 0 ether);
+    }
+
+    function testSettleAndRefund_WithoutErc20Transfer() public {
+        assertEq(IERC20(Currency.unwrap(currency0)).balanceOf(address(fakePoolManagerRouter)), 0 ether);
+        assertEq(IERC20(Currency.unwrap(currency1)).balanceOf(address(fakePoolManagerRouter)), 0 ether);
+
+        // settleAndRefund works even if there's no excess currency
+        vm.prank(address(fakePoolManagerRouter));
+        snapStart("VaultTest#testSettleAndRefund_WithoutErc20Transfer");
+        vault.lock(hex"18");
+        snapEnd();
+
+        // verify
+        assertEq(IERC20(Currency.unwrap(currency0)).balanceOf(address(fakePoolManagerRouter)), 0 ether);
+        assertEq(IERC20(Currency.unwrap(currency1)).balanceOf(address(fakePoolManagerRouter)), 0 ether);
+    }
+
     function testNotCorrectPoolManager() public {
         // router => vault.lock
         // vault.lock => periphery.lockAcquired
@@ -208,7 +240,7 @@ contract VaultTest is Test, GasSnapshot {
         vm.prank(address(fakePoolManagerRouter));
         snapStart("VaultTest#lockSettledWhenAddLiquidity");
         vault.lock(hex"02");
-        snapStart("end");
+        snapEnd();
 
         assertEq(IERC20(Currency.unwrap(currency0)).balanceOf(address(vault)), 10 ether);
         assertEq(IERC20(Currency.unwrap(currency1)).balanceOf(address(vault)), 10 ether);

diff --git a/test/vault/VaultInvariant.t.sol b/test/vault/VaultInvariant.t.sol
@@ -31,6 +31,7 @@ contract VaultPoolManager is Test {
     enum ActionType {
         Take,
         Settle,
+        SettleAndRefund,
         SettleFor,
         Mint,
         Burn
@@ -84,6 +85,21 @@ contract VaultPoolManager is Test {
         vault.lock(abi.encode(Action(ActionType.Settle, uint128(amt0), uint128(amt1))));
     }
 
+    /// @dev In settleAndRefund case, assume user add liquidity and paying to the vault
+    ///      but theres another folk who minted extra token to the vault
+    function settleAndRefund(uint256 amt0, uint256 amt1, bool sendToVault) public {
+        amt0 = bound(amt0, 0, MAX_TOKEN_BALANCE - 1 ether);
+        amt1 = bound(amt1, 0, MAX_TOKEN_BALANCE - 1 ether);
+
+        // someone send some token directly to vault
+        if (sendToVault) token0.mint(address(vault), 1 ether);
+
+        // mint token to VaultPoolManager, so VaultPoolManager can pay to the vault
+        token0.mint(address(this), amt0);
+        token1.mint(address(this), amt1);
+        vault.lock(abi.encode(Action(ActionType.SettleAndRefund, uint128(amt0), uint128(amt1))));
+    }
+
     /// @dev In settleFor case, assume user is paying for hook
     function settleFor(uint256 amt0, uint256 amt1) public {
         amt0 = bound(amt0, 0, MAX_TOKEN_BALANCE);
@@ -165,6 +181,15 @@ contract VaultPoolManager is Test {
 
             vault.settle(currency0);
             vault.settle(currency1);
+        } else if (action.actionType == ActionType.SettleAndRefund) {
+            BalanceDelta delta = toBalanceDelta(int128(action.amt0), int128(action.amt1));
+            vault.accountPoolBalanceDelta(poolKey, delta, address(this));
+
+            token0.transfer(address(vault), action.amt0);
+            token1.transfer(address(vault), action.amt1);
+
+            vault.settleAndRefund(currency0);
+            vault.settleAndRefund(currency1);
         } else if (action.actionType == ActionType.SettleFor) {
             // hook cash out the fee ahead
             BalanceDelta delta = toBalanceDelta(int128(action.amt0), int128(action.amt1));
@@ -212,13 +237,14 @@ contract VaultInvariant is Test, GasSnapshot {
         // Only call vaultPoolManager, otherwise all other contracts deployed in setUp will be called
         targetContract(address(vaultPoolManager));
 
-        bytes4[] memory selectors = new bytes4[](6);
+        bytes4[] memory selectors = new bytes4[](7);
         selectors[0] = VaultPoolManager.take.selector;
         selectors[1] = VaultPoolManager.mint.selector;
         selectors[2] = VaultPoolManager.settle.selector;
         selectors[3] = VaultPoolManager.burn.selector;
         selectors[4] = VaultPoolManager.settleFor.selector;
         selectors[5] = VaultPoolManager.collectFee.selector;
+        selectors[6] = VaultPoolManager.settleAndRefund.selector;
         targetSelector(FuzzSelector({addr: address(vaultPoolManager), selectors: selectors}));
     }