@bananapus/core-v6 0.0.21 → 0.0.22

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

@@ -2,11 +2,8 @@
 pragma solidity 0.8.26;
 
 import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
-import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
 import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
-import {JBRuleset} from "../../../../src/structs/JBRuleset.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";
 
@@ -33,40 +30,42 @@ contract TestAccountingContextsOf_Local is JBMultiTerminalSetup {
             address(directory), abi.encodeCall(IJBDirectory.controllerOf, (_projectId)), abi.encode(address(this))
         );
 
-        // mock call to tokens decimals()
-        mockExpect(_usdc, abi.encodeCall(IERC20Metadata.decimals, ()), abi.encode(6));
-
-        // 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
-        });
-
-        // mock call to rulesets currentOf returning 0 to bypass ruleset checking
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(ruleset));
-
         // call params
         JBAccountingContext[] memory _tokens = new JBAccountingContext[](1);
         // forge-lint: disable-next-line(unsafe-typecast)
         _tokens[0] = JBAccountingContext({token: _usdc, decimals: 6, currency: uint32(uint160(_usdc))});
 
+        // Mock recordAccountingContextOf in the store (validation now happens there)
+        mockExpect(
+            address(store), abi.encodeCall(IJBTerminalStore.recordAccountingContextOf, (_projectId, _tokens)), ""
+        );
+
         _terminal.addAccountingContextsFor(_projectId, _tokens);
 
+        // Mock the store to return all contexts when queried
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextsOf, (address(_terminal), _projectId)),
+            abi.encode(_tokens)
+        );
+
         JBAccountingContext[] memory _storedContexts = _terminal.accountingContextsOf(_projectId);
         assertEq(_storedContexts[0].currency, _usdcCurrency);
         assertEq(_storedContexts[0].token, _usdc);
         assertEq(_storedContexts[0].decimals, 6);
     }
 
-    function test_WhenAccountingContextsAreNotSet() external view {
+    function test_WhenAccountingContextsAreNotSet() external {
         // it will return an empty array
+
+        // Mock the store to return empty array
+        JBAccountingContext[] memory _empty = new JBAccountingContext[](0);
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextsOf, (address(_terminal), _projectId)),
+            abi.encode(_empty)
+        );
+
         JBAccountingContext[] memory _storedContexts = _terminal.accountingContextsOf(_projectId);
         assertEq(_storedContexts.length, 0);
     }

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

@@ -1,14 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import {JBMultiTerminal} from "../../../../src/JBMultiTerminal.sol";
+import {JBTerminalStore} from "../../../../src/JBTerminalStore.sol";
 import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
-import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
 import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
 import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
-import {JBRuleset} from "../../../../src/structs/JBRuleset.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";
 
@@ -43,44 +40,20 @@ contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
     function test_GivenTheContextIsAlreadySet() external whenCallerIsPermissioned {
         // it will revert ACCOUNTING_CONTEXT_ALREADY_SET
 
-        // Accounting Context to set
-        // forge-lint: disable-next-line(unsafe-typecast)
-        JBAccountingContext memory _context =
-        // forge-lint: disable-next-line(unsafe-typecast)
-        JBAccountingContext({token: _usdc, decimals: 18, currency: uint32(_usdcCurrency)});
-
-        // Find the storage slot
-        bytes32 contextSlot = keccak256(abi.encode(_projectId, uint256(0)));
-        bytes32 slot = keccak256(abi.encode(_usdc, contextSlot));
-
-        // Set storage
-        vm.store(address(_terminal), slot, bytes32(abi.encode(_context)));
-
-        // 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));
-
-        JBAccountingContext memory _storedContext = _terminal.accountingContextForTokenOf(_projectId, _usdc);
-        assertEq(_storedContext.token, _usdc);
-
         // call params
         JBAccountingContext[] memory _tokens = new JBAccountingContext[](1);
         // forge-lint: disable-next-line(unsafe-typecast)
         _tokens[0] = JBAccountingContext({token: _usdc, decimals: 6, currency: uint32(uint160(_usdc))});
 
+        // Mock recordAccountingContextOf to revert with AccountingContextAlreadySet
+        vm.mockCallRevert(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.recordAccountingContextOf, (_projectId, _tokens)),
+            abi.encodeWithSelector(JBTerminalStore.JBTerminalStore_AccountingContextAlreadySet.selector, _usdc)
+        );
+
         vm.expectRevert(
-            abi.encodeWithSelector(JBMultiTerminal.JBMultiTerminal_AccountingContextAlreadySet.selector, _usdc)
+            abi.encodeWithSelector(JBTerminalStore.JBTerminalStore_AccountingContextAlreadySet.selector, _usdc)
         );
         _terminal.addAccountingContextsFor(_projectId, _tokens);
     }
