@bananapus/core-v6 0.0.15 → 0.0.17

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

@@ -1,12 +1,21 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBMultiTerminal} from "../../../../src/JBMultiTerminal.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {JBMultiTerminalSetup} from "./JBMultiTerminalSetup.sol";
 
 contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
     uint256 _projectId = 1;
     address _usdc = makeAddr("USDC");
+    // forge-lint: disable-next-line(unsafe-typecast)
     uint256 _usdcCurrency = uint32(uint160(_usdc));
 
     function setUp() public {
@@ -35,8 +44,10 @@ contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
         // it will revert ACCOUNTING_CONTEXT_ALREADY_SET
 
         // Accounting Context to set
+        // forge-lint: disable-next-line(unsafe-typecast)
         JBAccountingContext memory _context =
-            JBAccountingContext({token: _usdc, decimals: 18, currency: uint32(_usdcCurrency)});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: _usdc, decimals: 18, currency: uint32(_usdcCurrency)});
 
         // Find the storage slot
         bytes32 contextSlot = keccak256(abi.encode(_projectId, uint256(0)));
@@ -65,6 +76,7 @@ contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
 
         // call params
         JBAccountingContext[] memory _tokens = new JBAccountingContext[](1);
+        // forge-lint: disable-next-line(unsafe-typecast)
         _tokens[0] = JBAccountingContext({token: _usdc, decimals: 6, currency: uint32(uint160(_usdc))});
 
         vm.expectRevert(
@@ -97,6 +109,7 @@ contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
 
         // call params
         JBAccountingContext[] memory _tokens = new JBAccountingContext[](1);
+        // forge-lint: disable-next-line(unsafe-typecast)
         _tokens[0] = JBAccountingContext({token: _usdc, decimals: 6, currency: uint32(uint160(_usdc))});
 
         _terminal.addAccountingContextsFor(_projectId, _tokens);
@@ -104,6 +117,7 @@ contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
         JBAccountingContext memory _storedContext = _terminal.accountingContextForTokenOf(_projectId, _usdc);
         assertEq(_storedContext.token, _usdc);
         assertEq(_storedContext.decimals, 6);
+        // forge-lint: disable-next-line(unsafe-typecast)
         assertEq(_storedContext.currency, uint32(uint160(_usdc)));
     }
 
@@ -263,6 +277,7 @@ contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
         _tokens[0] = JBAccountingContext({
             token: someToken,
             decimals: 17, // invalid- we will mock a return of 18 decimals
+            // forge-lint: disable-next-line(unsafe-typecast)
             currency: uint32(uint160(someToken))
         });
 
@@ -296,6 +311,7 @@ contract TestAddAccountingContextsFor_Local is JBMultiTerminalSetup {
 
         // call params
         JBAccountingContext[] memory _tokens = new JBAccountingContext[](1);
+        // forge-lint: disable-next-line(unsafe-typecast)
         _tokens[0] = JBAccountingContext({token: someToken, decimals: 18, currency: uint32(uint160(0))});
 
         // setup: return data

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

@@ -1,7 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBMultiTerminal} from "../../../../src/JBMultiTerminal.sol";
+import {IJBFeeTerminal} from "../../../../src/interfaces/IJBFeeTerminal.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBFees} from "../../../../src/libraries/JBFees.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {JBFee} from "../../../../src/structs/JBFee.sol";
+import {JBSingleAllowance} from "../../../../src/structs/JBSingleAllowance.sol";
+import {IAllowanceTransfer, IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
 import {JBMultiTerminalSetup} from "./JBMultiTerminalSetup.sol";
 
 contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
@@ -11,9 +20,12 @@ contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
     // global constants
     uint256 _projectId = 1;
     address _native = JBConstants.NATIVE_TOKEN;
+    // forge-lint: disable-next-line(unsafe-typecast)
     uint256 _nativeCurrency = uint32(uint160(_native));
     address _usdc = makeAddr("USDC");
+    // forge-lint: disable-next-line(unsafe-typecast)
     uint256 _usdcCurrency = uint32(uint160(_usdc));
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 _terminalUSDCBalance = 1e18;
 
     // set by modifiers
@@ -25,6 +37,7 @@ contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
     bool _shouldReturnHeldFees;
 
     // Permit2 params.
+    // forge-lint: disable-next-line(mixed-case-variable)
     bytes32 DOMAIN_SEPARATOR;
     address from;
     uint256 fromPrivateKey = 0x12341234;
@@ -37,8 +50,10 @@ contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
 
     modifier whenNativeTokenIsAccepted() {
         // Accounting Context to set
+        // forge-lint: disable-next-line(unsafe-typecast)
         JBAccountingContext memory _context =
-            JBAccountingContext({token: _native, decimals: 18, currency: uint32(_nativeCurrency)});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: _native, decimals: 18, currency: uint32(_nativeCurrency)});
 
         // Find the storage slot
         bytes32 contextSlot = keccak256(abi.encode(_projectId, uint256(0)));
