@bananapus/core-v6 0.0.20 → 0.0.22

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

@@ -8,7 +8,6 @@ import {IJBFeeTerminal} from "../../../../src/interfaces/IJBFeeTerminal.sol";
 import {IJBFeelessAddresses} from "../../../../src/interfaces/IJBFeelessAddresses.sol";
 import {IJBPayoutTerminal} from "../../../../src/interfaces/IJBPayoutTerminal.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 {JBPayHookSpecification} from "../../../../src/structs/JBPayHookSpecification.sol";
@@ -18,7 +17,6 @@ import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMeta
 import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
 import {JBTokenAmount} from "../../../../src/structs/JBTokenAmount.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";
 
@@ -55,7 +53,7 @@ contract TestUseAllowanceOf_Local is JBMultiTerminalSetup {
         // recordUsedAllowance
         mockExpect(
             address(store),
-            abi.encodeCall(IJBTerminalStore.recordUsedAllowanceOf, (_projectId, mockTokenContext, 0, 0)),
+            abi.encodeCall(IJBTerminalStore.recordUsedAllowanceOf, (_projectId, mockTokenContext.token, 0, 0)),
             abi.encode(returnedRuleset, 0)
         );
 
@@ -88,12 +86,10 @@ contract TestUseAllowanceOf_Local is JBMultiTerminalSetup {
             metadata: 0
         });
 
-        JBAccountingContext memory mockTokenContext = JBAccountingContext({token: address(0), decimals: 0, currency: 0});
-
-        // recordUsedAllowance
+        // recordUsedAllowance — terminal now passes token address directly.
         mockExpect(
             address(store),
-            abi.encodeCall(IJBTerminalStore.recordUsedAllowanceOf, (_projectId, mockTokenContext, 100, 0)),
+            abi.encodeCall(IJBTerminalStore.recordUsedAllowanceOf, (_projectId, mockToken, 100, 0)),
             abi.encode(returnedRuleset, 100)
         );
 
@@ -140,12 +136,10 @@ contract TestUseAllowanceOf_Local is JBMultiTerminalSetup {
             metadata: 0
         });
 
-        JBAccountingContext memory mockTokenContext = JBAccountingContext({token: address(0), decimals: 0, currency: 0});
-
-        // recordUsedAllowance
+        // recordUsedAllowance — terminal now passes token address directly
         mockExpect(
             address(store),
-            abi.encodeCall(IJBTerminalStore.recordUsedAllowanceOf, (_projectId, mockTokenContext, 100, 0)),
+            abi.encodeCall(IJBTerminalStore.recordUsedAllowanceOf, (_projectId, mockToken, 100, 0)),
             abi.encode(returnedRuleset, 100)
         );
 
@@ -222,24 +216,30 @@ contract TestUseAllowanceOf_Local is JBMultiTerminalSetup {
             metadata: 0
         });
 
-        // mock call to tokens decimals()
-        mockExpect(mockToken, abi.encodeCall(IERC20Metadata.decimals, ()), abi.encode(18));
-
-        // mock call to rulesets currentOf returning 0 to bypass ruleset checking
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(returnedRuleset));
-
         // call params
         JBAccountingContext[] memory _tokens = new JBAccountingContext[](1);
         _tokens[0] = JBAccountingContext({token: mockToken, decimals: 18, currency: currencyId});
 
+        // 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 (used by _tokenAmountOf during fee processing)
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, mockToken)),
+            abi.encode(_tokens[0])
+        );
+
         _terminal.accountingContextForTokenOf(_projectId, mockToken);
 
         // recordUsedAllowance
         mockExpect(
             address(store),
-            abi.encodeCall(IJBTerminalStore.recordUsedAllowanceOf, (_projectId, _tokens[0], 100, 0)),
+            abi.encodeCall(IJBTerminalStore.recordUsedAllowanceOf, (_projectId, _tokens[0].token, 100, 0)),
             abi.encode(returnedRuleset, 100)
         );
 
@@ -370,22 +370,21 @@ contract TestUseAllowanceOf_Local is JBMultiTerminalSetup {
             metadata: packedMetadata
         });
 
-        // mock call to tokens decimals()
-        mockExpect(mockToken, abi.encodeCall(IERC20Metadata.decimals, ()), abi.encode(18));
-
-        // mock call to rulesets currentOf
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(returnedRuleset));
-
         // Set up accounting context so the token is recognized
         JBAccountingContext[] memory _tokens = new JBAccountingContext[](1);
         _tokens[0] = JBAccountingContext({token: mockToken, decimals: 18, currency: currencyId});
 
+        // Mock recordAccountingContextOf in the store (validation now happens there)
+        mockExpect(
+            address(store), abi.encodeCall(IJBTerminalStore.recordAccountingContextOf, (_projectId, _tokens)), ""
+        );
+
         _terminal.addAccountingContextsFor(_projectId, _tokens);
 
         // recordUsedAllowance
         mockExpect(
             address(store),
-            abi.encodeCall(IJBTerminalStore.recordUsedAllowanceOf, (_projectId, _tokens[0], 100, 0)),
+            abi.encodeCall(IJBTerminalStore.recordUsedAllowanceOf, (_projectId, _tokens[0].token, 100, 0)),
             abi.encode(returnedRuleset, 100)
         );
 
