@rev-net/core-v6 0.0.11 → 0.0.12

package/ADMINISTRATION.md

@@ -35,8 +35,7 @@ Admin privileges and their scope in revnet-core-v6. Revnets are designed to be a
 
 | Function | Required Role | Permission ID | What It Does |
 |----------|--------------|---------------|-------------|
-| `deployFor()` | Anyone (new revnet) or Juicebox project owner (existing project) | None | Deploys a new revnet or irreversibly converts an existing Juicebox project into a revnet. |
-| `deployWith721sFor()` | Anyone (new revnet) or Juicebox project owner (existing project) | None | Same as `deployFor()` but also deploys a tiered ERC-721 hook and optional croptop posting rules. |
+| `deployFor()` | Anyone (new revnet) or Juicebox project owner (existing project) | None | Deploys a new revnet or irreversibly converts an existing Juicebox project into a revnet. Both variants deploy a tiered ERC-721 hook: the 4-arg variant deploys a default empty hook; the 6-arg variant deploys a hook with pre-configured tiers and optional croptop posting rules. |
 | `deploySuckersFor()` | Split Operator | Checked via `_checkIfIsSplitOperatorOf()` | Deploys new cross-chain suckers for an existing revnet. Also requires the current ruleset's `extraMetadata` bit 2 to be set (allows deploying suckers). |
 | `setSplitOperatorOf()` | Split Operator | Checked via `_checkIfIsSplitOperatorOf()` | Replaces the current split operator with a new address. Revokes all operator permissions from the caller and grants them to the new address. |
 | `autoIssueFor()` | Anyone | None | Mints pre-configured auto-issuance tokens for a beneficiary once the relevant stage has started. Amounts are set at deployment and can only be claimed once. |
@@ -57,15 +56,16 @@ The split operator receives the following Juicebox permission IDs, scoped to its
 | `SUCKER_SAFETY` | Manage sucker safety settings (e.g., emergency hatch). |
 | `SET_BUYBACK_HOOK` | Configure the buyback hook. |
 | `SET_ROUTER_TERMINAL` | Set the router terminal. |
+| `SET_TOKEN_METADATA` | Update the revnet token's name and symbol. |
 
 Optional 721 permissions (granted only if enabled at deployment via `REVDeploy721TiersHookConfig`):
 
 | Permission ID | Deployment Flag | What It Allows |
 |---------------|----------------|----------------|
-| `ADJUST_721_TIERS` | `splitOperatorCanAdjustTiers` | Add or remove ERC-721 tiers. |
-| `SET_721_METADATA` | `splitOperatorCanUpdateMetadata` | Update ERC-721 tier metadata. |
-| `MINT_721` | `splitOperatorCanMint` | Mint ERC-721s without payment from tiers with `allowOwnerMint`. |
-| `SET_721_DISCOUNT_PERCENT` | `splitOperatorCanIncreaseDiscountPercent` | Increase the discount percentage of a tier. |
+| `ADJUST_721_TIERS` | `preventSplitOperatorAdjustingTiers` | Add or remove ERC-721 tiers. Allowed unless prevented. |
+| `SET_721_METADATA` | `preventSplitOperatorUpdatingMetadata` | Update ERC-721 tier metadata. Allowed unless prevented. |
+| `MINT_721` | `preventSplitOperatorMinting` | Mint ERC-721s without payment from tiers with `allowOwnerMint`. Allowed unless prevented. |
+| `SET_721_DISCOUNT_PERCENT` | `preventSplitOperatorIncreasingDiscountPercent` | Increase the discount percentage of a tier. Allowed unless prevented. |
 
 ### REVLoans
 
@@ -112,7 +112,7 @@ The `REVLoans` contract has minimal admin surface by design:
 
 The following parameters are set at deployment and can never be changed:
 
-### REVDeployer (per-revnet, set at `deployFor` / `deployWith721sFor` time)
+### REVDeployer (per-revnet, set at `deployFor` time)
 - Stage schedule (start times, issuance rates, cut frequencies, cut percentages)
 - Cash-out tax rates per stage
 - Split percentages per stage

