@bananapus/core-v6 0.0.37 → 0.0.39

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

@@ -1,415 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {JBTerminalStore} from "../../../../src/JBTerminalStore.sol";
-import {IJBController} from "../../../../src/interfaces/IJBController.sol";
-import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {IJBFundAccessLimits} from "../../../../src/interfaces/IJBFundAccessLimits.sol";
-import {IJBPrices} from "../../../../src/interfaces/IJBPrices.sol";
-import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
-import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
-import {IJBToken} from "../../../../src/interfaces/IJBToken.sol";
-import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
-import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
-import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
-import {JBCurrencyAmount} from "../../../../src/structs/JBCurrencyAmount.sol";
-import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
-import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
-import {JBTerminalStoreSetup} from "./JBTerminalStoreSetup.sol";
-
-contract TestRecordUsedAllowanceOf_Local is JBTerminalStoreSetup {
-    uint256 _projectId = 1;
-    uint256 _decimals = 18;
-    uint256 _defaultAmount = 1e18;
-    uint256 _balance = 1e19;
-    uint256 _payoutLimit = 2e18;
-
-    // Mocks
-    IJBToken _token = IJBToken(makeAddr("token"));
-    IJBController _controller = IJBController(makeAddr("controller"));
-    IJBFundAccessLimits _accessLimits = IJBFundAccessLimits(makeAddr("funds"));
-
-    uint32 _currency = uint32(uint160(address(_token)));
-    address _nativeAddress = JBConstants.NATIVE_TOKEN;
-    uint32 _nativeCurrency = uint32(uint160(JBConstants.NATIVE_TOKEN));
-
-    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() {
-        // Find the storage slot
-        bytes32 balanceOfSlot = keccak256(abi.encode(address(this), uint256(0)));
-        bytes32 projectSlot = keccak256(abi.encode(_projectId, uint256(balanceOfSlot)));
-        bytes32 slot = keccak256(abi.encode(address(_token), uint256(projectSlot)));
-
-        bytes32 balanceBytes = bytes32(_balance);
-
-        // Set balance
-        vm.store(address(_store), slot, balanceBytes);
-
-        // Ensure balance is set correctly
-        uint256 _balanceCallReturn = _store.balanceOf(address(this), _projectId, address(_token));
-        assertEq(_balanceCallReturn, _balance);
-
-        JBRulesetMetadata memory _metadata = JBRulesetMetadata({
-            reservedPercent: 0,
-            cashOutTaxRate: JBConstants.MAX_CASH_OUT_TAX_RATE,
-            // forge-lint: disable-next-line(unsafe-typecast)
-            baseCurrency: uint32(uint160(_nativeAddress)),
-            pausePay: false,
-            pauseCreditTransfers: false,
-            allowOwnerMinting: false,
-            allowSetCustomToken: false,
-            allowTerminalMigration: false,
-            allowSetTerminals: false,
-            ownerMustSendPayouts: false,
-            allowSetController: false,
-            allowAddAccountingContext: true,
-            allowAddPriceFeed: false,
-            holdFees: false,
-            useTotalSurplusForCashOuts: false,
-            useDataHookForPay: false,
-            useDataHookForCashOut: false,
-            dataHook: address(0),
-            metadata: 0
-        });
-
-        uint256 _packedMetadata = JBRulesetMetadataResolver.packRulesetMetadata(_metadata);
-
-        // JBRulesets return calldata
-        JBRuleset memory _returnedRuleset = JBRuleset({
-            cycleNumber: uint48(block.timestamp),
-            id: uint48(block.timestamp),
-            basedOnId: 0,
-            start: uint48(block.timestamp),
-            duration: uint32(block.timestamp + 1000),
-            weight: 1e18,
-            weightCutPercent: 0,
-            approvalHook: IJBRulesetApprovalHook(address(0)),
-            metadata: _packedMetadata
-        });
-
-        bytes memory _currentOfCall = abi.encodeCall(IJBRulesets.currentOf, (_projectId));
-        bytes memory _currentOfReturn = abi.encode(_returnedRuleset);
-        mockExpect(address(rulesets), _currentOfCall, _currentOfReturn);
-
-        // mock call to JBDirectory controllerOf
-        bytes memory _directoryCall = abi.encodeCall(IJBDirectory.controllerOf, (_projectId));
-        bytes memory _returned = abi.encode(_controller);
-        mockExpect(address(directory), _directoryCall, _returned);
-
-        // mock call to get JBFundAccessLimits address
-        mockExpect(
-            address(_controller), abi.encodeCall(IJBController.FUND_ACCESS_LIMITS, ()), abi.encode(_accessLimits)
-        );
-
-        // mock call to JBFundAccessLimits surplusAllowanceOf
-        mockExpect(
-            address(_accessLimits),
-            abi.encodeCall(
-                IJBFundAccessLimits.surplusAllowanceOf,
-                (_projectId, block.timestamp, address(this), address(_token), _currency)
-            ),
-            abi.encode(1e19)
-        );
-
-        JBCurrencyAmount[] memory _limits = new JBCurrencyAmount[](1);
-        _limits[0] = JBCurrencyAmount({amount: 0, currency: _currency});
-
-        // mock JBFundAccessLimits call to payoutLimitsOf
-        bytes memory _payoutLimitsCall = abi.encodeCall(
-            IJBFundAccessLimits.payoutLimitsOf, (_projectId, block.timestamp, address(this), address(_token))
-        );
-        bytes memory _payoutLimitsReturn = abi.encode(_limits);
-        mockExpect(address(_accessLimits), _payoutLimitsCall, _payoutLimitsReturn);
-
-        _;
-    }
-
-    function test_GivenCallingCurrencyEqAccountingCurrency() external whenAmountIsWithinRangeToUseSurplusAllowance {
-        // it will not convert prices
-
-        // setup calldata
-        JBAccountingContext memory _context =
-            JBAccountingContext({token: address(_token), decimals: 18, currency: _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)));
-        bytes32 slot = keccak256(abi.encode(address(_nativeAddress), uint256(projectSlot)));
-
-        bytes32 balanceBytes = bytes32(_balance);
-
-        // Set balance
-        vm.store(address(_store), slot, balanceBytes);
-
-        // Ensure balance is set correctly
-        uint256 _balanceCallReturn = _store.balanceOf(address(this), _projectId, address(_nativeAddress));
-        assertEq(_balanceCallReturn, _balance);
-
-        JBRulesetMetadata memory _metadata = JBRulesetMetadata({
-            reservedPercent: 0,
-            cashOutTaxRate: JBConstants.MAX_CASH_OUT_TAX_RATE,
-            // forge-lint: disable-next-line(unsafe-typecast)
-            baseCurrency: uint32(uint160(_nativeAddress)),
-            pausePay: false,
-            pauseCreditTransfers: false,
-            allowOwnerMinting: false,
-            allowSetCustomToken: false,
-            allowTerminalMigration: false,
-            allowSetTerminals: false,
-            ownerMustSendPayouts: false,
-            allowSetController: false,
-            allowAddAccountingContext: true,
-            allowAddPriceFeed: false,
-            holdFees: false,
-            useTotalSurplusForCashOuts: false,
-            useDataHookForPay: false,
-            useDataHookForCashOut: false,
-            dataHook: address(0),
-            metadata: 0
-        });
-
-        uint256 _packedMetadata = JBRulesetMetadataResolver.packRulesetMetadata(_metadata);
-
-        // JBRulesets return calldata
-        JBRuleset memory _returnedRuleset = JBRuleset({
-            cycleNumber: uint48(block.timestamp),
-            id: uint48(block.timestamp),
-            basedOnId: 0,
-            start: uint48(block.timestamp),
-            duration: uint32(block.timestamp + 1000),
-            weight: 1e18,
-            weightCutPercent: 0,
-            approvalHook: IJBRulesetApprovalHook(address(0)),
-            metadata: _packedMetadata
-        });
-
-        // mock call to JBRulesets currentOf
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(_returnedRuleset));
-
-        // mock call to JBDirectory controllerOf
-        mockExpect(address(directory), abi.encodeCall(IJBDirectory.controllerOf, (_projectId)), abi.encode(_controller));
-
-        // mock call to get JBFundAccessLimits address
-        mockExpect(
-            address(_controller), abi.encodeCall(IJBController.FUND_ACCESS_LIMITS, ()), abi.encode(_accessLimits)
-        );
-
-        // mock call to JBFundAccessLimits surplusAllowanceOf
-        mockExpect(
-            address(_accessLimits),
-            abi.encodeCall(
-                IJBFundAccessLimits.surplusAllowanceOf,
-                (_projectId, block.timestamp, address(this), address(_nativeAddress), _currency)
-            ),
-            abi.encode(1e19)
-        );
-
-        JBCurrencyAmount[] memory _limits = new JBCurrencyAmount[](2);
-        _limits[0] = JBCurrencyAmount({amount: 0, currency: _currency});
-        _limits[1] = JBCurrencyAmount({amount: 0, currency: _nativeCurrency});
-
-        // mock JBFundAccessLimits call to payoutLimitsOf
-        mockExpect(
-            address(_accessLimits),
-            abi.encodeCall(
-                IJBFundAccessLimits.payoutLimitsOf,
-                (_projectId, block.timestamp, address(this), address(_nativeAddress))
-            ),
-            abi.encode(_limits)
-        );
-
-        // mock call to JBPrices pricePerUnitOf
-        bytes memory _pricePerCall =
-            abi.encodeCall(IJBPrices.pricePerUnitOf, (_projectId, _currency, _nativeCurrency, 18));
-        mockExpect(address(prices), _pricePerCall, abi.encode(1e18));
-
-        // setup calldata
-        JBAccountingContext memory _context =
-            JBAccountingContext({token: address(_nativeAddress), decimals: 18, currency: _nativeCurrency});
-
-        // price is 1:1
-        (, uint256 usedAmount) = _store.recordUsedAllowanceOf(_projectId, _context.token, _defaultAmount, _currency);
-        assertEq(usedAmount, _defaultAmount);
-    }
-
-    function test_GivenThereIsInadequateBalance() external {
-        // it will revert INADEQUATE_TERMINAL_STORE_BALANCE
-
-        // do not set a balance (will be zero)
-
-        JBRulesetMetadata memory _metadata = JBRulesetMetadata({
-            reservedPercent: 0,
-            cashOutTaxRate: JBConstants.MAX_CASH_OUT_TAX_RATE,
-            baseCurrency: uint32(uint160(_currency)),
-            pausePay: false,
-            pauseCreditTransfers: false,
-            allowOwnerMinting: false,
-            allowSetCustomToken: false,
-            allowTerminalMigration: false,
-            allowSetTerminals: false,
-            ownerMustSendPayouts: false,
-            allowSetController: false,
-            allowAddAccountingContext: true,
-            allowAddPriceFeed: false,
-            holdFees: false,
-            useTotalSurplusForCashOuts: false,
-            useDataHookForPay: false,
-            useDataHookForCashOut: false,
-            dataHook: address(0),
-            metadata: 0
-        });
-
-        uint256 _packedMetadata = JBRulesetMetadataResolver.packRulesetMetadata(_metadata);
-
-        // JBRulesets return calldata
-        JBRuleset memory _returnedRuleset = JBRuleset({
-            cycleNumber: uint48(block.timestamp),
-            id: uint48(block.timestamp),
-            basedOnId: 0,
-            start: uint48(block.timestamp),
-            duration: uint32(block.timestamp + 1000),
-            weight: 1e18,
-            weightCutPercent: 0,
-            approvalHook: IJBRulesetApprovalHook(address(0)),
-            metadata: _packedMetadata
-        });
-
-        bytes memory _currentOfCall = abi.encodeCall(IJBRulesets.currentOf, (_projectId));
-        bytes memory _currentOfReturn = abi.encode(_returnedRuleset);
-        mockExpect(address(rulesets), _currentOfCall, _currentOfReturn);
-
-        // mock call to JBDirectory controllerOf
-        bytes memory _directoryCall = abi.encodeCall(IJBDirectory.controllerOf, (_projectId));
-        bytes memory _returned = abi.encode(_controller);
-        mockExpect(address(directory), _directoryCall, _returned);
-
-        // mock call to get JBFundAccessLimits address
-        mockExpect(
-            address(_controller), abi.encodeCall(IJBController.FUND_ACCESS_LIMITS, ()), abi.encode(_accessLimits)
-        );
-
-        JBCurrencyAmount[] memory _limits = new JBCurrencyAmount[](1);
-        _limits[0] = JBCurrencyAmount({amount: 0, currency: _currency});
-
-        // mock JBFundAccessLimits call to payoutLimitsOf
-        bytes memory _payoutLimitsCall = abi.encodeCall(
-            IJBFundAccessLimits.payoutLimitsOf, (_projectId, block.timestamp, address(this), address(_token))
-        );
-        bytes memory _payoutLimitsReturn = abi.encode(_limits);
-        mockExpect(address(_accessLimits), _payoutLimitsCall, _payoutLimitsReturn);
-
-        // setup calldata
-        JBAccountingContext memory _context =
-            JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
-
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JBTerminalStore.JBTerminalStore_InadequateTerminalStoreBalance.selector, _defaultAmount, 0
-            )
-        );
-        _store.recordUsedAllowanceOf(_projectId, _context.token, _defaultAmount, _currency);
-    }
-
-    function test_WhenAmountIsNotWithinRangeToUseSurplusAllowance() external {
-        // it will revert JBTerminalStore_InadequateTerminalStoreBalance
-
-        // do not set a balance (will be zero)
-
-        JBRulesetMetadata memory _metadata = JBRulesetMetadata({
-            reservedPercent: 0,
-            cashOutTaxRate: JBConstants.MAX_CASH_OUT_TAX_RATE,
-            baseCurrency: uint32(uint160(_currency)),
-            pausePay: false,
-            pauseCreditTransfers: false,
-            allowOwnerMinting: false,
-            allowSetCustomToken: false,
-            allowTerminalMigration: false,
-            allowSetTerminals: false,
-            ownerMustSendPayouts: false,
-            allowSetController: false,
-            allowAddAccountingContext: true,
-            allowAddPriceFeed: false,
-            holdFees: false,
-            useTotalSurplusForCashOuts: false,
-            useDataHookForPay: false,
-            useDataHookForCashOut: false,
-            dataHook: address(0),
-            metadata: 0
-        });
-
-        uint256 _packedMetadata = JBRulesetMetadataResolver.packRulesetMetadata(_metadata);
-
-        // JBRulesets return calldata
-        JBRuleset memory _returnedRuleset = JBRuleset({
-            cycleNumber: uint48(block.timestamp),
-            id: uint48(block.timestamp),
-            basedOnId: 0,
-            start: uint48(block.timestamp),
-            duration: uint32(block.timestamp + 1000),
-            weight: 1e18,
-            weightCutPercent: 0,
-            approvalHook: IJBRulesetApprovalHook(address(0)),
-            metadata: _packedMetadata
-        });
-
-        bytes memory _currentOfCall = abi.encodeCall(IJBRulesets.currentOf, (_projectId));
-        bytes memory _currentOfReturn = abi.encode(_returnedRuleset);
-        mockExpect(address(rulesets), _currentOfCall, _currentOfReturn);
-
-        // mock call to JBDirectory controllerOf
-        bytes memory _directoryCall = abi.encodeCall(IJBDirectory.controllerOf, (_projectId));
-        bytes memory _returned = abi.encode(_controller);
-        mockExpect(address(directory), _directoryCall, _returned);
-
-        // mock call to get JBFundAccessLimits address
-        mockExpect(
-            address(_controller), abi.encodeCall(IJBController.FUND_ACCESS_LIMITS, ()), abi.encode(_accessLimits)
-        );
-
-        // Return data for next mock
-        JBCurrencyAmount[] memory _payoutLimits = new JBCurrencyAmount[](1);
-        _payoutLimits[0] = JBCurrencyAmount({amount: 0, currency: _currency});
-
-        // mock call to JBFundAccessLimits payoutLimitsOf
-        mockExpect(
-            address(_accessLimits),
-            abi.encodeCall(
-                IJBFundAccessLimits.payoutLimitsOf, (_projectId, block.timestamp, address(this), address(_token))
-            ),
-            abi.encode(_payoutLimits)
-        );
-
-        // setup calldata
-        JBAccountingContext memory _context =
-            JBAccountingContext({token: address(_token), decimals: 18, currency: _currency});
-
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JBTerminalStore.JBTerminalStore_InadequateTerminalStoreBalance.selector,
-                _defaultAmount,
-                0 // no balance
-            )
-        );
-        _store.recordUsedAllowanceOf(_projectId, _context.token, _defaultAmount, _currency);
-    }
-}

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