@@ -499,22 +498,28 @@ contract TestUseAllowanceOf_Local is JBMultiTerminalSetup {
             metadata: packedMetadata
         });
 
-        // mock call to tokens decimals()
-        mockExpect(mockToken, abi.encodeCall(IERC20Metadata.decimals, ()), abi.encode(18));
-
-        // mock call to rulesets currentOf
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(returnedRuleset));
-
         // Set up accounting context
         JBAccountingContext[] memory _tokens = new JBAccountingContext[](1);
         _tokens[0] = JBAccountingContext({token: mockToken, decimals: 18, currency: currencyId});
 
+        // 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 (used by _tokenAmountOf during fee processing)
+        mockExpect(
+            address(store),
+            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, mockToken)),
+            abi.encode(_tokens[0])
+        );
+
         // recordUsedAllowance
         mockExpect(
             address(store),
-            abi.encodeCall(IJBTerminalStore.recordUsedAllowanceOf, (_projectId, _tokens[0], 100, 0)),
+            abi.encodeCall(IJBTerminalStore.recordUsedAllowanceOf, (_projectId, _tokens[0].token, 100, 0)),
             abi.encode(returnedRuleset, 100)
         );
 

package/test/units/static/JBSurplus/TestSurplusFuzz.sol

@@ -19,17 +19,7 @@ contract MockSurplusTerminal is ERC165, IJBCashOutTerminal {
         surplusAmount = _surplus;
     }
 
-    function currentSurplusOf(
-        uint256,
-        JBAccountingContext[] memory,
-        uint256,
-        uint256
-    )
-        external
-        view
-        override
-        returns (uint256)
-    {
+    function currentSurplusOf(uint256, address[] calldata, uint256, uint256) external view override returns (uint256) {
         return surplusAmount;
     }
 
@@ -131,9 +121,8 @@ contract TestSurplusFuzz_Local is JBTest {
     /// @notice Surplus with no terminals is 0.
     function testFuzz_noTerminals_returnsZero(uint256 projectId) external view {
         IJBTerminal[] memory terminals = new IJBTerminal[](0);
-        JBAccountingContext[] memory contexts = new JBAccountingContext[](0);
 
-        uint256 surplus = JBSurplus.currentSurplusOf(projectId, terminals, contexts, 18, 1);
+        uint256 surplus = JBSurplus.currentSurplusOf(projectId, terminals, new address[](0), 18, 1);
         assertEq(surplus, 0, "surplus with no terminals should be 0");
     }
 
@@ -146,9 +135,7 @@ contract TestSurplusFuzz_Local is JBTest {
         terminals[0] = terminal1;
         terminals[1] = terminal2;
 
-        JBAccountingContext[] memory contexts = new JBAccountingContext[](0);
-
-        uint256 total = JBSurplus.currentSurplusOf(1, terminals, contexts, 18, 1);
+        uint256 total = JBSurplus.currentSurplusOf(1, terminals, new address[](0), 18, 1);
         assertEq(total, uint256(surplus1) + uint256(surplus2), "surplus should be sum of all terminals");
     }
 
@@ -165,10 +152,8 @@ contract TestSurplusFuzz_Local is JBTest {
         IJBTerminal[] memory terminals2 = new IJBTerminal[](1);
         terminals2[0] = terminal2;
 
-        JBAccountingContext[] memory contexts = new JBAccountingContext[](0);
-
-        uint256 total1 = JBSurplus.currentSurplusOf(1, terminals1, contexts, 18, 1);
-        uint256 total2 = JBSurplus.currentSurplusOf(1, terminals2, contexts, 18, 1);
+        uint256 total1 = JBSurplus.currentSurplusOf(1, terminals1, new address[](0), 18, 1);
+        uint256 total2 = JBSurplus.currentSurplusOf(1, terminals2, new address[](0), 18, 1);
 
         assertLe(total1, total2, "surplus should be monotonically increasing");
     }

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

@@ -4,8 +4,10 @@ pragma solidity 0.8.26;
 import {JBTerminalStore} from "../../../../src/JBTerminalStore.sol";
 import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
 import {IJBPrices} from "../../../../src/interfaces/IJBPrices.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
 import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
 import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
 
 /*
@@ -24,5 +26,20 @@ contract JBTerminalStoreSetup is JBTest {
     function terminalStoreSetup() public virtual {
         // Instantiate the contract being tested
         _store = new JBTerminalStore(directory, prices, rulesets);
+
+        // Default mock: allow adding accounting contexts (return zero-id ruleset to bypass the
+        // allowAddAccountingContext check in recordAccountingContextOf).
+        JBRuleset memory _zeroRuleset = JBRuleset({
+            cycleNumber: 0,
+            id: 0,
+            basedOnId: 0,
+            start: 0,
+            duration: 0,
+            weight: 0,
+            weightCutPercent: 0,
+            approvalHook: IJBRulesetApprovalHook(address(0)),
+            metadata: 0
+        });
+        vm.mockCall(address(rulesets), abi.encodeWithSelector(IJBRulesets.currentOf.selector), abi.encode(_zeroRuleset));
     }
 }