@bananapus/core-v6 0.0.36 → 0.0.38

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

@@ -1,117 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {JBMultiTerminal} from "../../../../src/JBMultiTerminal.sol";
-import {IJBCashOutHook} from "../../../../src/interfaces/IJBCashOutHook.sol";
-import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {IJBFeelessAddresses} from "../../../../src/interfaces/IJBFeelessAddresses.sol";
-import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
-import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
-import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
-import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
-import {JBCashOutHookSpecification} from "../../../../src/structs/JBCashOutHookSpecification.sol";
-import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
-import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
-import {JBMultiTerminalSetup} from "./JBMultiTerminalSetup.sol";
-
-contract TestPreviewCashOutFrom_Local is JBMultiTerminalSetup {
-    uint256 _projectId = 1;
-    uint256 _cashOutCount = 1e18;
-    address _holder = makeAddr("holder");
-    address payable _beneficiary = payable(makeAddr("beneficiary"));
-    address _token = JBConstants.NATIVE_TOKEN;
-
-    function setUp() public {
-        super.multiTerminalSetup();
-    }
-
-    function _acceptToken(address token, uint8 decimals, uint32 currency) internal {
-        mockExpect(address(projects), abi.encodeCall(IERC721.ownerOf, (_projectId)), abi.encode(address(0)));
-        mockExpect(
-            address(directory), abi.encodeCall(IJBDirectory.controllerOf, (_projectId)), abi.encode(address(this))
-        );
-
-        JBAccountingContext[] memory contexts = new JBAccountingContext[](1);
-        contexts[0] = JBAccountingContext({token: token, decimals: decimals, currency: currency});
-
-        // Mock recordAccountingContextOf in the store (validation now happens there)
-        mockExpect(
-            address(store), abi.encodeCall(IJBTerminalStore.recordAccountingContextOf, (_projectId, contexts)), ""
-        );
-
-        vm.prank(address(this));
-        _terminal.addAccountingContextsFor(_projectId, contexts);
-
-        // Mock accountingContextOf for subsequent reads (not all code paths call it, so use mockCall only)
-        vm.mockCall(
-            address(store),
-            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, token)),
-            abi.encode(contexts[0])
-        );
-    }
-
-    function test_RevertsWhenTokenIsNotAccepted() external {
-        // previewCashOutFrom now delegates directly to the store without a token acceptance check,
-        // so it reverts during store computation (e.g. unmocked external call) rather than with TokenNotAccepted.
-        vm.expectRevert();
-        JBMultiTerminal(address(_terminal))
-            .previewCashOutFrom(_holder, _projectId, _cashOutCount, _token, _beneficiary, "");
-    }
-
-    function test_ReturnsRulesetAndCashOutPreviewValues() external {
-        // forge-lint: disable-next-line(unsafe-typecast)
-        _acceptToken(_token, 18, uint32(uint160(_token)));
-
-        JBRuleset memory ruleset = JBRuleset({
-            cycleNumber: 1,
-            id: 1,
-            basedOnId: 0,
-            start: uint48(block.timestamp),
-            duration: 0,
-            weight: 0,
-            weightCutPercent: 0,
-            approvalHook: IJBRulesetApprovalHook(address(0)),
-            metadata: 0
-        });
-
-        JBCashOutHookSpecification[] memory specs = new JBCashOutHookSpecification[](1);
-        specs[0] = JBCashOutHookSpecification({
-            hook: IJBCashOutHook(makeAddr("hook")), noop: false, amount: 321, metadata: hex"5678"
-        });
-
-        JBAccountingContext memory accountingContext =
-        // forge-lint: disable-next-line(unsafe-typecast)
-        JBAccountingContext({token: _token, decimals: 18, currency: uint32(uint160(_token))});
-        JBAccountingContext[] memory accountingContexts = new JBAccountingContext[](1);
-        accountingContexts[0] = accountingContext;
-
-        mockExpect(
-            address(feelessAddresses), abi.encodeCall(IJBFeelessAddresses.isFeeless, (_beneficiary)), abi.encode(true)
-        );
-
-        mockExpect(
-            address(store),
-            abi.encodeCall(
-                IJBTerminalStore.previewCashOutFrom,
-                (address(_terminal), _holder, _projectId, _cashOutCount, accountingContext.token, true, bytes(""))
-            ),
-            abi.encode(ruleset, 999, 1234, specs)
-        );
-
-        (
-            JBRuleset memory previewRuleset,
-            uint256 reclaimAmount,
-            uint256 cashOutTaxRate,
-            JBCashOutHookSpecification[] memory previewSpecs
-        ) = JBMultiTerminal(address(_terminal))
-            .previewCashOutFrom(_holder, _projectId, _cashOutCount, _token, _beneficiary, "");
-
-        assertEq(previewRuleset.id, ruleset.id);
-        assertEq(reclaimAmount, 999);
-        assertEq(cashOutTaxRate, 1234);
-        assertEq(previewSpecs.length, 1);
-        assertEq(address(previewSpecs[0].hook), address(specs[0].hook));
-        assertEq(previewSpecs[0].amount, specs[0].amount);
-        assertEq(previewSpecs[0].metadata, specs[0].metadata);
-    }
-}

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

