@rev-net/core-v6 0.0.9 → 0.0.11

package/ARCHITECTURE.md

@@ -26,7 +26,7 @@ Deployer → REVDeployer.deployFor()
     → Each stage: duration, weight, cashOutTaxRate, splits
     → Auto-issuance: pre-mint tokens to specified beneficiaries per chain
   → Set REVDeployer as data hook (controls pay + cashout behavior)
-  → Configure buyback hook (swap vs mint decision)
+  → Initialize buyback pools at 1:1 price, configure buyback hook
   → Deploy suckers for cross-chain operation
   → Deploy 721 tiers if specified
   → Compute matching hash for cross-chain deployment verification

package/README.md

@@ -16,9 +16,9 @@ Revnets are autonomous Juicebox projects with predetermined economic stages. Eac
 
 ```
 1. Deploy revnet with stage configurations
-   → REVDeployer.deployFor(revnetId=0, config, terminals, ...)
+   → REVDeployer.deployFor(revnetId=0, config, terminals, suckerConfig)
    → Creates Juicebox project owned by REVDeployer (permanently)
-   → Deploys ERC-20 token, configures buyback pools, deploys suckers
+   → Deploys ERC-20 token, initializes buyback pools at 1:1 price, deploys suckers
    |
 2. Stage 1 begins (startsAtOrAfter or block.timestamp)
    → Tokens issued at initialIssuance rate per unit of base currency
@@ -125,13 +125,13 @@ test/
   REVAutoIssuanceFuzz.t.sol                      # Auto-issuance fuzz tests
   REVInvincibility.t.sol                         # Economic property fuzzing
   REVInvincibilityHandler.sol                    # Fuzz handler
-  REVDeployerAuditRegressions.t.sol              # Deployer audit regressions
+  REVDeployerRegressions.t.sol                   # Deployer regressions
   REVLoansSourced.t.sol                          # Multi-source loan tests
   REVLoansUnSourced.t.sol                        # Loan error cases
   REVLoansFeeRecovery.t.sol                      # Fee calculation tests
   REVLoansAttacks.t.sol                          # Flash loan, reentrancy scenarios
   REVLoans.invariants.t.sol                      # Loan fuzzing invariants
-  REVLoansAuditRegressions.t.sol                 # Loan audit regressions
+  REVLoansRegressions.t.sol                      # Loan regressions
   TestPR09-32_*.t.sol                            # Per-PR regression tests
   helpers/
     MaliciousContracts.sol                       # Attack contract mocks

package/SKILLS.md

@@ -17,8 +17,8 @@ Deploy and manage Revnets -- autonomous, unowned Juicebox projects with staged i
 
 | Function | What it does |
 |----------|-------------|
-| `REVDeployer.deployFor(revnetId, config, terminals, buybackHookConfig, suckerConfig)` | Deploy a new revnet (`revnetId=0`) or convert an existing Juicebox project. Encodes stage configs into rulesets, deploys ERC-20 token, sets up split operator, buyback pools, suckers, and loans permissions. |
-| `REVDeployer.deployWith721sFor(revnetId, config, terminals, buybackHookConfig, 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, 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.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
@@ -187,7 +187,6 @@ JBAccountingContext({
 import {REVConfig} from "@rev-net/core-v6/src/structs/REVConfig.sol";
 import {REVStageConfig} from "@rev-net/core-v6/src/structs/REVStageConfig.sol";
 import {REVDescription} from "@rev-net/core-v6/src/structs/REVDescription.sol";
-import {REVBuybackHookConfig} from "@rev-net/core-v6/src/structs/REVBuybackHookConfig.sol";
 import {REVSuckerDeploymentConfig} from "@rev-net/core-v6/src/structs/REVSuckerDeploymentConfig.sol";
 import {IREVDeployer} from "@rev-net/core-v6/src/interfaces/IREVDeployer.sol";
 
@@ -224,11 +223,6 @@ deployer.deployFor({
     revnetId: 0,                           // 0 = deploy new
     configuration: config,
     terminalConfigurations: terminals,
-    buybackHookConfiguration: REVBuybackHookConfig({
-        dataHook: IJBRulesetDataHook(address(0)),
-        hookToConfigure: IJBBuybackHook(address(0)),
-        poolConfigurations: new REVBuybackPoolConfig[](0)
-    }),
     suckerDeploymentConfiguration: REVSuckerDeploymentConfig({
         deployerConfigurations: new JBSuckerDeployerConfig[](0),
         salt: bytes32(0)

package/STYLE_GUIDE.md

@@ -17,8 +17,6 @@ src/
 
 One contract/interface/struct/enum per file. Name the file after the type it contains.
 
-**Structs, enums, libraries, and interfaces always go in their subdirectories** (`src/structs/`, `src/enums/`, `src/libraries/`, `src/interfaces/`) — never inline in contract files or placed in `src/` root. This keeps type definitions discoverable and import paths consistent across repos.
-
 ## Pragma Versions
 
 ```solidity
@@ -106,14 +104,6 @@ contract JBExample is JBPermissioned, IJBExample {
     // -------------------------- constructor ---------------------------- //
     //*********************************************************************//
 
-    //*********************************************************************//
-    // ---------------------- receive / fallback ------------------------- //
-    //*********************************************************************//
-
-    //*********************************************************************//
-    // --------------------------- modifiers ----------------------------- //
-    //*********************************************************************//
-
     //*********************************************************************//
     // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
@@ -141,28 +131,23 @@ contract JBExample is JBPermissioned, IJBExample {
 ```
 
 **Section order:**
-1. `using` declarations
-2. Custom errors
-3. Public constants
-4. Internal constants
-5. Public immutable stored properties
-6. Internal immutable stored properties
-7. Public stored properties
-8. Internal stored properties
-9. Constructor
-10. `receive` / `fallback`
-11. Modifiers
-12. External transactions
-13. External views
-14. Public transactions
-15. Internal helpers
-16. Internal views
-17. Private helpers
+1. Custom errors
+2. Public constants
+3. Internal constants
+4. Public immutable stored properties
+5. Internal immutable stored properties
+6. Public stored properties
+7. Internal stored properties
+8. Constructor
+9. External transactions
+10. External views
+11. Public transactions
+12. Internal helpers
+13. Internal views
+14. Private helpers
 
 Functions are alphabetized within each section.
 
-**Events:** Events are declared in interfaces only, never in implementation contracts. Implementations inherit events from their interface and emit them unqualified. This keeps the ABI definition in one place and allows tests to use interface-qualified event expectations (e.g., `emit IJBController.LaunchProject(...)`).
-
 ## Interface Structure
 
 ```solidity
@@ -334,9 +319,6 @@ optimizer_runs = 200
 libs = ["node_modules", "lib"]
 fs_permissions = [{ access = "read-write", path = "./"}]
 
-[profile.ci_sizes]
-optimizer_runs = 200
-
 [fuzz]
 runs = 4096
 
@@ -351,13 +333,13 @@ multiline_func_header = "all"
 wrap_comments = true
 ```
 
-**Variations:**
-- `evm_version = 'cancun'` for repos using transient storage (buyback-hook, router-terminal, univ4-router)
-- `via_ir = true` for repos hitting stack-too-deep (buyback-hook, banny-retail, univ4-lp-split-hook, deploy-all)
-- `optimizer = false` only for deploy-all-v6 (stack-too-deep with optimization)
-- `lint_on_build = false` for repos that depend on packages with test helpers using bare `src/` imports (solar linter can't resolve cross-package). Run `forge lint src/` explicitly.
+**Optional sections (add only when needed):**
+- `[rpc_endpoints]` — repos with fork tests. Maps named endpoints to env vars (e.g. `ethereum = "${RPC_ETHEREUM_MAINNET}"`).
 
-> **This repo's deviations:** `optimizer_runs = 100` (stack-too-deep at 200 due to deep struct nesting), `via_ir = true`, `lint_on_build = false` (nana-core test helpers use bare `src/` imports that solar can't resolve cross-package). Package scope: `@rev-net/`.
+**Common variations:**
+- `via_ir = true` when hitting stack-too-deep
+- `optimizer = false` when optimization causes stack-too-deep
+- `optimizer_runs` reduced when deep struct nesting causes stack-too-deep at 200 runs
 
 ### CI Workflows
 
@@ -390,7 +372,7 @@ jobs:
         env:
           RPC_ETHEREUM_MAINNET: ${{ secrets.RPC_ETHEREUM_MAINNET }}
       - name: Check contract sizes
-        run: FOUNDRY_PROFILE=ci_sizes forge build --sizes --skip "*/test/**" --skip "*/script/**" --skip SphinxUtils
+        run: forge build --sizes --skip "*/test/**" --skip "*/script/**" --skip SphinxUtils
 ```
 
 **lint.yml:**
@@ -412,6 +394,55 @@ jobs:
         run: forge fmt --check
 ```
 
+**slither.yml** (repos with `src/` contracts only):
+```yaml
+name: slither
+on:
+    pull_request:
+      branches:
+        - main
+    push:
+      branches:
+        - main
+jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - name: Install npm dependencies
+        run: npm install --omit=dev
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+      - name: Run slither
+        uses: crytic/slither-action@v0.3.1
+        with:
+            slither-config: slither-ci.config.json
+            fail-on: medium
+```
+
+**slither-ci.config.json:**
+```json
+{
+  "detectors_to_exclude": "timestamp,uninitialized-local,naming-convention,solc-version,shadowing-local",
+  "exclude_informational": true,
+  "exclude_low": false,
+  "exclude_medium": false,
+  "exclude_high": false,
+  "disable_color": false,
+  "filter_paths": "(mocks/|test/|node_modules/|lib/)",
+  "legacy_ast": false
+}
+```
+
+**Variations:**
+- Deployer-only repos (no `src/`, only `script/`) skip slither entirely — the action's internal `forge build` skips `test/` and `script/` by default, leaving nothing to compile.
+- Use inline `// slither-disable-next-line <detector>` to suppress known false positives rather than adding to `detectors_to_exclude` in the config. The comment must be on the line immediately before the flagged expression.
+
 ### package.json
 
 ```json
@@ -436,13 +467,62 @@ jobs:
 
 ### remappings.txt
 
-Every repo has a `remappings.txt`. Minimal content:
+Every repo has a `remappings.txt` as the **single source of truth** for import remappings. Never add remappings to `foundry.toml`.
+
+**Principle:** Import paths in Solidity source must match npm package names exactly. With `libs = ["node_modules", "lib"]`, Foundry auto-resolves `@scope/package/path/File.sol` → `node_modules/@scope/package/path/File.sol`. No remapping needed for packages installed as real directories.
+
+**Note:** Auto-resolution does **not** work for symlinked packages (e.g. npm workspace links). Workspace repos like `deploy-all-v6` and `nana-cli-v6` need explicit `@scope/package/=node_modules/@scope/package/` remappings for each symlinked dependency.
+
+**Minimal content** (most repos):
+
+```
+forge-std/=lib/forge-std/src/
+```
+
+Only add extra remappings for:
+- **`forge-std`** — always needed (git submodule with `src/` subdirectory)
+- **Repo-specific `lib/` submodules** that have no npm package (e.g., `hookmate/=lib/hookmate/src/`)
+- **Symlinked npm packages** — need explicit `@scope/package/=node_modules/@scope/package/` entries
+- **Nested transitive deps** — e.g., `@chainlink/contracts-ccip/` nested inside `@bananapus/suckers-v6/node_modules/`
+
+**Never add remappings for:**
+- npm packages that match their import path and are installed as real directories — they auto-resolve
+- Short-form aliases (e.g., `@bananapus/core/` → `@bananapus/core-v6/src/`) — fix the import instead
+- Packages available via npm that are also git submodules — remove the submodule, use npm
+
+**Import path convention:**
+
+| Package | Import path | Resolves to |
+|---------|------------|-------------|
+| `@bananapus/core-v6` | `@bananapus/core-v6/src/libraries/JBConstants.sol` | `node_modules/@bananapus/core-v6/src/...` |
+| `@openzeppelin/contracts` | `@openzeppelin/contracts/token/ERC20/IERC20.sol` | `node_modules/@openzeppelin/contracts/...` |
+| `@uniswap/v4-core` | `@uniswap/v4-core/src/interfaces/IPoolManager.sol` | `node_modules/@uniswap/v4-core/src/...` |
 
+### Linting
+
+Solar (Foundry's built-in linter) runs automatically during `forge build`. It scans all `.sol` files in `libs` directories, including `node_modules`.
+
+**All test helpers must use relative imports** (e.g. `../../src/structs/JBRuleset.sol`), not bare `src/` imports. This ensures solar can resolve paths when the helper is consumed via npm in downstream repos.
+
+### Fork Tests
+
+Fork tests use named RPC endpoints defined in `[rpc_endpoints]` of `foundry.toml`. No skip guards — fork tests should hard-fail if the RPC endpoint is unavailable, making CI failures explicit.
+
+```solidity
+function setUp() public {
+    vm.createSelectFork("ethereum");
+    // ... setup code
+}
 ```
-@sphinx-labs/contracts/=lib/sphinx/packages/contracts/contracts/foundry
+
+The endpoint name (e.g. `"ethereum"`) maps to an env var via `foundry.toml`:
+
+```toml
+[rpc_endpoints]
+ethereum = "${RPC_ETHEREUM_MAINNET}"
 ```
 
-Additional mappings as needed for repo-specific dependencies.
+For multi-chain fork tests, add all needed endpoints.
 
 ### Formatting
 
@@ -453,15 +533,6 @@ Run `forge fmt` before committing. The `[fmt]` config in `foundry.toml` enforces
 
 CI checks formatting via `forge fmt --check`.
 
-### CI Secrets
-
-| Secret | Purpose |
-|--------|--------|
-| `NPM_TOKEN` | npm publish access (used by `publish.yml`) |
-| `RPC_ETHEREUM_MAINNET` | Ethereum mainnet RPC URL for fork tests (used by `test.yml`) |
-
-Fork tests require `RPC_ETHEREUM_MAINNET` — they fail if it's missing.
-
 ### Branching
 
 - `main` is the primary branch
@@ -480,3 +551,8 @@ Fork tests require `RPC_ETHEREUM_MAINNET` — they fail if it's missing.
 ### Contract Size Checks
 
 CI runs `forge build --sizes` to catch contracts approaching the 24KB limit.
+
+## Repo-Specific Deviations
+
+- **`optimizer_runs = 100`** — reduced for contract size compliance
+- **`npm install --omit=dev && npm install @sphinx-labs/contracts` in CI** — test files import deployment helpers from dependencies (`SuckerDeploymentLib`, `CroptopDeploymentLib`) that use `@sphinx-labs` contracts. Installing just the contracts package avoids the full `@sphinx-labs/plugins` tree (445+ Solidity files) that would bloat compilation

package/docs/src/README.md

@@ -123,13 +123,13 @@ test/
   REVAutoIssuanceFuzz.t.sol                      # Auto-issuance fuzz tests
   REVInvincibility.t.sol                         # Economic property fuzzing
   REVInvincibilityHandler.sol                    # Fuzz handler
-  REVDeployerAuditRegressions.t.sol              # Deployer audit regressions
+  REVDeployerRegressions.t.sol                   # Deployer regressions
   REVLoansSourced.t.sol                          # Multi-source loan tests
   REVLoansUnSourced.t.sol                        # Loan error cases
   REVLoansFeeRecovery.t.sol                      # Fee calculation tests
   REVLoansAttacks.t.sol                          # Flash loan, reentrancy scenarios
   REVLoans.invariants.t.sol                      # Loan fuzzing invariants
-  REVLoansAuditRegressions.t.sol                 # Loan audit regressions
+  REVLoansRegressions.t.sol                      # Loan regressions
   TestPR09-32_*.t.sol                            # Per-PR regression tests
   helpers/
     MaliciousContracts.sol                       # Attack contract mocks

package/foundry.toml

@@ -17,6 +17,9 @@ fail_on_revert = false
 [lint]
 lint_on_build = false
 
+[rpc_endpoints]
+ethereum = "${RPC_ETHEREUM_MAINNET}"
+
 [fmt]
 number_underscore = "thousands"
 multiline_func_header = "all"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rev-net/core-v6",
-    "version": "0.0.9",
+    "version": "0.0.11",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -20,14 +20,17 @@
         "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.13",
-        "@bananapus/buyback-hook-v6": "^0.0.10",
-        "@bananapus/core-v6": "^0.0.14",
-        "@bananapus/permission-ids-v6": "^0.0.6",
-        "@bananapus/router-terminal-v6": "^0.0.9",
-        "@bananapus/suckers-v6": "^0.0.8",
-        "@croptop/core-v6": "^0.0.10",
-        "@openzeppelin/contracts": "^5.2.0"
+        "@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",
+        "@openzeppelin/contracts": "^5.6.1",
+        "@uniswap/v4-core": "^1.0.2",
+        "@uniswap/v4-periphery": "^1.0.3"
     },
     "devDependencies": {
         "@sphinx-labs/plugins": "^0.33.2"

package/remappings.txt

@@ -1 +1 @@
-@sphinx-labs/contracts/=node_modules/@sphinx-labs/contracts/contracts/foundry
+forge-std/=lib/forge-std/src/

package/script/Deploy.s.sol

@@ -8,7 +8,7 @@ import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
 import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
 import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
 
-import {Sphinx} from "@sphinx-labs/contracts/SphinxPlugin.sol";
+import {Sphinx} from "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
 import {Script} from "forge-std/Script.sol";
 
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";

package/script/helpers/RevnetCoreDeploymentLib.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.26;
 
 import {stdJson} from "forge-std/Script.sol";
 import {Vm} from "forge-std/Vm.sol";
-import {SphinxConstants, NetworkInfo} from "@sphinx-labs/contracts/SphinxConstants.sol";
+import {SphinxConstants, NetworkInfo} from "@sphinx-labs/contracts/contracts/foundry/SphinxConstants.sol";
 
 import {IREVDeployer} from "./../../src/interfaces/IREVDeployer.sol";
 import {IREVLoans} from "./../../src/interfaces/IREVLoans.sol";

package/src/REVDeployer.sol

@@ -99,8 +99,8 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
     uint24 public constant DEFAULT_BUYBACK_POOL_FEE = 10_000;
 
     /// @notice The default tick spacing used when auto-configuring buyback pools.
-    /// @dev 60 is the standard tick spacing for the 1% fee tier.
-    int24 public constant DEFAULT_BUYBACK_TICK_SPACING = 60;
+    /// @dev 200 aligns with UniV4DeploymentSplitHook.TICK_SPACING so both target the same pool.
+    int24 public constant DEFAULT_BUYBACK_TICK_SPACING = 200;
 
     /// @notice The default TWAP window used when auto-configuring buyback pools.
     /// @dev 2 days provides robust manipulation resistance.
@@ -326,6 +326,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         bool usesTiered721Hook = address(tiered721Hook) != address(0);
         if (usesTiered721Hook) {
             JBPayHookSpecification[] memory specs;
+            // slither-disable-next-line unused-return
             (, specs) = IJBRulesetDataHook(address(tiered721Hook)).beforePayRecordedWith(context);
             // The 721 hook returns a single spec (itself) whose amount is the total split amount.
             if (specs.length > 0) {
@@ -441,17 +442,14 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         return SUCKER_REGISTRY.isSuckerOf({projectId: revnetId, addr: addr});
     }
 
-    /// @notice Initialize fund access limits for the loan contract and configure buyback pools for each terminal token.
+    /// @notice Initialize fund access limits for the loan contract.
     /// @dev Returns an unlimited surplus allowance for each terminal+token pair derived from the terminal
-    /// configurations. Also auto-configures a buyback pool for each token with sensible defaults (1% fee, 2-day TWAP).
-    /// @param revnetId The ID of the revnet to configure buyback pools for.
+    /// configurations.
     /// @param terminalConfigurations The terminals to set up for the revnet. Used for payments and cash outs.
     /// @return fundAccessLimitGroups The fund access limit groups for the loans.
-    function _makeLoanFundAccessLimitsAndBuybackPools(
-        uint256 revnetId,
-        JBTerminalConfig[] calldata terminalConfigurations
-    )
+    function _makeLoanFundAccessLimits(JBTerminalConfig[] calldata terminalConfigurations)
         internal
+        pure
         returns (JBFundAccessLimitGroup[] memory fundAccessLimitGroups)
     {
         // Count the total number of accounting contexts across all terminals.
@@ -463,7 +461,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         // Initialize the fund access limit groups.
         fundAccessLimitGroups = new JBFundAccessLimitGroup[](count);
 
-        // Set up the fund access limits and buyback pools.
+        // Set up the fund access limits.
         uint256 index;
         for (uint256 i; i < terminalConfigurations.length; i++) {
             JBTerminalConfig calldata terminalConfiguration = terminalConfigurations[i];
@@ -481,30 +479,28 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
                     payoutLimits: new JBCurrencyAmount[](0),
                     surplusAllowances: loanAllowances
                 });
-
-                // Configure a buyback pool for this terminal token with default fee and TWAP window.
-                // slither-disable-next-line calls-loop
-                _trySetBuybackPoolFor(revnetId, accountingContext.token);
             }
         }
     }
 
-    /// @notice Try to configure a buyback pool for a terminal token. Silently catches failures (e.g., if the Uniswap V4
-    /// pool isn't initialized yet).
+    /// @notice Try to initialize a Uniswap V4 buyback pool for a terminal token at a generic 1:1 price.
+    /// @dev Called after the ERC-20 token is deployed so the pool can be initialized in the PoolManager.
+    /// Silently catches failures (e.g., if the pool is already initialized).
     /// @param revnetId The ID of the revnet.
-    /// @param terminalToken The terminal token to configure a buyback pool for.
-    function _trySetBuybackPoolFor(uint256 revnetId, address terminalToken) internal {
-        // Try to set the pool — if the pool isn't initialized in the PoolManager yet, this will revert and be caught.
+    /// @param terminalToken The terminal token to initialize a buyback pool for.
+    function _tryInitializeBuybackPoolFor(uint256 revnetId, address terminalToken) internal {
+        // Try to initialize the pool at a generic 1:1 sqrtPriceX96 and configure the buyback hook.
         // The buyback hook constructs the PoolKey internally from the project token, terminal token, and pool params.
         // slither-disable-next-line calls-loop
-        try BUYBACK_HOOK.setPoolFor({
+        try BUYBACK_HOOK.initializePoolFor({
             projectId: revnetId,
             fee: DEFAULT_BUYBACK_POOL_FEE,
             tickSpacing: DEFAULT_BUYBACK_TICK_SPACING,
             twapWindow: DEFAULT_BUYBACK_TWAP_WINDOW,
-            terminalToken: terminalToken
+            terminalToken: terminalToken,
+            sqrtPriceX96: uint160(1 << 96)
         }) {}
-            catch {} // Pool may not be initialized yet — that's OK.
+            catch {} // Pool may already be initialized — that's OK.
     }
 
     /// @notice Make a ruleset configuration for a revnet's stage.
@@ -1063,6 +1059,15 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
             salt: keccak256(abi.encode(configuration.description.salt, encodedConfigurationHash, _msgSender()))
         });
 
+        // Now that the ERC-20 exists, initialize buyback pools for each terminal token.
+        for (uint256 i; i < terminalConfigurations.length; i++) {
+            JBTerminalConfig calldata terminalConfiguration = terminalConfigurations[i];
+            for (uint256 j; j < terminalConfiguration.accountingContextsToAccept.length; j++) {
+                // slither-disable-next-line calls-loop
+                _tryInitializeBuybackPoolFor(revnetId, terminalConfiguration.accountingContextsToAccept[j].token);
+            }
+        }
+
         // Give the split operator their permissions.
         _setSplitOperatorOf({revnetId: revnetId, operator: configuration.splitOperator});
 
@@ -1153,10 +1158,9 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
             configuration.description.salt
         );
 
-        // Initialize fund access limit groups for the loan contract and configure buyback pools.
-        JBFundAccessLimitGroup[] memory fundAccessLimitGroups = _makeLoanFundAccessLimitsAndBuybackPools({
-            revnetId: revnetId, terminalConfigurations: terminalConfigurations
-        });
+        // Initialize fund access limit groups for the loan contract.
+        JBFundAccessLimitGroup[] memory fundAccessLimitGroups =
+            _makeLoanFundAccessLimits({terminalConfigurations: terminalConfigurations});
 
         // Iterate through each stage to set up its ruleset.
         for (uint256 i; i < configuration.stageConfigurations.length; i++) {

package/src/REVLoans.sol

@@ -1206,6 +1206,7 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
     /// @param sourceFeeAmount The amount of the fee being taken from the revnet acting as the source of the loan.
     /// @param collateralCountToReturn The amount of collateral being returned that the loan no longer requires.
     /// @param beneficiary The address receiving the returned collateral and any tokens resulting from paying fees.
+    // slither-disable-next-line reentrancy-eth,reentrancy-events
     function _repayLoan(
         uint256 loanId,
         REVLoan storage loan,

package/test/{REVDeployerAuditRegressions.t.sol → REVDeployerRegressions.t.sol}

@@ -29,7 +29,7 @@ import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressReg
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 
 /// @notice Regression tests for REVDeployer.
-contract REVDeployerRegressions_Local is TestBaseWorkflow {
+contract REVDeployerRegressions is TestBaseWorkflow {
     using JBRulesetMetadataResolver for JBRuleset;
 
     bytes32 REV_DEPLOYER_SALT = "REVDeployer";