package/ARCHITECTURE.md

@@ -9,7 +9,7 @@ Autonomous revenue networks ("revnets") built on Juicebox V6. REVDeployer create
 ```
 src/
 ├── REVDeployer.sol  — Deploys revnets: stages → rulesets, data hook, buyback, suckers, 721 tiers
-├── REVLoans.sol     — Borrow against locked revnet tokens (10-year max, gradual liquidation)
+├── REVLoans.sol     — Borrow against burned revnet tokens (10-year max, permissionless liquidation)
 ├── interfaces/
 │   ├── IREVDeployer.sol
 │   └── IREVLoans.sol
@@ -28,7 +28,7 @@ Deployer → REVDeployer.deployFor()
   → Set REVDeployer as data hook (controls pay + cashout behavior)
   → Initialize buyback pools at 1:1 price, configure buyback hook
   → Deploy suckers for cross-chain operation
-  → Deploy 721 tiers if specified
+  → Deploy tiered ERC-721 hook (always — empty by default, pre-configured if specified)
   → Compute matching hash for cross-chain deployment verification
 ```
 
@@ -47,18 +47,18 @@ Cash Out → REVDeployer.beforeCashOutRecordedWith()
 ### Loan Flow
 ```
 Borrower → REVLoans.borrowFrom()
-  → Lock borrower's revnet tokens as collateral
+  → Burn borrower's revnet tokens as collateral
   → Calculate max borrow based on bonding curve value
-  → Transfer borrowed funds to borrower
-  → Create loan with 10-year max term
+  → Pull funds from treasury via USE_ALLOWANCE
+  → Mint loan ERC-721 NFT to borrower
 
 Repay → REVLoans.repayLoan()
-  → Accept repayment (principal + prepay fee)
-  → Return locked collateral tokens to borrower
+  → Accept repayment (principal + prepaid fee)
+  → Re-mint collateral tokens to borrower
 
-Liquidate → REVLoans.liquidateLoan()
-  → After loan term, gradually release collateral
-  → Liquidation schedule spreads over time
+Liquidate → REVLoans.liquidateExpiredLoansFrom()
+  → After 10-year term, anyone can liquidate
+  → Collateral permanently destroyed (was burned at borrow time)
 ```
 
 ## Extension Points
@@ -84,4 +84,4 @@ Liquidate → REVLoans.liquidateLoan()
 - Stages are immutable after deployment — no owner can change ruleset parameters
 - Matching hash ensures cross-chain deployments have identical economic parameters
 - REVDeployer is the data hook for all revnets it deploys — centralizes behavioral control
-- Loans use bonding curve value, not market price — immune to external price manipulation
+- Loans use bonding curve value, not market price — independent of external DEX pricing

package/README.md

@@ -54,8 +54,10 @@ Revnets are autonomous Juicebox projects with predetermined economic stages. Eac
 
 ### Deployer Variants
 
-- **Basic revnet** -- `deployFor` with stage configurations mapped to Juicebox rulesets.
-- **Tiered 721 revnet** -- `deployWith721sFor` adds a tiered 721 pay hook that mints NFTs as people pay.
+Every revnet gets a tiered ERC-721 hook deployed automatically — even if no tiers are configured at launch. This lets the split operator add and sell NFTs later without migration.
+
+- **Basic revnet** -- `deployFor` with stage configurations mapped to Juicebox rulesets and an empty 721 hook.
+- **Tiered 721 revnet** -- `deployFor` adds a tiered 721 pay hook with pre-configured tiers that mint NFTs as people pay.
 - **Croptop revnet** -- A tiered 721 revnet with Croptop posting criteria, allowing the public to post content.
 
 ## Architecture
