@rev-net/core-v6 0.0.11 → 0.0.13

package/test/REVInvincibility.t.sol

@@ -1,25 +1,34 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
 import {StdInvariant} from "forge-std/StdInvariant.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
-import /* {*} from "@bananapus/721-hook-v6/src/JB721TiersHookDeployer.sol";
+// import /* {*} from "@bananapus/721-hook-v6/src/JB721TiersHookDeployer.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import /* {*} from */ "./../src/REVDeployer.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import /* {*} from */ "./../src/REVLoans.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@croptop/core-v6/src/CTPublisher.sol";
 import {MockBuybackDataHook} from "./mock/MockBuybackDataHook.sol";
 
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
 
 import {JBCashOuts} from "@bananapus/core-v6/src/libraries/JBCashOuts.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
-import {MockPriceFeed} from "@bananapus/core-v6/test/mock/MockPriceFeed.sol";
 import {MockERC20} from "@bananapus/core-v6/test/mock/MockERC20.sol";
 import {REVLoans} from "../src/REVLoans.sol";
 import {REVLoan} from "../src/structs/REVLoan.sol";
@@ -34,12 +43,11 @@ import {JB721TiersHook} from "@bananapus/721-hook-v6/src/JB721TiersHook.sol";
 import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
-import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {mulDiv} from "@prb/math/src/Common.sol";
 
 import {REVInvincibilityHandler} from "./REVInvincibilityHandler.sol";
 import {BrokenFeeTerminal} from "./helpers/MaliciousContracts.sol";
+import {REVEmpty721Config} from "./helpers/REVEmpty721Config.sol";
 
 // =========================================================================
 // Shared config struct
