@ballkidz/defifa 0.0.7 → 0.0.9

package/test/DefifaHookRegressions.t.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.26;
 
-import "forge-std/Test.sol";
-import "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
+import {TestBaseWorkflow} from "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
 
 import {DefifaGovernor} from "../src/DefifaGovernor.sol";
 import {DefifaDeployer} from "../src/DefifaDeployer.sol";
@@ -10,24 +9,26 @@ import {DefifaHook} from "../src/DefifaHook.sol";
 import {DefifaTokenUriResolver} from "../src/DefifaTokenUriResolver.sol";
 import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
 
-import {JBMetadataResolver} from "@bananapus/core-v6/src/libraries/JBMetadataResolver.sol";
-import {MetadataResolverHelper} from "@bananapus/core-v6/test/helpers/MetadataResolverHelper.sol";
 import {JBTest} from "@bananapus/core-v6/test/helpers/JBTest.sol";
 import {JBRulesetMetadataResolver} from "@bananapus/core-v6/src/libraries/JBRulesetMetadataResolver.sol";
-import {
-    JB721TiersRulesetMetadataResolver
-} from "@bananapus/721-hook-v6/src/libraries/JB721TiersRulesetMetadataResolver.sol";
+import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {ITypeface} from "lib/typeface/contracts/interfaces/ITypeface.sol";
 import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
-import {JB721Tier} from "@bananapus/721-hook-v6/src/structs/JB721Tier.sol";
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 import {DefifaDelegation} from "../src/structs/DefifaDelegation.sol";
 import {DefifaLaunchProjectData} from "../src/structs/DefifaLaunchProjectData.sol";
 import {DefifaTierParams} from "../src/structs/DefifaTierParams.sol";