@@ -88,32 +61,25 @@ contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
     function test_GivenHappyPathERC20() external whenCallerIsPermissioned {
         // it will set the context and emit SetAccountingContext
 
-        // mock call to tokens decimals()
-        mockExpect(_usdc, abi.encodeCall(IERC20Metadata.decimals, ()), abi.encode(6));
-
-        // 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
-        });
-
-        // mock call to rulesets currentOf returning 0 to bypass ruleset checking
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(ruleset));
-
         // call params
         JBAccountingContext[] memory _tokens = new JBAccountingContext[](1);
         // forge-lint: disable-next-line(unsafe-typecast)
         _tokens[0] = JBAccountingContext({token: _usdc, decimals: 6, currency: uint32(uint160(_usdc))});
 
+        // Mock recordAccountingContextOf in the store (validation now happens there)
+        mockExpect(
+            address(store), abi.encodeCall(IJBTerminalStore.recordAccountingContextOf, (_projectId, _tokens)), ""
+        );
+
         _terminal.addAccountingContextsFor(_projectId, _tokens);
 
+        // Mock the store to return the context when queried
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, _usdc)),
+            abi.encode(_tokens[0])
+        );
+
         JBAccountingContext memory _storedContext = _terminal.accountingContextForTokenOf(_projectId, _usdc);
         assertEq(_storedContext.token, _usdc);
         assertEq(_storedContext.decimals, 6);
@@ -128,25 +94,22 @@ contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
             token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
         });
 
-        // mock call to rulesets currentOf returning 0 to bypass ruleset checking
-
-        // 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 the store to return the context when queried
+        mockExpect(
+            address(store),
+            abi.encodeCall(
+                IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, JBConstants.NATIVE_TOKEN)
+            ),
+            abi.encode(_tokens[0])
+        );
+
         JBAccountingContext memory _storedContext =
             _terminal.accountingContextForTokenOf(_projectId, JBConstants.NATIVE_TOKEN);
         assertEq(_storedContext.token, JBConstants.NATIVE_TOKEN);
@@ -173,23 +136,22 @@ contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
             token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
         });
 
-        // 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 the store to return the context when queried
+        mockExpect(
+            address(store),
+            abi.encodeCall(
+                IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, JBConstants.NATIVE_TOKEN)
+            ),
+            abi.encode(_tokens[0])
+        );
+
         JBAccountingContext memory _storedContext =
             _terminal.accountingContextForTokenOf(_projectId, JBConstants.NATIVE_TOKEN);
         assertEq(_storedContext.token, JBConstants.NATIVE_TOKEN);
@@ -216,18 +178,19 @@ contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
             token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
         });
 
-        // setup: return data
-        JBRuleset memory ruleset = generateUnfriendlyRuleset();
-
-        // mock rulesets call
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(ruleset));
+        // Mock recordAccountingContextOf to revert with AddingAccountingContextNotAllowed (validation now in store)
+        vm.mockCallRevert(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.recordAccountingContextOf, (_projectId, _tokens)),
+            abi.encodeWithSelector(JBTerminalStore.JBTerminalStore_AddingAccountingContextNotAllowed.selector)
+        );
 