@@ -55,8 +70,10 @@ contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
 
     modifier whenShouldReturnHeldFeesEqTrue() {
         // Accounting Context to set
+        // forge-lint: disable-next-line(unsafe-typecast)
         JBAccountingContext memory _context =
-            JBAccountingContext({token: _native, decimals: 18, currency: uint32(_nativeCurrency)});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: _native, decimals: 18, currency: uint32(_nativeCurrency)});
 
         // Find the storage slot
         bytes32 contextSlot = keccak256(abi.encode(_projectId, uint256(0)));
@@ -68,8 +85,8 @@ contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
         JBAccountingContext memory _storedContext = _terminal.accountingContextForTokenOf(_projectId, _native);
         assertEq(_storedContext.token, _native);
 
-        // Find the storage slot for fees array
-        bytes32 feeSlot = keccak256(abi.encode(_projectId, uint256(2)));
+        // Find the storage slot for fees array (_heldFeesOf is at storage slot 3)
+        bytes32 feeSlot = keccak256(abi.encode(_projectId, uint256(3)));
         bytes32 slotForArrayLength = keccak256(abi.encode(_native, feeSlot));
 
         // Set the length of the fees array in the storage slot
@@ -222,8 +239,10 @@ contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
         // it will revert NO_MSG_VALUE_ALLOWED
 
         // Accounting Context to set
+        // forge-lint: disable-next-line(unsafe-typecast)
         JBAccountingContext memory _context =
-            JBAccountingContext({token: _usdc, decimals: 18, currency: uint32(_usdcCurrency)});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: _usdc, decimals: 18, currency: uint32(_usdcCurrency)});
 
         // Find the storage slot
         bytes32 contextSlot = keccak256(abi.encode(_projectId, uint256(0)));
@@ -249,8 +268,10 @@ contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
 
     modifier whenPayMetadataContainsPermitData() {
         // Accounting Context to set
+        // forge-lint: disable-next-line(unsafe-typecast)
         JBAccountingContext memory _context =
-            JBAccountingContext({token: _usdc, decimals: 18, currency: uint32(_usdcCurrency)});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: _usdc, decimals: 18, currency: uint32(_usdcCurrency)});
 
         // Find the storage slot
         bytes32 contextSlot = keccak256(abi.encode(_projectId, uint256(0)));
@@ -333,8 +354,15 @@ contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
         payAmount = 1e18;
 
         // Setup: prepare permit details for signing.
+        // forge-lint: disable-next-line(unsafe-typecast)
         IAllowanceTransfer.PermitDetails memory details = IAllowanceTransfer.PermitDetails({
-            token: address(_usdc), amount: uint160(payAmount), expiration: uint48(expiration), nonce: 0
+            // forge-lint: disable-next-line(unsafe-typecast)
+            token: address(_usdc),
+            // forge-lint: disable-next-line(unsafe-typecast)
+            amount: uint160(payAmount),
+            // forge-lint: disable-next-line(unsafe-typecast)
+            expiration: uint48(expiration),
+            nonce: 0
         });
 
         IAllowanceTransfer.PermitSingle memory permit =
