@bananapus/core-v6 0.0.37 → 0.0.38

package/test/TestL2SequencerPriceFeed.sol

@@ -1,292 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.6;
-
-import {Test} from "forge-std/Test.sol";
-import {AggregatorV2V3Interface} from "@chainlink/contracts/src/v0.8/shared/interfaces/AggregatorV2V3Interface.sol";
-import {AggregatorV3Interface} from "@chainlink/contracts/src/v0.8/shared/interfaces/AggregatorV3Interface.sol";
-import {JBChainlinkV3PriceFeed} from "../src/JBChainlinkV3PriceFeed.sol";
-import {JBChainlinkV3SequencerPriceFeed} from "../src/JBChainlinkV3SequencerPriceFeed.sol";
-
-/// @notice Tests for JBChainlinkV3PriceFeed and JBChainlinkV3SequencerPriceFeed failure scenarios.
-/// Covers sequencer down, grace period, stale prices, negative/zero prices, and incomplete rounds.
-contract TestL2SequencerPriceFeed_Local is Test {
-    // The price feed under test (with sequencer check).
-    JBChainlinkV3SequencerPriceFeed private _sequencerFeed;
-
-    // The base price feed (without sequencer check).
-    JBChainlinkV3PriceFeed private _baseFeed;
-
-    // Mock addresses for Chainlink aggregators.
-    address private _mockPriceFeed = makeAddr("priceFeed");
-    address private _mockSequencerFeed = makeAddr("sequencerFeed");
-
-    uint256 private constant _THRESHOLD = 3600; // 1 hour staleness threshold
-    uint256 private constant _GRACE_PERIOD = 3600; // 1 hour grace period after restart
-
-    function setUp() public {
-        // Warp to a realistic timestamp so subtraction does not underflow.
-        vm.warp(100_000);
-
-        vm.label(_mockPriceFeed, "MockPriceFeed");
-        vm.label(_mockSequencerFeed, "MockSequencerFeed");
-
-        // Mock the decimals() call on the price feed aggregator.
-        vm.mockCall(
-            _mockPriceFeed, abi.encodeWithSelector(AggregatorV3Interface.decimals.selector), abi.encode(uint8(8))
-        );
-
-        _baseFeed = new JBChainlinkV3PriceFeed(AggregatorV3Interface(_mockPriceFeed), _THRESHOLD);
-
-        _sequencerFeed = new JBChainlinkV3SequencerPriceFeed(
-            AggregatorV3Interface(_mockPriceFeed),
-            _THRESHOLD,
-            AggregatorV2V3Interface(_mockSequencerFeed),
-            _GRACE_PERIOD
-        );
-    }
-
-    // -- Helper to mock a healthy price feed response --
-    function _mockHealthyPrice(int256 price, uint256 updatedAt) internal {
-        vm.mockCall(
-            _mockPriceFeed,
-            abi.encodeWithSelector(AggregatorV3Interface.latestRoundData.selector),
-            abi.encode(uint80(1), price, block.timestamp, updatedAt, uint80(1))
-        );
-    }
-
-    // -- Helper to mock sequencer feed response --
-    function _mockSequencer(int256 answer, uint256 startedAt) internal {
-        vm.mockCall(
-            _mockSequencerFeed,
-            abi.encodeWithSelector(AggregatorV3Interface.latestRoundData.selector),
-            abi.encode(uint80(1), answer, startedAt, block.timestamp, uint80(1))
-        );
-    }
-
-    /// @notice Sequencer is down (answer=1): should revert.
-    function test_revertsWhenSequencerDown() public {
-        // answer=1 means sequencer is down.
-        // startedAt is well in the past (long enough for grace period).
-        _mockSequencer(int256(1), block.timestamp - _GRACE_PERIOD - 100);
-        _mockHealthyPrice(2000e8, block.timestamp);
-
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JBChainlinkV3SequencerPriceFeed.JBChainlinkV3SequencerPriceFeed_SequencerDownOrRestarting.selector,
-                block.timestamp,
-                _GRACE_PERIOD,
-                block.timestamp - _GRACE_PERIOD - 100
-            )
-        );
-        _sequencerFeed.currentUnitPrice(18);
-    }
-
-    /// @notice Sequencer just restarted and still within grace period: should revert.
-    function test_revertsWhenWithinGracePeriod() public {
-        // Sequencer is up (answer=0), but restarted very recently.
-        uint256 restartedAt = block.timestamp - _GRACE_PERIOD / 2; // half the grace period ago
-        _mockSequencer(int256(0), restartedAt);
-        _mockHealthyPrice(2000e8, block.timestamp);
-
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JBChainlinkV3SequencerPriceFeed.JBChainlinkV3SequencerPriceFeed_SequencerDownOrRestarting.selector,
-                block.timestamp,
-                _GRACE_PERIOD,
-                restartedAt
-            )
-        );
-        _sequencerFeed.currentUnitPrice(18);
-    }
-
-    /// @notice Sequencer feed returns startedAt=0 (invalid round): should revert.
-    function test_revertsWhenSequencerRoundInvalid() public {
-        _mockSequencer(int256(0), 0);
-        _mockHealthyPrice(2000e8, block.timestamp);
-
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JBChainlinkV3SequencerPriceFeed.JBChainlinkV3SequencerPriceFeed_InvalidRound.selector
-            )
-        );
-        _sequencerFeed.currentUnitPrice(18);
-    }
-
-    /// @notice After grace period passes, sequencer feed works normally.
-    function test_worksAfterGracePeriodPasses() public {
-        // Sequencer is up (answer=0), restarted long enough ago.
-        uint256 restartedAt = block.timestamp - _GRACE_PERIOD - 1;
-        _mockSequencer(int256(0), restartedAt);
-        _mockHealthyPrice(2000e8, block.timestamp);
-
-        uint256 price = _sequencerFeed.currentUnitPrice(18);
-        // 2000e8 with 8 decimals -> adjusted to 18 decimals: 2000e18.
-        assertEq(price, 2000e18, "price should be 2000 with 18 decimals");
-    }
-
-    /// @notice Stale price beyond threshold: should revert (base feed behavior).
-    function test_revertsOnStalePrice() public {
-        uint256 staleUpdatedAt = block.timestamp - _THRESHOLD - 1;
-
-        vm.mockCall(
-            _mockPriceFeed,
-            abi.encodeWithSelector(AggregatorV3Interface.latestRoundData.selector),
-            abi.encode(uint80(1), int256(2000e8), block.timestamp, staleUpdatedAt, uint80(1))
-        );
-
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JBChainlinkV3PriceFeed.JBChainlinkV3PriceFeed_StalePrice.selector,
-                block.timestamp,
-                _THRESHOLD,
-                staleUpdatedAt
-            )
-        );
-        _baseFeed.currentUnitPrice(18);
-    }
-
-    /// @notice Stale price on sequencer feed (sequencer healthy, price stale): should revert.
-    function test_sequencerFeed_revertsOnStalePrice() public {
-        uint256 restartedAt = block.timestamp - _GRACE_PERIOD - 1;
-        _mockSequencer(int256(0), restartedAt);
-
-        uint256 staleUpdatedAt = block.timestamp - _THRESHOLD - 1;
-        vm.mockCall(
-            _mockPriceFeed,
-            abi.encodeWithSelector(AggregatorV3Interface.latestRoundData.selector),
-            abi.encode(uint80(1), int256(2000e8), block.timestamp, staleUpdatedAt, uint80(1))
-        );
-
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JBChainlinkV3PriceFeed.JBChainlinkV3PriceFeed_StalePrice.selector,
-                block.timestamp,
-                _THRESHOLD,
-                staleUpdatedAt
-            )
-        );
-        _sequencerFeed.currentUnitPrice(18);
-    }
-
-    /// @notice Negative price: should revert.
-    function test_revertsOnNegativePrice() public {
-        vm.mockCall(
-            _mockPriceFeed,
-            abi.encodeWithSelector(AggregatorV3Interface.latestRoundData.selector),
-            abi.encode(uint80(1), int256(-100), block.timestamp, block.timestamp, uint80(1))
-        );
-
-        vm.expectRevert(
-            abi.encodeWithSelector(JBChainlinkV3PriceFeed.JBChainlinkV3PriceFeed_NegativePrice.selector, int256(-100))
-        );
-        _baseFeed.currentUnitPrice(18);
-    }
-
-    /// @notice Fuzz: any negative price should revert.
-    function testFuzz_revertsOnAnyNegativePrice(int256 _price) public {
-        vm.assume(_price < 0);
-
-        vm.mockCall(
-            _mockPriceFeed,
-            abi.encodeWithSelector(AggregatorV3Interface.latestRoundData.selector),
-            abi.encode(uint80(1), _price, block.timestamp, block.timestamp, uint80(1))
-        );
-
-        vm.expectRevert(
-            abi.encodeWithSelector(JBChainlinkV3PriceFeed.JBChainlinkV3PriceFeed_NegativePrice.selector, _price)
-        );
-        _baseFeed.currentUnitPrice(18);
-    }
-
-    /// @notice Zero price: should revert (price <= 0 check).
-    function test_revertsOnZeroPrice() public {
-        vm.mockCall(
-            _mockPriceFeed,
-            abi.encodeWithSelector(AggregatorV3Interface.latestRoundData.selector),
-            abi.encode(uint80(1), int256(0), block.timestamp, block.timestamp, uint80(1))
-        );
-
-        vm.expectRevert(
-            abi.encodeWithSelector(JBChainlinkV3PriceFeed.JBChainlinkV3PriceFeed_NegativePrice.selector, int256(0))
-        );
-        _baseFeed.currentUnitPrice(18);
-    }
-
-    /// @notice Incomplete round (updatedAt=0): should revert.
-    function test_revertsOnIncompleteRound() public {
-        vm.mockCall(
-            _mockPriceFeed,
-            abi.encodeWithSelector(AggregatorV3Interface.latestRoundData.selector),
-            abi.encode(uint80(1), int256(2000e8), block.timestamp, uint256(0), uint80(1))
-        );
-
-        vm.expectRevert(abi.encodeWithSelector(JBChainlinkV3PriceFeed.JBChainlinkV3PriceFeed_IncompleteRound.selector));
-        _baseFeed.currentUnitPrice(18);
-    }
-
-    /// @notice Incomplete round on sequencer feed path: should revert.
-    function test_sequencerFeed_revertsOnIncompleteRound() public {
-        uint256 restartedAt = block.timestamp - _GRACE_PERIOD - 1;
-        _mockSequencer(int256(0), restartedAt);
-
-        // updatedAt = 0 means incomplete round.
-        vm.mockCall(
-            _mockPriceFeed,
-            abi.encodeWithSelector(AggregatorV3Interface.latestRoundData.selector),
-            abi.encode(uint80(1), int256(2000e8), block.timestamp, uint256(0), uint80(1))
-        );
-
-        vm.expectRevert(abi.encodeWithSelector(JBChainlinkV3PriceFeed.JBChainlinkV3PriceFeed_IncompleteRound.selector));
-        _sequencerFeed.currentUnitPrice(18);
-    }
-
-    /// @notice Price at exactly the threshold boundary: should succeed.
-    function test_priceAtExactThresholdBoundary() public {
-        // updatedAt = block.timestamp - THRESHOLD, so block.timestamp == THRESHOLD + updatedAt.
-        // The condition is block.timestamp > THRESHOLD + updatedAt, so this should NOT revert.
-        uint256 updatedAt = block.timestamp - _THRESHOLD;
-
-        vm.mockCall(
-            _mockPriceFeed,
-            abi.encodeWithSelector(AggregatorV3Interface.latestRoundData.selector),
-            abi.encode(uint80(1), int256(1500e8), block.timestamp, updatedAt, uint80(1))
-        );
-
-        uint256 price = _baseFeed.currentUnitPrice(18);
-        assertEq(price, 1500e18, "price at exact threshold boundary should succeed");
-    }
-
-    /// @notice Grace period at exact boundary: sequencer restarted exactly grace period ago should still revert.
-    function test_gracePeriodExactBoundary() public {
-        // startedAt = block.timestamp - GRACE_PERIOD.
-        // The condition is block.timestamp <= GRACE_PERIOD_TIME + startedAt,
-        // which is block.timestamp <= block.timestamp, which is true. So should revert.
-        uint256 startedAt = block.timestamp - _GRACE_PERIOD;
-        _mockSequencer(int256(0), startedAt);
-        _mockHealthyPrice(2000e8, block.timestamp);
-
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                JBChainlinkV3SequencerPriceFeed.JBChainlinkV3SequencerPriceFeed_SequencerDownOrRestarting.selector,
-                block.timestamp,
-                _GRACE_PERIOD,
-                startedAt
-            )
-        );
-        _sequencerFeed.currentUnitPrice(18);
-    }
-
-    /// @notice Decimal adjustment: price with fewer decimals scaled up correctly.
-    function test_decimalScaling() public {
-        _mockHealthyPrice(1e8, block.timestamp); // 1.00000000 with 8 decimals
-
-        uint256 price18 = _baseFeed.currentUnitPrice(18);
-        assertEq(price18, 1e18, "1e8 at 8 decimals should scale to 1e18 at 18 decimals");
-
-        uint256 price8 = _baseFeed.currentUnitPrice(8);
-        assertEq(price8, 1e8, "1e8 at 8 decimals should stay 1e8 at 8 decimals");
-
-        uint256 price6 = _baseFeed.currentUnitPrice(6);
-        assertEq(price6, 1e6, "1e8 at 8 decimals should scale to 1e6 at 6 decimals");
-    }
-}