@@ -1,114 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {JBMultiTerminal} from "../../../../src/JBMultiTerminal.sol";
-import {IJBController} from "../../../../src/interfaces/IJBController.sol";
-import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {IJBPayHook} from "../../../../src/interfaces/IJBPayHook.sol";
-import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
-import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
-import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
-import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
-import {JBPayHookSpecification} from "../../../../src/structs/JBPayHookSpecification.sol";
-import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
-import {JBTokenAmount} from "../../../../src/structs/JBTokenAmount.sol";
-import {JBMultiTerminalSetup} from "./JBMultiTerminalSetup.sol";
-
-contract TestPreviewPayFor_Local is JBMultiTerminalSetup {
-    uint256 _projectId = 1;
-    uint256 _amount = 1e18;
-    address _token = JBConstants.NATIVE_TOKEN;
-    address _beneficiary = makeAddr("beneficiary");
-    address _payer = makeAddr("payer");
-    IJBController _controller = IJBController(makeAddr("controller"));
-
-    function setUp() public {
-        super.multiTerminalSetup();
-    }
-
-    function _setAccountingContext(address token, uint8 decimals, uint32 currency) internal {
-        // Mock the store to return this accounting context
-        mockExpect(
-            address(store),
-            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, token)),
-            abi.encode(JBAccountingContext({token: token, decimals: decimals, currency: currency}))
-        );
-    }
-
-    function test_RevertsWhenTokenIsNotAccepted() external {
-        // Mock accountingContextOf to return empty context (token not accepted)
-        mockExpect(
-            address(store),
-            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), _projectId, _token)),
-            abi.encode(JBAccountingContext({token: address(0), decimals: 0, currency: 0}))
-        );
-
-        vm.prank(_payer);
-        vm.expectRevert(abi.encodeWithSelector(JBMultiTerminal.JBMultiTerminal_TokenNotAccepted.selector, _token));
-        JBMultiTerminal(address(_terminal)).previewPayFor(_projectId, _token, _amount, _beneficiary, "");
-    }
-
-    function test_ReturnsRulesetMintSplitAndHookSpecifications() external {
-        // forge-lint: disable-next-line(unsafe-typecast)
-        _setAccountingContext(_token, 18, uint32(uint160(_token)));
-
-        _mockPreviewPayFrom();
-
-        vm.prank(_payer);
-        (
-            JBRuleset memory previewRuleset,
-            uint256 beneficiaryTokenCount,
-            uint256 reservedTokenCount,
-            JBPayHookSpecification[] memory previewSpecs
-        ) = JBMultiTerminal(address(_terminal)).previewPayFor(_projectId, _token, _amount, _beneficiary, "");
-
-        assertEq(previewRuleset.id, 1);
-        assertEq(beneficiaryTokenCount, 750);
-        assertEq(reservedTokenCount, 250);
-        assertEq(previewSpecs.length, 1);
-        assertEq(previewSpecs[0].amount, 123);
-        assertEq(previewSpecs[0].metadata, hex"1234");
-    }
-
-    function _mockPreviewPayFrom() internal {
-        JBRuleset memory ruleset = JBRuleset({
-            cycleNumber: 1,
-            id: 1,
-            basedOnId: 0,
-            start: uint48(block.timestamp),
-            duration: 0,
-            weight: 0,
-            weightCutPercent: 0,
-            approvalHook: IJBRulesetApprovalHook(address(0)),
-            metadata: 0
-        });
-
-        JBPayHookSpecification[] memory specs = new JBPayHookSpecification[](1);
-        specs[0] =
-            JBPayHookSpecification({hook: IJBPayHook(makeAddr("hook")), noop: false, amount: 123, metadata: hex"1234"});
-
-        JBTokenAmount memory tokenAmount =
-        // forge-lint: disable-next-line(unsafe-typecast)
-        JBTokenAmount({token: _token, decimals: 18, currency: uint32(uint160(_token)), value: _amount});
-
-        mockExpect(
-            address(store),
-            abi.encodeWithSelector(
-                bytes4(0xdb6d7e03), address(_terminal), _payer, tokenAmount, _projectId, _beneficiary, bytes("")
-            ),
-            abi.encode(ruleset, 1000, specs)
-        );
-
-        mockExpect(
-            address(directory),
-            abi.encodeCall(IJBDirectory.controllerOf, (_projectId)),
-            abi.encode(address(_controller))
-        );
-
-        mockExpect(
-            address(_controller),
-            abi.encodeCall(IJBController.previewMintOf, (_projectId, 1000, true)),
-            abi.encode(750, 250)
-        );
-    }
-}

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