@@ -102,8 +104,8 @@ If `forge install` has issues, try `git submodule update --init --recursive`.
 
 ```
 src/
-  REVDeployer.sol                                # Revnet deployer + data hook (~1,256 lines)
-  REVLoans.sol                                   # Token-collateralized lending (~1,333 lines)
+  REVDeployer.sol                                # Revnet deployer + data hook (~1,287 lines)
+  REVLoans.sol                                   # Token-collateralized lending (~1,359 lines)
   interfaces/
     IREVDeployer.sol                             # Deployer interface + events
     IREVLoans.sol                                # Loans interface + events
@@ -159,6 +161,7 @@ The split operator has these default permissions:
 | `SUCKER_SAFETY` | Emergency sucker functions |
 | `SET_BUYBACK_HOOK` | Swap buyback hook |
 | `SET_ROUTER_TERMINAL` | Swap terminal |
+| `SET_TOKEN_METADATA` | Update token name and symbol |
 
 Plus optional from 721 hook config: `ADJUST_721_TIERS`, `SET_721_METADATA`, `MINT_721`, `SET_721_DISCOUNT_PERCENT`.
 

package/RISKS.md

@@ -44,6 +44,6 @@ When a revnet expands to a chain where the native token is not ETH (e.g., Celo),
 
 | Function | Protection | Risk |
 |----------|-----------|------|
-| `REVLoans.borrowFrom` | Collateral locked BEFORE funds transferred | LOW |
-| `REVLoans.repayLoan` | Loan state cleared BEFORE collateral returned | LOW |
+| `REVLoans.borrowFrom` | Collateral burned BEFORE funds transferred | LOW |
+| `REVLoans.repayLoan` | Loan state cleared BEFORE collateral re-minted | LOW |
 | `REVDeployer.beforePayRecordedWith` | View function, no state changes | NONE |

package/SKILLS.md

@@ -8,8 +8,8 @@ Deploy and manage Revnets -- autonomous, unowned Juicebox projects with staged i
 
 | Contract | Role |
 |----------|------|
-| `REVDeployer` | Deploys revnets, permanently owns the project NFT, acts as data hook and cash-out hook. Manages stages, splits, auto-issuance, buyback hooks, 721 hooks, suckers, and split operators. (~1,256 lines) |
-| `REVLoans` | Issues token-collateralized loans from revnet treasuries. Each loan is an ERC-721 NFT. Burns collateral on borrow, re-mints on repay. Charges tiered fees (REV protocol fee + source fee + prepaid fee). (~1,333 lines) |
+| `REVDeployer` | Deploys revnets, permanently owns the project NFT, acts as data hook and cash-out hook. Manages stages, splits, auto-issuance, buyback hooks, 721 hooks, suckers, and split operators. (~1,287 lines) |
+| `REVLoans` | Issues token-collateralized loans from revnet treasuries. Each loan is an ERC-721 NFT. Burns collateral on borrow, re-mints on repay. Charges tiered fees (REV protocol fee + source fee + prepaid fee). (~1,359 lines) |
 
 ## Key Functions
 
@@ -17,8 +17,8 @@ Deploy and manage Revnets -- autonomous, unowned Juicebox projects with staged i
 
 | Function | What it does |
 |----------|-------------|
-| `REVDeployer.deployFor(revnetId, config, terminals, suckerConfig)` | Deploy a new revnet (`revnetId=0`) or convert an existing Juicebox project. Encodes stage configs into rulesets, deploys ERC-20 token, initializes buyback pool at 1:1 price, sets up split operator, suckers, and loans permissions. |
-| `REVDeployer.deployWith721sFor(revnetId, config, terminals, suckerConfig, hookConfig, allowedPosts)` | Same as `deployFor` but also deploys a tiered ERC-721 hook. Optionally configures Croptop posting criteria and grants publisher permission to add tiers. |
+| `REVDeployer.deployFor(revnetId, config, terminals, suckerConfig)` | Deploy a new revnet (`revnetId=0`) or convert an existing Juicebox project. Encodes stage configs into rulesets, deploys ERC-20 token, initializes buyback pool at 1:1 price, sets up split operator, suckers, loans permissions, and deploys a default empty tiered ERC-721 hook. |
+| `REVDeployer.deployFor(revnetId, config, terminals, suckerConfig, hookConfig, allowedPosts)` | Same as `deployFor` but deploys a tiered ERC-721 hook with pre-configured tiers. Optionally configures Croptop posting criteria and grants publisher permission to add tiers. |
 | `REVDeployer.deploySuckersFor(revnetId, suckerConfig)` | Deploy new cross-chain suckers post-launch. Split operator only. Validates ruleset allows sucker deployment (bit 2 of `extraMetadata`). Uses stored config hash for cross-chain matching. |
 
 ### Data Hooks
@@ -80,13 +80,13 @@ Deploy and manage Revnets -- autonomous, unowned Juicebox projects with staged i
 
 | Struct | Key Fields | Used In |
 |--------|------------|---------|
-| `REVConfig` | `description` (REVDescription), `baseCurrency`, `splitOperator`, `stageConfigurations[]`, `loanSources[]`, `loans` | `deployFor`, `deployWith721sFor` |
+| `REVConfig` | `description` (REVDescription), `baseCurrency`, `splitOperator`, `stageConfigurations[]` | `deployFor` |
 | `REVStageConfig` | `startsAtOrAfter` (uint48), `initialIssuance` (uint112), `issuanceCutFrequency` (uint32), `issuanceCutPercent` (uint32), `cashOutTaxRate` (uint16), `splitPercent` (uint16), `splits[]`, `autoIssuances[]`, `extraMetadata` (uint16) | Translated into `JBRulesetConfig` |
 | `REVDescription` | `name`, `ticker`, `uri`, `salt` | ERC-20 token deployment and project metadata |
 | `REVAutoIssuance` | `chainId` (uint32), `count` (uint104), `beneficiary` | Per-stage cross-chain token auto-minting |
 | `REVLoan` | `amount` (uint112), `collateral` (uint112), `createdAt` (uint48), `prepaidFeePercent` (uint16), `prepaidDuration` (uint32), `source` (REVLoanSource) | Per-loan state in `REVLoans` |
 | `REVLoanSource` | `token`, `terminal` (IJBPayoutTerminal) | Identifies which terminal and token a loan draws from |
-| `REVDeploy721TiersHookConfig` | `baseline721HookConfiguration` (REVBaseline721HookConfig), `salt`, `splitOperatorCanAdjustTiers`, `CanUpdateMetadata`, `CanMint`, `CanIncreaseDiscountPercent` | 721 hook deployment with operator permissions. Uses `REVBaseline721HookConfig` (not `JBDeploy721TiersHookConfig`) to omit `issueTokensForSplits` — revnets always force it to `false`. |
+| `REVDeploy721TiersHookConfig` | `baseline721HookConfiguration` (REVBaseline721HookConfig), `salt`, `preventSplitOperatorAdjustingTiers`, `preventSplitOperatorUpdatingMetadata`, `preventSplitOperatorMinting`, `preventSplitOperatorIncreasingDiscountPercent` | 721 hook deployment with operator permissions (preventive flags — `false` = allowed). Uses `REVBaseline721HookConfig` (not `JBDeploy721TiersHookConfig`) to omit `issueTokensForSplits` — revnets always force it to `false`. |
 | `REVBaseline721HookConfig` | `name`, `symbol`, `baseUri`, `tokenUriResolver`, `contractUri`, `tiersConfig`, `reserveBeneficiary`, `flags` (REV721TiersHookFlags) | Same as `JBDeploy721TiersHookConfig` but uses `REV721TiersHookFlags` which omits `issueTokensForSplits`. |
 | `REV721TiersHookFlags` | `noNewTiersWithReserves`, `noNewTiersWithVotes`, `noNewTiersWithOwnerMinting`, `preventOverspending` | Same as `JB721TiersHookFlags` minus `issueTokensForSplits`. Revnets do their own weight adjustment for splits. |
 | `REVCroptopAllowedPost` | `category` (uint24), `minimumPrice` (uint104), `minimumTotalSupply` (uint32), `maximumTotalSupply` (uint32), `allowedAddresses[]` | Croptop posting criteria |
@@ -212,11 +212,9 @@ REVConfig memory config = REVConfig({
         uri: "ipfs://...",
         salt: bytes32(0)
     }),
-    baseCurrency: 1,                       // USD
+    baseCurrency: 1,                       // ETH
     splitOperator: msg.sender,
-    stageConfigurations: stages,
-    loanSources: new REVLoanSource[](0),
-    loans: address(0)                      // No loans contract
+    stageConfigurations: stages
 });
 
 deployer.deployFor({

package/STYLE_GUIDE.md

@@ -253,9 +253,12 @@ uint256 public constant MAX_RESERVED_PERCENT = 10_000;
 
 ## Function Calls
 
-Use named parameters for readability when calling functions with 3+ arguments:
+Use named arguments for all function calls with 2 or more arguments — in both `src/` and `script/`:
 
 ```solidity