package/test/TestLaunchProject.sol

@@ -1,188 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.6;
-
-import {TestBaseWorkflow} from "./helpers/TestBaseWorkflow.sol";
-import {IJBController} from "../src/interfaces/IJBController.sol";
-import {IJBRulesetApprovalHook} from "../src/interfaces/IJBRulesetApprovalHook.sol";
-import {IJBRulesets} from "../src/interfaces/IJBRulesets.sol";
-import {IJBTerminal} from "../src/interfaces/IJBTerminal.sol";
-import {JBConstants} from "../src/libraries/JBConstants.sol";
-import {JBAccountingContext} from "../src/structs/JBAccountingContext.sol";
-import {JBFundAccessLimitGroup} from "../src/structs/JBFundAccessLimitGroup.sol";
-import {JBRuleset} from "../src/structs/JBRuleset.sol";
-import {JBRulesetConfig} from "../src/structs/JBRulesetConfig.sol";
-import {JBRulesetMetadata} from "../src/structs/JBRulesetMetadata.sol";
-import {JBSplitGroup} from "../src/structs/JBSplitGroup.sol";
-import {JBTerminalConfig} from "../src/structs/JBTerminalConfig.sol";
-
-// Projects can be launched.
-contract TestLaunchProject_Local is TestBaseWorkflow {
-    IJBController private _controller;
-    JBRulesetMetadata private _metadata;
-    IJBTerminal private _terminal;
-    IJBRulesets private _rulesets;
-
-    address private _projectOwner;
-
-    function setUp() public override {
-        super.setUp();
-
-        _projectOwner = multisig();
-        _terminal = jbMultiTerminal();
-        _controller = jbController();
-        _rulesets = jbRulesets();
-
-        _metadata = JBRulesetMetadata({
-            reservedPercent: 0,
-            cashOutTaxRate: 0,
-            baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
-            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
-        });
-    }
-
-    function equals(JBRuleset memory queued, JBRuleset memory stored) internal pure returns (bool) {
-        // Just compare the output of hashing all fields packed.
-        return (keccak256(
-                    abi.encodePacked(
-                        queued.cycleNumber,
-                        queued.id,
-                        queued.basedOnId,
-                        queued.start,
-                        queued.duration,
-                        queued.weight,
-                        queued.weightCutPercent,
-                        queued.approvalHook,
-                        queued.metadata
-                    )
-                )
-                == keccak256(
-                    abi.encodePacked(
-                        stored.cycleNumber,
-                        stored.id,
-                        stored.basedOnId,
-                        stored.start,
-                        stored.duration,
-                        stored.weight,
-                        stored.weightCutPercent,
-                        stored.approvalHook,
-                        stored.metadata
-                    )
-                ));
-    }
-
-    function testLaunchProject() public {
-        // Package up ruleset configuration.
-        JBRulesetConfig[] memory _rulesetConfig = new JBRulesetConfig[](1);
-        _rulesetConfig[0].mustStartAtOrAfter = 0;
-        _rulesetConfig[0].duration = 0;
-        _rulesetConfig[0].weight = 0;
-        _rulesetConfig[0].weightCutPercent = 0;
-        _rulesetConfig[0].approvalHook = IJBRulesetApprovalHook(address(0));
-        _rulesetConfig[0].metadata = _metadata;
-        _rulesetConfig[0].splitGroups = new JBSplitGroup[](0);
-        _rulesetConfig[0].fundAccessLimitGroups = new JBFundAccessLimitGroup[](0);
-
-        // Package up terminal configuration.
-        JBTerminalConfig[] memory _terminalConfigurations = new JBTerminalConfig[](1);
-        JBAccountingContext[] memory _tokensToAccept = new JBAccountingContext[](1);
-        _tokensToAccept[0] = JBAccountingContext({
-            token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-        });
-        _terminalConfigurations[0] =
-            JBTerminalConfig({terminal: _terminal, accountingContextsToAccept: _tokensToAccept});
-
-        uint256 projectId = _controller.launchProjectFor({
-            owner: _projectOwner,
-            projectUri: "myIPFSHash",
-            rulesetConfigurations: _rulesetConfig,
-            terminalConfigurations: _terminalConfigurations,
-            memo: ""
-        });
-
-        // Get a reference to the first ruleset.
-        JBRuleset memory ruleset = _rulesets.currentOf(projectId);
-
-        // Reference queued attributes for sake of comparison.
-        JBRuleset memory queued = JBRuleset({
-            cycleNumber: 1,
-            id: uint48(block.timestamp),
-            basedOnId: 0,
-            start: uint48(block.timestamp),
-            duration: 0,
-            weight: 0,
-            weightCutPercent: 0,
-            approvalHook: IJBRulesetApprovalHook(address(0)),
-            metadata: ruleset.metadata
-        });
-
-        bool same = equals(queued, ruleset);
-
-        assertEq(same, true);
-    }
-
-    function testLaunchProjectFuzzWeight(uint112 _weight) public {
-        uint256 _projectId;
-
-        // Package up ruleset configuration.
-        JBRulesetConfig[] memory _rulesetConfig = new JBRulesetConfig[](1);
-        _rulesetConfig[0].mustStartAtOrAfter = 0;
-        _rulesetConfig[0].duration = 14;
-        _rulesetConfig[0].weight = _weight;
-        _rulesetConfig[0].weightCutPercent = 450_000_000;
-        _rulesetConfig[0].approvalHook = IJBRulesetApprovalHook(address(0));
-        _rulesetConfig[0].metadata = _metadata;
-        _rulesetConfig[0].splitGroups = new JBSplitGroup[](0);
-        _rulesetConfig[0].fundAccessLimitGroups = new JBFundAccessLimitGroup[](0);
-
-        // Package up terminal configuration.
-        JBTerminalConfig[] memory _terminalConfigurations = new JBTerminalConfig[](1);
-        JBAccountingContext[] memory _tokensToAccept = new JBAccountingContext[](1);
-        _tokensToAccept[0] = JBAccountingContext({
-            token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-        });
-        _terminalConfigurations[0] =
-            JBTerminalConfig({terminal: _terminal, accountingContextsToAccept: _tokensToAccept});
-
-        _projectId = _controller.launchProjectFor({
-            owner: _projectOwner,
-            projectUri: "myIPFSHash",
-            rulesetConfigurations: _rulesetConfig,
-            terminalConfigurations: _terminalConfigurations,
-            memo: ""
-        });
-
-        JBRuleset memory ruleset = _rulesets.currentOf(_projectId);
-
-        // Reference queued attributes for sake of comparison.
-        JBRuleset memory queued = JBRuleset({
-            cycleNumber: 1,
-            id: uint48(block.timestamp),
-            basedOnId: 0,
-            start: uint48(block.timestamp),
-            duration: _rulesetConfig[0].duration,
-            weight: _weight,
-            weightCutPercent: _rulesetConfig[0].weightCutPercent,
-            approvalHook: _rulesetConfig[0].approvalHook,
-            metadata: ruleset.metadata
-        });
-
-        bool same = equals(queued, ruleset);
-
-        assertEq(same, true);
-    }
-}