@@ -343,8 +371,15 @@ contract TestAddToBalanceOf_Local is JBMultiTerminalSetup {
         // Setup: sign permit details.
         bytes memory sig = getPermitSignature(permit, fromPrivateKey, DOMAIN_SEPARATOR);
 
+        // forge-lint: disable-next-line(unsafe-typecast)
         JBSingleAllowance memory permitData = JBSingleAllowance({
-            sigDeadline: deadline, amount: uint160(1), expiration: uint48(expiration), nonce: uint48(0), signature: sig
+            // forge-lint: disable-next-line(unsafe-typecast)
+            sigDeadline: deadline,
+            amount: uint160(1),
+            // forge-lint: disable-next-line(unsafe-typecast)
+            expiration: uint48(expiration),
+            nonce: uint48(0),
+            signature: sig
         });
 
         // Setup: prepare data for metadata helper.

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

@@ -1,7 +1,26 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {MockERC20} from "../../../mock/MockERC20.sol";
+import {JBMultiTerminal} from "../../../../src/JBMultiTerminal.sol";
+import {JBPermissioned} from "../../../../src/abstract/JBPermissioned.sol";
+import {IJBCashOutHook} from "../../../../src/interfaces/IJBCashOutHook.sol";
+import {IJBCashOutTerminal} from "../../../../src/interfaces/IJBCashOutTerminal.sol";
+import {IJBController} from "../../../../src/interfaces/IJBController.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBFeelessAddresses} from "../../../../src/interfaces/IJBFeelessAddresses.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBFees} from "../../../../src/libraries/JBFees.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {JBAfterCashOutRecordedContext} from "../../../../src/structs/JBAfterCashOutRecordedContext.sol";
+import {JBCashOutHookSpecification} from "../../../../src/structs/JBCashOutHookSpecification.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBTokenAmount} from "../../../../src/structs/JBTokenAmount.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {JBMultiTerminalSetup} from "./JBMultiTerminalSetup.sol";
 
 contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
@@ -87,12 +106,15 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             metadata: 0
         });
 
+        // mock feeless address check
+        mockExpect(address(feelessAddresses), abi.encodeCall(IJBFeelessAddresses.isFeeless, (_bene)), abi.encode(true));
+
         // mock call to JBTerminalStore recordCashOutFor
         mockExpect(
             address(store),
             abi.encodeCall(
                 IJBTerminalStore.recordCashOutFor,
-                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, "")
+                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, true, "")
             ),
             abi.encode(returnedRuleset, reclaimAmount, _maxCashOutTaxRate, hookSpecifications)
         );
@@ -110,9 +132,6 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
         // put code at mockToken address to pass OZ Address check
         vm.etch(_mockToken, abi.encode(1));
 
-        // mock feeless address check
-        mockExpect(address(feelessAddresses), abi.encodeCall(IJBFeelessAddresses.isFeeless, (_bene)), abi.encode(true));
-
         _terminal.cashOutTokensOf(_holder, _projectId, _defaultAmount, _mockToken, _minReclaimed, _bene, "");
     }
 
@@ -135,12 +154,15 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             metadata: 0
         });
 
+        // mock feeless address check
+        mockExpect(address(feelessAddresses), abi.encodeCall(IJBFeelessAddresses.isFeeless, (_bene)), abi.encode(true));
+
         // mock call to JBTerminalStore recordCashOutFor
         mockExpect(
             address(store),
             abi.encodeCall(
                 IJBTerminalStore.recordCashOutFor,
-                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, "")
+                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, true, "")
             ),
             abi.encode(returnedRuleset, reclaimAmount, _maxCashOutTaxRate, hookSpecifications)
         );
@@ -158,8 +180,6 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
         // put code at mockToken address to pass OZ Address check
         vm.etch(_mockToken, abi.encode(1));
 
-        // mock feeless address check
-        mockExpect(address(feelessAddresses), abi.encodeCall(IJBFeelessAddresses.isFeeless, (_bene)), abi.encode(true));
         vm.expectRevert(
             abi.encodeWithSelector(JBMultiTerminal.JBMultiTerminal_UnderMinTokensReclaimed.selector, 1e9, 1e18)
         );
@@ -189,12 +209,15 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             metadata: 0
         });
 