+// Good — named arguments
+token.mint({account: beneficiary, amount: count});
+_transferOwnership({newOwner: address(0), projectId: 0});
 PERMISSIONS.hasPermission({
     operator: sender,
     account: account,
@@ -264,8 +267,18 @@ PERMISSIONS.hasPermission({
     includeRoot: true,
     includeWildcardProjectId: true
 });
+
+// Bad — positional arguments with 2+ args
+token.mint(beneficiary, count);
+_transferOwnership(address(0), 0);
 ```
 
+Single-argument calls use positional style: `_burn(amount)`.
+
+This also applies to constructor calls, struct literals, and inherited/library calls (e.g., OZ `_mint`, `_safeMint`, `safeTransfer`, `allowance`, `Clones.cloneDeterministic`).
+
+Named argument keys must use **camelCase** — never underscores. If a function's parameter names use underscores, rename them to camelCase first.
+
 ## Multiline Signatures
 
 ```solidity

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rev-net/core-v6",
-    "version": "0.0.11",
+    "version": "0.0.12",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -20,14 +20,14 @@
         "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'revnet-core-v6'"
     },
     "dependencies": {
-        "@bananapus/721-hook-v6": "^0.0.15",
-        "@bananapus/buyback-hook-v6": "^0.0.11",
-        "@bananapus/core-v6": "^0.0.15",
-        "@bananapus/ownable-v6": "^0.0.8",
-        "@bananapus/permission-ids-v6": "^0.0.7",
-        "@bananapus/router-terminal-v6": "^0.0.10",
-        "@bananapus/suckers-v6": "^0.0.9",
-        "@croptop/core-v6": "^0.0.14",
+        "@bananapus/721-hook-v6": "^0.0.16",
+        "@bananapus/buyback-hook-v6": "^0.0.12",
+        "@bananapus/core-v6": "^0.0.16",
+        "@bananapus/ownable-v6": "^0.0.9",
+        "@bananapus/permission-ids-v6": "^0.0.9",
+        "@bananapus/router-terminal-v6": "^0.0.11",
+        "@bananapus/suckers-v6": "^0.0.10",
+        "@croptop/core-v6": "^0.0.15",
         "@openzeppelin/contracts": "^5.6.1",
         "@uniswap/v4-core": "^1.0.2",
         "@uniswap/v4-periphery": "^1.0.3"

package/script/Deploy.s.sol

@@ -31,11 +31,21 @@ import {REVDescription} from "../src/structs/REVDescription.sol";
 import {REVStageConfig} from "../src/structs/REVStageConfig.sol";
 import {REVSuckerDeploymentConfig} from "../src/structs/REVSuckerDeploymentConfig.sol";
 import {REVLoans, IREVLoans} from "./../src/REVLoans.sol";
+import {REVDeploy721TiersHookConfig} from "../src/structs/REVDeploy721TiersHookConfig.sol";
+import {REVCroptopAllowedPost} from "../src/structs/REVCroptopAllowedPost.sol";
+import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
+import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
+import {JB721InitTiersConfig} from "@bananapus/721-hook-v6/src/structs/JB721InitTiersConfig.sol";
+import {JB721TierConfig} from "@bananapus/721-hook-v6/src/structs/JB721TierConfig.sol";
+import {REVBaseline721HookConfig} from "../src/structs/REVBaseline721HookConfig.sol";
+import {REV721TiersHookFlags} from "../src/structs/REV721TiersHookFlags.sol";
 
 struct FeeProjectConfig {
     REVConfig configuration;
     JBTerminalConfig[] terminalConfigurations;
     REVSuckerDeploymentConfig suckerDeploymentConfiguration;
+    REVDeploy721TiersHookConfig tiered721HookConfiguration;
+    REVCroptopAllowedPost[] allowedPosts;
 }
 
 contract DeployScript is Script, Sphinx {
@@ -90,32 +100,43 @@ contract DeployScript is Script, Sphinx {
         // Get the deployment addresses for the nana CORE for this chain.
         // We want to do this outside of the `sphinx` modifier.
         core = CoreDeploymentLib.getDeployment(
-            vm.envOr("NANA_CORE_DEPLOYMENT_PATH", string("node_modules/@bananapus/core-v6/deployments/"))
+            vm.envOr({
+                name: "NANA_CORE_DEPLOYMENT_PATH", defaultValue: string("node_modules/@bananapus/core-v6/deployments/")
+            })
         );
         // Get the deployment addresses for the suckers contracts for this chain.
         suckers = SuckerDeploymentLib.getDeployment(
-            vm.envOr("NANA_SUCKERS_DEPLOYMENT_PATH", string("node_modules/@bananapus/suckers-v6/deployments/"))
+            vm.envOr({
+                name: "NANA_SUCKERS_DEPLOYMENT_PATH",
+                defaultValue: string("node_modules/@bananapus/suckers-v6/deployments/")
+            })
         );
         // Get the deployment addresses for the 721 hook contracts for this chain.
         croptop = CroptopDeploymentLib.getDeployment(
-            vm.envOr("CROPTOP_CORE_DEPLOYMENT_PATH", string("node_modules/@croptop/core-v6/deployments/"))
+            vm.envOr({
+                name: "CROPTOP_CORE_DEPLOYMENT_PATH", defaultValue: string("node_modules/@croptop/core-v6/deployments/")
+            })
         );
         // Get the deployment addresses for the 721 hook contracts for this chain.
         hook = Hook721DeploymentLib.getDeployment(
-            vm.envOr("NANA_721_DEPLOYMENT_PATH", string("node_modules/@bananapus/721-hook-v6/deployments/"))
+            vm.envOr({
+                name: "NANA_721_DEPLOYMENT_PATH",
+                defaultValue: string("node_modules/@bananapus/721-hook-v6/deployments/")
+            })
         );
         // Get the deployment addresses for the router terminal contracts for this chain.
         routerTerminal = RouterTerminalDeploymentLib.getDeployment(
-            vm.envOr(
-                "NANA_ROUTER_TERMINAL_DEPLOYMENT_PATH",
-                string("node_modules/@bananapus/router-terminal-v6/deployments/")
-            )
+            vm.envOr({
+                name: "NANA_ROUTER_TERMINAL_DEPLOYMENT_PATH",
+                defaultValue: string("node_modules/@bananapus/router-terminal-v6/deployments/")
+            })
         );
         // Get the deployment addresses for the 721 hook contracts for this chain.
         buybackHook = BuybackDeploymentLib.getDeployment(
-            vm.envOr(
-                "NANA_BUYBACK_HOOK_DEPLOYMENT_PATH", string("node_modules/@bananapus/buyback-hook-v6/deployments/")
-            )
+            vm.envOr({
+                name: "NANA_BUYBACK_HOOK_DEPLOYMENT_PATH",
+                defaultValue: string("node_modules/@bananapus/buyback-hook-v6/deployments/")
+            })
         );
 
         // We use the same trusted forwarder and permit2 as the core deployment.
@@ -210,7 +231,7 @@ contract DeployScript is Script, Sphinx {
 
         // The project's revnet configuration
         REVConfig memory revnetConfiguration = REVConfig({
-            description: REVDescription(NAME, SYMBOL, PROJECT_URI, ERC20_SALT),
+            description: REVDescription({name: NAME, ticker: SYMBOL, uri: PROJECT_URI, salt: ERC20_SALT}),
             baseCurrency: ETH_CURRENCY,
             splitOperator: OPERATOR,
             stageConfigurations: stageConfigurations
@@ -262,7 +283,32 @@ contract DeployScript is Script, Sphinx {
         return FeeProjectConfig({
             configuration: revnetConfiguration,
             terminalConfigurations: terminalConfigurations,
-            suckerDeploymentConfiguration: suckerDeploymentConfiguration
+            suckerDeploymentConfiguration: suckerDeploymentConfiguration,
+            tiered721HookConfiguration: REVDeploy721TiersHookConfig({
+                baseline721HookConfiguration: REVBaseline721HookConfig({
+                    name: "",
+                    symbol: "",
+                    baseUri: "",
+                    tokenUriResolver: IJB721TokenUriResolver(address(0)),
+                    contractUri: "",
+                    tiersConfig: JB721InitTiersConfig({
+                        tiers: new JB721TierConfig[](0), currency: ETH_CURRENCY, decimals: 18
+                    }),
+                    reserveBeneficiary: address(0),
+                    flags: REV721TiersHookFlags({
+                        noNewTiersWithReserves: false,
+                        noNewTiersWithVotes: false,
+                        noNewTiersWithOwnerMinting: false,
+                        preventOverspending: false
+                    })
+                }),
+                salt: bytes32(0),
+                preventSplitOperatorAdjustingTiers: false,
+                preventSplitOperatorUpdatingMetadata: false,
+                preventSplitOperatorMinting: false,
+                preventSplitOperatorIncreasingDiscountPercent: false
+            }),
+            allowedPosts: new REVCroptopAllowedPost[](0)
         });
     }
 
@@ -271,11 +317,13 @@ contract DeployScript is Script, Sphinx {
         uint256 FEE_PROJECT_ID = core.projects.createFor(safeAddress());
 
         // Deploy REVLoans first — it only depends on the controller.
-        (address _revloansAddr, bool _revloansIsDeployed) = _isDeployed(
-            REVLOANS_SALT,
-            type(REVLoans).creationCode,
-            abi.encode(core.controller, core.projects, FEE_PROJECT_ID, LOANS_OWNER, PERMIT2, TRUSTED_FORWARDER)
-        );
+        (address _revloansAddr, bool _revloansIsDeployed) = _isDeployed({
+            salt: REVLOANS_SALT,
+            creationCode: type(REVLoans).creationCode,
+            arguments: abi.encode(
+                core.controller, core.projects, FEE_PROJECT_ID, LOANS_OWNER, PERMIT2, TRUSTED_FORWARDER
+            )
+        });
         REVLoans revloans = _revloansIsDeployed
             ? REVLoans(payable(_revloansAddr))
             : new REVLoans{salt: REVLOANS_SALT}({
@@ -288,10 +336,10 @@ contract DeployScript is Script, Sphinx {
             });
 
         // Deploy REVDeployer with the REVLoans and buyback hook addresses.
-        (address _deployerAddr, bool _deployerIsDeployed) = _isDeployed(
-            DEPLOYER_SALT,
-            type(REVDeployer).creationCode,
-            abi.encode(
+        (address _deployerAddr, bool _deployerIsDeployed) = _isDeployed({
+            salt: DEPLOYER_SALT,
+            creationCode: type(REVDeployer).creationCode,
+            arguments: abi.encode(
                 core.controller,
                 suckers.registry,
                 FEE_PROJECT_ID,
@@ -301,22 +349,22 @@ contract DeployScript is Script, Sphinx {
                 address(revloans),
                 TRUSTED_FORWARDER
             )
-        );
+        });
         REVDeployer _basicDeployer = _deployerIsDeployed
             ? REVDeployer(payable(_deployerAddr))
-            : new REVDeployer{salt: DEPLOYER_SALT}(
-                core.controller,
-                suckers.registry,
-                FEE_PROJECT_ID,
-                hook.hook_deployer,
-                croptop.publisher,
-                IJBBuybackHookRegistry(address(buybackHook.registry)),
-                address(revloans),
-                TRUSTED_FORWARDER
-            );
+            : new REVDeployer{salt: DEPLOYER_SALT}({
+                controller: core.controller,
+                suckerRegistry: suckers.registry,
+                feeRevnetId: FEE_PROJECT_ID,
+                hookDeployer: hook.hook_deployer,
+                publisher: croptop.publisher,
+                buybackHook: IJBBuybackHookRegistry(address(buybackHook.registry)),
+                loans: address(revloans),
+                trustedForwarder: TRUSTED_FORWARDER
+            });
 
         // Approve the basic deployer to configure the project.
-        core.projects.approve(address(_basicDeployer), FEE_PROJECT_ID);
+        core.projects.approve({to: address(_basicDeployer), tokenId: FEE_PROJECT_ID});
 
         // Build the config.
         FeeProjectConfig memory feeProjectConfig = getFeeProjectConfig();
@@ -326,7 +374,9 @@ contract DeployScript is Script, Sphinx {
             revnetId: FEE_PROJECT_ID,
             configuration: feeProjectConfig.configuration,
             terminalConfigurations: feeProjectConfig.terminalConfigurations,
-            suckerDeploymentConfiguration: feeProjectConfig.suckerDeploymentConfiguration
+            suckerDeploymentConfiguration: feeProjectConfig.suckerDeploymentConfiguration,
+            tiered721HookConfiguration: feeProjectConfig.tiered721HookConfiguration,
+            allowedPosts: feeProjectConfig.allowedPosts
         });
     }
 

package/script/helpers/RevnetCoreDeploymentLib.sol

@@ -29,7 +29,7 @@ library RevnetCoreDeploymentLib {
 
         for (uint256 _i; _i < networks.length; _i++) {
             if (networks[_i].chainId == chainId) {
-                return getDeployment(path, networks[_i].name);
+                return getDeployment({path: path, network_name: networks[_i].name});
             }
         }
 
@@ -44,10 +44,17 @@ library RevnetCoreDeploymentLib {
         view
         returns (RevnetCoreDeployment memory deployment)
     {
-        deployment.basic_deployer =
-            IREVDeployer(_getDeploymentAddress(path, "revnet-core-v6", network_name, "REVDeployer"));
+        deployment.basic_deployer = IREVDeployer(
+            _getDeploymentAddress({
+                path: path, project_name: "revnet-core-v6", network_name: network_name, contractName: "REVDeployer"
+            })
+        );
 
-        deployment.loans = IREVLoans(_getDeploymentAddress(path, "revnet-core-v6", network_name, "REVLoans"));
+        deployment.loans = IREVLoans(
+            _getDeploymentAddress({
+                path: path, project_name: "revnet-core-v6", network_name: network_name, contractName: "REVLoans"
+            })
+        );
     }
 
     /// @notice Get the address of a contract that was deployed by the Deploy script.
@@ -67,6 +74,6 @@ library RevnetCoreDeploymentLib {
     {
         string memory deploymentJson =
             vm.readFile(string.concat(path, project_name, "/", network_name, "/", contractName, ".json"));
-        return stdJson.readAddress(deploymentJson, ".address");
+        return stdJson.readAddress({json: deploymentJson, key: ".address"});
     }
 }