@bananapus/core-v6 0.0.20 → 0.0.22

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

@@ -10,7 +10,6 @@ import {IJBController} from "../../../../src/interfaces/IJBController.sol";
 import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
 import {IJBFeelessAddresses} from "../../../../src/interfaces/IJBFeelessAddresses.sol";
 import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
-import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
 import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
 import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
 import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
@@ -22,7 +21,6 @@ import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
 import {JBTokenAmount} from "../../../../src/structs/JBTokenAmount.sol";
 import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {JBMultiTerminalSetup} from "./JBMultiTerminalSetup.sol";
 
@@ -54,29 +52,28 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             address(directory), abi.encodeCall(IJBDirectory.controllerOf, (_projectId)), abi.encode(address(this))
         );
 
-        if (token != JBConstants.NATIVE_TOKEN) {
-            mockExpect(token, abi.encodeCall(IERC20Metadata.decimals, ()), abi.encode(decimals));
+        // Mock ERC20 transfer for non-contract token addresses (needed for SafeERC20 calls later).
+        if (token != JBConstants.NATIVE_TOKEN && token.code.length == 0) {
+            vm.mockCall(token, abi.encodeWithSelector(IERC20.transfer.selector), abi.encode(true));
         }
 
         JBAccountingContext[] memory _tokens = new JBAccountingContext[](1);
         _tokens[0] = JBAccountingContext({token: token, decimals: decimals, currency: currency});
 
-        JBRuleset memory returnedRuleset = JBRuleset({
-            cycleNumber: 1,
-            id: 0,
-            basedOnId: 0,
-            start: 0,
-            duration: 0,
-            weight: 0,
-            weightCutPercent: 0,
-            approvalHook: IJBRulesetApprovalHook(address(0)),
-            metadata: 0
-        });
-
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(returnedRuleset));
+        // Mock recordAccountingContextOf in the store (validation now happens there)
+        mockExpect(
+            address(store), abi.encodeCall(IJBTerminalStore.recordAccountingContextOf, (_projectId, _tokens)), ""
+        );
 
         vm.prank(address(this));
         _terminal.addAccountingContextsFor(_projectId, _tokens);
+
+        // Mock accountingContextOf for subsequent reads (not all code paths call it, so use mockCall only)
+        vm.mockCall(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, token)),
+            abi.encode(_tokens[0])
+        );
     }
 
     function test_WhenCallerDNHavePermission() external {
@@ -125,7 +122,8 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
         uint256 reclaimAmount = 1e9;
         JBCashOutHookSpecification[] memory hookSpecifications = new JBCashOutHookSpecification[](0);
         JBAccountingContext memory mockTokenContext =
-            JBAccountingContext({token: _mockToken, decimals: 18, currency: uint32(uint160(_mockToken))});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: _mockToken, decimals: 18, currency: uint32(uint160(_mockToken))});
         JBAccountingContext[] memory mockBalanceContext = new JBAccountingContext[](1);
         mockBalanceContext[0] = mockTokenContext;
         JBRuleset memory returnedRuleset = JBRuleset({
@@ -148,7 +146,7 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             address(store),
             abi.encodeCall(
                 IJBTerminalStore.recordCashOutFor,
-                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, true, "")
+                (_holder, _projectId, _defaultAmount, mockTokenContext.token, true, "")
             ),
             abi.encode(returnedRuleset, reclaimAmount, _maxCashOutTaxRate, hookSpecifications)
         );
@@ -165,6 +163,7 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
 
         // put code at mockToken address to pass OZ Address check
         vm.etch(_mockToken, abi.encode(1));
+        // forge-lint: disable-next-line(unsafe-typecast)
         _acceptToken(_mockToken, 18, uint32(uint160(_mockToken)));
 
         vm.prank(_bene);
@@ -177,7 +176,8 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
         uint256 reclaimAmount = 1e9;
         JBCashOutHookSpecification[] memory hookSpecifications = new JBCashOutHookSpecification[](0);
         JBAccountingContext memory mockTokenContext =