-        vm.expectRevert(JBMultiTerminal.JBMultiTerminal_AddingAccountingContextNotAllowed.selector);
+        vm.expectRevert(JBTerminalStore.JBTerminalStore_AddingAccountingContextNotAllowed.selector);
         _terminal.addAccountingContextsFor(_projectId, _tokens);
     }
 
     function test_WhenCurrencyIsNativeButDecimalsDNEQ18() external {
-        // it will revert JBMultiTerminal_AccountingContextDecimalsMismatch
+        // it will revert JBTerminalStore_AccountingContextDecimalsMismatch
 
         // mock call to JBProjects ownerOf(_projectId)
         bytes memory _projectsCall = abi.encodeCall(IERC721.ownerOf, (_projectId));
@@ -247,18 +210,19 @@ contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
             currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
         });
 
-        // setup: return data
-        JBRuleset memory ruleset = generateFriendlyRuleset();
-
-        // mock rulesets call
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(ruleset));
+        // Mock recordAccountingContextOf to revert with DecimalsMismatch (validation now in store)
+        vm.mockCallRevert(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.recordAccountingContextOf, (_projectId, _tokens)),
+            abi.encodeWithSelector(JBTerminalStore.JBTerminalStore_AccountingContextDecimalsMismatch.selector)
+        );
 
-        vm.expectRevert(JBMultiTerminal.JBMultiTerminal_AccountingContextDecimalsMismatch.selector);
+        vm.expectRevert(JBTerminalStore.JBTerminalStore_AccountingContextDecimalsMismatch.selector);
         _terminal.addAccountingContextsFor(_projectId, _tokens);
     }
 
     function test_WhenTokenDecimalsDoesNotMatchAccountingContext() external {
-        // it will revert JBMultiTerminal_AccountingContextDecimalsMismatch
+        // it will revert JBTerminalStore_AccountingContextDecimalsMismatch
 
         // mock call to JBProjects ownerOf(_projectId)
         bytes memory _projectsCall = abi.encodeCall(IERC721.ownerOf, (_projectId));
@@ -281,21 +245,19 @@ contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
             currency: uint32(uint160(someToken))
         });
 
-        // setup: return data
-        JBRuleset memory ruleset = generateFriendlyRuleset();
-
-        // mock rulesets call
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(ruleset));
-
-        // mock token call
-        mockExpect(address(someToken), abi.encodeCall(IERC20Metadata.decimals, ()), abi.encode(18));
+        // Mock recordAccountingContextOf to revert with DecimalsMismatch (validation now in store)
+        vm.mockCallRevert(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.recordAccountingContextOf, (_projectId, _tokens)),
+            abi.encodeWithSelector(JBTerminalStore.JBTerminalStore_AccountingContextDecimalsMismatch.selector)
+        );
 
-        vm.expectRevert(JBMultiTerminal.JBMultiTerminal_AccountingContextDecimalsMismatch.selector);
+        vm.expectRevert(JBTerminalStore.JBTerminalStore_AccountingContextDecimalsMismatch.selector);
         _terminal.addAccountingContextsFor(_projectId, _tokens);
     }
 
     function test_WhenCurrencyEQZero() external {
-        // it will revert JBMultiTerminal_ZeroAccountingContextCurrency
+        // it will revert JBTerminalStore_ZeroAccountingContextCurrency
 
         // mock call to JBProjects ownerOf(_projectId)
         bytes memory _projectsCall = abi.encodeCall(IERC721.ownerOf, (_projectId));
@@ -314,16 +276,14 @@ contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
         // forge-lint: disable-next-line(unsafe-typecast)
         _tokens[0] = JBAccountingContext({token: someToken, decimals: 18, currency: uint32(uint160(0))});
 
-        // setup: return data
-        JBRuleset memory ruleset = generateFriendlyRuleset();
-
-        // mock rulesets call
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(ruleset));
-
-        // mock token call
-        mockExpect(address(someToken), abi.encodeCall(IERC20Metadata.decimals, ()), abi.encode(18));
+        // Mock recordAccountingContextOf to revert with ZeroAccountingContextCurrency (validation now in store)
+        vm.mockCallRevert(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.recordAccountingContextOf, (_projectId, _tokens)),
+            abi.encodeWithSelector(JBTerminalStore.JBTerminalStore_ZeroAccountingContextCurrency.selector)
+        );
 
