@bananapus/core-v6 0.0.21 → 0.0.22

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

@@ -45,6 +45,11 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
 
     function setUp() public {
         super.terminalStoreSetup();
+
+        // Register accounting context so the store can look up decimals/currency for the token.
+        JBAccountingContext[] memory _ctxs = new JBAccountingContext[](1);
+        _ctxs[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
+        _store.recordAccountingContextOf(_projectId, _ctxs);
     }
 
     modifier whenCurrentRulesetUseTotalSurplusForCashOutsEqTrue() {
@@ -73,16 +78,14 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
         mockExpect(address(directory), _directoryCall, _returned);
 
         // mock call to first terminal currentSurplusOf
-        bytes memory _terminal1Call = abi.encodeCall(
-            IJBTerminal.currentSurplusOf, (_projectId, new JBAccountingContext[](0), _decimals, _currency)
-        );
+        bytes memory _terminal1Call =
+            abi.encodeCall(IJBTerminal.currentSurplusOf, (_projectId, new address[](0), _decimals, _currency));
         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)
-        );
+        bytes memory _terminal2Call =
+            abi.encodeCall(IJBTerminal.currentSurplusOf, (_projectId, new address[](0), _decimals, _currency));
         bytes memory _terminal2Return = abi.encode(2e18);
         mockExpect(address(_terminal2), _terminal2Call, _terminal2Return);
 
@@ -158,16 +161,14 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
         mockExpect(address(directory), _directoryCall, _returned);
 
         // mock call to first terminal currentSurplusOf
-        bytes memory _terminal1Call = abi.encodeCall(
-            IJBTerminal.currentSurplusOf, (_projectId, new JBAccountingContext[](0), _decimals, _currency)
-        );
+        bytes memory _terminal1Call =
+            abi.encodeCall(IJBTerminal.currentSurplusOf, (_projectId, new address[](0), _decimals, _currency));
         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)
-        );
+        bytes memory _terminal2Call =
+            abi.encodeCall(IJBTerminal.currentSurplusOf, (_projectId, new address[](0), _decimals, _currency));
         bytes memory _terminal2Return = abi.encode(2e18);
         mockExpect(address(_terminal2), _terminal2Call, _terminal2Return);
 
@@ -243,16 +244,14 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
         mockExpect(address(directory), _directoryCall, _returned);
 
         // mock call to first terminal currentSurplusOf
-        bytes memory _terminal1Call = abi.encodeCall(
-            IJBTerminal.currentSurplusOf, (_projectId, new JBAccountingContext[](0), _decimals, _currency)
-        );
+        bytes memory _terminal1Call =
+            abi.encodeCall(IJBTerminal.currentSurplusOf, (_projectId, new address[](0), _decimals, _currency));
         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)
-        );
+        bytes memory _terminal2Call =
+            abi.encodeCall(IJBTerminal.currentSurplusOf, (_projectId, new address[](0), _decimals, _currency));
         bytes memory _terminal2Return = abi.encode(2e18);
         mockExpect(address(_terminal2), _terminal2Call, _terminal2Return);
 
@@ -318,13 +317,6 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
         JBCurrencyAmount[] memory _payoutLimits = new JBCurrencyAmount[](1);
         _payoutLimits[0] = JBCurrencyAmount({amount: 1e17, currency: _currency});
 
-        // call params
-        JBAccountingContext memory _accountingContexts =
-            JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
-        JBAccountingContext[] memory _balanceContexts = new JBAccountingContext[](1);
-
-        _balanceContexts[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
-
         uint256 _cashOutCount = 4e18; // greater than token total supply
 
         vm.expectRevert(
@@ -334,8 +326,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
             holder: address(this),
             projectId: _projectId,
             cashOutCount: _cashOutCount,
-            accountingContext: _accountingContexts,
-            balanceAccountingContexts: _balanceContexts,
+            tokenToReclaim: address(_token),
             beneficiaryIsFeeless: false,
             metadata: ""
         });
@@ -354,13 +345,6 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
         JBCurrencyAmount[] memory _payoutLimits = new JBCurrencyAmount[](1);
         _payoutLimits[0] = JBCurrencyAmount({amount: 1e17, currency: _currency});
 