-            JBAccountingContext({token: _mockToken, decimals: 18, currency: uint32(uint160(_mockToken))});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: _mockToken, decimals: 18, currency: uint32(uint160(_mockToken))});
         JBAccountingContext[] memory mockBalanceContext = new JBAccountingContext[](1);
         mockBalanceContext[0] = mockTokenContext;
         JBRuleset memory returnedRuleset = JBRuleset({
@@ -200,7 +200,7 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             address(store),
             abi.encodeCall(
                 IJBTerminalStore.recordCashOutFor,
-                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, true, "")
+                (_holder, _projectId, _defaultAmount, mockTokenContext.token, true, "")
             ),
             abi.encode(returnedRuleset, reclaimAmount, _maxCashOutTaxRate, hookSpecifications)
         );
@@ -217,6 +217,7 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
 
         // put code at mockToken address to pass OZ Address check
         vm.etch(_mockToken, abi.encode(1));
+        // forge-lint: disable-next-line(unsafe-typecast)
         _acceptToken(_mockToken, 18, uint32(uint160(_mockToken)));
 
         vm.expectRevert(
@@ -238,7 +239,8 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
         uint256 reclaimAmount = 1e9;
         JBCashOutHookSpecification[] memory hookSpecifications = new JBCashOutHookSpecification[](0);
         JBAccountingContext memory mockTokenContext =
-            JBAccountingContext({token: _mockToken, decimals: 18, currency: uint32(uint160(_mockToken))});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: _mockToken, decimals: 18, currency: uint32(uint160(_mockToken))});
         JBAccountingContext[] memory mockBalanceContext = new JBAccountingContext[](1);
         mockBalanceContext[0] = mockTokenContext;
         JBRuleset memory returnedRuleset = JBRuleset({
@@ -261,7 +263,7 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             address(store),
             abi.encodeCall(
                 IJBTerminalStore.recordCashOutFor,
-                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, false, "")
+                (_holder, _projectId, _defaultAmount, mockTokenContext.token, false, "")
             ),
             abi.encode(returnedRuleset, reclaimAmount, _halfCashOutTaxRate, hookSpecifications)
         );
@@ -278,6 +280,7 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
 
         // put code at mockToken address to pass OZ Address check
         vm.etch(_mockToken, abi.encode(1));
+        // forge-lint: disable-next-line(unsafe-typecast)
         _acceptToken(_mockToken, 18, uint32(uint160(_mockToken)));
 
         // get fee amount
@@ -378,7 +381,7 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             address(store),
             abi.encodeCall(
                 IJBTerminalStore.recordCashOutFor,
-                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, true, "")
+                (_holder, _projectId, _defaultAmount, mockTokenContext.token, true, "")
             ),
             abi.encode(returnedRuleset, reclaimAmount, _maxCashOutTaxRate, hookSpecifications)
         );
@@ -495,7 +498,7 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             address(store),
             abi.encodeCall(
                 IJBTerminalStore.recordCashOutFor,
-                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, true, "")
+                (_holder, _projectId, _defaultAmount, mockTokenContext.token, true, "")
             ),
             abi.encode(returnedRuleset, reclaimAmount, _maxCashOutTaxRate, hookSpecifications)
         );
@@ -583,7 +586,8 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
         hookSpecifications[0] =
             JBCashOutHookSpecification({hook: IJBCashOutHook(address(this)), noop: true, amount: 0, metadata: "info"});
         JBAccountingContext memory mockTokenContext =
-            JBAccountingContext({token: _mockToken, decimals: 18, currency: uint32(uint160(_mockToken))});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: _mockToken, decimals: 18, currency: uint32(uint160(_mockToken))});
         JBAccountingContext[] memory mockBalanceContext = new JBAccountingContext[](1);
         mockBalanceContext[0] = mockTokenContext;
         JBRuleset memory returnedRuleset = JBRuleset({
@@ -603,7 +607,7 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             address(store),
             abi.encodeCall(
                 IJBTerminalStore.recordCashOutFor,
-                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, true, "")
+                (_holder, _projectId, _defaultAmount, mockTokenContext.token, true, "")
             ),
             abi.encode(returnedRuleset, reclaimAmount, _maxCashOutTaxRate, hookSpecifications)
         );
@@ -614,6 +618,7 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             address(this), abi.encodeCall(IJBController.burnTokensOf, (_holder, _projectId, _defaultAmount, "")), ""
         );
 
+        // forge-lint: disable-next-line(unsafe-typecast)
         _acceptToken(_mockToken, 18, uint32(uint160(_mockToken)));
 
         vm.prank(_bene);

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