package/test/TestMetaTx.sol

@@ -1,217 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity >=0.8.6;
-
-import {TestBaseWorkflow} from "./helpers/TestBaseWorkflow.sol";
-import {JBTokens} from "../src/JBTokens.sol";
-import {IJBCashOutTerminal} from "../src/interfaces/IJBCashOutTerminal.sol";
-import {IJBController} from "../src/interfaces/IJBController.sol";
-import {IJBMultiTerminal} from "../src/interfaces/IJBMultiTerminal.sol";
-import {IJBRulesetApprovalHook} from "../src/interfaces/IJBRulesetApprovalHook.sol";
-import {IJBTerminal} from "../src/interfaces/IJBTerminal.sol";
-import {JBConstants} from "../src/libraries/JBConstants.sol";
-import {JBAccountingContext} from "../src/structs/JBAccountingContext.sol";
-import {JBFundAccessLimitGroup} from "../src/structs/JBFundAccessLimitGroup.sol";
-import {JBRulesetConfig} from "../src/structs/JBRulesetConfig.sol";
-import {JBRulesetMetadata} from "../src/structs/JBRulesetMetadata.sol";
-import {JBSplitGroup} from "../src/structs/JBSplitGroup.sol";
-import {JBTerminalConfig} from "../src/structs/JBTerminalConfig.sol";
-import {mul as UD60x18mul, unwrap as UD60x18unwrap, wrap as UD60x18wrap} from "@prb/math/src/UD60x18.sol";
-import {ERC2771Forwarder} from "@openzeppelin/contracts/metatx/ERC2771Forwarder.sol";
-import {ERC2771ForwarderMock, ForwardRequest} from "./mock/ERC2771ForwarderMock.sol";
-
-contract TestMetaTx_Local is TestBaseWorkflow {
-    uint112 private constant _WEIGHT = 1000 * 10 ** 18;
-
-    IJBController private _controller;
-    IJBMultiTerminal private _terminal;
-    JBTokens private _tokens;
-    ERC2771ForwarderMock internal _erc2771Forwarder = ERC2771ForwarderMock(address(123_456));
-    address private _projectOwner;
-
-    uint256 _projectId;
-
-    // Meta Tx guys
-    uint256 internal _signerPrivateKey;
-    uint256 internal _relayerPrivateKey;
-    address internal _signer;
-    address internal _relayer;
-
-    // utility function - setUp() is below
-    function _forgeRequestData(
-        uint256 value,
-        uint256 nonce,
-        uint48 deadline,
-        bytes memory data,
-        address target
-    )
-        private
-        view
-        returns (ERC2771Forwarder.ForwardRequestData memory)
-    {
-        ForwardRequest memory request = ForwardRequest({
-            from: _signer, to: address(target), value: value, gas: 300_000, nonce: nonce, deadline: deadline, data: data
-        });
-
-        bytes32 digest = _erc2771Forwarder.structHash(request);
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(_signerPrivateKey, digest);
-        bytes memory signature = abi.encodePacked(r, s, v);
-
-        return ERC2771Forwarder.ForwardRequestData({
-            from: request.from,
-            to: request.to,
-            value: request.value,
-            gas: request.gas,
-            deadline: request.deadline,
-            data: request.data,
-            signature: signature
-        });
-    }
-
-    function setUp() public override {
-        super.setUp();
-
-        _controller = jbController();
-        _tokens = jbTokens();
-        _terminal = jbMultiTerminal();
-
-        // Deploy forwarder
-        deployCodeTo("ERC2771ForwarderMock.sol", abi.encode("ERC2771Forwarder"), address(123_456));
-
-        _signerPrivateKey = 0xA11CE;
-        _relayerPrivateKey = 0xB0B;
-
-        _signer = vm.addr(_signerPrivateKey);
-        _relayer = vm.addr(_relayerPrivateKey);
-
-        // In case we need to test access control
-        _projectOwner = _signer;
-
-        JBRulesetMetadata memory _metadata = JBRulesetMetadata({
-            reservedPercent: 0,
-            cashOutTaxRate: 0,
-            baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
-            pausePay: false,
-            pauseCreditTransfers: false,
-            allowOwnerMinting: true,
-            allowSetCustomToken: true,
-            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
-        });
-
-        // Package up cycle config.
-        JBRulesetConfig[] memory _rulesetConfig = new JBRulesetConfig[](1);
-        _rulesetConfig[0].mustStartAtOrAfter = 0;
-        _rulesetConfig[0].duration = 0;
-        _rulesetConfig[0].weight = _WEIGHT;
-        _rulesetConfig[0].weightCutPercent = 0;
-        _rulesetConfig[0].approvalHook = IJBRulesetApprovalHook(address(0));
-        _rulesetConfig[0].metadata = _metadata;
-        _rulesetConfig[0].splitGroups = new JBSplitGroup[](0);
-        _rulesetConfig[0].fundAccessLimitGroups = new JBFundAccessLimitGroup[](0);
-
-        JBTerminalConfig[] memory _terminalConfigurations = new JBTerminalConfig[](1);
-        JBAccountingContext[] memory _tokensToAccept = new JBAccountingContext[](1);
-        _tokensToAccept[0] = JBAccountingContext({
-            token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-        });
-        _terminalConfigurations[0] =
-            JBTerminalConfig({terminal: _terminal, accountingContextsToAccept: _tokensToAccept});
-
-        // First project for fee collection
-        _controller.launchProjectFor({
-            owner: _projectOwner,
-            projectUri: "myIPFSHash",
-            rulesetConfigurations: _rulesetConfig,
-            terminalConfigurations: _terminalConfigurations,
-            memo: ""
-        });
-
-        _projectId = _controller.launchProjectFor({
-            owner: _projectOwner,
-            projectUri: "myIPFSHash",
-            rulesetConfigurations: _rulesetConfig,
-            terminalConfigurations: _terminalConfigurations,
-            memo: ""
-        });
-    }
-
-    function testForwarderDeployed() public view {
-        // Check: forwarder deployed to address
-        assertEq(_erc2771Forwarder.deployed(), true);
-    }
-
-    function testMetaPayAndMetaCashOut() public {
-        // Setup: pay amounts, set balances
-        uint256 _payAmount = 1 ether;
-        vm.deal(_relayer, 1 ether);
-
-        // Setup: meta tx data
-        bytes memory _data = abi.encodeWithSelector(
-            IJBTerminal.pay.selector,
-            _projectId,
-            JBConstants.NATIVE_TOKEN,
-            _payAmount,
-            _signer,
-            0, // minReturnedTokens
-            "Take my money!", // memo
-            "" // metadata, empty bytes
-        );
-
-        // Setup: forwarder request data
-        ERC2771Forwarder.ForwardRequestData memory requestData = _forgeRequestData({
-            value: _payAmount, nonce: 0, deadline: uint48(block.timestamp + 1), data: _data, target: address(_terminal)
-        });
-
-        // Send: "Meta Tx" (signed by _signer) from relayer to our trusted forwarder
-        vm.prank(_relayer);
-        _erc2771Forwarder.execute{value: _payAmount}(requestData);
-
-        // Check: Ensure balance left the relayer (sponsor)
-        assertEq(_relayer.balance, 0);
-
-        // Check: Ensure terminal has ETH from meta tx
-        assertEq(address(_terminal).balance, 1 ether);
-
-        // Check: Ensure the beneficiary (signer) has a balance of tokens.
-        uint256 _beneficiaryTokenBalance = UD60x18unwrap(UD60x18mul(UD60x18wrap(_payAmount), UD60x18wrap(_WEIGHT)));
-        assertEq(_tokens.totalBalanceOf(_signer, _projectId), _beneficiaryTokenBalance);
-
-        // Setup 2: meta tx data for cash outs
-        bytes memory _data2 = abi.encodeWithSelector(
-            IJBCashOutTerminal.cashOutTokensOf.selector,
-            _signer,
-            _projectId,
-            _beneficiaryTokenBalance,
-            JBConstants.NATIVE_TOKEN,
-            0, // minReturnedTokens
-            payable(_signer),
-            "Gimme my money!", // memo
-            "" // metadata, empty bytes
-        );
-
-        // Setup 2: forwarder request data with incremented nonce for cash out tx
-        ERC2771Forwarder.ForwardRequestData memory requestData2 = _forgeRequestData({
-            value: 0, nonce: 1, deadline: uint48(block.timestamp + 1), data: _data2, target: address(_terminal)
-        });
-
-        // Setup 2: Give relayer some gas gas gasssss
-        vm.deal(_relayer, 1 ether);
-
-        // Send 2 : "Meta Tx #2" (signed by _signer) from relayer to our trusted forwarder
-        vm.prank(_relayer);
-        _erc2771Forwarder.execute{value: 0}(requestData2);
-
-        // Check 2: original signer has ETH back
-        assertEq(_signer.balance, 1 ether);
-    }
-}