@@ -1,219 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {JBTerminalStore} from "../../../../src/JBTerminalStore.sol";
-import {IJBController} from "../../../../src/interfaces/IJBController.sol";
-import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {IJBFundAccessLimits} from "../../../../src/interfaces/IJBFundAccessLimits.sol";
-import {IJBPrices} from "../../../../src/interfaces/IJBPrices.sol";
-import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
-import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
-import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
-import {IJBToken} from "../../../../src/interfaces/IJBToken.sol";
-import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
-import {JBRulesetMetadataResolver} from "../../../../src/libraries/JBRulesetMetadataResolver.sol";
-import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
-import {JBCurrencyAmount} from "../../../../src/structs/JBCurrencyAmount.sol";
-import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
-import {JBRulesetMetadata} from "../../../../src/structs/JBRulesetMetadata.sol";
-import {JBTerminalStoreSetup} from "./JBTerminalStoreSetup.sol";
-
-contract TestUint224Overflow_Local is JBTerminalStoreSetup {
-    using JBRulesetMetadataResolver for JBRulesetMetadata;
-
-    uint256 _projectId = 1;
-
-    // Mocks
-    IJBTerminal _terminal = IJBTerminal(makeAddr("terminal"));
-    IJBToken _token = IJBToken(makeAddr("token"));
-    IJBController _controller = IJBController(makeAddr("controller"));
-    IJBFundAccessLimits _accessLimits = IJBFundAccessLimits(makeAddr("funds"));
-
-    uint32 _currency = uint32(uint160(address(_token)));
-
-    function setUp() public {
-        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)));
-        bytes32 projectSlot = keccak256(abi.encode(projectId, uint256(balanceOfSlot)));
-        bytes32 slot = keccak256(abi.encode(token, uint256(projectSlot)));
-        vm.store(address(_store), slot, bytes32(balance));
-    }
-
-    /// @notice Helper to create a standard ruleset with packed metadata.
-    function _mockRulesetAndControllerCalls() internal {
-        JBRulesetMetadata memory _metadata = JBRulesetMetadata({
-            reservedPercent: 0,
-            cashOutTaxRate: 0,
-            baseCurrency: _currency,
-            pausePay: false,
-            pauseCreditTransfers: false,
-            allowOwnerMinting: false,
-            allowSetCustomToken: false,
-            allowTerminalMigration: false,
-            allowSetTerminals: false,
-            ownerMustSendPayouts: false,
-            allowSetController: false,
-            allowAddAccountingContext: true,
-            allowAddPriceFeed: false,
-            holdFees: false,
-            useTotalSurplusForCashOuts: false,
-            useDataHookForPay: false,
-            useDataHookForCashOut: false,
-            dataHook: address(0),
-            metadata: 0
-        });
-
-        uint256 _packedMetadata = JBRulesetMetadataResolver.packRulesetMetadata(_metadata);
-
-        JBRuleset memory _returnedRuleset = JBRuleset({
-            cycleNumber: uint48(block.timestamp),
-            id: uint48(block.timestamp),
-            basedOnId: 0,
-            start: uint48(block.timestamp),
-            duration: uint32(block.timestamp + 1000),
-            weight: 1e18,
-            weightCutPercent: 0,
-            approvalHook: IJBRulesetApprovalHook(address(0)),
-            metadata: _packedMetadata
-        });
-
-        // Mock rulesets.currentOf
-        mockExpect(address(rulesets), abi.encodeCall(IJBRulesets.currentOf, (_projectId)), abi.encode(_returnedRuleset));
-
-        // Mock directory.controllerOf
-        mockExpect(address(directory), abi.encodeCall(IJBDirectory.controllerOf, (_projectId)), abi.encode(_controller));
-
-        // Mock controller.FUND_ACCESS_LIMITS
-        mockExpect(
-            address(_controller), abi.encodeCall(IJBController.FUND_ACCESS_LIMITS, ()), abi.encode(_accessLimits)
-        );
-    }
-
-    /// @notice Verifies that decimal adjustment overflow reverts with Uint224Overflow.
-    /// A payout limit that fits in uint224 but overflows when adjusted from 6 to 18 decimals.
-    function test_RevertWhen_DecimalAdjustmentOverflowsUint224() external {
-        // Balance must be large enough (after decimal adjustment) to exceed the payout limit,
-        // but not so large that the balance itself overflows during adjustment.
-        // Balance in 6-decimal terms: 1e62 → adjusted to 18 decimals = 1e74 (fits uint256).
-        _setBalance(address(_terminal), _projectId, address(_token), 1e62);
-
-        _mockRulesetAndControllerCalls();
-
-        // Amount that fits in uint224 but when multiplied by 10^12 (6→18 decimal adjustment) exceeds uint224.
-        // type(uint224).max / 1e6 ≈ 2.7e61. Multiplied by 1e12 → ≈ 2.7e73, exceeds uint224 but fits uint256.
-        uint224 amount = type(uint224).max / 1e6;
-        JBCurrencyAmount[] memory _limits = new JBCurrencyAmount[](1);
-        _limits[0] = JBCurrencyAmount({amount: amount, currency: _currency});
-
-        // Mock payoutLimitsOf to return the large limit.
-        mockExpect(
-            address(_accessLimits),
-            abi.encodeCall(
-                IJBFundAccessLimits.payoutLimitsOf, (_projectId, block.timestamp, address(_terminal), address(_token))
-            ),
-            abi.encode(_limits)
-        );
-
-        // 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));
-        _currentSurplusOf(18, _currency);
-    }
-
-    /// @notice Verifies that currency conversion overflow reverts with Uint224Overflow.
-    /// A payout limit near type(uint224).max in currency A, converted to currency B at a very low price,
-    /// would overflow uint224.
-    function test_RevertWhen_CurrencyConversionOverflowsUint224() external {
-        // Set up a large balance.
-        _setBalance(address(_terminal), _projectId, address(_token), type(uint256).max);
-
-        _mockRulesetAndControllerCalls();
-
-        // Payout limit near uint224 max, in a DIFFERENT currency than the target.
-        uint32 _otherCurrency = uint32(uint160(JBConstants.NATIVE_TOKEN));
-        JBCurrencyAmount[] memory _limits = new JBCurrencyAmount[](1);
-        _limits[0] = JBCurrencyAmount({amount: type(uint224).max, currency: _otherCurrency});
-
-        // Mock payoutLimitsOf.
-        mockExpect(
-            address(_accessLimits),
-            abi.encodeCall(
-                IJBFundAccessLimits.payoutLimitsOf, (_projectId, block.timestamp, address(_terminal), address(_token))
-            ),
-            abi.encode(_limits)
-        );
-
-        // Mock price: very low price means large converted amount.
-        // pricePerUnitOf returns price with _MAX_FIXED_POINT_FIDELITY (18) decimals.
-        // A price of 1 (1 wei) means 1 unit of pricingCurrency = 10^18 units of unitCurrency.
-        mockExpect(
-            address(prices),
-            abi.encodeCall(IJBPrices.pricePerUnitOf, (_projectId, _otherCurrency, _currency, 18)),
-            abi.encode(uint256(1)) // extremely low price → huge conversion result
-        );
-
-        // 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();
-        _currentSurplusOf(18, _currency);
-    }
-
-    /// @notice Verifies that normal amounts below uint224.max pass through without reverting.
-    function test_NormalAmountsDoNotRevert() external {
-        // Balance in 6-decimal terms: 100e6 = 100 units. Adjusted to 18 decimals = 100e18.
-        uint256 _balance = 100e6;
-        _setBalance(address(_terminal), _projectId, address(_token), _balance);
-
-        _mockRulesetAndControllerCalls();
-
-        // Normal payout limit: 50 units in 6-decimal token. Adjusted to 18 decimals = 50e18.
-        JBCurrencyAmount[] memory _limits = new JBCurrencyAmount[](1);
-        _limits[0] = JBCurrencyAmount({amount: 50e6, currency: _currency});
-
-        // Mock payoutLimitsOf.
-        mockExpect(
-            address(_accessLimits),
-            abi.encodeCall(
-                IJBFundAccessLimits.payoutLimitsOf, (_projectId, block.timestamp, address(_terminal), address(_token))
-            ),
-            abi.encode(_limits)
-        );
-
-        // 6-decimal token queried as 18-decimal target.
-        // 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 = _currentSurplusOf(18, _currency);
-        assertEq(surplus, 50e18);
-    }
-}

package/test/units/static/JBTokens/JBTokensSetup.sol

@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {JBERC20} from "../../../../src/JBERC20.sol";
-import {JBTokens} from "../../../../src/JBTokens.sol";
-import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
-import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
-import {IJBToken} from "../../../../src/interfaces/IJBToken.sol";
-import {IJBTokens} from "../../../../src/interfaces/IJBTokens.sol";
-import {JBTest} from "../../../helpers/JBTest.sol";
-
-/*
-Contract that deploys a target contract with other mock contracts to satisfy the constructor.
-Tests relative to this contract will be dependent on mock calls/emits and stdStorage.
-*/
-contract JBTokensSetup is JBTest {
-    // Mocks
-    IJBDirectory public directory = IJBDirectory(makeAddr("directory"));
-    IJBPermissions public permissions = IJBPermissions(makeAddr("permissions"));
-    IJBProjects public projects = IJBProjects(makeAddr("projects"));
-    IJBToken public jbToken;
-
-    // Target Contract
-    IJBTokens public _tokens;
-
-    function tokensSetup() public virtual {
-        // Instantiate the contract being tested
-        jbToken = new JBERC20(permissions, projects);
-        _tokens = new JBTokens(directory, jbToken);
-    }
-}