-        vm.expectRevert(JBMultiTerminal.JBMultiTerminal_ZeroAccountingContextCurrency.selector);
+        vm.expectRevert(JBTerminalStore.JBTerminalStore_ZeroAccountingContextCurrency.selector);
         _terminal.addAccountingContextsFor(_projectId, _tokens);
     }
 }

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

@@ -55,12 +55,12 @@ contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
         // forge-lint: disable-next-line(unsafe-typecast)
         JBAccountingContext({token: _native, decimals: 18, currency: uint32(_nativeCurrency)});
 
-        // Find the storage slot
-        bytes32 contextSlot = keccak256(abi.encode(_projectId, uint256(0)));
-        bytes32 slot = keccak256(abi.encode(_native, contextSlot));
-
-        // Set storage
-        vm.store(address(_terminal), slot, bytes32(abi.encode(_context)));
+        // Mock the store to return this accounting context
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, _native)),
+            abi.encode(_context)
+        );
 
         JBAccountingContext memory _storedContext = _terminal.accountingContextForTokenOf(_projectId, _native);
         assertEq(_storedContext.token, _native);
@@ -75,18 +75,18 @@ contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
         // forge-lint: disable-next-line(unsafe-typecast)
         JBAccountingContext({token: _native, decimals: 18, currency: uint32(_nativeCurrency)});
 
-        // Find the storage slot
-        bytes32 contextSlot = keccak256(abi.encode(_projectId, uint256(0)));
-        bytes32 slot = keccak256(abi.encode(_native, contextSlot));
-
-        // Set storage
-        vm.store(address(_terminal), slot, bytes32(abi.encode(_context)));
+        // Mock the store to return this accounting context
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, _native)),
+            abi.encode(_context)
+        );
 
         JBAccountingContext memory _storedContext = _terminal.accountingContextForTokenOf(_projectId, _native);
         assertEq(_storedContext.token, _native);
 
-        // Find the storage slot for fees array (_heldFeesOf is at storage slot 3)
-        bytes32 feeSlot = keccak256(abi.encode(_projectId, uint256(3)));
+        // Find the storage slot for fees array (_heldFeesOf is at storage slot 1)
+        bytes32 feeSlot = keccak256(abi.encode(_projectId, uint256(1)));
         bytes32 slotForArrayLength = keccak256(abi.encode(_native, feeSlot));
 
         // Set the length of the fees array in the storage slot
@@ -223,6 +223,13 @@ contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
     function test_WhenTheProjectDNHAccountingContextForTheToken() external {
         // it will revert TOKEN_NOT_ACCEPTED
 
+        // 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.addToBalanceOf{value: payAmount}({
@@ -244,12 +251,12 @@ contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
         // forge-lint: disable-next-line(unsafe-typecast)
         JBAccountingContext({token: _usdc, decimals: 18, currency: uint32(_usdcCurrency)});
 
-        // Find the storage slot
-        bytes32 contextSlot = keccak256(abi.encode(_projectId, uint256(0)));
-        bytes32 slot = keccak256(abi.encode(_usdc, contextSlot));
-
-        // Set storage
-        vm.store(address(_terminal), slot, bytes32(abi.encode(_context)));
+        // Mock the store to return this accounting context
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, _usdc)),
+            abi.encode(_context)
+        );
 
         JBAccountingContext memory _storedContext = _terminal.accountingContextForTokenOf(_projectId, _usdc);
         assertEq(_storedContext.token, _usdc);
@@ -273,12 +280,12 @@ contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
         // forge-lint: disable-next-line(unsafe-typecast)
         JBAccountingContext({token: _usdc, decimals: 18, currency: uint32(_usdcCurrency)});
 
-        // Find the storage slot
-        bytes32 contextSlot = keccak256(abi.encode(_projectId, uint256(0)));
-        bytes32 slot = keccak256(abi.encode(_usdc, contextSlot));
-
-        // Set storage
-        vm.store(address(_terminal), slot, bytes32(abi.encode(_context)));
+        // Mock the store to return this accounting context
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, _usdc)),
+            abi.encode(_context)
+        );
 
         JBAccountingContext memory _storedContext = _terminal.accountingContextForTokenOf(_projectId, _usdc);
         assertEq(_storedContext.token, _usdc);

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);