@@ -10,6 +10,7 @@ import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
 import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
 import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
 import {JBFees} from "../../../../src/libraries/JBFees.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
 import {JBPayHookSpecification} from "../../../../src/structs/JBPayHookSpecification.sol";
 import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
 import {JBSplit} from "../../../../src/structs/JBSplit.sol";
@@ -32,6 +33,7 @@ contract TestExecutePayout_Local is JBMultiTerminalSetup {
 
     address _native = JBConstants.NATIVE_TOKEN;
     address _usdc = makeAddr("USDC");
+    // forge-lint: disable-next-line(unsafe-typecast)
     uint32 _usdcCurrency = uint32(uint160(_usdc));
 
     JBSplit private _split;
@@ -42,10 +44,12 @@ contract TestExecutePayout_Local is JBMultiTerminalSetup {
     }
 
     function _setAccountingContext(uint256 projectId, address token, uint8 decimals, uint32 currency) internal {
-        bytes32 contextSlot = keccak256(abi.encode(projectId, uint256(0)));
-        bytes32 slot = keccak256(abi.encode(token, contextSlot));
-        bytes32 packed = bytes32(uint256(uint160(token)) | (uint256(decimals) << 160) | (uint256(currency) << 168));
-        vm.store(address(_terminal), slot, packed);
+        // Mock the store to return this accounting context
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), projectId, token)),
+            abi.encode(JBAccountingContext({token: token, decimals: decimals, currency: currency}))
+        );
     }
 
     modifier whenASplitHookIsConfigured() {
@@ -66,6 +70,13 @@ contract TestExecutePayout_Local is JBMultiTerminalSetup {
     function test_GivenTheSplitHookEQFeeless() external whenASplitHookIsConfigured {
         // it will not process a fee
 
+        // Mock accountingContextOf for the decimals lookup in executePayout
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _noProject, _native)),
+            abi.encode(JBAccountingContext({token: _native, decimals: 0, currency: 0}))
+        );
+
         // mock call to split hook supportsInterface
         mockExpect(
             address(_hook),
@@ -111,6 +122,13 @@ contract TestExecutePayout_Local is JBMultiTerminalSetup {
     function test_GivenTheSplitHookDNEQFeeless() external whenASplitHookIsConfigured {
         // it will process a fee
 
+        // Mock accountingContextOf for the decimals lookup in executePayout
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _noProject, _native)),
+            abi.encode(JBAccountingContext({token: _native, decimals: 0, currency: 0}))
+        );
+
         // mock call to split hook supportsInterface
         mockExpect(
             address(_hook),

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

@@ -13,6 +13,8 @@ import {JBTokenAmount} from "../../../../src/structs/JBTokenAmount.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {JBMultiTerminalSetup} from "./JBMultiTerminalSetup.sol";
 
+// Accounting context is now read from the store
+
 contract TestExecuteProcessFee_Local is JBMultiTerminalSetup {
     uint256 _projectId = 1;
     uint256 _defaultAmount = 1e18;
@@ -28,11 +30,12 @@ contract TestExecuteProcessFee_Local is JBMultiTerminalSetup {
     }
 
     function _setAccountingContext(address token, uint8 decimals, uint32 currency) internal {
-        bytes32 contextSlot = keccak256(abi.encode(_projectId, uint256(0)));
-        bytes32 slot = keccak256(abi.encode(token, contextSlot));
-
-        bytes32 packed = bytes32(uint256(uint160(token)) | (uint256(decimals) << 160) | (uint256(currency) << 168));
-        vm.store(address(_terminal), slot, packed);
+        // Mock the store to return this accounting context
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, token)),
+            abi.encode(JBAccountingContext({token: token, decimals: decimals, currency: currency}))
+        );
     }
 
     function test_WhenCallerIsNotItself() external {

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

@@ -7,7 +7,6 @@ import {IJBController} from "../../../../src/interfaces/IJBController.sol";
 import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
 import {IJBPayHook} from "../../../../src/interfaces/IJBPayHook.sol";
 import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
-import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
 import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
 import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
 import {IJBTokens} from "../../../../src/interfaces/IJBTokens.sol";
@@ -17,7 +16,6 @@ import {JBAfterPayRecordedContext} from "../../../../src/structs/JBAfterPayRecor
 import {JBPayHookSpecification} from "../../../../src/structs/JBPayHookSpecification.sol";
 import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
 import {JBTokenAmount} from "../../../../src/structs/JBTokenAmount.sol";
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {JBMultiTerminalSetup} from "./JBMultiTerminalSetup.sol";
 
@@ -60,23 +58,22 @@ contract TestPay_Local is JBMultiTerminalSetup {
             token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
         });
 