@@ -56,23 +64,38 @@ struct InvincibilityProjectConfig {
 contract REVInvincibility_PropertyTests is TestBaseWorkflow {
     using JBRulesetMetadataResolver for JBRuleset;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JB721TiersHook EXAMPLE_HOOK;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookDeployer HOOK_DEPLOYER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookStore HOOK_STORE;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJBAddressRegistry ADDRESS_REGISTRY;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IREVLoans LOANS_CONTRACT;
+    // forge-lint: disable-next-line(mixed-case-variable)
     MockERC20 TOKEN;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJBSuckerRegistry SUCKER_REGISTRY;
+    // forge-lint: disable-next-line(mixed-case-variable)
     CTPublisher PUBLISHER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     MockBuybackDataHook MOCK_BUYBACK;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 FEE_PROJECT_ID;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 REVNET_ID;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     address USER = makeAddr("user");
+    // forge-lint: disable-next-line(mixed-case-variable)
     address ATTACKER = makeAddr("attacker");
 
     address private constant TRUSTED_FORWARDER = 0xB2b5841DBeF766d4b521221732F9B618fCf34A87;
@@ -112,9 +135,12 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
 
         return InvincibilityProjectConfig({
             configuration: REVConfig({
-                description: REVDescription(
-                    "Revnet", "$REV", "ipfs://QmNRHT91HcDgMcenebYX7rJigt77cgNcosvuhX21wkF3tx", "REV_TOKEN"
-                ),
+                description: REVDescription({
+                    name: "Revnet",
+                    ticker: "$REV",
+                    uri: "ipfs://QmNRHT91HcDgMcenebYX7rJigt77cgNcosvuhX21wkF3tx",
+                    salt: "REV_TOKEN"
+                }),
                 baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
                 splitOperator: multisig(),
                 stageConfigurations: stageConfigurations
@@ -183,6 +209,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
 
         return InvincibilityProjectConfig({
             configuration: REVConfig({
+                // forge-lint: disable-next-line(named-struct-fields)
                 description: REVDescription("NANA", "$NANA", "ipfs://nana", "NANA_TOKEN"),
                 baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
                 splitOperator: multisig(),
@@ -202,8 +229,9 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
 
         SUCKER_REGISTRY = new JBSuckerRegistry(jbDirectory(), jbPermissions(), multisig(), address(0));
         HOOK_STORE = new JB721TiersHookStore();
-        EXAMPLE_HOOK =
-            new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, jbSplits(), multisig());
+        EXAMPLE_HOOK = new JB721TiersHook(
+            jbDirectory(), jbPermissions(), jbPrices(), jbRulesets(), HOOK_STORE, jbSplits(), multisig()
+        );
         ADDRESS_REGISTRY = new JBAddressRegistry();
         HOOK_DEPLOYER = new JB721TiersHookDeployer(EXAMPLE_HOOK, HOOK_STORE, ADDRESS_REGISTRY, multisig());
         PUBLISHER = new CTPublisher(jbDirectory(), jbPermissions(), FEE_PROJECT_ID, multisig());
@@ -240,16 +268,20 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
             revnetId: FEE_PROJECT_ID,
             configuration: feeConfig.configuration,
             terminalConfigurations: feeConfig.terminalConfigurations,
-            suckerDeploymentConfiguration: feeConfig.suckerDeploymentConfiguration
+            suckerDeploymentConfiguration: feeConfig.suckerDeploymentConfiguration,
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
         });
 
         // Deploy second revnet with loans
         InvincibilityProjectConfig memory revConfig = _getRevnetConfig();
-        REVNET_ID = REV_DEPLOYER.deployFor({
+        (REVNET_ID,) = REV_DEPLOYER.deployFor({
             revnetId: 0,
             configuration: revConfig.configuration,
             terminalConfigurations: revConfig.terminalConfigurations,
-            suckerDeploymentConfiguration: revConfig.suckerDeploymentConfiguration
+            suckerDeploymentConfiguration: revConfig.suckerDeploymentConfiguration,
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
         });
 
         vm.deal(USER, 10_000e18);
@@ -294,11 +326,13 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
     function test_fixVerify_uint112Truncation() public {
         // Prove the truncation math: uint112(max+1) wraps to 0
         uint256 overflowValue = uint256(type(uint112).max) + 1;
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint112 truncated = uint112(overflowValue);
         assertEq(truncated, 0, "uint112 truncation wraps max+1 to 0");
 
         // Prove a more realistic overflow: max + 1000 wraps to 999
         uint256 slightlyOver = uint256(type(uint112).max) + 1000;
+        // forge-lint: disable-next-line(unsafe-typecast)
         truncated = uint112(slightlyOver);
         assertEq(truncated, 999, "uint112 truncation wraps to low bits");
 
@@ -325,6 +359,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
 
         // The bug: code writes to hookSpecifications[1] (OOB for size-1 array)
         // The fix: should write to index 0 when no tiered721Hook
+        // forge-lint: disable-next-line(mixed-case-variable)
         bool wouldOOB = (!usesTiered721Hook && usesBuybackHook);
         assertTrue(wouldOOB, "this config triggers the OOB write at index [1]");
 
@@ -480,9 +515,10 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
         });
 
         vm.prank(multisig());
-        uint256 h5RevnetId = REV_DEPLOYER.deployFor({
+        (uint256 h5RevnetId,) = REV_DEPLOYER.deployFor({
             revnetId: 0,
             configuration: REVConfig({
+                // forge-lint: disable-next-line(named-struct-fields)
                 description: REVDescription("H5Test", "H5T", "ipfs://h5", "H5_TOKEN"),
                 baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
                 splitOperator: multisig(),
@@ -491,7 +527,9 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
             terminalConfigurations: tc,
             suckerDeploymentConfiguration: REVSuckerDeploymentConfig({
                 deployerConfigurations: new JBSuckerDeployerConfig[](0), salt: keccak256("H5_INVINCIBILITY")
-            })
+            }),
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
         });
 
         // Stage 0 auto-issuance stored at block.timestamp
@@ -922,26 +960,43 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
 contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
     using JBRulesetMetadataResolver for JBRuleset;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     bytes32 REV_DEPLOYER_SALT = "REVDeployer_INV";
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JB721TiersHook EXAMPLE_HOOK;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookDeployer HOOK_DEPLOYER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookStore HOOK_STORE;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJBAddressRegistry ADDRESS_REGISTRY;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IREVLoans LOANS_CONTRACT;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJBSuckerRegistry SUCKER_REGISTRY;
+    // forge-lint: disable-next-line(mixed-case-variable)
     CTPublisher PUBLISHER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     MockBuybackDataHook MOCK_BUYBACK;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     REVInvincibilityHandler HANDLER;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 FEE_PROJECT_ID;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 REVNET_ID;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 INITIAL_TIMESTAMP;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 STAGE_1_START;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 STAGE_2_START;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     address USER = makeAddr("invUser");
 
     address private constant TRUSTED_FORWARDER = 0xB2b5841DBeF766d4b521221732F9B618fCf34A87;
@@ -953,8 +1008,9 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
 
         SUCKER_REGISTRY = new JBSuckerRegistry(jbDirectory(), jbPermissions(), multisig(), address(0));
         HOOK_STORE = new JB721TiersHookStore();
-        EXAMPLE_HOOK =
-            new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, jbSplits(), multisig());
+        EXAMPLE_HOOK = new JB721TiersHook(
+            jbDirectory(), jbPermissions(), jbPrices(), jbRulesets(), HOOK_STORE, jbSplits(), multisig()
+        );
         ADDRESS_REGISTRY = new JBAddressRegistry();
         HOOK_DEPLOYER = new JB721TiersHookDeployer(EXAMPLE_HOOK, HOOK_STORE, ADDRESS_REGISTRY, multisig());
         PUBLISHER = new CTPublisher(jbDirectory(), jbPermissions(), FEE_PROJECT_ID, multisig());
@@ -1018,6 +1074,7 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
             REV_DEPLOYER.deployFor({
                 revnetId: FEE_PROJECT_ID,
                 configuration: REVConfig({
+                    // forge-lint: disable-next-line(named-struct-fields)
                     description: REVDescription("Revnet", "$REV", "ipfs://rev", "REV_TOKEN_INV"),
                     baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
                     splitOperator: multisig(),
@@ -1026,7 +1083,9 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
                 terminalConfigurations: tc,
                 suckerDeploymentConfiguration: REVSuckerDeploymentConfig({
                     deployerConfigurations: new JBSuckerDeployerConfig[](0), salt: keccak256("REV_INV")
-                })
+                }),
+                tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+                allowedPosts: REVEmpty721Config.emptyAllowedPosts()
             });
         }
 
@@ -1064,6 +1123,7 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
             });
 
             stages[1] = REVStageConfig({
+                // forge-lint: disable-next-line(unsafe-typecast)
                 startsAtOrAfter: uint40(STAGE_1_START),
                 autoIssuances: new REVAutoIssuance[](0),
                 splitPercent: 2000,
@@ -1076,6 +1136,7 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
             });
 
             stages[2] = REVStageConfig({
+                // forge-lint: disable-next-line(unsafe-typecast)
                 startsAtOrAfter: uint40(STAGE_2_START),
                 autoIssuances: new REVAutoIssuance[](0),
                 splitPercent: 0,
@@ -1087,9 +1148,10 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
                 extraMetadata: 0
             });
 
-            REVNET_ID = REV_DEPLOYER.deployFor({
+            (REVNET_ID,) = REV_DEPLOYER.deployFor({
                 revnetId: 0,
                 configuration: REVConfig({
+                    // forge-lint: disable-next-line(named-struct-fields)
                     description: REVDescription("NANA", "$NANA", "ipfs://nana", "NANA_TOKEN_INV"),
                     baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
                     splitOperator: multisig(),
@@ -1098,7 +1160,9 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
                 terminalConfigurations: tc,
                 suckerDeploymentConfiguration: REVSuckerDeploymentConfig({
                     deployerConfigurations: new JBSuckerDeployerConfig[](0), salt: keccak256("NANA_INV")
-                })
+                }),
+                tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+                allowedPosts: REVEmpty721Config.emptyAllowedPosts()
             });
         }
 

package/test/REVInvincibilityHandler.sol

@@ -1,11 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+// forge-lint: disable-next-line(unused-import)
 import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
 import {mulDiv} from "@prb/math/src/Common.sol";
+// forge-lint: disable-next-line(unused-import)
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import {IREVLoans} from "../src/interfaces/IREVLoans.sol";
@@ -20,24 +24,41 @@ contract REVInvincibilityHandler is JBTest {
     // =========================================================================
     // Ghost variables
     // =========================================================================
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public COLLATERAL_SUM;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public COLLATERAL_RETURNED;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public BORROWED_SUM;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public REPAID_SUM;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public PAID_IN_SUM;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public CASHED_OUT_SUM;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public ADDED_TO_BALANCE_SUM;
 
     // Per-operation call counts
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public callCount_payAndBorrow;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public callCount_repayLoan;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public callCount_reallocateCollateral;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public callCount_liquidateLoans;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public callCount_advanceTime;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public callCount_payInto;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public callCount_cashOut;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public callCount_addToBalance;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public callCount_sendReservedTokens;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public callCount_changeStage;
 
     // Fee project tracking
@@ -46,13 +67,21 @@ contract REVInvincibilityHandler is JBTest {
     // =========================================================================
     // Dependencies
     // =========================================================================
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJBMultiTerminal public TERMINAL;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IREVLoans public LOANS;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJBPermissions public PERMS;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJBTokens public TOKENS;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJBController public CTRL;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public REVNET_ID;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 public FEE_PROJECT_ID;
+    // forge-lint: disable-next-line(mixed-case-variable)
     address public USER;
 
     // Stage boundaries (for changeStage)

package/test/REVLifecycle.t.sol

@@ -1,23 +1,31 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
-import /* {*} from "@bananapus/721-hook-v6/src/JB721TiersHookDeployer.sol";
+// import /* {*} from "@bananapus/721-hook-v6/src/JB721TiersHookDeployer.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import /* {*} from */ "./../src/REVDeployer.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@croptop/core-v6/src/CTPublisher.sol";
 import {MockBuybackDataHook} from "./mock/MockBuybackDataHook.sol";
 
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
 
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
 import {REVLoans} from "../src/REVLoans.sol";
-import {REVLoan} from "../src/structs/REVLoan.sol";
 import {REVStageConfig, REVAutoIssuance} from "../src/structs/REVStageConfig.sol";
 import {REVDescription} from "../src/structs/REVDescription.sol";
 import {IREVLoans} from "./../src/interfaces/IREVLoans.sol";
@@ -28,28 +36,45 @@ import {JB721TiersHook} from "@bananapus/721-hook-v6/src/JB721TiersHook.sol";
 import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
+import {REVEmpty721Config} from "./helpers/REVEmpty721Config.sol";
 
 /// @notice Full revnet lifecycle E2E: deploy 3-stage -> pay -> advance stages -> cash out.
 contract REVLifecycle_Local is TestBaseWorkflow {
+    // forge-lint: disable-next-line(mixed-case-variable)
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";
+    // forge-lint: disable-next-line(mixed-case-variable)
     bytes32 ERC20_SALT = "REV_TOKEN";
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JB721TiersHook EXAMPLE_HOOK;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookDeployer HOOK_DEPLOYER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookStore HOOK_STORE;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJBAddressRegistry ADDRESS_REGISTRY;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IREVLoans LOANS_CONTRACT;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJBSuckerRegistry SUCKER_REGISTRY;
+    // forge-lint: disable-next-line(mixed-case-variable)
     CTPublisher PUBLISHER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     MockBuybackDataHook MOCK_BUYBACK;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 FEE_PROJECT_ID;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 REVNET_ID;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     address USER1 = makeAddr("user1");
+    // forge-lint: disable-next-line(mixed-case-variable)
     address USER2 = makeAddr("user2");
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 DECIMAL_MULTIPLIER = 10 ** 18;
 
     address private constant TRUSTED_FORWARDER = 0xB2b5841DBeF766d4b521221732F9B618fCf34A87;
@@ -61,8 +86,9 @@ contract REVLifecycle_Local is TestBaseWorkflow {
 
         SUCKER_REGISTRY = new JBSuckerRegistry(jbDirectory(), jbPermissions(), multisig(), address(0));
         HOOK_STORE = new JB721TiersHookStore();
-        EXAMPLE_HOOK =
-            new JB721TiersHook(jbDirectory(), jbPermissions(), jbRulesets(), HOOK_STORE, jbSplits(), multisig());
+        EXAMPLE_HOOK = new JB721TiersHook(
+            jbDirectory(), jbPermissions(), jbPrices(), jbRulesets(), HOOK_STORE, jbSplits(), multisig()
+        );
         ADDRESS_REGISTRY = new JBAddressRegistry();
         HOOK_DEPLOYER = new JB721TiersHookDeployer(EXAMPLE_HOOK, HOOK_STORE, ADDRESS_REGISTRY, multisig());
         PUBLISHER = new CTPublisher(jbDirectory(), jbPermissions(), FEE_PROJECT_ID, multisig());
@@ -121,6 +147,7 @@ contract REVLifecycle_Local is TestBaseWorkflow {
             autoIssuances: new REVAutoIssuance[](0),
             splitPercent: 0,
             splits: splits,
+            // forge-lint: disable-next-line(unsafe-typecast)
             initialIssuance: uint112(1000 * DECIMAL_MULTIPLIER),
             issuanceCutFrequency: 90 days,
             issuanceCutPercent: JBConstants.MAX_WEIGHT_CUT_PERCENT / 2,
@@ -155,6 +182,7 @@ contract REVLifecycle_Local is TestBaseWorkflow {
         });
 
         REVConfig memory revnetConfiguration = REVConfig({
+            // forge-lint: disable-next-line(named-struct-fields)
             description: REVDescription("Lifecycle", "LIFE", "ipfs://lifecycle", "LIFE_TOKEN"),
             baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
             splitOperator: multisig(),
@@ -162,13 +190,15 @@ contract REVLifecycle_Local is TestBaseWorkflow {
         });
 
         vm.prank(multisig());
-        REVNET_ID = REV_DEPLOYER.deployFor({
+        (REVNET_ID,) = REV_DEPLOYER.deployFor({
             revnetId: FEE_PROJECT_ID,
             configuration: revnetConfiguration,
             terminalConfigurations: terminalConfigurations,
             suckerDeploymentConfiguration: REVSuckerDeploymentConfig({
                 deployerConfigurations: new JBSuckerDeployerConfig[](0), salt: keccak256("LIFECYCLE_TEST")
-            })
+            }),
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
         });
     }