@bananapus/core-v6 0.0.15 → 0.0.17

package/test/TestPayHooks.sol

@@ -1,7 +1,24 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.6;
 
-import /* {*} from */ "./helpers/TestBaseWorkflow.sol";
+import {TestBaseWorkflow} from "./helpers/TestBaseWorkflow.sol";
+import {IJBController} from "../src/interfaces/IJBController.sol";
+import {IJBPayHook} from "../src/interfaces/IJBPayHook.sol";
+import {IJBRulesetApprovalHook} from "../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesetDataHook} from "../src/interfaces/IJBRulesetDataHook.sol";
+import {IJBTerminal} from "../src/interfaces/IJBTerminal.sol";
+import {JBConstants} from "../src/libraries/JBConstants.sol";
+import {JBAccountingContext} from "../src/structs/JBAccountingContext.sol";
+import {JBAfterPayRecordedContext} from "../src/structs/JBAfterPayRecordedContext.sol";
+import {JBFundAccessLimitGroup} from "../src/structs/JBFundAccessLimitGroup.sol";
+import {JBPayHookSpecification} from "../src/structs/JBPayHookSpecification.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";
+import {JBTokenAmount} from "../src/structs/JBTokenAmount.sol";
+import {mulDiv} from "@prb/math/src/Common.sol";
 
 contract TestPayHooks_Local is TestBaseWorkflow {
     uint8 private constant _WEIGHT_DECIMALS = 18;
@@ -118,25 +135,27 @@ contract TestPayHooks_Local is TestBaseWorkflow {
             bytes memory _hookMetadata = bytes("Some data hook metadata");
 
             // Package up the specification struct.
-            _specifications[i] = JBPayHookSpecification(IJBPayHook(_hookAddress), _payHookAmounts[i], _hookMetadata);
+            _specifications[i] = JBPayHookSpecification({
+                hook: IJBPayHook(_hookAddress), amount: _payHookAmounts[i], metadata: _hookMetadata
+            });
 
             // Keep a reference to the data that'll be received by the hook.
             JBAfterPayRecordedContext memory _postRecordPayContext = JBAfterPayRecordedContext({
                 payer: _payer,
                 projectId: _projectId,
                 rulesetId: _ruleset.id,
-                amount: JBTokenAmount(
-                    JBConstants.NATIVE_TOKEN,
-                    _terminal.accountingContextForTokenOf(_projectId, JBConstants.NATIVE_TOKEN).decimals,
-                    _terminal.accountingContextForTokenOf(_projectId, JBConstants.NATIVE_TOKEN).currency,
-                    _nativePayAmount
-                ),
-                forwardedAmount: JBTokenAmount(
-                    JBConstants.NATIVE_TOKEN,
-                    _terminal.accountingContextForTokenOf(_projectId, JBConstants.NATIVE_TOKEN).decimals,
-                    _terminal.accountingContextForTokenOf(_projectId, JBConstants.NATIVE_TOKEN).currency,
-                    _payHookAmounts[i]
-                ),
+                amount: JBTokenAmount({
+                    token: JBConstants.NATIVE_TOKEN,
+                    decimals: _terminal.accountingContextForTokenOf(_projectId, JBConstants.NATIVE_TOKEN).decimals,
+                    currency: _terminal.accountingContextForTokenOf(_projectId, JBConstants.NATIVE_TOKEN).currency,
+                    value: _nativePayAmount
+                }),
+                forwardedAmount: JBTokenAmount({
+                    token: JBConstants.NATIVE_TOKEN,
+                    decimals: _terminal.accountingContextForTokenOf(_projectId, JBConstants.NATIVE_TOKEN).decimals,
+                    currency: _terminal.accountingContextForTokenOf(_projectId, JBConstants.NATIVE_TOKEN).currency,
+                    value: _payHookAmounts[i]
+                }),
                 weight: _WEIGHT,
                 newlyIssuedTokenCount: mulDiv(_nativePayAmount, _DATA_HOOK_WEIGHT, 10 ** _NATIVE_TOKEN_DECIMALS),
                 beneficiary: _beneficiary,

package/test/TestPermissions.sol

@@ -1,7 +1,24 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.6;
 
-import /* {*} from */ "./helpers/TestBaseWorkflow.sol";
+import {TestBaseWorkflow} from "./helpers/TestBaseWorkflow.sol";
+import {MockERC20} from "./mock/MockERC20.sol";
+import {JBPermissions} from "../src/JBPermissions.sol";
+import {JBPermissioned} from "../src/abstract/JBPermissioned.sol";
+import {IJBController} from "../src/interfaces/IJBController.sol";
+import {IJBPermissions} from "../src/interfaces/IJBPermissions.sol";
+import {IJBRulesetApprovalHook} from "../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBTerminal} from "../src/interfaces/IJBTerminal.sol";
+import {IJBToken} from "../src/interfaces/IJBToken.sol";
+import {JBConstants} from "../src/libraries/JBConstants.sol";
+import {JBAccountingContext} from "../src/structs/JBAccountingContext.sol";
+import {JBFundAccessLimitGroup} from "../src/structs/JBFundAccessLimitGroup.sol";
+import {JBPermissionsData} from "../src/structs/JBPermissionsData.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 {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
 
 contract TestPermissions_Local is TestBaseWorkflow {
     IJBController private _controller;
@@ -135,6 +152,7 @@ contract TestPermissions_Local is TestBaseWorkflow {
         address _op,
         uint56 _projectId,
         uint8 _checkedId,
+        // forge-lint: disable-next-line(mixed-case-variable)
         uint8[] memory _set_permissions
     )
         public
@@ -143,6 +161,7 @@ contract TestPermissions_Local is TestBaseWorkflow {
         vm.assume(_set_permissions.length != 0);
         vm.assume(_account != trustedForwarder());
 
+        // forge-lint: disable-next-line(mixed-case-variable)
         uint256[] memory _check_permissions = new uint256[](1);
         _check_permissions[0] = _checkedId;
 

package/test/TestPermissionsEdge.sol

@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.6;
 
-import /* {*} from */ "./helpers/TestBaseWorkflow.sol";
+import {TestBaseWorkflow} from "./helpers/TestBaseWorkflow.sol";
+import {JBPermissions} from "../src/JBPermissions.sol";
+import {JBPermissionsData} from "../src/structs/JBPermissionsData.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
 
 /// @notice Defense-in-depth validation of JBPermissions ROOT escalation prevention.
 /// Verifies that ROOT operators cannot forward ROOT, cannot set wildcard permissions,
@@ -231,6 +234,7 @@ contract TestPermissionsEdge_Local is TestBaseWorkflow {
         uint256 idx;
         for (uint256 i = 1; i < 256; i++) {
             if ((bitmap >> i) & 1 == 1) {
+                // forge-lint: disable-next-line(unsafe-typecast)
                 ids[idx] = uint8(i);
                 idx++;
             }

package/test/TestPermit2DataHook.t.sol

@@ -0,0 +1,360 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.6;
+
+import {TestBaseWorkflow} from "./helpers/TestBaseWorkflow.sol";
+import {MetadataResolverHelper} from "./helpers/MetadataResolverHelper.sol";
+import {IJBController} from "../src/interfaces/IJBController.sol";
+import {IJBPrices} from "../src/interfaces/IJBPrices.sol";
+import {IJBRulesetApprovalHook} from "../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesetDataHook} from "../src/interfaces/IJBRulesetDataHook.sol";
+import {IJBTerminal} from "../src/interfaces/IJBTerminal.sol";
+import {IJBTokens} from "../src/interfaces/IJBTokens.sol";
+import {JBConstants} from "../src/libraries/JBConstants.sol";
+import {JBAccountingContext} from "../src/structs/JBAccountingContext.sol";
+import {JBFundAccessLimitGroup} from "../src/structs/JBFundAccessLimitGroup.sol";
+import {JBPayHookSpecification} from "../src/structs/JBPayHookSpecification.sol";
+import {JBRulesetConfig} from "../src/structs/JBRulesetConfig.sol";
+import {JBRulesetMetadata} from "../src/structs/JBRulesetMetadata.sol";
+import {JBSingleAllowance} from "../src/structs/JBSingleAllowance.sol";
+import {JBSplitGroup} from "../src/structs/JBSplitGroup.sol";
+import {JBTerminalConfig} from "../src/structs/JBTerminalConfig.sol";
+import {IAllowanceTransfer, IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {MockPriceFeed} from "./mock/MockPriceFeed.sol";
+import {mulDiv} from "@prb/math/src/Common.sol";
+
+/// @notice Tests combining Permit2 ERC-20 transfers with data hook weight overrides.
+contract TestPermit2DataHook_Local is TestBaseWorkflow {
+    uint112 private constant _WEIGHT = uint112(1000 * 10 ** 18);
+    address private constant _DATA_HOOK = address(bytes20(keccak256("permit2datahook")));
+
+    IJBController private _controller;
+    IJBTerminal private _terminal;
+    IJBPrices private _prices;
+    IJBTokens private _tokens;
+    IERC20 private _usdc;
+    IPermit2 private _permit2;
+    MetadataResolverHelper private _helper;
+    address private _projectOwner;
+
+    uint256 _projectId;
+
+    // Permit2 params.
+    // forge-lint: disable-next-line(mixed-case-variable)
+    bytes32 DOMAIN_SEPARATOR;
+    address from;
+    uint256 fromPrivateKey;
+
+    // Price.
+    uint256 _nativePricePerUsd = 0.0005 * 10 ** 18; // 1/2000
+
+    function setUp() public override {
+        super.setUp();
+
+        vm.label(_DATA_HOOK, "Data Hook");
+
+        _controller = jbController();
+        _projectOwner = multisig();
+        _terminal = jbMultiTerminal();
+        _prices = jbPrices();
+        _tokens = jbTokens();
+        _helper = metadataHelper();
+        _usdc = usdcToken();
+        _permit2 = permit2();
+
+        fromPrivateKey = 0x12341234;
+        from = vm.addr(fromPrivateKey);
+        DOMAIN_SEPARATOR = permit2().DOMAIN_SEPARATOR();
+
+        // First project: fee collector with data hook disabled.
+        JBRulesetMetadata memory _feeMetadata = JBRulesetMetadata({
+            reservedPercent: 0,
+            cashOutTaxRate: JBConstants.MAX_CASH_OUT_TAX_RATE,
+            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: true,
+            holdFees: false,
+            useTotalSurplusForCashOuts: false,
+            useDataHookForPay: false,
+            useDataHookForCashOut: false,
+            dataHook: address(0),
+            metadata: 0
+        });
+
+        JBRulesetConfig[] memory _feeRulesetConfig = new JBRulesetConfig[](1);
+        _feeRulesetConfig[0].mustStartAtOrAfter = 0;
+        _feeRulesetConfig[0].duration = 0;
+        _feeRulesetConfig[0].weight = _WEIGHT;
+        _feeRulesetConfig[0].weightCutPercent = 0;
+        _feeRulesetConfig[0].approvalHook = IJBRulesetApprovalHook(address(0));
+        _feeRulesetConfig[0].metadata = _feeMetadata;
+        _feeRulesetConfig[0].splitGroups = new JBSplitGroup[](0);
+        _feeRulesetConfig[0].fundAccessLimitGroups = new JBFundAccessLimitGroup[](0);
+
+        JBTerminalConfig[] memory _terminalConfigurations = new JBTerminalConfig[](1);
+        JBAccountingContext[] memory _tokensToAccept = new JBAccountingContext[](2);
+        _tokensToAccept[0] = JBAccountingContext({
+            token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
+        });
+        _tokensToAccept[1] = JBAccountingContext({
+            token: address(usdcToken()), decimals: 6, currency: uint32(uint160(address(usdcToken())))
+        });
+        _terminalConfigurations[0] =
+            JBTerminalConfig({terminal: _terminal, accountingContextsToAccept: _tokensToAccept});
+
+        // Create fee project (project ID 1).
+        _controller.launchProjectFor({
+            owner: _projectOwner,
+            projectUri: "feeProject",
+            rulesetConfigurations: _feeRulesetConfig,
+            terminalConfigurations: _terminalConfigurations,
+            memo: ""
+        });
+
+        // Second project: data hook enabled for pay, uses USDC via Permit2.
+        JBRulesetMetadata memory _metadata = JBRulesetMetadata({
+            reservedPercent: 0,
+            cashOutTaxRate: JBConstants.MAX_CASH_OUT_TAX_RATE,
+            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: true,
+            holdFees: false,
+            useTotalSurplusForCashOuts: false,
+            useDataHookForPay: true,
+            useDataHookForCashOut: false,
+            dataHook: _DATA_HOOK,
+            metadata: 0
+        });
+
+        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);
+
+        _projectId = _controller.launchProjectFor({
+            owner: _projectOwner,
+            projectUri: "permit2DataHookProject",
+            rulesetConfigurations: _rulesetConfig,
+            terminalConfigurations: _terminalConfigurations,
+            memo: ""
+        });
+
+        vm.startPrank(_projectOwner);
+        MockPriceFeed _priceFeedNativeUsd = new MockPriceFeed(_nativePricePerUsd, 18);
+        vm.label(address(_priceFeedNativeUsd), "Mock Price Feed Native-USD");
+
+        _controller.addPriceFeed({
+            projectId: _projectId,
+            pricingCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
+            unitCurrency: uint32(uint160(address(usdcToken()))),
+            feed: _priceFeedNativeUsd
+        });
+
+        vm.stopPrank();
+    }
+
+    /// @notice Builds Permit2 metadata for the given coin amount and nonce.
+    function _buildPermit2Metadata(uint256 coins, uint48 nonce) internal view returns (bytes memory packedData) {
+        uint256 deadline = block.timestamp + 1 days;
+        // forge-lint: disable-next-line(unsafe-typecast)
+        uint48 expiration = uint48(block.timestamp + 1 days);
+
+        IAllowanceTransfer.PermitDetails memory details = IAllowanceTransfer.PermitDetails({
+            token: address(_usdc),
+            // forge-lint: disable-next-line(unsafe-typecast)
+            amount: uint160(coins),
+            expiration: expiration,
+            nonce: nonce
+        });
+
+        IAllowanceTransfer.PermitSingle memory permitSingle =
+            IAllowanceTransfer.PermitSingle({details: details, spender: address(_terminal), sigDeadline: deadline});
+
+        bytes memory sig = getPermitSignature(permitSingle, fromPrivateKey, DOMAIN_SEPARATOR);
+
+        JBSingleAllowance memory permitData = JBSingleAllowance({
+            sigDeadline: deadline,
+            // forge-lint: disable-next-line(unsafe-typecast)
+            amount: uint160(coins),
+            expiration: expiration,
+            nonce: nonce,
+            signature: sig
+        });
+
+        bytes4[] memory ids = new bytes4[](1);
+        bytes[] memory datas = new bytes[](1);
+        datas[0] = abi.encode(permitData);
+        ids[0] = _helper.getId("permit2", address(_terminal));
+
+        packedData = _helper.createMetadata(ids, datas);
+    }
+
+    /// @notice Pay via Permit2 with a data hook that returns the original weight -- tokens should match normal
+    /// issuance.
+    function test_permit2_withDataHook_paySucceeds() public {
+        uint256 _coins = 1_000_000; // 1 USDC (6 decimals)
+
+        // Data hook returns the original weight and empty hook specifications.
+        JBPayHookSpecification[] memory _emptySpecs = new JBPayHookSpecification[](0);
+        vm.mockCall(
+            _DATA_HOOK,
+            abi.encodeWithSelector(IJBRulesetDataHook.beforePayRecordedWith.selector),
+            abi.encode(uint256(_WEIGHT), _emptySpecs)
+        );
+
+        // Build Permit2 metadata.
+        bytes memory _packedData = _buildPermit2Metadata(_coins, 0);
+
+        // Setup: give coins and approve permit2 contract.
+        deal(address(_usdc), from, _coins);
+        vm.prank(from);
+        IERC20(address(_usdc)).approve(address(permit2()), _coins);
+
+        // Pay using Permit2 with data hook.
+        vm.prank(from);
+        uint256 _minted = _terminal.pay({
+            projectId: _projectId,
+            amount: _coins,
+            token: address(_usdc),
+            beneficiary: from,
+            minReturnedTokens: 0,
+            memo: "Permit2 + data hook",
+            metadata: _packedData
+        });
+
+        // Check: tokens were transferred.
+        assertEq(_usdc.balanceOf(address(_terminal)), _coins, "terminal should hold the USDC");
+
+        // Check: payer receives project tokens.
+        assertEq(_tokens.totalBalanceOf(from, _projectId), _minted, "payer should have minted tokens");
+
+        // Check: minted amount matches expected calculation.
+        // The baseCurrency is NATIVE_TOKEN (ETH), so USDC amounts get converted via price feed.
+        // 1 USDC = 0.0005 ETH (from _nativePricePerUsd). So 1e6 USDC = 0.0005e18 = 5e14 ETH.
+        // Token count = ethEquivalent * weight / 10^18
+        // ethEquivalent = _coins * 10^12 (6->18 decimals) * _nativePricePerUsd / 10^18
+        uint256 adjustedAmount = _coins * 10 ** 12; // adjust from 6 to 18 decimals
+        uint256 ethEquivalent = mulDiv(adjustedAmount, _nativePricePerUsd, 10 ** 18);
+        uint256 expectedTokens = mulDiv(ethEquivalent, _WEIGHT, 10 ** 18);
+        assertEq(_minted, expectedTokens, "minted tokens should match weight calculation");
+    }
+
+    /// @notice Pay via Permit2 with a data hook that modifies the weight (2x) -- tokens should reflect the modified
+    /// weight.
+    function test_permit2_withDataHook_hookModifiesWeight() public {
+        uint256 _coins = 500_000; // 0.5 USDC (6 decimals)
+
+        // Data hook returns 2x the original weight.
+        uint256 _modifiedWeight = uint256(_WEIGHT) * 2;
+        JBPayHookSpecification[] memory _emptySpecs = new JBPayHookSpecification[](0);
+        vm.mockCall(
+            _DATA_HOOK,
+            abi.encodeWithSelector(IJBRulesetDataHook.beforePayRecordedWith.selector),
+            abi.encode(_modifiedWeight, _emptySpecs)
+        );
+
+        // Build Permit2 metadata.
+        bytes memory _packedData = _buildPermit2Metadata(_coins, 0);
+
+        // Setup: give coins and approve permit2 contract.
+        deal(address(_usdc), from, _coins);
+        vm.prank(from);
+        IERC20(address(_usdc)).approve(address(permit2()), _coins);
+
+        // Pay using Permit2 with data hook.
+        vm.prank(from);
+        uint256 _minted = _terminal.pay({
+            projectId: _projectId,
+            amount: _coins,
+            token: address(_usdc),
+            beneficiary: from,
+            minReturnedTokens: 0,
+            memo: "Permit2 + modified weight",
+            metadata: _packedData
+        });
+
+        // Check: correct ERC-20 amount transferred via Permit2.
+        assertEq(_usdc.balanceOf(address(_terminal)), _coins, "terminal should hold the USDC");
+
+        // Check: tokens minted matches the MODIFIED weight (2x), not the original.
+        // USDC amounts are converted to ETH via price feed before token calculation.
+        // 500_000 USDC (0.5 USDC) = 0.00025 ETH = 2.5e14 at 18 decimals.
+        // Token count = ethEquivalent * modifiedWeight / 10^18
+        uint256 adjustedAmount = _coins * 10 ** 12; // adjust from 6 to 18 decimals
+        uint256 ethEquivalent = mulDiv(adjustedAmount, _nativePricePerUsd, 10 ** 18);
+        uint256 expectedTokens = mulDiv(ethEquivalent, _modifiedWeight, 10 ** 18);
+        assertEq(_minted, expectedTokens, "minted tokens should match 2x modified weight");
+
+        // Check: payer balance matches.
+        assertEq(_tokens.totalBalanceOf(from, _projectId), _minted, "payer should have all minted tokens");
+    }
+
+    /// Permit2 signature helpers.
+    /// (required because `permit2/test/utils/PermitSignature.sol` imports `draft-EIP712.sol` which is no longer a
+    /// draft.)
+
+    bytes32 public constant _PERMIT_DETAILS_TYPEHASH =
+        keccak256("PermitDetails(address token,uint160 amount,uint48 expiration,uint48 nonce)");
+
+    bytes32 public constant _PERMIT_SINGLE_TYPEHASH = keccak256(
+        "PermitSingle(PermitDetails details,address spender,uint256 sigDeadline)PermitDetails(address token,uint160 amount,uint48 expiration,uint48 nonce)"
+    );
+
+    function getPermitSignatureRaw(
+        IAllowanceTransfer.PermitSingle memory permitSingle,
+        uint256 privateKey,
+        bytes32 domainSeparator
+    )
+        internal
+        pure
+        returns (uint8 v, bytes32 r, bytes32 s)
+    {
+        bytes32 permitHash = keccak256(abi.encode(_PERMIT_DETAILS_TYPEHASH, permitSingle.details));
+
+        bytes32 msgHash = keccak256(
+            abi.encodePacked(
+                "\x19\x01",
+                domainSeparator,
+                keccak256(
+                    abi.encode(_PERMIT_SINGLE_TYPEHASH, permitHash, permitSingle.spender, permitSingle.sigDeadline)
+                )
+            )
+        );
+
+        (v, r, s) = vm.sign(privateKey, msgHash);
+    }
+
+    function getPermitSignature(
+        IAllowanceTransfer.PermitSingle memory permitSingle,
+        uint256 privateKey,
+        bytes32 domainSeparator
+    )
+        internal
+        pure
+        returns (bytes memory sig)
+    {
+        (uint8 v, bytes32 r, bytes32 s) = getPermitSignatureRaw(permitSingle, privateKey, domainSeparator);
+        return bytes.concat(r, s, bytes1(v));
+    }
+}

package/test/TestPermit2Terminal.sol

@@ -1,7 +1,23 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.6;
 
-import /* {*} from */ "./helpers/TestBaseWorkflow.sol";
+import {TestBaseWorkflow} from "./helpers/TestBaseWorkflow.sol";
+import {MetadataResolverHelper} from "./helpers/MetadataResolverHelper.sol";
+import {JBMultiTerminal} from "../src/JBMultiTerminal.sol";
+import {IJBController} from "../src/interfaces/IJBController.sol";
+import {IJBPrices} from "../src/interfaces/IJBPrices.sol";
+import {IJBRulesetApprovalHook} from "../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBTerminal} from "../src/interfaces/IJBTerminal.sol";
+import {IJBTokens} from "../src/interfaces/IJBTokens.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 {JBSingleAllowance} from "../src/structs/JBSingleAllowance.sol";
+import {JBSplitGroup} from "../src/structs/JBSplitGroup.sol";
+import {JBTerminalConfig} from "../src/structs/JBTerminalConfig.sol";
+import {IAllowanceTransfer, IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {MockPriceFeed} from "./mock/MockPriceFeed.sol";
 
@@ -20,6 +36,7 @@ contract TestPermit2Terminal_Local is TestBaseWorkflow {
     uint256 _projectId;
 
     // Permit2 params.
+    // forge-lint: disable-next-line(mixed-case-variable)
     bytes32 DOMAIN_SEPARATOR;
     address from;
     uint256 fromPrivateKey;
@@ -126,7 +143,13 @@ contract TestPermit2Terminal_Local is TestBaseWorkflow {
 
         // Setup: prepare permit details for signing.
         IAllowanceTransfer.PermitDetails memory details = IAllowanceTransfer.PermitDetails({
-            token: address(_usdc), amount: uint160(_coins), expiration: uint48(_expiration), nonce: 0
+            // forge-lint: disable-next-line(unsafe-typecast)
+            token: address(_usdc),
+            // forge-lint: disable-next-line(unsafe-typecast)
+            amount: uint160(_coins),
+            // forge-lint: disable-next-line(unsafe-typecast)
+            expiration: uint48(_expiration),
+            nonce: 0
         });
 
         IAllowanceTransfer.PermitSingle memory permit =
@@ -137,7 +160,9 @@ contract TestPermit2Terminal_Local is TestBaseWorkflow {
 
         JBSingleAllowance memory permitData = JBSingleAllowance({
             sigDeadline: _deadline,
+            // forge-lint: disable-next-line(unsafe-typecast)
             amount: uint160(_coins),
+            // forge-lint: disable-next-line(unsafe-typecast)
             expiration: uint48(_expiration),
             nonce: uint48(0),
             signature: sig
@@ -191,7 +216,13 @@ contract TestPermit2Terminal_Local is TestBaseWorkflow {
 
         // Setup: prepare permit details for signing.
         IAllowanceTransfer.PermitDetails memory details = IAllowanceTransfer.PermitDetails({
-            token: address(_usdc), amount: uint160(_coins), expiration: uint48(_expiration), nonce: 0
+            // forge-lint: disable-next-line(unsafe-typecast)
+            token: address(_usdc),
+            // forge-lint: disable-next-line(unsafe-typecast)
+            amount: uint160(_coins),
+            // forge-lint: disable-next-line(unsafe-typecast)
+            expiration: uint48(_expiration),
+            nonce: 0
         });
 
         IAllowanceTransfer.PermitSingle memory permit =
@@ -202,7 +233,9 @@ contract TestPermit2Terminal_Local is TestBaseWorkflow {
 
         JBSingleAllowance memory permitData = JBSingleAllowance({
             sigDeadline: _deadline,
+            // forge-lint: disable-next-line(unsafe-typecast)
             amount: uint160(_coins),
+            // forge-lint: disable-next-line(unsafe-typecast)
             expiration: uint48(_expiration),
             nonce: uint48(0),
             signature: sig

package/test/TestRulesetQueueing.sol

@@ -1,7 +1,22 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.6;
 
-import /* {*} from */ "./helpers/TestBaseWorkflow.sol";
+import {TestBaseWorkflow} from "./helpers/TestBaseWorkflow.sol";
+import {JBController} from "../src/JBController.sol";
+import {JBDeadline} from "../src/JBDeadline.sol";
+import {JBRulesets} from "../src/JBRulesets.sol";
+import {JBApprovalStatus} from "../src/enums/JBApprovalStatus.sol";
+import {IJBController} from "../src/interfaces/IJBController.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 {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";
 
 // A project's rulesets can be queued, and re-queued as long as the current ruleset approval hook approves.
 contract TestRulesetQueuing_Local is TestBaseWorkflow {
@@ -13,8 +28,11 @@ contract TestRulesetQueuing_Local is TestBaseWorkflow {
     IJBTerminal private _terminal;
     uint112 private _weight;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 private _DEADLINE_DURATION = 3 days;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 private _RULESET_DURATION_DAYS = 6;
+    // forge-lint: disable-next-line(unsafe-typecast, mixed-case-variable)
     uint32 private _RULESET_DURATION = uint32(_RULESET_DURATION_DAYS * 1 days);
 
     function setUp() public override {
@@ -779,6 +797,7 @@ contract TestRulesetQueuing_Local is TestBaseWorkflow {
         // Package up another config to overwrite.
         JBRulesetConfig[] memory _secondQueued = new JBRulesetConfig[](1);
 
+        // forge-lint: disable-next-line(unsafe-typecast)
         _secondQueued[0].mustStartAtOrAfter = uint48(block.timestamp + _DEADLINE_DURATION);
         _secondQueued[0].duration = _RULESET_DURATION;
         _secondQueued[0].weight = _weightSecondQueued;
@@ -805,10 +824,13 @@ contract TestRulesetQueuing_Local is TestBaseWorkflow {
         _duration = bound(_duration, 1, block.timestamp);
 
         JBRuleset memory _ruleset = JBRuleset({
+            // forge-lint: disable-next-line(unsafe-typecast)
             id: uint48(_rulesetId),
             basedOnId: 0,
             cycleNumber: 1,
+            // forge-lint: disable-next-line(unsafe-typecast)
             start: uint48(_start),
+            // forge-lint: disable-next-line(unsafe-typecast)
             duration: uint32(_duration),
             weight: 1,
             weightCutPercent: 0,