@bananapus/core-v6 0.0.21 → 0.0.23

package/test/units/static/JBTerminalStore/TestCurrentSurplusOf.sol

@@ -37,6 +37,21 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         super.terminalStoreSetup();
     }
 
+    /// @notice Helper to register an accounting context with the store (pranks as the terminal).
+    function _registerContext(JBAccountingContext memory ctx) internal {
+        JBAccountingContext[] memory ctxs = new JBAccountingContext[](1);
+        ctxs[0] = ctx;
+        vm.prank(address(_terminal));
+        _store.recordAccountingContextOf(_projectId, ctxs);
+    }
+
+    /// @notice Helper to call currentSurplusOf with the new multi-terminal signature.
+    function _currentSurplusOf(uint256 decimals, uint256 currency) internal view returns (uint256) {
+        IJBTerminal[] memory terminals = new IJBTerminal[](1);
+        terminals[0] = _terminal;
+        return _store.currentSurplusOf(_projectId, terminals, new address[](0), decimals, currency);
+    }
+
     modifier whenProjectHasBalance() {
         // Find the storage slot
         bytes32 balanceOfSlot = keccak256(abi.encode(address(_terminal), uint256(0)));
@@ -62,6 +77,7 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         JBAccountingContext[] memory _contexts = new JBAccountingContext[](1);
 
         _contexts[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
+        _registerContext(_contexts[0]);
 
         // JBRulesets calldata
         JBRuleset memory _returnedRuleset = JBRuleset({
@@ -101,7 +117,7 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         bytes memory _payoutLimitsReturn = abi.encode(_payoutLimits);
         mockExpect(address(_accessLimits), _payoutLimitsCall, _payoutLimitsReturn);
 
-        uint256 currentSurplus = _store.currentSurplusOf(address(_terminal), _projectId, _contexts, 6, _currency);
+        uint256 currentSurplus = _currentSurplusOf(6, _currency);
 
         // assert correct calcs
         uint256 expectedSurplus = (1e18 - 1e17) / 10 ** (18 - 6);
@@ -116,6 +132,7 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         JBAccountingContext[] memory _contexts = new JBAccountingContext[](1);
 
         _contexts[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
+        _registerContext(_contexts[0]);
 
         // JBRulesets calldata
         JBRuleset memory _returnedRuleset = JBRuleset({
@@ -161,7 +178,7 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         bytes memory _pricePerReturn = abi.encode(uint256(1));
         mockExpect(address(prices), _pricePerCall, _pricePerReturn);
 
-        uint256 currentSurplus = _store.currentSurplusOf(address(_terminal), _projectId, _contexts, 6, _nativeCurrency);
+        uint256 currentSurplus = _currentSurplusOf(6, _nativeCurrency);
 
         // assert correct calcs
         uint256 expectedSurplus = ((1e18 - 1e17) * 1e18) / 10 ** (18 - 6);
@@ -174,6 +191,7 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         JBAccountingContext[] memory _contexts = new JBAccountingContext[](1);
 
         _contexts[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
+        _registerContext(_contexts[0]);
 
         // JBRulesets calldata
         JBRuleset memory _returnedRuleset = JBRuleset({
@@ -213,7 +231,7 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         bytes memory _payoutLimitsReturn = abi.encode(_payoutLimits);
         mockExpect(address(_accessLimits), _payoutLimitsCall, _payoutLimitsReturn);
 
-        uint256 currentSurplus = _store.currentSurplusOf(address(_terminal), _projectId, _contexts, 18, _currency);
+        uint256 currentSurplus = _currentSurplusOf(18, _currency);
 
         // assert correct calcs
         uint256 expectedSurplus = 1e18 - 1e17;
@@ -225,6 +243,7 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         JBAccountingContext[] memory _contexts = new JBAccountingContext[](1);
 
         _contexts[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
+        _registerContext(_contexts[0]);
 
         // JBRulesets calldata
         JBRuleset memory _returnedRuleset = JBRuleset({
@@ -270,7 +289,7 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         bytes memory _pricePerReturn = abi.encode(uint256(1));
         mockExpect(address(prices), _pricePerCall, _pricePerReturn);
 
-        uint256 currentSurplus = _store.currentSurplusOf(address(_terminal), _projectId, _contexts, 18, _nativeCurrency);
+        uint256 currentSurplus = _currentSurplusOf(18, _nativeCurrency);
 
         // assert correct calcs
         uint256 expectedSurplus = (1e18 - 1e17) * 1e18;
@@ -283,6 +302,7 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         JBAccountingContext[] memory _contexts = new JBAccountingContext[](1);
 
         _contexts[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
+        _registerContext(_contexts[0]);
 
         // JBRulesets calldata
         JBRuleset memory _returnedRuleset = JBRuleset({
@@ -322,7 +342,7 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         bytes memory _payoutLimitsReturn = abi.encode(_payoutLimits);
         mockExpect(address(_accessLimits), _payoutLimitsCall, _payoutLimitsReturn);
 
-        uint256 currentSurplus = _store.currentSurplusOf(address(_terminal), _projectId, _contexts, 18, _currency);
+        uint256 currentSurplus = _currentSurplusOf(18, _currency);
 
         // assert correct calcs
         uint256 expectedSurplus = (1e18 - 1e17);
@@ -335,6 +355,7 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         JBAccountingContext[] memory _contexts = new JBAccountingContext[](1);
 
         _contexts[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _nativeCurrency});
+        _registerContext(_contexts[0]);
 
         // JBRulesets calldata
         JBRuleset memory _returnedRuleset = JBRuleset({
@@ -380,7 +401,7 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         bytes memory _pricePerReturn = abi.encode(uint256(1e18));
         mockExpect(address(prices), _pricePerCall, _pricePerReturn);
 
-        uint256 currentSurplus = _store.currentSurplusOf(address(_terminal), _projectId, _contexts, 18, _nativeCurrency);
+        uint256 currentSurplus = _currentSurplusOf(18, _nativeCurrency);
 
         // assert correct calcs
         uint256 expectedSurplus = 1e18 - 1e17;
@@ -393,6 +414,7 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         JBAccountingContext[] memory _contexts = new JBAccountingContext[](1);
 
         _contexts[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
+        _registerContext(_contexts[0]);
 
         // JBRulesets calldata
         JBRuleset memory _returnedRuleset = JBRuleset({
@@ -432,7 +454,7 @@ contract TestCurrentSurplusOf_Local is JBTerminalStoreSetup {
         bytes memory _payoutLimitsReturn = abi.encode(_payoutLimits);
         mockExpect(address(_accessLimits), _payoutLimitsCall, _payoutLimitsReturn);
 
-        uint256 currentSurplus = _store.currentSurplusOf(address(_terminal), _projectId, _contexts, 18, _currency);
+        uint256 currentSurplus = _currentSurplusOf(18, _currency);
 
         // assert correct calcs
         uint256 expectedSurplus = 0;

package/test/units/static/JBTerminalStore/TestCurrentTotalSurplusOf.sol

@@ -1,50 +1,107 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+import {IJBController} from "../../../../src/interfaces/IJBController.sol";
 import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBFundAccessLimits} from "../../../../src/interfaces/IJBFundAccessLimits.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
 import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
 import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {JBCurrencyAmount} from "../../../../src/structs/JBCurrencyAmount.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
 import {JBTerminalStoreSetup} from "./JBTerminalStoreSetup.sol";
 
 contract TestCurrentTotalSurplusOf_Local is JBTerminalStoreSetup {
     uint256 _projectId = 1;
     uint256 _decimals = 18;
-    uint256 _currency = uint32(uint160(makeAddr("token")));
 
     // Mocks
     IJBTerminal _terminal1 = IJBTerminal(makeAddr("terminal1"));
     IJBTerminal _terminal2 = IJBTerminal(makeAddr("terminal2"));
+    address _token = makeAddr("token");
+    IJBController _controller = IJBController(makeAddr("controller"));
+    IJBFundAccessLimits _accessLimits = IJBFundAccessLimits(makeAddr("funds"));
+
+    // forge-lint: disable-next-line(unsafe-typecast)
+    uint32 _currency = uint32(uint160(_token));
 
     function setUp() public {
         super.terminalStoreSetup();
     }
 
+    /// @notice Helper to set balance for a terminal/project/token via vm.store.
+    function _setBalance(address terminal, uint256 projectId, address token, uint256 balance) internal {
+        bytes32 balanceOfSlot = keccak256(abi.encode(terminal, uint256(0)));
+        bytes32 projectSlot = keccak256(abi.encode(projectId, uint256(balanceOfSlot)));
+        bytes32 slot = keccak256(abi.encode(token, uint256(projectSlot)));
+        vm.store(address(_store), slot, bytes32(balance));
+    }
+
+    /// @notice Helper to register an accounting context with the store (pranks as the terminal).
+    function _registerContext(address terminal, JBAccountingContext memory ctx) internal {
+        JBAccountingContext[] memory ctxs = new JBAccountingContext[](1);
+        ctxs[0] = ctx;
+        vm.prank(terminal);
+        _store.recordAccountingContextOf(_projectId, ctxs);
+    }
+
     function test_WhenTerminalsAreConfiguredInJBDirectory() external {
         // it will return the cumulative surplus
 
-        // return data for mock call
+        // Set up terminals in directory
         IJBTerminal[] memory _terminals = new IJBTerminal[](2);
         _terminals[0] = _terminal1;
         _terminals[1] = _terminal2;
 
-        // mock call to JBDirectory terminalsOf
-        bytes memory _directoryCall = abi.encodeCall(IJBDirectory.terminalsOf, (_projectId));
-        bytes memory _returned = abi.encode(_terminals);
-        mockExpect(address(directory), _directoryCall, _returned);
+        mockExpect(address(directory), abi.encodeCall(IJBDirectory.terminalsOf, (_projectId)), abi.encode(_terminals));
 
-        // mock call to first terminal currentSurplusOf
-        bytes memory _terminal1Call = abi.encodeCall(
-            IJBTerminal.currentSurplusOf, (_projectId, new JBAccountingContext[](0), _decimals, _currency)
+        // Set up accounting contexts for each terminal
+        JBAccountingContext memory ctx = JBAccountingContext({token: _token, decimals: 18, currency: _currency});
+        _registerContext(address(_terminal1), ctx);
+        _registerContext(address(_terminal2), ctx);
+
+        // Set balances: terminal1 = 1e18, terminal2 = 2e18
+        _setBalance(address(_terminal1), _projectId, _token, 1e18);
+        _setBalance(address(_terminal2), _projectId, _token, 2e18);
+
+        // Mock ruleset
+        JBRuleset memory _returnedRuleset = JBRuleset({
+            cycleNumber: uint48(block.timestamp),
+            id: uint48(block.timestamp),
+            basedOnId: 0,
+            start: uint48(block.timestamp),
+            duration: uint32(block.timestamp + 1000),
+            weight: 1e18,
+            weightCutPercent: 0,
+            approvalHook: IJBRulesetApprovalHook(address(0)),
+            metadata: 0
+        });
+        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(_returnedRuleset));
+
+        // Mock controller and fund access limits (zero payout limits = all balance is surplus)
+        mockExpect(address(directory), abi.encodeCall(IJBDirectory.controllerOf, (_projectId)), abi.encode(_controller));
+        mockExpect(
+            address(_controller), abi.encodeCall(IJBController.FUND_ACCESS_LIMITS, ()), abi.encode(_accessLimits)
         );
-        bytes memory _terminal1Return = abi.encode(1e18);
-        mockExpect(address(_terminal1), _terminal1Call, _terminal1Return);
 
-        // mock call to first terminal currentSurplusOf
-        bytes memory _terminal2Call = abi.encodeCall(
-            IJBTerminal.currentSurplusOf, (_projectId, new JBAccountingContext[](0), _decimals, _currency)
+        JBCurrencyAmount[] memory _emptyLimits = new JBCurrencyAmount[](0);
+        // Mock payoutLimitsOf for terminal1
+        mockExpect(
+            address(_accessLimits),
+            abi.encodeCall(
+                IJBFundAccessLimits.payoutLimitsOf, (_projectId, block.timestamp, address(_terminal1), _token)
+            ),
+            abi.encode(_emptyLimits)
+        );
+        // Mock payoutLimitsOf for terminal2
+        mockExpect(
+            address(_accessLimits),
+            abi.encodeCall(
+                IJBFundAccessLimits.payoutLimitsOf, (_projectId, block.timestamp, address(_terminal2), _token)
+            ),
+            abi.encode(_emptyLimits)
         );
-        bytes memory _terminal2Return = abi.encode(2e18);
-        mockExpect(address(_terminal2), _terminal2Call, _terminal2Return);
 
         uint256 sum = _store.currentTotalSurplusOf(_projectId, _decimals, _currency);
         assertEq(3e18, sum);
@@ -53,13 +110,24 @@ contract TestCurrentTotalSurplusOf_Local is JBTerminalStoreSetup {
     function test_WhenTerminalsAreNotConfiguredInJBDirectory() external {
         // it will return zero
 
-        // return data for mock call
         IJBTerminal[] memory _terminals = new IJBTerminal[](0);
 
         // mock call to JBDirectory terminalsOf
-        bytes memory _directoryCall = abi.encodeCall(IJBDirectory.terminalsOf, (_projectId));
-        bytes memory _returned = abi.encode(_terminals);
-        mockExpect(address(directory), _directoryCall, _returned);
+        mockExpect(address(directory), abi.encodeCall(IJBDirectory.terminalsOf, (_projectId)), abi.encode(_terminals));
+
+        // Mock ruleset (needed by currentSurplusOf)
+        JBRuleset memory _returnedRuleset = JBRuleset({
+            cycleNumber: uint48(block.timestamp),
+            id: uint48(block.timestamp),
+            basedOnId: 0,
+            start: uint48(block.timestamp),
+            duration: uint32(block.timestamp + 1000),
+            weight: 1e18,
+            weightCutPercent: 0,
+            approvalHook: IJBRulesetApprovalHook(address(0)),
+            metadata: 0
+        });
+        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(_returnedRuleset));
 
         uint256 sum = _store.currentTotalSurplusOf(_projectId, _decimals, _currency);
         assertEq(0, sum);

package/test/units/static/JBTerminalStore/TestPreviewCashOutFrom.sol

@@ -16,7 +16,6 @@ import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMeta
 import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
 import {JBBeforeCashOutRecordedContext} from "../../../../src/structs/JBBeforeCashOutRecordedContext.sol";
 import {JBCashOutHookSpecification} from "../../../../src/structs/JBCashOutHookSpecification.sol";
-import {JBCurrencyAmount} from "../../../../src/structs/JBCurrencyAmount.sol";
 import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
 import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
 import {JBTokenAmount} from "../../../../src/structs/JBTokenAmount.sol";
@@ -42,6 +41,12 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
 
     function setUp() public {
         super.terminalStoreSetup();
+
+        // Register accounting context so the store can look up decimals/currency for the token.
+        // address(this) acts as the terminal for both preview and record calls.
+        JBAccountingContext[] memory _ctxs = new JBAccountingContext[](1);
+        _ctxs[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
+        _store.recordAccountingContextOf(_projectId, _ctxs);
     }
 
     function _setBalance(address terminal, uint256 balance) internal {
@@ -60,16 +65,12 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
 
         mockExpect(
             address(_terminal1),
-            abi.encodeCall(
-                IJBTerminal.currentSurplusOf, (_projectId, new JBAccountingContext[](0), _decimals, _currency)
-            ),
+            abi.encodeCall(IJBTerminal.currentSurplusOf, (_projectId, new address[](0), _decimals, _currency)),
             abi.encode(1e18)
         );
         mockExpect(
             address(_terminal2),
-            abi.encodeCall(
-                IJBTerminal.currentSurplusOf, (_projectId, new JBAccountingContext[](0), _decimals, _currency)
-            ),
+            abi.encodeCall(IJBTerminal.currentSurplusOf, (_projectId, new address[](0), _decimals, _currency)),
             abi.encode(2e18)
         );
     }
@@ -119,9 +120,8 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
         uint256 _cashOutCount = 10e18;
 
         JBAccountingContext memory _accountingContext =
-            JBAccountingContext({token: address(_token), decimals: uint8(_decimals), currency: _currency});
-
-        JBAccountingContext[] memory _balanceContexts = new JBAccountingContext[](0);
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: address(_token), decimals: uint8(_decimals), currency: _currency});
 
         // Mock for preview call
         mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(_returnedRuleset));
@@ -133,11 +133,11 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
         );
 
         (, uint256 previewReclaimAmount, uint256 previewTaxRate, JBCashOutHookSpecification[] memory previewSpecs) = _store.previewCashOutFrom({
+            terminal: address(this),
             holder: address(this),
             projectId: _projectId,
             cashOutCount: _cashOutCount,
-            accountingContext: _accountingContext,
-            balanceAccountingContexts: _balanceContexts,
+            tokenToReclaim: _accountingContext.token,
             beneficiaryIsFeeless: false,
             metadata: ""
         });
@@ -156,8 +156,7 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
             holder: address(this),
             projectId: _projectId,
             cashOutCount: _cashOutCount,
-            accountingContext: _accountingContext,
-            balanceAccountingContexts: _balanceContexts,
+            tokenToReclaim: _accountingContext.token,
             beneficiaryIsFeeless: false,
             metadata: ""
         });
@@ -208,7 +207,8 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
         });
 
         JBAccountingContext memory _accountingContext =
-            JBAccountingContext({token: address(_token), decimals: uint8(_decimals), currency: _currency});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: address(_token), decimals: uint8(_decimals), currency: _currency});
 
         mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(_returnedRuleset));
         mockExpect(address(directory), abi.encodeCall(IJBDirectory.controllerOf, (_projectId)), abi.encode(_controller));
@@ -221,11 +221,11 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
         uint256 balanceBefore = _store.balanceOf(address(this), _projectId, address(_token));
 
         _store.previewCashOutFrom({
+            terminal: address(this),
             holder: address(this),
             projectId: _projectId,
             cashOutCount: 5e18,
-            accountingContext: _accountingContext,
-            balanceAccountingContexts: new JBAccountingContext[](0),
+            tokenToReclaim: _accountingContext.token,
             beneficiaryIsFeeless: false,
             metadata: ""
         });
@@ -275,7 +275,8 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
         });
 
         JBAccountingContext memory _accountingContext =
-            JBAccountingContext({token: address(_token), decimals: uint8(_decimals), currency: _currency});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: address(_token), decimals: uint8(_decimals), currency: _currency});
 
         mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(_returnedRuleset));
         mockExpect(address(directory), abi.encodeCall(IJBDirectory.controllerOf, (_projectId)), abi.encode(_controller));
@@ -293,11 +294,11 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
             )
         );
         _store.previewCashOutFrom({
+            terminal: address(this),
             holder: address(this),
             projectId: _projectId,
             cashOutCount: _excessiveCashOutCount,
-            accountingContext: _accountingContext,
-            balanceAccountingContexts: new JBAccountingContext[](0),
+            tokenToReclaim: _accountingContext.token,
             beneficiaryIsFeeless: false,
             metadata: ""
         });
@@ -343,7 +344,8 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
         });
 
         JBAccountingContext memory _accountingContext =
-            JBAccountingContext({token: address(_token), decimals: uint8(_decimals), currency: _currency});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: address(_token), decimals: uint8(_decimals), currency: _currency});
 
         IJBTerminal[] memory _terminals = new IJBTerminal[](1);
         _terminals[0] = _terminal1;
@@ -352,9 +354,7 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
         mockExpect(address(directory), abi.encodeCall(IJBDirectory.terminalsOf, (_projectId)), abi.encode(_terminals));
         mockExpect(
             address(_terminal1),
-            abi.encodeCall(
-                IJBTerminal.currentSurplusOf, (_projectId, new JBAccountingContext[](0), _decimals, _currency)
-            ),
+            abi.encodeCall(IJBTerminal.currentSurplusOf, (_projectId, new address[](0), _decimals, _currency)),
             abi.encode(0)
         );
         mockExpect(address(directory), abi.encodeCall(IJBDirectory.controllerOf, (_projectId)), abi.encode(_controller));
@@ -365,11 +365,11 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
         );
 
         (, uint256 reclaimAmount,,) = _store.previewCashOutFrom({
+            terminal: address(this),
             holder: address(this),
             projectId: _projectId,
             cashOutCount: 5e18,
-            accountingContext: _accountingContext,
-            balanceAccountingContexts: new JBAccountingContext[](0),
+            tokenToReclaim: _accountingContext.token,
             beneficiaryIsFeeless: false,
             metadata: ""
         });
@@ -418,7 +418,8 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
         });
 
         JBAccountingContext memory _accountingContext =
