@bananapus/core-v6 0.0.28 → 0.0.30

package/test/TestFeeFreeCashOutBypass.sol

@@ -802,7 +802,7 @@ contract TestFeeFreeCashOutBypass is TestBaseWorkflow {
             beneficiary: payable(user),
             metadata: new bytes(0)
         });
-        // Balance dropped significantly. _reduceFeeFreeSurplus should have capped fee-free at remaining balance.
+        // Balance dropped significantly. _capFeeFreeSurplus should have capped fee-free at remaining balance.
 
         // Step 4: Switch back to zero tax. Cash out remaining.
         _reconfigureWithTaxRate(_projectIdB, 0);
@@ -855,7 +855,7 @@ contract TestFeeFreeCashOutBypass is TestBaseWorkflow {
         vm.prank(multisig());
         jbFeelessAddresses().setFeelessAddress(_attacker, true);
 
-        // Step 3: Feeless cashout — no fees charged, but _reduceFeeFreeSurplus should still cap.
+        // Step 3: Feeless cashout — no fees charged, but _capFeeFreeSurplus should still cap.
         uint256 attackerTokens = _tokens.totalBalanceOf(_attacker, _projectIdB);
         vm.prank(_attacker);
         uint256 reclaim = _terminal.cashOutTokensOf({

package/test/units/static/JBMultiTerminal/TestCashOutTokensOf.sol

@@ -340,7 +340,7 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
         whenADataHookIsConfigured
         whenCallerHasPermission
     {
-        // it will safeIncreaseAllowance pass the full amount to the hook and emit HookAfterRecordCashOut
+        // it will forceApprove pass the full amount to the hook and emit HookAfterRecordCashOut
 
         // mint mocked erc20 tokens to hodler
         _mockToken2.mint(address(_terminal), _defaultAmount * 10);
@@ -350,9 +350,6 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
         vm.prank(_holder);
         _mockToken2.approve(address(_terminal), _defaultAmount);
 
-        vm.prank(address(_terminal));
-        _mockToken2.approve(address(_mockHook), _defaultAmount);
-
         uint256 reclaimAmount = 1e9;
         JBCashOutHookSpecification[] memory hookSpecifications = new JBCashOutHookSpecification[](1);
         hookSpecifications[0] =
@@ -431,8 +428,8 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
 
         mockExpect(address(_mockHook), abi.encodeCall(IJBCashOutHook.afterCashOutRecordedWith, (context)), "");
 
-        // ensure approval is increased
-        vm.expectCall(address(_mockToken2), abi.encodeCall(IERC20.approve, (address(_mockHook), _defaultAmount * 2)));
+        // ensure approval is set via forceApprove
+        vm.expectCall(address(_mockToken2), abi.encodeCall(IERC20.approve, (address(_mockHook), _defaultAmount)));
 
         _acceptToken(address(_mockToken2), 18, uint32(uint160(address(_mockToken2))));
 
@@ -456,7 +453,7 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
         whenADataHookIsConfigured
         whenCallerHasPermission
     {
-        // it will safeIncreaseAllowance pass the amount to the hook and emit HookAfterRecordCashOut
+        // it will forceApprove pass the amount to the hook and emit HookAfterRecordCashOut
 
         // mint mocked erc20 tokens to hodler
         _mockToken2.mint(address(_terminal), _defaultAmount * 10);
@@ -466,9 +463,6 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
         vm.prank(_holder);
         _mockToken2.approve(address(_terminal), _defaultAmount);
 
-        vm.prank(address(_terminal));
-        _mockToken2.approve(address(_mockHook), _defaultAmount);
-
         uint256 reclaimAmount = 1e9;
         JBCashOutHookSpecification[] memory hookSpecifications = new JBCashOutHookSpecification[](1);
         JBCashOutHookSpecification[] memory paySpecs = new JBCashOutHookSpecification[](0);

package/test/units/static/JBMultiTerminal/TestExecutePayout.sol

@@ -332,12 +332,7 @@ contract TestExecutePayout_Local is JBMultiTerminalSetup {
         uint256 taxedAmount = JBFees.feeAmountFrom(_defaultAmount, _fee);
         uint256 amountAfterTax = _defaultAmount - taxedAmount;
 
-        // mock call for SafeERC20s allowance check
-        mockExpect(
-            _usdc, abi.encodeCall(IERC20.allowance, (address(_terminal), address(_mockSecondTerminal))), abi.encode(0)
-        );
-
-        // mock call for SafeERC20s safeIncreaseAllowance approval
+        // mock call for SafeERC20s forceApprove approval
         mockExpect(_usdc, abi.encodeCall(IERC20.approve, (_mockSecondTerminal, amountAfterTax)), "");
 
         // mock call to second terminals addToBalanceOf
@@ -421,12 +416,7 @@ contract TestExecutePayout_Local is JBMultiTerminalSetup {
         uint256 taxedAmount = JBFees.feeAmountFrom(_defaultAmount, _fee);
         uint256 amountAfterTax = _defaultAmount - taxedAmount;
 
-        // mock call for SafeERC20s allowance check
-        mockExpect(
-            _usdc, abi.encodeCall(IERC20.allowance, (address(_terminal), address(_mockSecondTerminal))), abi.encode(0)
-        );
-
-        // mock call for SafeERC20s safeIncreaseAllowance approval
+        // mock call for SafeERC20s forceApprove approval
         mockExpect(_usdc, abi.encodeCall(IERC20.approve, (_mockSecondTerminal, amountAfterTax)), "");
 
         // mock call to second terminals pay function

package/test/units/static/JBMultiTerminal/TestExecuteProcessFee.sol

@@ -68,12 +68,9 @@ contract TestExecuteProcessFee_Local is JBMultiTerminalSetup {
     }
 
     function test_WhenTokenIsErc20AndFeeTerminalIsExternal() external {
-        // it will safeIncreaseAllowance
+        // it will forceApprove
 
-        // mock token allowance call
-        mockExpect(_usdc, abi.encodeCall(IERC20.allowance, (address(_terminal), address(_feeTerminal))), abi.encode(0));
-
-        // mock approval call
+        // mock approval call for forceApprove
         mockExpect(_usdc, abi.encodeCall(IERC20.approve, (address(_feeTerminal), _defaultAmount)), "");
 
         // mock pay call to fee terminal

package/test/units/static/JBMultiTerminal/TestMigrateBalanceOf.sol

@@ -103,7 +103,7 @@ contract TestMigrateBalanceOf_Local is JBMultiTerminalSetup {
     } */
 
     function test_GivenTokenIsERC20() external whenPermissioned {
-        // it will safeIncreaseAllowance and addToBalanceOf
+        // it will forceApprove and addToBalanceOf
 
         // mock _isFeeless to return true (skip migration fee for this unit test)
         mockExpect(
@@ -132,10 +132,7 @@ contract TestMigrateBalanceOf_Local is JBMultiTerminalSetup {
             abi.encode(_defaultAmount)
         );
 
-        // mock call for SafeERC20s allowance check
-        mockExpect(_usdc, abi.encodeCall(IERC20.allowance, (address(_terminal), address(_newTerminal))), abi.encode(0));
-
-        // mock call for SafeERC20s safeIncreaseAllowance approval
+        // mock call for SafeERC20s forceApprove approval
         mockExpect(_usdc, abi.encodeCall(IERC20.approve, (address(_newTerminal), _defaultAmount)), "");
 
         // mock call to new terminal addToBalance