+        // mock feeless address check
+        mockExpect(address(feelessAddresses), abi.encodeCall(IJBFeelessAddresses.isFeeless, (_bene)), abi.encode(false));
+
         // mock call to JBTerminalStore recordCashOutFor
         mockExpect(
             address(store),
             abi.encodeCall(
                 IJBTerminalStore.recordCashOutFor,
-                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, "")
+                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, false, "")
             ),
             abi.encode(returnedRuleset, reclaimAmount, _halfCashOutTaxRate, hookSpecifications)
         );
@@ -212,9 +235,6 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
         // put code at mockToken address to pass OZ Address check
         vm.etch(_mockToken, abi.encode(1));
 
-        // mock feeless address check
-        mockExpect(address(feelessAddresses), abi.encodeCall(IJBFeelessAddresses.isFeeless, (_bene)), abi.encode(false));
-
         // get fee amount
         uint256 tax = JBFees.feeAmountFrom(reclaimAmount, 25); // 25 = default fee)
         uint256 transferredAmount = reclaimAmount - tax;
@@ -301,12 +321,14 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             metadata: 0
         });
 
+        mockExpect(address(feelessAddresses), abi.encodeCall(IJBFeelessAddresses.isFeeless, (_bene)), abi.encode(true));
+
         // mock call to JBTerminalStore recordCashOutFor
         mockExpect(
             address(store),
             abi.encodeCall(
                 IJBTerminalStore.recordCashOutFor,
-                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, "")
+                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, true, "")
             ),
             abi.encode(returnedRuleset, reclaimAmount, _maxCashOutTaxRate, hookSpecifications)
         );
@@ -321,16 +343,16 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             address(this), abi.encodeCall(IJBController.burnTokensOf, (_holder, _projectId, _defaultAmount, "")), ""
         );
 
-        mockExpect(address(feelessAddresses), abi.encodeCall(IJBFeelessAddresses.isFeeless, (_bene)), abi.encode(true));
-
         mockExpect(
             address(feelessAddresses),
             abi.encodeCall(IJBFeelessAddresses.isFeeless, (address(_mockHook))),
             abi.encode(true)
         );
 
-        JBTokenAmount memory reclaimedAmount = JBTokenAmount(address(_mockToken2), 0, 0, reclaimAmount);
-        JBTokenAmount memory forwardedAmount = JBTokenAmount(address(_mockToken2), 0, 0, _defaultAmount);
+        JBTokenAmount memory reclaimedAmount =
+            JBTokenAmount({token: address(_mockToken2), decimals: 0, currency: 0, value: reclaimAmount});
+        JBTokenAmount memory forwardedAmount =
+            JBTokenAmount({token: address(_mockToken2), decimals: 0, currency: 0, value: _defaultAmount});
 
         // needed for hook call
         JBAfterCashOutRecordedContext memory context = JBAfterCashOutRecordedContext({
@@ -402,12 +424,14 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             metadata: 0
         });
 
+        mockExpect(address(feelessAddresses), abi.encodeCall(IJBFeelessAddresses.isFeeless, (_bene)), abi.encode(true));
+
         // mock call to JBTerminalStore recordCashOutFor
         mockExpect(
             address(store),
             abi.encodeCall(
                 IJBTerminalStore.recordCashOutFor,
-                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, "")
+                (_holder, _projectId, _defaultAmount, mockTokenContext, mockBalanceContext, true, "")
             ),
             abi.encode(returnedRuleset, reclaimAmount, _maxCashOutTaxRate, hookSpecifications)
         );
@@ -422,8 +446,6 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
             address(this), abi.encodeCall(IJBController.burnTokensOf, (_holder, _projectId, _defaultAmount, "")), ""
         );
 