-        // call params
-        JBAccountingContext memory _accountingContexts =
-            JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
-        JBAccountingContext[] memory _balanceContexts = new JBAccountingContext[](1);
-
-        _balanceContexts[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
-
         uint256 _cashOutCount = 6; // within balance bounds
         uint256 expectedCashOuts = mulDiv(3e18, _cashOutCount, _totalSupply);
 
@@ -368,8 +352,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
             holder: address(this),
             projectId: _projectId,
             cashOutCount: _cashOutCount,
-            accountingContext: _accountingContexts,
-            balanceAccountingContexts: _balanceContexts,
+            tokenToReclaim: address(_token),
             beneficiaryIsFeeless: false,
             metadata: ""
         });
@@ -443,8 +426,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
             holder: address(this),
             projectId: _projectId,
             cashOutCount: _cashOutCount,
-            accountingContext: _accountingContexts,
-            balanceAccountingContexts: _balanceContexts,
+            tokenToReclaim: address(_token),
             beneficiaryIsFeeless: false,
             metadata: ""
         });
@@ -469,13 +451,6 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
             abi.encode(_totalTokens)
         );
 
-        // call params
-        JBAccountingContext memory _accountingContexts =
-            JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
-        JBAccountingContext[] memory _balanceContexts = new JBAccountingContext[](1);
-
-        _balanceContexts[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
-
         uint256 _cashOutCount = 4e18; // greater than caller balance
 
         uint256 reclaimAmount = mulDiv(_currentSurplus, _cashOutCount, _totalTokens);
@@ -489,8 +464,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
             holder: address(this),
             projectId: _projectId,
             cashOutCount: _cashOutCount,
-            accountingContext: _accountingContexts,
-            balanceAccountingContexts: _balanceContexts,
+            tokenToReclaim: address(_token),
             beneficiaryIsFeeless: false,
             metadata: ""
         });
@@ -554,8 +528,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
             holder: address(this),
             projectId: _projectId,
             cashOutCount: _cashOutCount,
-            accountingContext: _accountingContexts,
-            balanceAccountingContexts: _balanceContexts,
+            tokenToReclaim: address(_token),
             beneficiaryIsFeeless: true,
             metadata: ""
         });
@@ -611,8 +584,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
             holder: address(this),
             projectId: _projectId,
             cashOutCount: 1e18,
-            accountingContext: _accountingContexts,
-            balanceAccountingContexts: _balanceContexts,
+            tokenToReclaim: address(_token),
             beneficiaryIsFeeless: false,
             metadata: ""
         });
@@ -667,8 +639,7 @@ contract TestRecordCashOutsFor_Local is JBTerminalStoreSetup {
             holder: address(this),
             projectId: _projectId,
             cashOutCount: 1e18,
-            accountingContext: _accountingContexts,
-            balanceAccountingContexts: _balanceContexts,
+            tokenToReclaim: address(_token),
             beneficiaryIsFeeless: false,
             metadata: ""
         });

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

@@ -36,6 +36,13 @@ contract TestRecordPayoutFor_Local is JBTerminalStoreSetup {
         super.terminalStoreSetup();
     }
 