-        // setup: return data
-        JBRuleset memory returnedRuleset = JBRuleset({
-            cycleNumber: 1,
-            id: 0,
-            basedOnId: 0,
-            start: 0,
-            duration: 0,
-            weight: 0,
-            weightCutPercent: 0,
-            approvalHook: IJBRulesetApprovalHook(address(0)),
-            metadata: 0
-        });
-
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(returnedRuleset));
+        // Mock recordAccountingContextOf in the store (validation now happens there)
+        mockExpect(
+            address(store), abi.encodeCall(IJBTerminalStore.recordAccountingContextOf, (_projectId, _tokens)), ""
+        );
 
         _terminal.addAccountingContextsFor(_projectId, _tokens);
 
+        // Mock accountingContextOf for subsequent reads
+        mockExpect(
+            address(store),
+            abi.encodeCall(
+                IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, JBConstants.NATIVE_TOKEN)
+            ),
+            abi.encode(_tokens[0])
+        );
+
         _;
     }
 
@@ -89,31 +86,25 @@ contract TestPay_Local is JBMultiTerminalSetup {
             address(directory), abi.encodeCall(IJBDirectory.controllerOf, (_projectId)), abi.encode(address(this))
         );
 
-        // mock call to token decimals
-        mockExpect(address(_mockToken), abi.encodeCall(IERC20Metadata.decimals, ()), abi.encode(6));
-
         JBAccountingContext[] memory _tokens = new JBAccountingContext[](1);
         _tokens[0] = JBAccountingContext({
             token: address(_mockToken), decimals: 6, currency: uint32(uint160(address(_mockToken)))
         });
 
-        // setup: return data
-        JBRuleset memory ruleset = JBRuleset({
-            cycleNumber: 1,
-            id: 0,
-            basedOnId: 0,
-            start: 0,
-            duration: 0,
-            weight: 0,
-            weightCutPercent: 0,
-            approvalHook: IJBRulesetApprovalHook(address(0)),
-            metadata: 0
-        });
-
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(ruleset));
+        // Mock recordAccountingContextOf in the store (validation now happens there)
+        mockExpect(
+            address(store), abi.encodeCall(IJBTerminalStore.recordAccountingContextOf, (_projectId, _tokens)), ""
+        );
 
         _terminal.addAccountingContextsFor(_projectId, _tokens);
 
+        // Mock accountingContextOf for subsequent reads
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, address(_mockToken))),
+            abi.encode(_tokens[0])
+        );
+
         _;
     }
 
@@ -254,6 +245,7 @@ contract TestPay_Local is JBMultiTerminalSetup {
             // forge-lint: disable-next-line(unsafe-typecast)
             token: address(_mockToken),
             decimals: 6,
+            // forge-lint: disable-next-line(unsafe-typecast)
             currency: uint32(_mockTokenCurrency),
             value: _defaultAmount
         });