-        mockExpect(address(feelessAddresses), abi.encodeCall(IJBFeelessAddresses.isFeeless, (_bene)), abi.encode(true));
-
         mockExpect(
             address(feelessAddresses),
             abi.encodeCall(IJBFeelessAddresses.isFeeless, (address(_mockHook))),
@@ -433,9 +455,12 @@ contract TestCashOutTokensOf_Local is JBMultiTerminalSetup {
         uint256 hookTax = JBFees.feeAmountFrom(_defaultAmount, 25);
         uint256 passedAfterTax = _defaultAmount - hookTax;
 
-        JBTokenAmount memory reclaimedAmount = JBTokenAmount(address(_mockToken2), 0, 0, reclaimAmount);
-        JBTokenAmount memory forwardedAmount = JBTokenAmount(address(_mockToken2), 0, 0, passedAfterTax);
-        JBTokenAmount memory feeRepayAmount = JBTokenAmount(address(_mockToken2), 0, 0, hookTax);
+        JBTokenAmount memory reclaimedAmount =
+            JBTokenAmount({token: address(_mockToken2), decimals: 0, currency: 0, value: reclaimAmount});
+        JBTokenAmount memory forwardedAmount =
+            JBTokenAmount({token: address(_mockToken2), decimals: 0, currency: 0, value: passedAfterTax});
+        JBTokenAmount memory feeRepayAmount =
+            JBTokenAmount({token: address(_mockToken2), decimals: 0, currency: 0, value: hookTax});
 
         // needed for hook call
         JBAfterCashOutRecordedContext memory context = JBAfterCashOutRecordedContext({

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

@@ -1,7 +1,22 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBMultiTerminal} from "../../../../src/JBMultiTerminal.sol";
+import {IJBDirectory} from "../../../../src/interfaces/IJBDirectory.sol";
+import {IJBFeelessAddresses} from "../../../../src/interfaces/IJBFeelessAddresses.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBSplitHook} from "../../../../src/interfaces/IJBSplitHook.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBFees} from "../../../../src/libraries/JBFees.sol";
+import {JBPayHookSpecification} from "../../../../src/structs/JBPayHookSpecification.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBSplit} from "../../../../src/structs/JBSplit.sol";
+import {JBSplitHookContext} from "../../../../src/structs/JBSplitHookContext.sol";
+import {JBTokenAmount} from "../../../../src/structs/JBTokenAmount.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {JBMultiTerminalSetup} from "./JBMultiTerminalSetup.sol";
 
 contract TestExecutePayout_Local is JBMultiTerminalSetup {
@@ -344,7 +359,8 @@ contract TestExecutePayout_Local is JBMultiTerminalSetup {
         });
 
         // needed for next mock call returns
-        JBTokenAmount memory tokenAmount = JBTokenAmount(_usdc, 0, 0, _defaultAmount);
+        JBTokenAmount memory tokenAmount =
+            JBTokenAmount({token: _usdc, decimals: 0, currency: 0, value: _defaultAmount});
         JBPayHookSpecification[] memory hookSpecifications = new JBPayHookSpecification[](0);
         JBRuleset memory returnedRuleset = JBRuleset({
             cycleNumber: 1,

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

@@ -1,7 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBMultiTerminal} from "../../../../src/JBMultiTerminal.sol";
+import {IJBRulesetApprovalHook} from "../../../../src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBPayHookSpecification} from "../../../../src/structs/JBPayHookSpecification.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBTokenAmount} from "../../../../src/structs/JBTokenAmount.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {JBMultiTerminalSetup} from "./JBMultiTerminalSetup.sol";
 
 contract TestExecuteProcessFee_Local is JBMultiTerminalSetup {
@@ -80,7 +88,8 @@ contract TestExecuteProcessFee_Local is JBMultiTerminalSetup {
         // it will call internal _pay
 
         // needed for next mock call returns
-        JBTokenAmount memory tokenAmount = JBTokenAmount(_native, 0, 0, _defaultAmount);
+        JBTokenAmount memory tokenAmount =
+            JBTokenAmount({token: _native, decimals: 0, currency: 0, value: _defaultAmount});
         JBPayHookSpecification[] memory hookSpecifications = new JBPayHookSpecification[](0);
         JBRuleset memory returnedRuleset = JBRuleset({
             cycleNumber: 1,
@@ -143,7 +152,8 @@ contract TestExecuteProcessFee_Local is JBMultiTerminalSetup {
         // it will call external pay with zero msgvalue
 
         // needed for next mock call returns
-        JBTokenAmount memory tokenAmount = JBTokenAmount(_usdc, 0, 0, _defaultAmount);
+        JBTokenAmount memory tokenAmount =
+            JBTokenAmount({token: _usdc, decimals: 0, currency: 0, value: _defaultAmount});
         JBPayHookSpecification[] memory hookSpecifications = new JBPayHookSpecification[](0);
         JBRuleset memory returnedRuleset = JBRuleset({
             cycleNumber: 1,

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

@@ -1,7 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {JBMultiTerminal} from "../../../../src/JBMultiTerminal.sol";
+import {JBPermissioned} from "../../../../src/abstract/JBPermissioned.sol";
+import {IJBPermissions} from "../../../../src/interfaces/IJBPermissions.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {JBMultiTerminalSetup} from "./JBMultiTerminalSetup.sol";
 
 contract TestMigrateBalanceOf_Local is JBMultiTerminalSetup {
@@ -9,8 +18,10 @@ contract TestMigrateBalanceOf_Local is JBMultiTerminalSetup {
     uint256 _defaultAmount = 1e18;
     address _bene = makeAddr("beneficiary");
     address _native = JBConstants.NATIVE_TOKEN;
+    // forge-lint: disable-next-line(unsafe-typecast)
     uint256 _nativeCurrency = uint32(uint160(_native));
     address _usdc = makeAddr("USDC");
+    // forge-lint: disable-next-line(unsafe-typecast)
     uint256 _usdcCurrency = uint32(uint160(_usdc));
 
     IJBTerminal _newTerminal = IJBTerminal(makeAddr("newTerminal"));
@@ -94,8 +105,10 @@ contract TestMigrateBalanceOf_Local is JBMultiTerminalSetup {
         // it will safeIncreaseAllowance and addToBalanceOf
 
         // for next mock
+        // forge-lint: disable-next-line(unsafe-typecast)
         JBAccountingContext memory _context =
-            JBAccountingContext({token: _usdc, decimals: 6, currency: uint32(_usdcCurrency)});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: _usdc, decimals: 6, currency: uint32(_usdcCurrency)});
 
         // mock call to the destination terminals accountingContextFor
         mockExpect(
@@ -131,8 +144,10 @@ contract TestMigrateBalanceOf_Local is JBMultiTerminalSetup {
         // it will addToBalanceOf with value in msgvalue
 
         // for next mock
+        // forge-lint: disable-next-line(unsafe-typecast)
         JBAccountingContext memory _context =
-            JBAccountingContext({token: _native, decimals: 18, currency: uint32(_nativeCurrency)});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: _native, decimals: 18, currency: uint32(_nativeCurrency)});
 
         // mock call to the destination terminals accountingContextFor
         mockExpect(
@@ -165,8 +180,10 @@ contract TestMigrateBalanceOf_Local is JBMultiTerminalSetup {
         // it will not add to balance
 
         // for next mock
+        // forge-lint: disable-next-line(unsafe-typecast)
         JBAccountingContext memory _context =
-            JBAccountingContext({token: _native, decimals: 18, currency: uint32(_nativeCurrency)});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        JBAccountingContext({token: _native, decimals: 18, currency: uint32(_nativeCurrency)});
 
         // mock call to the destination terminals accountingContextFor
         mockExpect(

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

@@ -1,7 +1,24 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
+import {MockERC20} from "../../../mock/MockERC20.sol";
+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 {IJBRulesets} from "../../../../src/interfaces/IJBRulesets.sol";
+import {IJBTerminal} from "../../../../src/interfaces/IJBTerminal.sol";
+import {IJBTerminalStore} from "../../../../src/interfaces/IJBTerminalStore.sol";
+import {IJBTokens} from "../../../../src/interfaces/IJBTokens.sol";
+import {JBConstants} from "../../../../src/libraries/JBConstants.sol";
+import {JBAccountingContext} from "../../../../src/structs/JBAccountingContext.sol";
+import {JBAfterPayRecordedContext} from "../../../../src/structs/JBAfterPayRecordedContext.sol";
+import {JBPayHookSpecification} from "../../../../src/structs/JBPayHookSpecification.sol";
+import {JBRuleset} from "../../../../src/structs/JBRuleset.sol";
+import {JBTokenAmount} from "../../../../src/structs/JBTokenAmount.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {JBMultiTerminalSetup} from "./JBMultiTerminalSetup.sol";
 
 contract TestPay_Local is JBMultiTerminalSetup {
@@ -9,8 +26,10 @@ contract TestPay_Local is JBMultiTerminalSetup {
     uint256 _defaultAmount = 1e18;
     address _bene = makeAddr("beneficiary");
     address _native = JBConstants.NATIVE_TOKEN;
+    // forge-lint: disable-next-line(unsafe-typecast)
     uint32 _nativeCurrency = uint32(uint160(_native));
     address _usdc = makeAddr("USDC");
+    // forge-lint: disable-next-line(unsafe-typecast)
     uint32 _usdcCurrency = uint32(uint160(_usdc));
 
     address _mockController = makeAddr("mc");
@@ -102,7 +121,8 @@ contract TestPay_Local is JBMultiTerminalSetup {
         // it will revert UNDER_MIN_RETURNED_TOKENS
 
         // needed for next mock call returns
-        JBTokenAmount memory tokenAmount = JBTokenAmount(_native, 18, uint32(_nativeCurrency), _defaultAmount);
+        JBTokenAmount memory tokenAmount =
+            JBTokenAmount({token: _native, decimals: 18, currency: uint32(_nativeCurrency), value: _defaultAmount});
         JBPayHookSpecification[] memory hookSpecifications = new JBPayHookSpecification[](0);
         JBRuleset memory returnedRuleset = JBRuleset({
             cycleNumber: 1,
@@ -143,7 +163,8 @@ contract TestPay_Local is JBMultiTerminalSetup {
         // it will mint tokens and emit Pay
 
         // needed for next mock call returns
-        JBTokenAmount memory tokenAmount = JBTokenAmount(_native, 18, uint32(_nativeCurrency), _defaultAmount);
+        JBTokenAmount memory tokenAmount =
+            JBTokenAmount({token: _native, decimals: 18, currency: uint32(_nativeCurrency), value: _defaultAmount});
         JBPayHookSpecification[] memory hookSpecifications = new JBPayHookSpecification[](0);
         JBRuleset memory returnedRuleset = JBRuleset({
             cycleNumber: 1,
@@ -229,8 +250,13 @@ contract TestPay_Local is JBMultiTerminalSetup {
         _mockToken.approve(address(_mockHook), _defaultAmount);
 
         // needed for next mock call returns
-        JBTokenAmount memory tokenAmount =
-            JBTokenAmount(address(_mockToken), 6, uint32(_mockTokenCurrency), _defaultAmount);
+        JBTokenAmount memory tokenAmount = JBTokenAmount({
+            // forge-lint: disable-next-line(unsafe-typecast)
+            token: address(_mockToken),
+            decimals: 6,
+            currency: uint32(_mockTokenCurrency),
+            value: _defaultAmount
+        });
         JBPayHookSpecification[] memory hookSpecifications = new JBPayHookSpecification[](1);
         hookSpecifications[0] = JBPayHookSpecification({hook: _mockHook, amount: _defaultAmount, metadata: ""});
 
@@ -320,7 +346,8 @@ contract TestPay_Local is JBMultiTerminalSetup {
         // it will send ETH to the hook and emit HookAfterRecordPay and Pay
 
         // needed for next mock call returns
-        JBTokenAmount memory tokenAmount = JBTokenAmount(_native, 18, uint32(_nativeCurrency), _defaultAmount);
+        JBTokenAmount memory tokenAmount =
+            JBTokenAmount({token: _native, decimals: 18, currency: uint32(_nativeCurrency), value: _defaultAmount});
         JBPayHookSpecification[] memory hookSpecifications = new JBPayHookSpecification[](1);
         hookSpecifications[0] = JBPayHookSpecification({hook: _mockHook, amount: _defaultAmount, metadata: ""});
 
@@ -452,7 +479,8 @@ contract TestPay_Local is JBMultiTerminalSetup {
         // it will not transfer
 
         // needed for next mock call returns
-        JBTokenAmount memory tokenAmount = JBTokenAmount(_native, 18, uint32(_nativeCurrency), _defaultAmount);
+        JBTokenAmount memory tokenAmount =
+            JBTokenAmount({token: _native, decimals: 18, currency: uint32(_nativeCurrency), value: _defaultAmount});
         JBPayHookSpecification[] memory hookSpecifications = new JBPayHookSpecification[](0);
 
         JBRuleset memory returnedRuleset = JBRuleset({