-import {DefifaTierCashOutWeight} from "../src/structs/DefifaTierCashOutWeight.sol";
+import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
+import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+import {JBCurrencyIds} from "@bananapus/core-v6/src/libraries/JBCurrencyIds.sol";
+import {JBFundAccessLimitGroup} from "@bananapus/core-v6/src/structs/JBFundAccessLimitGroup.sol";
+import {JBRulesetConfig, JBTerminalConfig} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
+import {JBRulesetMetadata} from "@bananapus/core-v6/src/structs/JBRulesetMetadata.sol";
+import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
+import {JBSplitGroup} from "@bananapus/core-v6/src/structs/JBSplitGroup.sol";
+import {IJBRulesetApprovalHook} from "@bananapus/core-v6/src/interfaces/IJBRulesets.sol";
 
 /// @dev Helper to read block.timestamp via an external call, bypassing the via-ir optimizer's timestamp caching.
 contract TimestampReaderRegressions {
@@ -113,10 +114,10 @@ contract DefifaHookRegressions is JBTest, TestBaseWorkflow {
         );
         governor = new DefifaGovernor(jbController(), address(this));
         JBAddressRegistry _registry = new JBAddressRegistry();
-        DefifaTokenUriResolver _tokenURIResolver = new DefifaTokenUriResolver(ITypeface(address(0)));
+        DefifaTokenUriResolver _tokenUriResolver = new DefifaTokenUriResolver(ITypeface(address(0)));
         deployer = new DefifaDeployer(
             address(hook),
-            _tokenURIResolver,
+            _tokenUriResolver,
             governor,
             jbController(),
             _registry,
@@ -281,6 +282,7 @@ contract DefifaHookRegressions is JBTest, TestBaseWorkflow {
         // Transfer through 3 undelegated recipients sequentially.
         address currentHolder = playerA;
         for (uint256 i = 0; i < 3; i++) {
+            // forge-lint: disable-next-line(unsafe-typecast)
             address nextRecipient = address(uint160(0xBEEF0000 + i));
 
             vm.prank(currentHolder);

package/test/DefifaMintCostInvariant.t.sol

@@ -1,20 +1,37 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.26;
 
-import "forge-std/Test.sol";
-import "../src/DefifaGovernor.sol";
-import "../src/DefifaDeployer.sol";
-import "../src/DefifaHook.sol";
-import "../src/DefifaTokenUriResolver.sol";
-import "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
-
-import {JBMetadataResolver} from "@bananapus/core-v6/src/libraries/JBMetadataResolver.sol";
+import {Test} from "forge-std/Test.sol";
+import {DefifaGovernor} from "../src/DefifaGovernor.sol";
+import {DefifaDeployer} from "../src/DefifaDeployer.sol";
+import {DefifaHook} from "../src/DefifaHook.sol";
+import {DefifaTokenUriResolver} from "../src/DefifaTokenUriResolver.sol";
+import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
+
 import {MetadataResolverHelper} from "@bananapus/core-v6/test/helpers/MetadataResolverHelper.sol";
-import "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
+import {TestBaseWorkflow} from "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
 import {JBTest} from "@bananapus/core-v6/test/helpers/JBTest.sol";
-import "@bananapus/core-v6/src/libraries/JBRulesetMetadataResolver.sol";
-import "@bananapus/721-hook-v6/src/libraries/JB721TiersRulesetMetadataResolver.sol";
-import "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
+import {JBRulesetMetadataResolver} from "@bananapus/core-v6/src/libraries/JBRulesetMetadataResolver.sol";
+import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
+import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
+import {DefifaLaunchProjectData} from "../src/structs/DefifaLaunchProjectData.sol";
+import {DefifaTierParams} from "../src/structs/DefifaTierParams.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
+import {IJB721TiersHookStore} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHookStore.sol";
+import {IJBMultiTerminal} from "@bananapus/core-v6/src/interfaces/IJBMultiTerminal.sol";
+import {IJBRulesetApprovalHook} from "@bananapus/core-v6/src/interfaces/IJBRulesets.sol";
+import {JB721Tier} from "@bananapus/721-hook-v6/src/structs/JB721Tier.sol";
+import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
+import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+import {JBCurrencyIds} from "@bananapus/core-v6/src/libraries/JBCurrencyIds.sol";
+import {JBFundAccessLimitGroup} from "@bananapus/core-v6/src/structs/JBFundAccessLimitGroup.sol";
+import {JBMultiTerminal} from "@bananapus/core-v6/src/JBMultiTerminal.sol";
+import {JBRulesetConfig, JBTerminalConfig} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
+import {JBRulesetMetadata} from "@bananapus/core-v6/src/structs/JBRulesetMetadata.sol";
+import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
+import {JBSplitGroup} from "@bananapus/core-v6/src/structs/JBSplitGroup.sol";
+import {ITypeface} from "lib/typeface/contracts/interfaces/ITypeface.sol";
 
 /// @title MintCostHandler
 /// @notice Stateful fuzz handler that performs pay and refund operations,
@@ -72,6 +89,7 @@ contract MintCostHandler is Test {
         vm.deal(user, tierPrice);
 
         uint16[] memory m = new uint16[](1);
+        // forge-lint: disable-next-line(unsafe-typecast)
         m[0] = uint16(tierId);
         bytes[] memory data = new bytes[](1);
         data[0] = abi.encode(user, m);
@@ -246,6 +264,7 @@ contract DefifaMintCostInvariantTest is JBTest, TestBaseWorkflow {
             attestationStartTime: 0,
             attestationGracePeriod: 100_381,
             defaultAttestationDelegate: address(0),
+            // forge-lint: disable-next-line(unsafe-typecast)
             tierPrice: uint104(TIER_PRICE),
             tiers: tp,
             defaultTokenUriResolver: IJB721TokenUriResolver(address(0)),

package/test/DefifaNoContest.t.sol

@@ -1,20 +1,38 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.26;
 
-import "forge-std/Test.sol";
-import "../src/DefifaGovernor.sol";
-import "../src/DefifaDeployer.sol";
-import "../src/DefifaHook.sol";
-import "../src/DefifaTokenUriResolver.sol";
-import "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
-
-import {JBMetadataResolver} from "@bananapus/core-v6/src/libraries/JBMetadataResolver.sol";
-import {MetadataResolverHelper} from "@bananapus/core-v6/test/helpers/MetadataResolverHelper.sol";
-import "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
+import {DefifaGovernor} from "../src/DefifaGovernor.sol";
+import {DefifaDeployer} from "../src/DefifaDeployer.sol";
+import {DefifaHook} from "../src/DefifaHook.sol";
+import {DefifaTokenUriResolver} from "../src/DefifaTokenUriResolver.sol";
+import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
+
+import {TestBaseWorkflow} from "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
 import {JBTest} from "@bananapus/core-v6/test/helpers/JBTest.sol";
-import "@bananapus/core-v6/src/libraries/JBRulesetMetadataResolver.sol";
-import "@bananapus/721-hook-v6/src/libraries/JB721TiersRulesetMetadataResolver.sol";
-import "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
+import {JBRulesetMetadataResolver} from "@bananapus/core-v6/src/libraries/JBRulesetMetadataResolver.sol";
+import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
+
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {ITypeface} from "lib/typeface/contracts/interfaces/ITypeface.sol";
+import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
+import {JB721Tier} from "@bananapus/721-hook-v6/src/structs/JB721Tier.sol";
+import {DefifaDelegation} from "../src/structs/DefifaDelegation.sol";
+import {DefifaLaunchProjectData} from "../src/structs/DefifaLaunchProjectData.sol";
+import {DefifaTierParams} from "../src/structs/DefifaTierParams.sol";
+import {DefifaTierCashOutWeight} from "../src/structs/DefifaTierCashOutWeight.sol";
+import {DefifaGamePhase} from "../src/enums/DefifaGamePhase.sol";
+import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
+import {JBTerminalConfig} from "@bananapus/core-v6/src/structs/JBTerminalConfig.sol";
+import {JBRulesetConfig} from "@bananapus/core-v6/src/structs/JBRulesetConfig.sol";
+import {JBRulesetMetadata} from "@bananapus/core-v6/src/structs/JBRulesetMetadata.sol";
+import {JBSplitGroup} from "@bananapus/core-v6/src/structs/JBSplitGroup.sol";
+import {JBFundAccessLimitGroup} from "@bananapus/core-v6/src/structs/JBFundAccessLimitGroup.sol";
+import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
+import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
+import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+import {JBCurrencyIds} from "@bananapus/core-v6/src/libraries/JBCurrencyIds.sol";
+import {IJBRulesetApprovalHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetApprovalHook.sol";
+import {JBMultiTerminal} from "@bananapus/core-v6/src/JBMultiTerminal.sol";
 
 /// @title DefifaNoContestTest
 /// @notice Tests for the NO_CONTEST safety mechanisms: minParticipation threshold and scorecardTimeout.
@@ -802,6 +820,7 @@ contract DefifaNoContestTest is JBTest, TestBaseWorkflow {
             attestationStartTime: 0,
             attestationGracePeriod: 100_381,
             defaultAttestationDelegate: address(0),
+            // forge-lint: disable-next-line(unsafe-typecast)
             tierPrice: uint104(tierPrice),
             tiers: tp,
             defaultTokenUriResolver: IJB721TokenUriResolver(address(0)),
@@ -830,6 +849,7 @@ contract DefifaNoContestTest is JBTest, TestBaseWorkflow {
     function _mint(address user, uint256 tid, uint256 amt) internal {
         vm.deal(user, amt);
         uint16[] memory m = new uint16[](1);
+        // forge-lint: disable-next-line(unsafe-typecast)
         m[0] = uint16(tid);
         bytes[] memory data = new bytes[](1);
         data[0] = abi.encode(user, m);
@@ -872,9 +892,7 @@ contract DefifaNoContestTest is JBTest, TestBaseWorkflow {
     }
 
     function _surplus() internal view returns (uint256) {
-        return
-            jbMultiTerminal()
-                .currentSurplusOf(_pid, jbMultiTerminal().accountingContextsOf(_pid), 18, JBCurrencyIds.ETH);
+        return jbMultiTerminal().currentSurplusOf(_pid, new address[](0), 18, JBCurrencyIds.ETH);
     }
 
     function _cashOut(address user, uint256 tid, uint256 tnum) internal {

package/test/DefifaSecurity.t.sol

@@ -1,20 +1,38 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.26;
 
-import "forge-std/Test.sol";
-import "../src/DefifaGovernor.sol";
-import "../src/DefifaDeployer.sol";
-import "../src/DefifaHook.sol";
-import "../src/DefifaTokenUriResolver.sol";
-import "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
-
-import {JBMetadataResolver} from "@bananapus/core-v6/src/libraries/JBMetadataResolver.sol";
-import {MetadataResolverHelper} from "@bananapus/core-v6/test/helpers/MetadataResolverHelper.sol";
-import "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
+import {DefifaGovernor} from "../src/DefifaGovernor.sol";
+import {DefifaDeployer} from "../src/DefifaDeployer.sol";
+import {DefifaHook} from "../src/DefifaHook.sol";
+import {DefifaTokenUriResolver} from "../src/DefifaTokenUriResolver.sol";
+import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
+
+import {TestBaseWorkflow} from "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
 import {JBTest} from "@bananapus/core-v6/test/helpers/JBTest.sol";
-import "@bananapus/core-v6/src/libraries/JBRulesetMetadataResolver.sol";
-import "@bananapus/721-hook-v6/src/libraries/JB721TiersRulesetMetadataResolver.sol";
-import "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
+import {JBRulesetMetadataResolver} from "@bananapus/core-v6/src/libraries/JBRulesetMetadataResolver.sol";
+import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
+
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {ITypeface} from "lib/typeface/contracts/interfaces/ITypeface.sol";
+import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
+import {JB721Tier} from "@bananapus/721-hook-v6/src/structs/JB721Tier.sol";
+import {JB721TiersMintReservesConfig} from "@bananapus/721-hook-v6/src/structs/JB721TiersMintReservesConfig.sol";
+import {DefifaDelegation} from "../src/structs/DefifaDelegation.sol";
+import {DefifaLaunchProjectData} from "../src/structs/DefifaLaunchProjectData.sol";
+import {DefifaTierParams} from "../src/structs/DefifaTierParams.sol";
+import {DefifaTierCashOutWeight} from "../src/structs/DefifaTierCashOutWeight.sol";
+import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
+import {JBTerminalConfig} from "@bananapus/core-v6/src/structs/JBTerminalConfig.sol";
+import {JBRulesetConfig} from "@bananapus/core-v6/src/structs/JBRulesetConfig.sol";
+import {JBRulesetMetadata} from "@bananapus/core-v6/src/structs/JBRulesetMetadata.sol";
+import {JBSplitGroup} from "@bananapus/core-v6/src/structs/JBSplitGroup.sol";
+import {JBFundAccessLimitGroup} from "@bananapus/core-v6/src/structs/JBFundAccessLimitGroup.sol";
+import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
+import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
+import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+import {JBCurrencyIds} from "@bananapus/core-v6/src/libraries/JBCurrencyIds.sol";
+import {IJBRulesetApprovalHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetApprovalHook.sol";
+import {JBMultiTerminal} from "@bananapus/core-v6/src/JBMultiTerminal.sol";
 
 /// @dev Helper to read block.timestamp via an external call, bypassing the via-ir optimizer's timestamp caching.
 contract TimestampReader {
@@ -270,9 +288,9 @@ contract DefifaSecurityTest is JBTest, TestBaseWorkflow {
     // =========================================================================
     function testFuzz_fundConservation(uint8 rawTiers, uint8 rawPlayers) external {
         uint8 nTiers = uint8(bound(rawTiers, 2, 12));
-        uint8 nPPT = uint8(bound(rawPlayers, 1, 3));
+        uint8 nPpt = uint8(bound(rawPlayers, 1, 3));
 
-        _setupMultiN(nTiers, nPPT, 1 ether);
+        _setupMultiN(nTiers, nPpt, 1 ether);
         _toScoring();
 
         uint256 tw = _nft.TOTAL_CASHOUT_WEIGHT();
@@ -295,8 +313,8 @@ contract DefifaSecurityTest is JBTest, TestBaseWorkflow {
         uint256 total;
         for (uint256 i; i < _users.length; i++) {
             uint256 bb = _users[i].balance;
-            uint256 tid = (i / nPPT) + 1;
-            uint256 tnum = (i % nPPT) + 1;
+            uint256 tid = (i / nPpt) + 1;
+            uint256 tnum = (i % nPpt) + 1;
             _cashOut(_users[i], tid, tnum);
             total += _users[i].balance - bb;
         }
@@ -498,7 +516,7 @@ contract DefifaSecurityTest is JBTest, TestBaseWorkflow {
     // =========================================================================
 
     function _setupGame(uint8 nTiers, uint256 tierPrice) internal {
-        DefifaLaunchProjectData memory d = _launch_data(nTiers, tierPrice);
+        DefifaLaunchProjectData memory d = _launchData(nTiers, tierPrice);
         (_pid, _nft, _gov) = _launch(d);
         vm.warp(d.start - d.mintPeriodDuration - d.refundPeriodDuration);
         _users = new address[](nTiers);
@@ -511,7 +529,7 @@ contract DefifaSecurityTest is JBTest, TestBaseWorkflow {
     }
 
     function _setupMultiPlayer() internal {
-        DefifaLaunchProjectData memory d = _launch_data(4, 1 ether);
+        DefifaLaunchProjectData memory d = _launchData(4, 1 ether);
         (_pid, _nft, _gov) = _launch(d);
         vm.warp(d.start - d.mintPeriodDuration - d.refundPeriodDuration);
         _users = new address[](8);
@@ -529,15 +547,15 @@ contract DefifaSecurityTest is JBTest, TestBaseWorkflow {
         }
     }
 
-    function _setupMultiN(uint8 nTiers, uint8 nPPT, uint256 tierPrice) internal {
-        DefifaLaunchProjectData memory d = _launch_data(nTiers, tierPrice);
+    function _setupMultiN(uint8 nTiers, uint8 nPpt, uint256 tierPrice) internal {
+        DefifaLaunchProjectData memory d = _launchData(nTiers, tierPrice);
         (_pid, _nft, _gov) = _launch(d);
         vm.warp(d.start - d.mintPeriodDuration - d.refundPeriodDuration);
-        uint256 total = uint256(nTiers) * uint256(nPPT);
+        uint256 total = uint256(nTiers) * uint256(nPpt);
         _users = new address[](total);
         uint256 idx;
         for (uint256 t; t < nTiers; t++) {
-            for (uint256 p; p < nPPT; p++) {
+            for (uint256 p; p < nPpt; p++) {
                 _users[idx] = _addr(idx);
                 _mint(_users[idx], t + 1, tierPrice);
                 _delegateSelf(_users[idx], t + 1);
@@ -548,7 +566,7 @@ contract DefifaSecurityTest is JBTest, TestBaseWorkflow {
     }
 
     function _setupPartial(uint8 nTiers, uint256 nMint, uint256 tierPrice) internal {
-        DefifaLaunchProjectData memory d = _launch_data(nTiers, tierPrice);
+        DefifaLaunchProjectData memory d = _launchData(nTiers, tierPrice);
         (_pid, _nft, _gov) = _launch(d);
         vm.warp(d.start - d.mintPeriodDuration - d.refundPeriodDuration);
         _users = new address[](nMint);
@@ -567,7 +585,7 @@ contract DefifaSecurityTest is JBTest, TestBaseWorkflow {
     // PRIMITIVE HELPERS
     // =========================================================================
 
-    function _launch_data(uint8 n, uint256 tierPrice) internal returns (DefifaLaunchProjectData memory) {
+    function _launchData(uint8 n, uint256 tierPrice) internal returns (DefifaLaunchProjectData memory) {
         DefifaTierParams[] memory tp = new DefifaTierParams[](n);
         for (uint256 i; i < n; i++) {
             tp[i] = DefifaTierParams({
@@ -592,6 +610,7 @@ contract DefifaSecurityTest is JBTest, TestBaseWorkflow {
             attestationStartTime: 0,
             attestationGracePeriod: 100_381,
             defaultAttestationDelegate: address(0),
+            // forge-lint: disable-next-line(unsafe-typecast)
             tierPrice: uint104(tierPrice),
             tiers: tp,
             defaultTokenUriResolver: IJB721TokenUriResolver(address(0)),
@@ -616,6 +635,7 @@ contract DefifaSecurityTest is JBTest, TestBaseWorkflow {
     function _mint(address user, uint256 tid, uint256 amt) internal {
         vm.deal(user, amt);
         uint16[] memory m = new uint16[](1);
+        // forge-lint: disable-next-line(unsafe-typecast)
         m[0] = uint16(tid);
         bytes[] memory data = new bytes[](1);
         data[0] = abi.encode(user, m);
@@ -658,9 +678,7 @@ contract DefifaSecurityTest is JBTest, TestBaseWorkflow {
     }
 
     function _surplus() internal view returns (uint256) {
-        return
-            jbMultiTerminal()
-                .currentSurplusOf(_pid, jbMultiTerminal().accountingContextsOf(_pid), 18, JBCurrencyIds.ETH);
+        return jbMultiTerminal().currentSurplusOf(_pid, new address[](0), 18, JBCurrencyIds.ETH);
     }
 
     function _cashOut(address user, uint256 tid, uint256 tnum) internal {

package/test/DefifaUSDC.t.sol

@@ -1,32 +1,38 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.26;
 
-import "forge-std/Test.sol";
-import "../src/DefifaGovernor.sol";
-import "../src/DefifaDeployer.sol";
-import "../src/DefifaHook.sol";
-import "../src/DefifaTokenUriResolver.sol";
-import "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
-
-import {JBMetadataResolver} from "@bananapus/core-v6/src/libraries/JBMetadataResolver.sol";
-import {MetadataResolverHelper} from "@bananapus/core-v6/test/helpers/MetadataResolverHelper.sol";
-import "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
+import {DefifaGovernor} from "../src/DefifaGovernor.sol";
+import {DefifaDeployer} from "../src/DefifaDeployer.sol";
+import {DefifaHook} from "../src/DefifaHook.sol";
+import {DefifaTokenUriResolver} from "../src/DefifaTokenUriResolver.sol";
+import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
+
+import {TestBaseWorkflow} from "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
 import {JBTest} from "@bananapus/core-v6/test/helpers/JBTest.sol";
-import "@bananapus/core-v6/src/libraries/JBRulesetMetadataResolver.sol";
-import "@bananapus/721-hook-v6/src/libraries/JB721TiersRulesetMetadataResolver.sol";
-import "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
+import {JBRulesetMetadataResolver} from "@bananapus/core-v6/src/libraries/JBRulesetMetadataResolver.sol";
+import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import {ITypeface} from "lib/typeface/contracts/interfaces/ITypeface.sol";
 import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
-import {JB721Tier} from "@bananapus/721-hook-v6/src/structs/JB721Tier.sol";
 import {DefifaDelegation} from "../src/structs/DefifaDelegation.sol";
 import {DefifaLaunchProjectData} from "../src/structs/DefifaLaunchProjectData.sol";
 import {DefifaTierParams} from "../src/structs/DefifaTierParams.sol";
 import {DefifaTierCashOutWeight} from "../src/structs/DefifaTierCashOutWeight.sol";
 import {DefifaGamePhase} from "../src/enums/DefifaGamePhase.sol";
-import {DefifaScorecardState} from "../src/enums/DefifaScorecardState.sol";
+import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
+import {JBTerminalConfig} from "@bananapus/core-v6/src/structs/JBTerminalConfig.sol";
+import {JBRulesetConfig} from "@bananapus/core-v6/src/structs/JBRulesetConfig.sol";
+import {JBRulesetMetadata} from "@bananapus/core-v6/src/structs/JBRulesetMetadata.sol";
+import {JBSplitGroup} from "@bananapus/core-v6/src/structs/JBSplitGroup.sol";
+import {JBFundAccessLimitGroup} from "@bananapus/core-v6/src/structs/JBFundAccessLimitGroup.sol";
+import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
+import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
+import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+import {IJBRulesetApprovalHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetApprovalHook.sol";
+import {JBMultiTerminal} from "@bananapus/core-v6/src/JBMultiTerminal.sol";
+import {JBPermissionsData} from "@bananapus/core-v6/src/structs/JBPermissionsData.sol";
 
 /// @notice Mock USDC token with 6 decimals.
 contract DefifaMockUSDC is ERC20 {
@@ -147,7 +153,10 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
             .setPermissionsFor(
                 projectOwner,
                 JBPermissionsData({
-                    operator: address(deployer), projectId: uint64(_defifaProjectId), permissionIds: permissionIds
+                    operator: address(deployer),
+                    // forge-lint: disable-next-line(unsafe-typecast)
+                    projectId: uint64(_defifaProjectId),
+                    permissionIds: permissionIds
                 })
             );
 
@@ -159,11 +168,11 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
     // USDC LAUNCH DATA HELPERS
     // =========================================================================
 
-    function _launchDataUSDC(uint8 n, uint104 tierPrice) internal returns (DefifaLaunchProjectData memory) {
-        return _launchDataUSDCWith(n, tierPrice, 0, 0);
+    function _launchDataUsdc(uint8 n, uint104 tierPrice) internal returns (DefifaLaunchProjectData memory) {
+        return _launchDataUsdcWith(n, tierPrice, 0, 0);
     }
 
-    function _launchDataUSDCWith(
+    function _launchDataUsdcWith(
         uint8 n,
         uint104 tierPrice,
         uint256 minParticipation,
@@ -218,9 +227,10 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
         return address(bytes20(keccak256(abi.encode("usdc_user", i))));
     }
 
-    function _mintUSDC(address user, uint256 tid, uint104 amt) internal {
+    function _mintUsdc(address user, uint256 tid, uint104 amt) internal {
         usdc.mint(user, amt);
         uint16[] memory m = new uint16[](1);
+        // forge-lint: disable-next-line(unsafe-typecast)
         m[0] = uint16(tid);
         bytes[] memory data = new bytes[](1);
         data[0] = abi.encode(user, m);
@@ -278,14 +288,14 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
         vm.warp(_tsReader.timestamp() + 3 days + 1);
     }
 
-    function _setupGameUSDC(uint8 nTiers, uint104 tierPrice) internal {
-        DefifaLaunchProjectData memory d = _launchDataUSDC(nTiers, tierPrice);
+    function _setupGameUsdc(uint8 nTiers, uint104 tierPrice) internal {
+        DefifaLaunchProjectData memory d = _launchDataUsdc(nTiers, tierPrice);
         (_pid, _nft, _gov) = _launch(d);
         vm.warp(d.start - d.mintPeriodDuration - d.refundPeriodDuration);
         _users = new address[](nTiers);
         for (uint256 i; i < nTiers; i++) {
             _users[i] = _addr(i);
-            _mintUSDC(_users[i], i + 1, tierPrice);
+            _mintUsdc(_users[i], i + 1, tierPrice);
             _delegateSelf(_users[i], i + 1);
             vm.warp(_tsReader.timestamp() + 1);
         }
@@ -296,8 +306,7 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
     }
 
     function _surplus() internal view returns (uint256) {
-        return jbMultiTerminal()
-            .currentSurplusOf(_pid, jbMultiTerminal().accountingContextsOf(_pid), 6, uint32(uint160(address(usdc))));
+        return jbMultiTerminal().currentSurplusOf(_pid, new address[](0), 6, uint32(uint160(address(usdc))));
     }
 
     function _generateTokenId(uint256 tierId, uint256 tokenNumber) internal pure returns (uint256) {
@@ -312,7 +321,7 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
         return metadataHelper().createMetadata(ids, datas);
     }
 
-    function _cashOutUSDC(address user, uint256 tid, uint256 tnum) internal {
+    function _cashOutUsdc(address user, uint256 tid, uint256 tnum) internal {
         uint256[] memory cashOutIds = new uint256[](1);
         cashOutIds[0] = _generateTokenId(tid, tnum);
         bytes memory cashOutMetadata = _buildCashOutMetadata(abi.encode(cashOutIds));
@@ -330,7 +339,7 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
             });
     }
 
-    function _refundUSDC(address user, uint256 tid) internal {
+    function _refundUsdc(address user, uint256 tid) internal {
         uint256[] memory cashOutIds = new uint256[](1);
         cashOutIds[0] = _generateTokenId(tid, 1);
         bytes memory cashOutMetadata = _buildCashOutMetadata(abi.encode(cashOutIds));
@@ -355,7 +364,7 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
     /// @notice Test 1: Mint and refund with USDC.
     function test_defifa_usdc_mintAndRefund() external {
         uint104 tierPrice = 100e6; // 100 USDC
-        _setupGameUSDC(4, tierPrice);
+        _setupGameUsdc(4, tierPrice);
 
         // Verify MINT phase.
         assertEq(uint256(deployer.currentGamePhaseOf(_pid)), uint256(DefifaGamePhase.MINT));
@@ -370,7 +379,7 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
 
         // Refund user 0 during MINT phase.
         uint256 balBefore = usdc.balanceOf(_users[0]);
-        _refundUSDC(_users[0], 1);
+        _refundUsdc(_users[0], 1);
         assertEq(usdc.balanceOf(_users[0]) - balBefore, 100e6, "refund = 100 USDC");
         assertEq(_nft.balanceOf(_users[0]), 0, "NFT burned on refund");
 
@@ -381,7 +390,7 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
     /// @notice Test 2: Scorecard and distribute with USDC.
     function test_defifa_usdc_scorecardAndDistribute() external {
         uint104 tierPrice = 100e6;
-        _setupGameUSDC(4, tierPrice);
+        _setupGameUsdc(4, tierPrice);
 
         _toScoring();
 
@@ -394,14 +403,14 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
 
         // Winner cashes out -> receives USDC.
         uint256 winnerBalBefore = usdc.balanceOf(_users[0]);
-        _cashOutUSDC(_users[0], 1, 1);
+        _cashOutUsdc(_users[0], 1, 1);
         uint256 winnerReceived = usdc.balanceOf(_users[0]) - winnerBalBefore;
         assertGt(winnerReceived, 0, "winner received USDC");
 
         // Losers get 0 USDC.
         for (uint256 i = 1; i < 4; i++) {
             uint256 bb = usdc.balanceOf(_users[i]);
-            _cashOutUSDC(_users[i], i + 1, 1);
+            _cashOutUsdc(_users[i], i + 1, 1);
             assertEq(usdc.balanceOf(_users[i]), bb, "loser gets 0 USDC");
         }
     }
@@ -409,7 +418,7 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
     /// @notice Test 3: Fee accounting with USDC (6-decimal precision).
     function test_defifa_usdc_feeAccounting() external {
         uint104 tierPrice = 100e6;
-        _setupGameUSDC(4, tierPrice);
+        _setupGameUsdc(4, tierPrice);
 
         uint256 potBefore = _balance();
         assertEq(potBefore, 400e6, "pot = 400 USDC");
@@ -432,14 +441,14 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
     /// @notice Test 4: No-contest with USDC (minParticipation threshold).
     function test_defifa_usdc_noContest() external {
         uint104 tierPrice = 100e6;
-        DefifaLaunchProjectData memory d = _launchDataUSDCWith(4, tierPrice, 500e6, 0); // 500 USDC min
+        DefifaLaunchProjectData memory d = _launchDataUsdcWith(4, tierPrice, 500e6, 0); // 500 USDC min
         (_pid, _nft, _gov) = _launch(d);
         vm.warp(d.start - d.mintPeriodDuration - d.refundPeriodDuration);
 
         // Mint only 1 tier = 100 USDC < 500 USDC threshold.
         _users = new address[](1);
         _users[0] = _addr(0);
-        _mintUSDC(_users[0], 1, tierPrice);
+        _mintUsdc(_users[0], 1, tierPrice);
 
         _toScoring();
 
@@ -450,7 +459,7 @@ contract DefifaUSDCTest is JBTest, TestBaseWorkflow {
     /// @notice Test 5: Game pot reporting with USDC.
     function test_defifa_usdc_potCalculation() external {
         uint104 tierPrice = 100e6;
-        _setupGameUSDC(4, tierPrice);
+        _setupGameUsdc(4, tierPrice);
 
         _toScoring();