@@ -441,8 +433,16 @@ contract TestPay_Local is JBMultiTerminalSetup {
     function test_WhenTheProjectDNHAccountingContextForTheToken() external {
         // it will revert TOKEN_NOT_ACCEPTED
 
+        // Mock totalBalanceOf (called before _acceptFundsFor)
         mockExpect(address(tokens), abi.encodeCall(IJBTokens.totalBalanceOf, (_bene, _projectId)), abi.encode(0));
 
+        // Mock accountingContextOf to return empty context (token not accepted)
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, _native)),
+            abi.encode(JBAccountingContext({token: address(0), decimals: 0, currency: 0}))
+        );
+
         vm.expectRevert(abi.encodeWithSelector(JBMultiTerminal.JBMultiTerminal_TokenNotAccepted.selector, _native));
         _terminal.pay{value: 1e18}({
             projectId: _projectId,
@@ -463,8 +463,16 @@ contract TestPay_Local is JBMultiTerminalSetup {
     function test_WhenTheTerminalsTokenEqNativeTokenAndMsgvalueEqZero() external {
         // it will revert NO_MSG_VALUE_ALLOWED
 
+        // Mock totalBalanceOf (called before _acceptFundsFor)
         mockExpect(address(tokens), abi.encodeCall(IJBTokens.totalBalanceOf, (_bene, _projectId)), abi.encode(0));
 
+        // Mock accountingContextOf to return empty context (token not accepted)
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, _native)),
+            abi.encode(JBAccountingContext({token: address(0), decimals: 0, currency: 0}))
+        );
+
         vm.expectRevert(abi.encodeWithSelector(JBMultiTerminal.JBMultiTerminal_TokenNotAccepted.selector, _native));
         _terminal.pay{value: 0}({
             projectId: _projectId,

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

@@ -5,7 +5,6 @@ import {JBMultiTerminal} from "../../../../src/JBMultiTerminal.sol";
 import {IJBCashOutHook} from "../../../../src/interfaces/IJBCashOutHook.sol";
 import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
 import {IJBFeelessAddresses} from "../../../../src/interfaces/IJBFeelessAddresses.sol";
-import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
 import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
 import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
 import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
@@ -32,34 +31,35 @@ contract TestPreviewCashOutFrom_Local is JBMultiTerminalSetup {
             address(directory), abi.encodeCall(IJBDirectory.controllerOf, (_projectId)), abi.encode(address(this))
         );
 
-        JBRuleset memory returnedRuleset = JBRuleset({
-            cycleNumber: 1,
-            id: 0,
-            basedOnId: 0,
-            start: 0,
-            duration: 0,
-            weight: 0,
-            weightCutPercent: 0,
-            approvalHook: IJBRulesetApprovalHook(address(0)),
-            metadata: 0
-        });
-
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(returnedRuleset));
-
         JBAccountingContext[] memory contexts = new JBAccountingContext[](1);
         contexts[0] = JBAccountingContext({token: token, decimals: decimals, currency: currency});
 
+        // Mock recordAccountingContextOf in the store (validation now happens there)
+        mockExpect(
+            address(store), abi.encodeCall(IJBTerminalStore.recordAccountingContextOf, (_projectId, contexts)), ""
+        );
+
         vm.prank(address(this));
         _terminal.addAccountingContextsFor(_projectId, contexts);
+
+        // Mock accountingContextOf for subsequent reads (not all code paths call it, so use mockCall only)
+        vm.mockCall(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, token)),
+            abi.encode(contexts[0])
+        );
     }
 
     function test_RevertsWhenTokenIsNotAccepted() external {
-        vm.expectRevert(abi.encodeWithSelector(JBMultiTerminal.JBMultiTerminal_TokenNotAccepted.selector, _token));
+        // previewCashOutFrom now delegates directly to the store without a token acceptance check,
+        // so it reverts during store computation (e.g. unmocked external call) rather than with TokenNotAccepted.
+        vm.expectRevert();
         JBMultiTerminal(address(_terminal))
             .previewCashOutFrom(_holder, _projectId, _cashOutCount, _token, _beneficiary, "");
     }
 
     function test_ReturnsRulesetAndCashOutPreviewValues() external {
+        // forge-lint: disable-next-line(unsafe-typecast)
         _acceptToken(_token, 18, uint32(uint160(_token)));
 
         JBRuleset memory ruleset = JBRuleset({
@@ -80,7 +80,8 @@ contract TestPreviewCashOutFrom_Local is JBMultiTerminalSetup {
         });
 
         JBAccountingContext memory accountingContext =
-            JBAccountingContext({token: _token, decimals: 18, currency: uint32(uint160(_token))});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: _token, decimals: 18, currency: uint32(uint160(_token))});
         JBAccountingContext[] memory accountingContexts = new JBAccountingContext[](1);
         accountingContexts[0] = accountingContext;
 
@@ -92,7 +93,7 @@ contract TestPreviewCashOutFrom_Local is JBMultiTerminalSetup {
             address(store),
             abi.encodeCall(
                 IJBTerminalStore.previewCashOutFrom,
-                (_holder, _projectId, _cashOutCount, accountingContext, accountingContexts, true, bytes(""))
+                (address(_terminal), _holder, _projectId, _cashOutCount, accountingContext.token, true, bytes(""))
             ),
             abi.encode(ruleset, 999, 1234, specs)
         );

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