-            JBAccountingContext({token: address(_token), decimals: uint8(_decimals), currency: _currency});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: address(_token), decimals: uint8(_decimals), currency: _currency});
 
         JBBeforeCashOutRecordedContext memory _context = JBBeforeCashOutRecordedContext({
             terminal: address(this),
@@ -456,11 +457,11 @@ contract TestPreviewCashOutFor_Local is JBTerminalStoreSetup {
         );
 
         (, uint256 reclaimAmount, uint256 cashOutTaxRate, JBCashOutHookSpecification[] memory hookSpecifications) = _store.previewCashOutFrom({
+            terminal: address(this),
             holder: address(this),
             projectId: _projectId,
             cashOutCount: 10e18,
-            accountingContext: _accountingContext,
-            balanceAccountingContexts: new JBAccountingContext[](0),
+            tokenToReclaim: _accountingContext.token,
             beneficiaryIsFeeless: false,
             metadata: ""
         });

package/test/units/static/JBTerminalStore/TestPreviewPayFrom.sol

@@ -60,9 +60,13 @@ contract TestPreviewPayFrom_Local is JBTerminalStoreSetup {
         mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(_returnedRuleset));
 
         vm.expectRevert(abi.encodeWithSelector(JBTerminalStore.JBTerminalStore_RulesetNotFound.selector, _projectId));
-        vm.prank(_terminal);
         _store.previewPayFrom({
-            payer: address(this), amount: _tokenAmount, projectId: _projectId, beneficiary: address(this), metadata: ""
+            terminal: _terminal,
+            payer: address(this),
+            amount: _tokenAmount,
+            projectId: _projectId,
+            beneficiary: address(this),
+            metadata: ""
         });
     }
 
@@ -112,9 +116,13 @@ contract TestPreviewPayFrom_Local is JBTerminalStoreSetup {
         mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(_returnedRuleset));
 
         vm.expectRevert(JBTerminalStore.JBTerminalStore_RulesetPaymentPaused.selector);
-        vm.prank(_terminal);
         _store.previewPayFrom({
-            payer: address(this), amount: _tokenAmount, projectId: _projectId, beneficiary: address(this), metadata: ""
+            terminal: _terminal,
+            payer: address(this),
+            amount: _tokenAmount,
+            projectId: _projectId,
+            beneficiary: address(this),
+            metadata: ""
         });
     }
 