@@ -1,228 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {JBMultiTerminal} from "../../../../src/JBMultiTerminal.sol";
-import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {IJBFeeTerminal} from "../../../../src/interfaces/IJBFeeTerminal.sol";
-import {IJBFeelessAddresses} from "../../../../src/interfaces/IJBFeelessAddresses.sol";
-import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
-import {IJBProjects} from "../../../../src/interfaces/IJBProjects.sol";
-import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
-import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
-import {IJBSplits} from "../../../../src/interfaces/IJBSplits.sol";
-import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
-import {IJBTokens} from "../../../../src/interfaces/IJBTokens.sol";
-import {JBFees} from "../../../../src/libraries/JBFees.sol";
-import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
-import {JBFee} from "../../../../src/structs/JBFee.sol";
-import {JBPayHookSpecification} from "../../../../src/structs/JBPayHookSpecification.sol";
-import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
-import {IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
-import {JBTest} from "../../../helpers/JBTest.sol";
-
-/// @dev Harness that exposes internal held fee storage for direct manipulation in tests.
-contract ForTest_JBMultiTerminal is JBMultiTerminal {
-    constructor(
-        IJBFeelessAddresses feelessAddresses,
-        IJBPermissions permissions,
-        IJBProjects projects,
-        IJBSplits splits,
-        IJBTerminalStore store,
-        IJBTokens tokens,
-        IPermit2 permit2,
-        address trustedForwarder
-    )
-        JBMultiTerminal(feelessAddresses, permissions, projects, splits, store, tokens, permit2, trustedForwarder)
-    {}
-
-    function forTestAddHeldFee(uint256 projectId, address token, JBFee memory fee) external {
-        _heldFeesOf[projectId][token].push(fee);
-    }
-
-    function forTestSetNextHeldFeeIndex(uint256 projectId, address token, uint256 index) external {
-        _nextHeldFeeIndexOf[projectId][token] = index;
-    }
-}
-
-contract TestProcessHeldFeesOf_Local is JBTest {
-    // Target Contract (harness)
-    ForTest_JBMultiTerminal public _terminal;
-
-    // Mocks
-    IJBPermissions public permissions = IJBPermissions(makeAddr("permissions"));
-    IJBProjects public projects = IJBProjects(makeAddr("projects"));
-    IJBDirectory public directory = IJBDirectory(makeAddr("directory"));
-    IJBRulesets public rulesets = IJBRulesets(makeAddr("rulesets"));
-    IJBTokens public tokens = IJBTokens(makeAddr("tokens"));
-    IJBSplits public splits = IJBSplits(makeAddr("splits"));
-    IJBTerminalStore public store = IJBTerminalStore(makeAddr("store"));
-    IJBFeelessAddresses public feelessAddresses = IJBFeelessAddresses(makeAddr("feeless"));
-    IPermit2 public permit2 = IPermit2(makeAddr("permit2"));
-    address trustedForwarder = makeAddr("forwarder");
-
-    uint256 _feeProjectId = 1;
-    uint256 _projectId = 2;
-    address _mockToken = makeAddr("token");
-    address _beneficiary = makeAddr("beneficiary");
-
-    function _setAccountingContext(uint256 projectId, address token, uint8 decimals, uint32 currency) internal {
-        // Mock the store to return this accounting context
-        mockExpect(
-            address(store),
-            abi.encodeCall(IJBTerminalStore.accountingContextOf, (address(_terminal), projectId, token)),
-            abi.encode(JBAccountingContext({token: token, decimals: decimals, currency: currency}))
-        );
-    }
-
-    function setUp() public {
-        // Constructor will call to find directory from the terminal store
-        mockExpect(address(store), abi.encodeCall(IJBTerminalStore.DIRECTORY, ()), abi.encode(address(directory)));
-
-        _terminal = new ForTest_JBMultiTerminal(
-            feelessAddresses, permissions, projects, splits, store, tokens, permit2, trustedForwarder
-        );
-    }
-
-    function test_WhenHeldFeeUnlockTimestampGTBlocktimestamp() external {
-        // it will not process the fee (fee remains held)
-
-        // Add a held fee with unlockTimestamp in the future
-        uint48 futureTimestamp = uint48(block.timestamp + 1000);
-        _terminal.forTestAddHeldFee(
-            _projectId, _mockToken, JBFee({amount: 100, beneficiary: _beneficiary, unlockTimestamp: futureTimestamp})
-        );
-
-        // Mock the directory call to find the fee terminal (project 1 is the fee beneficiary)
-        mockExpect(
-            address(directory),
-            abi.encodeCall(IJBDirectory.primaryTerminalOf, (1, _mockToken)),
-            abi.encode(address(_terminal))
-        );
-
-        // Call processHeldFeesOf - the fee should NOT be processed because it's still locked
-        _terminal.processHeldFeesOf(_projectId, _mockToken, 1);
-
-        // Verify the fee is still held
-        JBFee[] memory remaining = _terminal.heldFeesOf(_projectId, _mockToken, 10);
-        assertEq(remaining.length, 1, "fee should still be held");
-        assertEq(remaining[0].amount, 100, "fee amount should be unchanged");
-        assertEq(remaining[0].unlockTimestamp, futureTimestamp, "unlock timestamp should be unchanged");
-    }
-
-    modifier whenHeldFeeIsUnlocked() {
-        _;
-    }
-
-    function test_GivenExecuteProcessFeeSucceeds() external whenHeldFeeIsUnlocked {
-        // it will process the fee and emit ProcessFee
-
-        // Add a held fee that is already unlocked
-        uint48 pastTimestamp = uint48(block.timestamp - 1);
-        uint256 heldAmount = 1000;
-        _terminal.forTestAddHeldFee(
-            _projectId,
-            _mockToken,
-            JBFee({amount: heldAmount, beneficiary: _beneficiary, unlockTimestamp: pastTimestamp})
-        );
-
-        // The fee amount that will be calculated from the held amount
-        uint256 expectedFeeAmount = JBFees.feeAmountFrom({amountBeforeFee: heldAmount, feePercent: _terminal.FEE()});
-
-        // Set up accounting context for the fee beneficiary project (project 1) so _pay can build the token amount.
-        // forge-lint: disable-next-line(unsafe-typecast)
-        _setAccountingContext(_feeProjectId, _mockToken, 0, uint32(uint160(_mockToken)));
-
-        // Mock the directory call to find the fee terminal - return _terminal itself so it uses internal _pay
-        mockExpect(
-            address(directory),
-            abi.encodeCall(IJBDirectory.primaryTerminalOf, (1, _mockToken)),
-            abi.encode(address(_terminal))
-        );
-
-        // Mock executeProcessFee: when the terminal calls itself, it will call recordPaymentFrom on the store.
-        // Since executeProcessFee is external and calls pay on the feeTerminal (which is _terminal itself),
-        // we need to mock the internal pay path: recordPaymentFrom on the store.
-        vm.mockCall(
-            address(store),
-            abi.encodeWithSelector(IJBTerminalStore.recordPaymentFrom.selector),
-            abi.encode(
-                JBRuleset({
-                    cycleNumber: 1,
-                    id: 1,
-                    basedOnId: 0,
-                    start: 0,
-                    duration: 0,
-                    weight: 0,
-                    weightCutPercent: 0,
-                    approvalHook: IJBRulesetApprovalHook(address(0)),
-                    metadata: 0
-                }),
-                uint256(0),
-                new JBPayHookSpecification[](0)
-            )
-        );
-
-        // Expect ProcessFee event
-        vm.expectEmit();
-        emit IJBFeeTerminal.ProcessFee({
-            projectId: _projectId,
-            token: _mockToken,
-            amount: expectedFeeAmount,
-            wasHeld: true,
-            beneficiary: _beneficiary,
-            caller: address(this)
-        });
-
-        _terminal.processHeldFeesOf(_projectId, _mockToken, 1);
-
-        // Verify held fees are cleaned up
-        JBFee[] memory remaining = _terminal.heldFeesOf(_projectId, _mockToken, 10);
-        assertEq(remaining.length, 0, "held fees should be empty after processing");
-    }
-
-    function test_GivenExecuteProcessFeeFails() external whenHeldFeeIsUnlocked {
-        // it will readd balance and emit FeeReverted
-
-        // Add a held fee that is already unlocked
-        uint48 pastTimestamp = uint48(block.timestamp - 1);
-        uint256 heldAmount = 1000;
-        _terminal.forTestAddHeldFee(
-            _projectId,
-            _mockToken,
-            JBFee({amount: heldAmount, beneficiary: _beneficiary, unlockTimestamp: pastTimestamp})
-        );
-
-        // The fee amount that will be calculated from the held amount
-        uint256 expectedFeeAmount = JBFees.feeAmountFrom({amountBeforeFee: heldAmount, feePercent: _terminal.FEE()});
-
-        // Mock the directory call to find the fee terminal - return address(0) which will cause
-        // executeProcessFee to revert with FeeTerminalNotFound
-        mockExpect(
-            address(directory), abi.encodeCall(IJBDirectory.primaryTerminalOf, (1, _mockToken)), abi.encode(address(0))
-        );
-
-        // Mock the recordAddedBalanceFor call that happens on fee revert (balance returned to project)
-        mockExpect(
-            address(store),
-            abi.encodeCall(IJBTerminalStore.recordAddedBalanceFor, (_projectId, _mockToken, expectedFeeAmount)),
-            abi.encode()
-        );
-
-        // Expect FeeReverted event
-        vm.expectEmit(true, true, true, false);
-        emit IJBFeeTerminal.FeeReverted({
-            projectId: _projectId,
-            token: _mockToken,
-            feeProjectId: 1,
-            amount: expectedFeeAmount,
-            reason: "",
-            caller: address(this)
-        });
-
-        _terminal.processHeldFeesOf(_projectId, _mockToken, 1);
-
-        // Verify held fees are cleaned up (entry was deleted even though fee processing failed)
-        JBFee[] memory remaining = _terminal.heldFeesOf(_projectId, _mockToken, 10);
-        assertEq(remaining.length, 0, "held fees should be empty after failed processing");
-    }
-}

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

@@ -1,55 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {JBMultiTerminal} from "../../../../src/JBMultiTerminal.sol";
-import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
-import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
-import {JBSplit} from "../../../../src/structs/JBSplit.sol";
-import {IJBSplitHook} from "../../../../src/interfaces/IJBSplitHook.sol";
-import {JBMultiTerminalSetup} from "./JBMultiTerminalSetup.sol";
-
-/// @notice Tests that a pay-type split back into the same terminal reverts with MintNotAllowed.
-contract TestSelfPayRevert_Local is JBMultiTerminalSetup {
-    uint64 _projectId = 1;
-    uint256 _defaultAmount = 1e18;
-    address _sender = makeAddr("sender");
-    address _native = JBConstants.NATIVE_TOKEN;
-
-    function setUp() public {
-        super.multiTerminalSetup();
-    }
-
-    /// @notice When a split routes a pay back to the same project on the same terminal,
-    /// executePayout should revert with MintNotAllowed.
-    function test_RevertWhen_SplitPaysBackToSameTerminal() external {
-        // Build a split targeting the SAME project with preferAddToBalance = false (pay path).
-        JBSplit memory split = JBSplit({
-            preferAddToBalance: false,
-            percent: 1_000_000_000,
-            projectId: _projectId,
-            beneficiary: payable(_sender),
-            lockedUntil: 0,
-            hook: IJBSplitHook(address(0))
-        });
-
-        // Mock primaryTerminalOf to return this terminal (self-referencing).
-        mockExpect(
-            address(directory),
-            abi.encodeCall(IJBDirectory.primaryTerminalOf, (_projectId, _native)),
-            abi.encode(address(_terminal))
-        );
-
-        // executePayout requires msg.sender == address(this), so we call it via the terminal.
-        // The terminal's try-catch in the split group lib would normally catch this.
-        vm.prank(address(_terminal));
-        vm.expectRevert(JBMultiTerminal.JBMultiTerminal_MintNotAllowed.selector);
-        JBMultiTerminal(payable(address(_terminal)))
-            .executePayout({
-                split: split,
-                projectId: uint256(_projectId),
-                token: _native,
-                amount: _defaultAmount,
-                originalMessageSender: _sender
-            });
-    }
-}