@@ -27,21 +27,50 @@ contract TestPreviewPayFor_Local is JBMultiTerminalSetup {
     }
 
     function _setAccountingContext(address token, uint8 decimals, uint32 currency) internal {
-        bytes32 contextSlot = keccak256(abi.encode(_projectId, uint256(0)));
-        bytes32 slot = keccak256(abi.encode(token, contextSlot));
-        bytes32 packed = bytes32(uint256(uint160(token)) | (uint256(decimals) << 160) | (uint256(currency) << 168));
-        vm.store(address(_terminal), slot, packed);
+        // Mock the store to return this accounting context
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, token)),
+            abi.encode(JBAccountingContext({token: token, decimals: decimals, currency: currency}))
+        );
     }
 
     function test_RevertsWhenTokenIsNotAccepted() external {
+        // Mock accountingContextOf to return empty context (token not accepted)
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, _token)),
+            abi.encode(JBAccountingContext({token: address(0), decimals: 0, currency: 0}))
+        );
+
         vm.prank(_payer);
         vm.expectRevert(abi.encodeWithSelector(JBMultiTerminal.JBMultiTerminal_TokenNotAccepted.selector, _token));
         JBMultiTerminal(address(_terminal)).previewPayFor(_projectId, _token, _amount, _beneficiary, "");
     }
 
     function test_ReturnsRulesetMintSplitAndHookSpecifications() external {
+        // forge-lint: disable-next-line(unsafe-typecast)
         _setAccountingContext(_token, 18, uint32(uint160(_token)));
 
+        _mockPreviewPayFrom();
+
+        vm.prank(_payer);
+        (
+            JBRuleset memory previewRuleset,
+            uint256 beneficiaryTokenCount,
+            uint256 reservedTokenCount,
+            JBPayHookSpecification[] memory previewSpecs
+        ) = JBMultiTerminal(address(_terminal)).previewPayFor(_projectId, _token, _amount, _beneficiary, "");
+
+        assertEq(previewRuleset.id, 1);
+        assertEq(beneficiaryTokenCount, 750);
+        assertEq(reservedTokenCount, 250);
+        assertEq(previewSpecs.length, 1);
+        assertEq(previewSpecs[0].amount, 123);
+        assertEq(previewSpecs[0].metadata, hex"1234");
+    }
+
+    function _mockPreviewPayFrom() internal {
         JBRuleset memory ruleset = JBRuleset({
             cycleNumber: 1,
             id: 1,
@@ -59,11 +88,14 @@ contract TestPreviewPayFor_Local is JBMultiTerminalSetup {
             JBPayHookSpecification({hook: IJBPayHook(makeAddr("hook")), noop: false, amount: 123, metadata: hex"1234"});
 
         JBTokenAmount memory tokenAmount =
-            JBTokenAmount({token: _token, decimals: 18, currency: uint32(uint160(_token)), value: _amount});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBTokenAmount({token: _token, decimals: 18, currency: uint32(uint160(_token)), value: _amount});
 
         mockExpect(
             address(store),
-            abi.encodeCall(IJBTerminalStore.previewPayFrom, (_payer, tokenAmount, _projectId, _beneficiary, bytes(""))),
+            abi.encodeWithSelector(
+                bytes4(0xdb6d7e03), address(_terminal), _payer, tokenAmount, _projectId, _beneficiary, bytes("")
+            ),
             abi.encode(ruleset, 1000, specs)
         );
 
@@ -78,21 +110,5 @@ contract TestPreviewPayFor_Local is JBMultiTerminalSetup {
             abi.encodeCall(IJBController.previewMintOf, (_projectId, 1000, true)),
             abi.encode(750, 250)
         );
-
-        vm.prank(_payer);
-        (
-            JBRuleset memory previewRuleset,
-            uint256 beneficiaryTokenCount,
-            uint256 reservedTokenCount,
-            JBPayHookSpecification[] memory previewSpecs
-        ) = JBMultiTerminal(address(_terminal)).previewPayFor(_projectId, _token, _amount, _beneficiary, "");
-
-        assertEq(previewRuleset.id, ruleset.id);
-        assertEq(beneficiaryTokenCount, 750);
-        assertEq(reservedTokenCount, 250);
-        assertEq(previewSpecs.length, 1);
-        assertEq(address(previewSpecs[0].hook), address(specs[0].hook));
-        assertEq(previewSpecs[0].amount, specs[0].amount);
-        assertEq(previewSpecs[0].metadata, specs[0].metadata);
     }
 }

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

@@ -13,6 +13,7 @@ import {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
 import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
 import {IJBTokens} from "../../../../src/interfaces/IJBTokens.sol";
 import {JBFees} from "../../../../src/libraries/JBFees.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
 import {JBFee} from "../../../../src/structs/JBFee.sol";
 import {JBPayHookSpecification} from "../../../../src/structs/JBPayHookSpecification.sol";
 import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
@@ -65,16 +66,17 @@ contract TestProcessHeldFeesOf_Local is JBTest {
     address _beneficiary = makeAddr("beneficiary");
 
     function _setAccountingContext(uint256 projectId, address token, uint8 decimals, uint32 currency) internal {
-        bytes32 contextSlot = keccak256(abi.encode(projectId, uint256(0)));
-        bytes32 slot = keccak256(abi.encode(token, contextSlot));
-        bytes32 packed = bytes32(uint256(uint160(token)) | (uint256(decimals) << 160) | (uint256(currency) << 168));
-        vm.store(address(_terminal), slot, packed);
+        // Mock the store to return this accounting context
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), projectId, token)),
+            abi.encode(JBAccountingContext({token: token, decimals: decimals, currency: currency}))
+        );
     }
 
     function setUp() public {
-        // Constructor will call to find directory and rulesets from the terminal store
+        // Constructor will call to find directory from the terminal store
         mockExpect(address(store), abi.encodeCall(IJBTerminalStore.DIRECTORY, ()), abi.encode(address(directory)));
-        mockExpect(address(store), abi.encodeCall(IJBTerminalStore.RULESETS, ()), abi.encode(address(rulesets)));
 
         _terminal = new ForTest_JBMultiTerminal(
             feelessAddresses, permissions, projects, splits, store, tokens, permit2, trustedForwarder
@@ -127,6 +129,7 @@ contract TestProcessHeldFeesOf_Local is JBTest {
         uint256 expectedFeeAmount = JBFees.feeAmountFrom({amountBeforeFee: heldAmount, feePercent: _terminal.FEE()});
 
         // Set up accounting context for the fee beneficiary project (project 1) so _pay can build the token amount.
+        // forge-lint: disable-next-line(unsafe-typecast)
         _setAccountingContext(_feeProjectId, _mockToken, 0, uint32(uint160(_mockToken)));
 
         // Mock the directory call to find the fee terminal - return _terminal itself so it uses internal _pay

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

@@ -47,7 +47,7 @@ contract TestSendPayoutsOf_Local is JBMultiTerminalSetup {
         // record payout mock call
         mockExpect(
             address(store),
-            abi.encodeCall(IJBTerminalStore.recordPayoutFor, (_projectId, mockTokenContext, 0, 0)),
+            abi.encodeCall(IJBTerminalStore.recordPayoutFor, (_projectId, mockTokenContext.token, 0, 0)),
             abi.encode(returnedRuleset, 0)
         );
 
@@ -86,7 +86,7 @@ contract TestSendPayoutsOf_Local is JBMultiTerminalSetup {
         // record payout mock call
         mockExpect(
             address(store),
-            abi.encodeCall(IJBTerminalStore.recordPayoutFor, (_projectId, mockTokenContext, 0, 0)),
+            abi.encodeCall(IJBTerminalStore.recordPayoutFor, (_projectId, mockTokenContext.token, 0, 0)),
             abi.encode(returnedRuleset, 0)
         );
 
@@ -134,7 +134,7 @@ contract TestSendPayoutsOf_Local is JBMultiTerminalSetup {
         // record payout mock call
         mockExpect(
             address(store),
-            abi.encodeCall(IJBTerminalStore.recordPayoutFor, (_projectId, mockTokenContext, 0, 0)),
+            abi.encodeCall(IJBTerminalStore.recordPayoutFor, (_projectId, mockTokenContext.token, 0, 0)),
             abi.encode(returnedRuleset, 0)
         );
 
@@ -204,7 +204,7 @@ contract TestSendPayoutsOf_Local is JBMultiTerminalSetup {
         // record payout mock call
         mockExpect(
             address(store),
-            abi.encodeCall(IJBTerminalStore.recordPayoutFor, (_projectId, mockTokenContext, 0, 100)),
+            abi.encodeCall(IJBTerminalStore.recordPayoutFor, (_projectId, mockTokenContext.token, 0, 100)),
             abi.encode(returnedRuleset, 100)
         );