@rev-net/core-v6 0.0.11 → 0.0.13

package/test/REVLoans.invariants.t.sol

@@ -1,22 +1,32 @@
 // 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";
+import {REVEmpty721Config} from "./helpers/REVEmpty721Config.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 {REVLoans} from "../src/REVLoans.sol";
@@ -40,17 +50,28 @@ struct FeeProjectConfig {
 }
 
 contract REVLoansCallHandler is JBTest {
+    // 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 RUNS;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 REVNET_ID;
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 LAST_LOAN_MODIFIED;
+    // forge-lint: disable-next-line(mixed-case-variable)
     address USER;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJBMultiTerminal TERMINAL;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IREVLoans LOANS;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJBPermissions PERMS;
+    // forge-lint: disable-next-line(mixed-case-variable)
     IJBTokens TOKENS;
 
     constructor(
@@ -258,34 +279,50 @@ contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow {
     using JBRulesetMetadataResolver for JBRuleset;
 
     /// @notice the salts that are used to deploy the contracts.
+    // 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";
 
     // Handlers
+    // forge-lint: disable-next-line(mixed-case-variable)
     REVLoansCallHandler PAY_HANDLER;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JB721TiersHook EXAMPLE_HOOK;
 
     /// @notice Deploys tiered ERC-721 hooks for revnets.
+    // 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;
 
     /// @notice Deploys and tracks suckers for revnets.
+    // 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;
 
     // When the second project is deployed, track the block.timestamp.
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 INITIAL_TIMESTAMP;
 
+    // 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");
 
     /// @notice The address that is allowed to forward calls.
@@ -322,7 +359,11 @@ contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow {
         {
             REVAutoIssuance[] memory issuanceConfs = new REVAutoIssuance[](1);
             issuanceConfs[0] = REVAutoIssuance({
-                chainId: uint32(block.chainid), count: uint104(70_000 * decimalMultiplier), beneficiary: multisig()
+                // forge-lint: disable-next-line(unsafe-typecast)
+                chainId: uint32(block.chainid),
+                // forge-lint: disable-next-line(unsafe-typecast)
+                count: uint104(70_000 * decimalMultiplier),
+                beneficiary: multisig()
             });
 
             stageConfigurations[0] = REVStageConfig({
@@ -330,6 +371,7 @@ contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow {
                 autoIssuances: issuanceConfs,
                 splitPercent: 2000, // 20%
                 splits: splits,
+                // forge-lint: disable-next-line(unsafe-typecast)
                 initialIssuance: uint112(1000 * decimalMultiplier),
                 issuanceCutFrequency: 90 days,
                 issuanceCutPercent: JBConstants.MAX_WEIGHT_CUT_PERCENT / 2,
@@ -364,6 +406,7 @@ contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow {
 
         // The project's revnet configuration
         REVConfig memory revnetConfiguration = REVConfig({
+            // forge-lint: disable-next-line(named-struct-fields)
             description: REVDescription(name, symbol, projectUri, ERC20_SALT),
             baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
             splitOperator: multisig(),
@@ -410,7 +453,11 @@ contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow {
         {
             REVAutoIssuance[] memory issuanceConfs = new REVAutoIssuance[](1);
             issuanceConfs[0] = REVAutoIssuance({
-                chainId: uint32(block.chainid), count: uint104(70_000 * decimalMultiplier), beneficiary: multisig()
+                // forge-lint: disable-next-line(unsafe-typecast)
+                chainId: uint32(block.chainid),
+                // forge-lint: disable-next-line(unsafe-typecast)
+                count: uint104(70_000 * decimalMultiplier),
+                beneficiary: multisig()
             });
 
             stageConfigurations[0] = REVStageConfig({
@@ -418,6 +465,7 @@ contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow {
                 autoIssuances: issuanceConfs,
                 splitPercent: 2000, // 20%
                 splits: splits,
+                // forge-lint: disable-next-line(unsafe-typecast)
                 initialIssuance: uint112(1000 * decimalMultiplier),
                 issuanceCutFrequency: 90 days,
                 issuanceCutPercent: JBConstants.MAX_WEIGHT_CUT_PERCENT / 2,
@@ -452,6 +500,7 @@ contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow {
 
         // The project's revnet configuration
         REVConfig memory revnetConfiguration = REVConfig({
+            // forge-lint: disable-next-line(named-struct-fields)
             description: REVDescription(name, symbol, projectUri, "NANA_TOKEN"),
             baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
             splitOperator: multisig(),
@@ -476,8 +525,9 @@ contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow {
 
         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();
 
@@ -515,22 +565,26 @@ contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow {
 
         // Configure the project.
         vm.prank(address(multisig()));
-        REVNET_ID = REV_DEPLOYER.deployFor({
+        (REVNET_ID,) = REV_DEPLOYER.deployFor({
             revnetId: FEE_PROJECT_ID, // Zero to deploy a new revnet
             configuration: feeProjectConfig.configuration,
             terminalConfigurations: feeProjectConfig.terminalConfigurations,
-            suckerDeploymentConfiguration: feeProjectConfig.suckerDeploymentConfiguration
+            suckerDeploymentConfiguration: feeProjectConfig.suckerDeploymentConfiguration,
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
         });
 
         // Configure second revnet
         FeeProjectConfig memory fee2Config = getSecondProjectConfig();
 
         // Configure the second project.
-        REVNET_ID = REV_DEPLOYER.deployFor({
+        (REVNET_ID,) = REV_DEPLOYER.deployFor({
             revnetId: 0, // Zero to deploy a new revnet
             configuration: fee2Config.configuration,
             terminalConfigurations: fee2Config.terminalConfigurations,
-            suckerDeploymentConfiguration: fee2Config.suckerDeploymentConfiguration
+            suckerDeploymentConfiguration: fee2Config.suckerDeploymentConfiguration,
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
         });
 
         INITIAL_TIMESTAMP = block.timestamp;

package/test/REVLoansAttacks.t.sol

@@ -1,17 +1,26 @@
 // 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";
@@ -31,8 +40,8 @@ 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";
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 /// @notice A malicious terminal that re-enters REVLoans during fee payment in _adjust().
 /// @dev Reentrancy during pay() callback in _adjust.
@@ -177,24 +186,40 @@ struct AttackProjectConfig {
 /// @notice Attack tests for REVLoans covering uint112 truncation, reentrancy,
 ///         collateral race conditions, liquidation edge cases, and fuzz testing.
 contract REVLoansAttacks 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)
     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;
@@ -224,7 +249,11 @@ contract REVLoansAttacks is TestBaseWorkflow {
 
         REVAutoIssuance[] memory issuanceConfs = new REVAutoIssuance[](1);
         issuanceConfs[0] = REVAutoIssuance({
-            chainId: uint32(block.chainid), count: uint104(70_000 * decimalMultiplier), beneficiary: multisig()
+            // forge-lint: disable-next-line(unsafe-typecast)
+            chainId: uint32(block.chainid),
+            // forge-lint: disable-next-line(unsafe-typecast)
+            count: uint104(70_000 * decimalMultiplier),
+            beneficiary: multisig()
         });
 
         stageConfigurations[0] = REVStageConfig({
@@ -232,6 +261,7 @@ contract REVLoansAttacks is TestBaseWorkflow {
             autoIssuances: issuanceConfs,
             splitPercent: 2000,
             splits: splits,
+            // forge-lint: disable-next-line(unsafe-typecast)
             initialIssuance: uint112(1000 * decimalMultiplier),
             issuanceCutFrequency: 90 days,
             issuanceCutPercent: JBConstants.MAX_WEIGHT_CUT_PERCENT / 2,
@@ -240,6 +270,7 @@ contract REVLoansAttacks is TestBaseWorkflow {
         });
 
         REVConfig memory revnetConfiguration = REVConfig({
+            // forge-lint: disable-next-line(named-struct-fields)
             description: REVDescription(name, symbol, projectUri, ERC20_SALT),
             baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
             splitOperator: multisig(),
@@ -280,7 +311,11 @@ contract REVLoansAttacks is TestBaseWorkflow {
         REVStageConfig[] memory stageConfigurations = new REVStageConfig[](1);
         REVAutoIssuance[] memory issuanceConfs = new REVAutoIssuance[](1);
         issuanceConfs[0] = REVAutoIssuance({
-            chainId: uint32(block.chainid), count: uint104(70_000 * decimalMultiplier), beneficiary: multisig()
+            // forge-lint: disable-next-line(unsafe-typecast)
+            chainId: uint32(block.chainid),
+            // forge-lint: disable-next-line(unsafe-typecast)
+            count: uint104(70_000 * decimalMultiplier),
+            beneficiary: multisig()
         });
 
         stageConfigurations[0] = REVStageConfig({
@@ -288,6 +323,7 @@ contract REVLoansAttacks is TestBaseWorkflow {
             autoIssuances: issuanceConfs,
             splitPercent: 2000,
             splits: splits,
+            // forge-lint: disable-next-line(unsafe-typecast)
             initialIssuance: uint112(1000 * decimalMultiplier),
             issuanceCutFrequency: 90 days,
             issuanceCutPercent: JBConstants.MAX_WEIGHT_CUT_PERCENT / 2,
@@ -296,6 +332,7 @@ contract REVLoansAttacks is TestBaseWorkflow {
         });
 
         REVConfig memory revnetConfiguration = REVConfig({
+            // forge-lint: disable-next-line(named-struct-fields)
             description: REVDescription(name, symbol, projectUri, "NANA_TOKEN"),
             baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
             splitOperator: multisig(),
@@ -318,8 +355,9 @@ contract REVLoansAttacks 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());
@@ -361,16 +399,20 @@ contract REVLoansAttacks is TestBaseWorkflow {
             revnetId: FEE_PROJECT_ID,
             configuration: feeProjectConfig.configuration,
             terminalConfigurations: feeProjectConfig.terminalConfigurations,
-            suckerDeploymentConfiguration: feeProjectConfig.suckerDeploymentConfiguration
+            suckerDeploymentConfiguration: feeProjectConfig.suckerDeploymentConfiguration,
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
         });
 
         // Deploy second revnet with loans enabled
         AttackProjectConfig memory revnetConfig = _getRevnetConfig();
-        REVNET_ID = REV_DEPLOYER.deployFor({
+        (REVNET_ID,) = REV_DEPLOYER.deployFor({
             revnetId: 0,
             configuration: revnetConfig.configuration,
             terminalConfigurations: revnetConfig.terminalConfigurations,
-            suckerDeploymentConfiguration: revnetConfig.suckerDeploymentConfiguration
+            suckerDeploymentConfiguration: revnetConfig.suckerDeploymentConfiguration,
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
         });
 
         vm.deal(USER, 1000e18);
@@ -440,11 +482,13 @@ contract REVLoansAttacks is TestBaseWorkflow {
         // Now verify that the uint112 cast would truncate if somehow a larger value were used.
         // We can directly verify the truncation behavior:
         uint256 overflowValue = uint256(type(uint112).max) + 1;
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint112 truncated = uint112(overflowValue);
         assertEq(truncated, 0, "uint112 truncation of max+1 should wrap to 0");
 
         // And for a value just slightly above max:
         uint256 slightlyOver = uint256(type(uint112).max) + 1000;
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint112 truncated2 = uint112(slightlyOver);
         assertEq(truncated2, 999, "uint112 truncation should wrap around");
     }
@@ -460,6 +504,7 @@ contract REVLoansAttacks is TestBaseWorkflow {
         uint256 overflowCollateral = maxCollateral + 1;
 
         // Direct cast would truncate
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint112 truncated = uint112(overflowCollateral);
         assertEq(truncated, 0, "Collateral overflow should truncate to 0");
 

package/test/REVLoansFeeRecovery.t.sol

@@ -1,17 +1,26 @@
 // 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";
@@ -33,7 +42,7 @@ import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStor
 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 {REVEmpty721Config} from "./helpers/REVEmpty721Config.sol";
 
 /// @notice A terminal mock that always reverts on pay(), used to simulate fee payment failure.
 contract RevertingFeeTerminal is ERC165, IJBPayoutTerminal {
@@ -137,24 +146,40 @@ struct FeeRecoveryProjectConfig {
 /// @dev When feeTerminal.pay() reverts, the borrower should receive the fee amount back
 ///      instead of losing it. For ERC-20 tokens, the dangling allowance must also be cleaned up.
 contract REVLoansFeeRecovery 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)
     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)
     RevertingFeeTerminal REVERTING_TERMINAL;
 
+    // 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");
     address private constant TRUSTED_FORWARDER = 0xB2b5841DBeF766d4b521221732F9B618fCf34A87;
 
@@ -180,7 +205,11 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
 
         REVAutoIssuance[] memory issuanceConfs = new REVAutoIssuance[](1);
         issuanceConfs[0] = REVAutoIssuance({
-            chainId: uint32(block.chainid), count: uint104(70_000 * decimalMultiplier), beneficiary: multisig()
+            // forge-lint: disable-next-line(unsafe-typecast)
+            chainId: uint32(block.chainid),
+            // forge-lint: disable-next-line(unsafe-typecast)
+            count: uint104(70_000 * decimalMultiplier),
+            beneficiary: multisig()
         });
 
         stageConfigurations[0] = REVStageConfig({
@@ -188,6 +217,7 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
             autoIssuances: issuanceConfs,
             splitPercent: 2000,
             splits: splits,
+            // forge-lint: disable-next-line(unsafe-typecast)
             initialIssuance: uint112(1000 * decimalMultiplier),
             issuanceCutFrequency: 90 days,
             issuanceCutPercent: JBConstants.MAX_WEIGHT_CUT_PERCENT / 2,
@@ -196,9 +226,12 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
         });
 
         REVConfig memory revnetConfiguration = REVConfig({
-            description: REVDescription(
-                "Revnet", "$REV", "ipfs://QmNRHT91HcDgMcenebYX7rJigt77cgNcosvuhX21wkF3tx", ERC20_SALT
-            ),
+            description: REVDescription({
+                name: "Revnet",
+                ticker: "$REV",
+                uri: "ipfs://QmNRHT91HcDgMcenebYX7rJigt77cgNcosvuhX21wkF3tx",
+                salt: ERC20_SALT
+            }),
             baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
             splitOperator: multisig(),
             stageConfigurations: stageConfigurations
@@ -235,7 +268,11 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
         REVStageConfig[] memory stageConfigurations = new REVStageConfig[](1);
         REVAutoIssuance[] memory issuanceConfs = new REVAutoIssuance[](1);
         issuanceConfs[0] = REVAutoIssuance({
-            chainId: uint32(block.chainid), count: uint104(70_000 * decimalMultiplier), beneficiary: multisig()
+            // forge-lint: disable-next-line(unsafe-typecast)
+            chainId: uint32(block.chainid),
+            // forge-lint: disable-next-line(unsafe-typecast)
+            count: uint104(70_000 * decimalMultiplier),
+            beneficiary: multisig()
         });
 
         stageConfigurations[0] = REVStageConfig({
@@ -243,6 +280,7 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
             autoIssuances: issuanceConfs,
             splitPercent: 2000,
             splits: splits,
+            // forge-lint: disable-next-line(unsafe-typecast)
             initialIssuance: uint112(1000 * decimalMultiplier),
             issuanceCutFrequency: 90 days,
             issuanceCutPercent: JBConstants.MAX_WEIGHT_CUT_PERCENT / 2,
@@ -255,9 +293,12 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
         _loanSources[1] = REVLoanSource({token: address(TOKEN), terminal: jbMultiTerminal()});
 
         REVConfig memory revnetConfiguration = REVConfig({
-            description: REVDescription(
-                "NANA", "$NANA", "ipfs://QmNRHT91HcDgMcenebYX7rJigt77cgNxosvuhX21wkF3tx", "NANA_TOKEN"
-            ),
+            description: REVDescription({
+                name: "NANA",
+                ticker: "$NANA",
+                uri: "ipfs://QmNRHT91HcDgMcenebYX7rJigt77cgNxosvuhX21wkF3tx",
+                salt: "NANA_TOKEN"
+            }),
             baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
             splitOperator: multisig(),
             stageConfigurations: stageConfigurations
@@ -279,8 +320,9 @@ contract REVLoansFeeRecovery 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());
@@ -323,16 +365,20 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
             revnetId: FEE_PROJECT_ID,
             configuration: feeProjectConfig.configuration,
             terminalConfigurations: feeProjectConfig.terminalConfigurations,
-            suckerDeploymentConfiguration: feeProjectConfig.suckerDeploymentConfiguration
+            suckerDeploymentConfiguration: feeProjectConfig.suckerDeploymentConfiguration,
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
         });
 
         // Deploy revnet with loans enabled.
         FeeRecoveryProjectConfig memory revnetConfig = _getRevnetConfig();
-        REVNET_ID = REV_DEPLOYER.deployFor({
+        (REVNET_ID,) = REV_DEPLOYER.deployFor({
             revnetId: 0,
             configuration: revnetConfig.configuration,
             terminalConfigurations: revnetConfig.terminalConfigurations,
-            suckerDeploymentConfiguration: revnetConfig.suckerDeploymentConfiguration
+            suckerDeploymentConfiguration: revnetConfig.suckerDeploymentConfiguration,
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
         });
 
         vm.deal(USER, 1000e18);