+    /// @notice Helper to register an accounting context with the store (from address(this) as terminal).
+    function _registerContext(address token, uint32 currency) internal {
+        JBAccountingContext[] memory ctxs = new JBAccountingContext[](1);
+        ctxs[0] = JBAccountingContext({token: token, decimals: 18, currency: currency});
+        _store.recordAccountingContextOf(_projectId, ctxs);
+    }
+
     modifier whenThereIsAZeroUsedPayoutLimitOfTheSenderForCurrentRuleset() {
         JBRulesetMetadata memory _metadata = JBRulesetMetadata({
             reservedPercent: 0,
@@ -147,6 +154,9 @@ contract TestRecordPayoutFor_Local is JBTerminalStoreSetup {
     {
         // it will revert JBTerminalStore_InadequateTerminalStoreBalance
 
+        // Register accounting context so the store can look up decimals/currency for the token.
+        _registerContext(address(_token), _currency);
+
         // setup calldata
         JBAccountingContext[] memory _contexts = new JBAccountingContext[](1);
         _contexts[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
@@ -156,7 +166,7 @@ contract TestRecordPayoutFor_Local is JBTerminalStoreSetup {
                 JBTerminalStore.JBTerminalStore_InadequateTerminalStoreBalance.selector, _defaultValue, 0
             )
         );
-        _store.recordPayoutFor(_projectId, _contexts[0], _defaultValue, _currency);
+        _store.recordPayoutFor(_projectId, _contexts[0].token, _defaultValue, _currency);
     }
 
     function test_GivenTheCallingCurrencyEqTheContextCurrency()
@@ -165,6 +175,9 @@ contract TestRecordPayoutFor_Local is JBTerminalStoreSetup {
     {
         // it will not convert prices, update balances and return
 
+        // Register accounting context so the store can look up decimals/currency for the token.
+        _registerContext(address(_token), _currency);
+
         // Find the storage slot
         bytes32 balanceOfSlot = keccak256(abi.encode(address(this), uint256(0)));
         bytes32 projectSlot = keccak256(abi.encode(_projectId, uint256(balanceOfSlot)));
@@ -193,7 +206,7 @@ contract TestRecordPayoutFor_Local is JBTerminalStoreSetup {
 
         uint256 balanceBefore = _store.balanceOf(address(this), _projectId, address(_token));
 
-        (, uint256 amountPaid) = _store.recordPayoutFor(_projectId, _contexts[0], _defaultValue, _currency);
+        (, uint256 amountPaid) = _store.recordPayoutFor(_projectId, _contexts[0].token, _defaultValue, _currency);
         assertEq(amountPaid, _defaultValue);
 
         // check usedPayoutLimit updated correctly
@@ -213,6 +226,10 @@ contract TestRecordPayoutFor_Local is JBTerminalStoreSetup {
     {
         // it will convert prices and return
 
+        // Register accounting context with _nativeCurrency so currency != accountingContext.currency triggers
+        // conversion.
+        _registerContext(address(_token), _nativeCurrency);
+
         // Find the storage slot
         bytes32 balanceOfSlot = keccak256(abi.encode(address(this), uint256(0)));
         bytes32 projectSlot = keccak256(abi.encode(_projectId, uint256(balanceOfSlot)));
@@ -245,7 +262,7 @@ contract TestRecordPayoutFor_Local is JBTerminalStoreSetup {
         bytes memory _pricesReturn = abi.encode(2e18);
         mockExpect(address(prices), _pricesCall, _pricesReturn);
 
-        (, uint256 amountPaid) = _store.recordPayoutFor(_projectId, _contexts[0], _defaultValue, _currency);
+        (, uint256 amountPaid) = _store.recordPayoutFor(_projectId, _contexts[0].token, _defaultValue, _currency);
         assertEq(amountPaid, _defaultValue / 2);
     }
 
@@ -255,6 +272,9 @@ contract TestRecordPayoutFor_Local is JBTerminalStoreSetup {
     {
         // it will revert INADEQUATE_TERMINAL_STORE_BALANCE
 
+        // Register accounting context so the store can look up decimals/currency for the token.
+        _registerContext(address(_token), _currency);
+
         // setup calldata
         JBAccountingContext[] memory _contexts = new JBAccountingContext[](1);
         _contexts[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
@@ -264,6 +284,6 @@ contract TestRecordPayoutFor_Local is JBTerminalStoreSetup {
                 JBTerminalStore.JBTerminalStore_InadequateTerminalStoreBalance.selector, _defaultValue, 0
             )
         );
-        _store.recordPayoutFor(_projectId, _contexts[0], _defaultValue, _currency);
+        _store.recordPayoutFor(_projectId, _contexts[0].token, _defaultValue, _currency);
     }
 }

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

@@ -35,6 +35,11 @@ contract TestRecordUsedAllowanceOf_Local is JBTerminalStoreSetup {
 
     function setUp() public {
         super.terminalStoreSetup();
+
+        // Register accounting context so the store can look up decimals/currency for the token.
+        JBAccountingContext[] memory _ctxs = new JBAccountingContext[](1);
+        _ctxs[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
+        _store.recordAccountingContextOf(_projectId, _ctxs);
     }
 
     modifier whenAmountIsWithinRangeToUseSurplusAllowance() {
@@ -134,13 +139,18 @@ contract TestRecordUsedAllowanceOf_Local is JBTerminalStoreSetup {
         JBAccountingContext memory _context =
             JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
 
-        (, uint256 usedAmount) = _store.recordUsedAllowanceOf(_projectId, _context, _defaultAmount, _currency);
+        (, uint256 usedAmount) = _store.recordUsedAllowanceOf(_projectId, _context.token, _defaultAmount, _currency);
         assertEq(usedAmount, _defaultAmount);
     }
 
     function test_GivenCallingCurrencyDneqAccountingCurrency() external {
         // it will convert prices
 
+        // Register accounting context for the native token so the store can look up decimals/currency.
+        JBAccountingContext[] memory _nativeCtxs = new JBAccountingContext[](1);
+        _nativeCtxs[0] = JBAccountingContext({token: address(_nativeAddress), decimals: 18, currency: _nativeCurrency});
+        _store.recordAccountingContextOf(_projectId, _nativeCtxs);
+
         // Find the storage slot
         bytes32 balanceOfSlot = keccak256(abi.encode(address(this), uint256(0)));
         bytes32 projectSlot = keccak256(abi.encode(_projectId, uint256(balanceOfSlot)));
@@ -238,7 +248,7 @@ contract TestRecordUsedAllowanceOf_Local is JBTerminalStoreSetup {
             JBAccountingContext({token: address(_nativeAddress), decimals: 18, currency: _nativeCurrency});
 
         // price is 1:1
-        (, uint256 usedAmount) = _store.recordUsedAllowanceOf(_projectId, _context, _defaultAmount, _currency);
+        (, uint256 usedAmount) = _store.recordUsedAllowanceOf(_projectId, _context.token, _defaultAmount, _currency);
         assertEq(usedAmount, _defaultAmount);
     }
 
@@ -317,7 +327,7 @@ contract TestRecordUsedAllowanceOf_Local is JBTerminalStoreSetup {
                 JBTerminalStore.JBTerminalStore_InadequateTerminalStoreBalance.selector, _defaultAmount, 0
             )
         );
-        _store.recordUsedAllowanceOf(_projectId, _context, _defaultAmount, _currency);
+        _store.recordUsedAllowanceOf(_projectId, _context.token, _defaultAmount, _currency);
     }
 
     function test_WhenAmountIsNotWithinRangeToUseSurplusAllowance() external {
@@ -400,6 +410,6 @@ contract TestRecordUsedAllowanceOf_Local is JBTerminalStoreSetup {
                 0 // no balance
             )
         );
-        _store.recordUsedAllowanceOf(_projectId, _context, _defaultAmount, _currency);
+        _store.recordUsedAllowanceOf(_projectId, _context.token, _defaultAmount, _currency);
     }
 }

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

@@ -35,6 +35,21 @@ contract TestUint224Overflow_Local is JBTerminalStoreSetup {
         super.terminalStoreSetup();
     }
 
+    /// @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);
+    }
+
+    /// @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 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)));
@@ -121,11 +136,12 @@ contract TestUint224Overflow_Local is JBTerminalStoreSetup {
         // Accounting context: token has 6 decimals.
         JBAccountingContext[] memory _contexts = new JBAccountingContext[](1);
         _contexts[0] = JBAccountingContext({token: address(_token), decimals: 6, currency: _currency});
+        _registerContext(_contexts[0]);
 
         // Query surplus with 18 target decimals — triggers decimal adjustment overflow.
         uint256 adjusted = uint256(amount) * 1e12;
         vm.expectRevert(abi.encodeWithSelector(JBTerminalStore.JBTerminalStore_Uint224Overflow.selector, adjusted));
-        _store.currentSurplusOf(address(_terminal), _projectId, _contexts, 18, _currency);
+        _currentSurplusOf(18, _currency);
     }
 
     /// @notice Verifies that currency conversion overflow reverts with Uint224Overflow.
@@ -163,10 +179,11 @@ contract TestUint224Overflow_Local is JBTerminalStoreSetup {
         // Same decimals so no decimal adjustment.
         JBAccountingContext[] memory _contexts = new JBAccountingContext[](1);
         _contexts[0] = JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
+        _registerContext(_contexts[0]);
 
         // The conversion: mulDiv(type(uint224).max, 10^18, 1) = type(uint224).max * 10^18 → overflows uint224.
         vm.expectRevert();
-        _store.currentSurplusOf(address(_terminal), _projectId, _contexts, 18, _currency);
+        _currentSurplusOf(18, _currency);
     }
 
     /// @notice Verifies that normal amounts below uint224.max pass through without reverting.
@@ -194,8 +211,9 @@ contract TestUint224Overflow_Local is JBTerminalStoreSetup {
         // Balance: 100e6 → 100e18. Payout limit: 50e6 → 50e18. Surplus = 50e18.
         JBAccountingContext[] memory _contexts = new JBAccountingContext[](1);
         _contexts[0] = JBAccountingContext({token: address(_token), decimals: 6, currency: _currency});
+        _registerContext(_contexts[0]);
 
-        uint256 surplus = _store.currentSurplusOf(address(_terminal), _projectId, _contexts, 18, _currency);
+        uint256 surplus = _currentSurplusOf(18, _currency);
         assertEq(surplus, 50e18);
     }
 }