@@ -165,7 +173,12 @@ contract TestPreviewPayFrom_Local is JBTerminalStoreSetup {
         mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(_returnedRuleset));
 
         (, uint256 previewTokenCount, JBPayHookSpecification[] memory previewSpecs) = _store.previewPayFrom({
-            payer: address(this), amount: _tokenAmount, projectId: _projectId, beneficiary: address(this), metadata: ""
+            terminal: _terminal,
+            payer: address(this),
+            amount: _tokenAmount,
+            projectId: _projectId,
+            beneficiary: address(this),
+            metadata: ""
         });
 
         // Mock for record call
@@ -225,10 +238,9 @@ contract TestPreviewPayFrom_Local is JBTerminalStoreSetup {
         JBPayHookSpecification[] memory _spec = new JBPayHookSpecification[](1);
         _spec[0] = JBPayHookSpecification({hook: _payHook, noop: false, amount: _defaultValue / 2, metadata: ""});
 
-        // The data hook context will use the terminal address passed to preview / msg.sender for record.
-        // Since we call both from address(this), they match.
+        // The data hook context uses the explicit terminal parameter for preview / msg.sender for record.
         JBBeforePayRecordedContext memory _context = JBBeforePayRecordedContext({
-            terminal: address(this),
+            terminal: _terminal,
             payer: address(this),
             amount: _tokenAmount,
             projectId: _projectId,
@@ -248,10 +260,15 @@ contract TestPreviewPayFrom_Local is JBTerminalStoreSetup {
         );
 
         (, uint256 previewTokenCount, JBPayHookSpecification[] memory previewSpecs) = _store.previewPayFrom({
-            payer: address(this), amount: _tokenAmount, projectId: _projectId, beneficiary: address(this), metadata: ""
+            terminal: _terminal,
+            payer: address(this),
+            amount: _tokenAmount,
+            projectId: _projectId,
+            beneficiary: address(this),
+            metadata: ""
         });
 
-        // Mock for record call
+        // Mock for record call — recordPaymentFrom uses msg.sender as terminal, so prank _terminal.
         mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(_returnedRuleset));
         mockExpect(
             address(_dataHook),
@@ -259,6 +276,7 @@ contract TestPreviewPayFrom_Local is JBTerminalStoreSetup {
             abi.encode(1e18 / 2, _spec)
         );
 
+        vm.prank(_terminal);
         (, uint256 recordTokenCount, JBPayHookSpecification[] memory recordSpecs) = _store.recordPaymentFrom({
             payer: address(this), amount: _tokenAmount, projectId: _projectId, beneficiary: address(this), metadata: ""
         });
@@ -315,9 +333,13 @@ contract TestPreviewPayFrom_Local is JBTerminalStoreSetup {
 
         uint256 balanceBefore = _store.balanceOf(_terminal, _projectId, address(_token));
 
-        vm.prank(_terminal);
         _store.previewPayFrom({
-            payer: address(this), amount: _tokenAmount, projectId: _projectId, beneficiary: address(this), metadata: ""
+            terminal: _terminal,
+            payer: address(this),
+            amount: _tokenAmount,
+            projectId: _projectId,
+            beneficiary: address(this),
+            metadata: ""
         });
 
         uint256 balanceAfter = _store.balanceOf(_terminal, _projectId, address(_token));
@@ -379,9 +401,13 @@ contract TestPreviewPayFrom_Local is JBTerminalStoreSetup {
 
         uint256 expectedCount = mulDiv(_defaultValue, 1e18, 2e18);
 
-        vm.prank(_terminal);
         (, uint256 tokenCount,) = _store.previewPayFrom({
-            payer: address(this), amount: _tokenAmount, projectId: _projectId, beneficiary: address(this), metadata: ""
+            terminal: _terminal,
+            payer: address(this),
+            amount: _tokenAmount,
+            projectId: _projectId,
+            beneficiary: address(this),
+            metadata: ""
         });
 
         assertEq(tokenCount, expectedCount);
@@ -450,9 +476,13 @@ contract TestPreviewPayFrom_Local is JBTerminalStoreSetup {
             abi.encode(1e18 / 2, _spec)
         );
 
-        vm.prank(_terminal);
         (, uint256 tokenCount, JBPayHookSpecification[] memory hookSpecifications) = _store.previewPayFrom({
-            payer: address(this), amount: _tokenAmount, projectId: _projectId, beneficiary: address(this), metadata: ""
+            terminal: _terminal,
+            payer: address(this),
+            amount: _tokenAmount,
+            projectId: _projectId,
+            beneficiary: address(this),
+            metadata: ""
         });
 
         assertEq(tokenCount, 1e18 / 2);