@bananapus/721-hook-v6 0.0.12 → 0.0.14

package/ARCHITECTURE.md

@@ -26,13 +26,18 @@ src/
 ### NFT Minting (via Payment)
 ```
 User → JBMultiTerminal.pay(metadata)
+  → beforePayRecordedWith()
+    → calculateSplitAmounts(): per-tier split amounts (in tier pricing denomination)
+    → convertSplitAmounts(): convert to payment token denomination (if currencies differ)
+    → Adjust weight down by split fraction
   → JBTerminalStore records payment
-  → JB721TiersHook.afterPayRecordedWith()
+  → afterPayRecordedWith()
     → Decode tier IDs from metadata
     → For each tier:
       → Validate: not removed, not paused, supply available
-      → Check price (with optional discount)
+      → Check price (with optional discount, normalized to tier pricing currency)
       → Mint NFT to beneficiary
+    → Distribute split funds to tier split recipients
     → Leftover amount optionally mints best-available tiers
 ```
 

package/RISKS.md

@@ -90,10 +90,10 @@ Deep implementation-level risk analysis covering all contracts in the 721 tiered
 ### R-9: Price Feed Dependency -- DoS Vector
 
 - **Severity**: MEDIUM
-- **Location**: `JB721TiersHookLib.sol` lines 121-138 (`normalizePaymentValue`)
-- **Description**: When the hook's pricing currency differs from the payment currency and a `JBPrices` contract is configured, the hook calls `prices.pricePerUnitOf()` to normalize the payment value. If the price feed reverts (e.g., stale Chainlink data, sequencer down on L2), all payments in non-native currencies will revert. This is a DoS vector but not a fund-loss vector.
-- **Tested**: NOT directly tested for the revert-on-stale-feed scenario.
-- **Mitigation**: If `address(prices) == address(0)`, payments in non-matching currencies silently return `(0, false)` and the hook skips minting (line 600). Projects using cross-currency pricing should monitor feed health.
+- **Location**: `JB721TiersHookLib.sol` — `normalizePaymentValue` and `convertSplitAmounts`
+- **Description**: When the hook's pricing currency differs from the payment currency and a `JBPrices` contract is configured, the hook calls `prices.pricePerUnitOf()` in two places: (1) `normalizePaymentValue` to convert the payment amount for tier price comparison, and (2) `convertSplitAmounts` to convert per-tier split amounts back to the payment token denomination for forwarding. If the price feed reverts (e.g., stale Chainlink data, sequencer down on L2), all payments in non-native currencies will revert. This is a DoS vector but not a fund-loss vector.
+- **Tested**: YES — `test/unit/pay_CrossCurrency_Unit.t.sol` tests 8-9 verify reverting price feeds block both `normalizePaymentValue` and `convertSplitAmounts`. Live cross-currency split conversion tested in `deploy-all-v6/test/fork/CrossCurrencyFork.t.sol`.
+- **Mitigation**: If `address(prices) == address(0)`, payments in non-matching currencies silently return `(0, false)` and the hook skips minting. `convertSplitAmounts` also returns early if no prices contract is set. Projects using cross-currency pricing should monitor feed health.
 
 ### R-10: Large Tier Array Gas Exhaustion
 
@@ -258,7 +258,7 @@ An attacker could observe a large cash-out and front-run it with their own cash-
 | R-6 Soft removal cash-out weight | YES (attacks t5) | YES (INV-721-2) | YES |
 | R-7 Pay credit payer/beneficiary | PARTIAL | YES (INV-721-3) | YES |
 | R-8 Reserve supply protection | YES (M6) | YES (INV-721-1,4) | YES |
-| R-9 Price feed DoS | NO | NO | NO |
+| R-9 Price feed DoS | YES (cc t8-t9) | NO | NO |
 | R-10 Large tier array gas | PARTIAL | NO | NO |
 | R-11 Metadata decode silent skip | PARTIAL | NO | NO |
 | R-12 ERC-721 receiver DoS | NO | NO | NO |
@@ -285,7 +285,7 @@ An attacker could observe a large cash-out and front-run it with their own cash-
 ### Notable Coverage Gaps
 
 1. **No reentrancy test** for the split distribution `.call{value}` path.
-2. **No price feed failure test** for cross-currency payment scenarios.
+2. **Price feed failure** is tested: `test/unit/pay_CrossCurrency_Unit.t.sol` tests 8-9 verify reverting price feeds block both payment normalization and split conversion. Live feed integration tested in `deploy-all-v6`.
 3. **No gas limit test** for operations with many tiers (hundreds+).
 4. **No test** for token URI resolver returning malicious/reverting data.
 5. **No test** for `initialize()` front-running on deterministic clones.

package/SKILLS.md

@@ -59,7 +59,8 @@ Tiered ERC-721 NFT hook for Juicebox V6 that mints NFTs when a project is paid a
 | `cashOutWeightOf(hook, tokenIds)` | `JB721TiersHookStore` | Returns combined cash out weight for specific token IDs. Uses original tier price, not discounted. |
 | `votingUnitsOf(hook, account)` | `JB721TiersHookStore` | Returns total voting units for an address across all tiers. Uses custom `votingUnits` if `useVotingUnits` is set, otherwise uses tier price. |
 | `tierVotingUnitsOf(hook, account, tierId)` | `JB721TiersHookStore` | Returns voting units for an address within a specific tier. |
-| `calculateSplitAmounts(store, hook, metadataIdTarget, metadata)` | `JB721TiersHookLib` | Called in `beforePayRecordedWith`. Decodes tier IDs from payer metadata, looks up each tier's `splitPercent`, calculates `mulDiv(price, splitPercent, SPLITS_TOTAL_PERCENT)` per tier, returns `totalSplitAmount` (forwarded to hook as `amount`) and encoded `hookMetadata` (tier IDs + amounts). |
+| `calculateSplitAmounts(store, hook, metadataIdTarget, metadata)` | `JB721TiersHookLib` | Called in `beforePayRecordedWith`. Decodes tier IDs from payer metadata, looks up each tier's `splitPercent`, calculates `mulDiv(price, splitPercent, SPLITS_TOTAL_PERCENT)` per tier, returns `totalSplitAmount` and encoded `hookMetadata` (tier IDs + amounts). Amounts are in the tier pricing denomination — call `convertSplitAmounts` afterward when the payment currency differs. |
+| `convertSplitAmounts(totalSplitAmount, splitMetadata, packedPricingContext, projectId, amountCurrency, amountDecimals)` | `JB721TiersHookLib` | Converts per-tier split amounts from tier pricing denomination to payment token denomination using `JBPrices.pricePerUnitOf`. Called automatically by `beforePayRecordedWith` when `totalSplitAmount != 0`. Returns early (no-op) when currencies match or no prices contract is configured. |
 | `distributeAll(directory, splits, projectId, hookAddress, token, encodedSplitData)` | `JB721TiersHookLib` | Called in `afterPayRecordedWith`. Decodes per-tier amounts, looks up each tier's splits from `JBSplits` by group ID (`hookAddress | (tierId << 160)`), distributes to split recipients. Leftover goes to project balance via `addToBalance`. |
 | `adjustTiersFor(store, splits, projectId, hookAddress, caller, tiersToAdd, tierIdsToRemove)` | `JB721TiersHookLib` | Called via DELEGATECALL from `adjustTiers`. Removes tiers, adds tiers, emits events, and registers any configured splits directly in `JBSplits`. |
 | `normalizePaymentValue(packedPricingContext, projectId, amountValue, amountCurrency, amountDecimals)` | `JB721TiersHookLib` | Converts a payment value to the hook's pricing currency using `JBPrices`. Returns `(0, false)` if currencies differ and no prices contract is set. |
@@ -138,7 +139,7 @@ Each tier has configurable voting power:
 - Each tier can route a percentage of its mint price to configured split recipients. The `splitPercent` field (out of `JBConstants.SPLITS_TOTAL_PERCENT` = 1,000,000,000) determines how much of the price is forwarded.
 - Split recipients are stored in `JBSplits` using group IDs computed as `uint256(uint160(hookAddress)) | (uint256(tierId) << 160)`.
 - Splits are registered in `JBSplits` both during `initialize()` (for tiers included at launch) and during `adjustTiers()` (for tiers added later), using the hook's `SPLITS` immutable directly.
-- In `beforePayRecordedWith`, `calculateSplitAmounts` decodes tier IDs from payer metadata, computes `mulDiv(price, splitPercent, SPLITS_TOTAL_PERCENT)` per tier, and returns the total to be forwarded to the hook. The weight is adjusted down proportionally unless the `issueTokensForSplits` flag is set, in which case the full `context.weight` is returned.
+- In `beforePayRecordedWith`, `calculateSplitAmounts` decodes tier IDs from payer metadata, computes `mulDiv(price, splitPercent, SPLITS_TOTAL_PERCENT)` per tier, and returns the total to be forwarded to the hook. If the payment currency differs from the tier pricing currency, `convertSplitAmounts` converts the amounts to the payment token denomination using the configured `JBPrices` contract. The weight is adjusted down proportionally unless the `issueTokensForSplits` flag is set, in which case the full `context.weight` is returned.
 - In `afterPayRecordedWith`, `distributeAll` distributes forwarded funds to each tier's split group recipients. Leftover after all splits goes back to the project's balance via `addToBalance`.
 - Split recipients can be projects (via `terminal.pay` or `terminal.addToBalance`) or plain addresses (direct ETH transfer or `SafeERC20.safeTransfer`). Splits with no `projectId` and no `beneficiary` are skipped -- their share stays in the leftover and is routed to the project's own balance via `addToBalanceOf`, preventing a misconfigured split from bricking the payout distribution.
 

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,12 +333,14 @@ 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)
+**Optional sections (add only when needed):**
+- `[rpc_endpoints]` — repos with fork tests. Maps named endpoints to env vars (e.g. `ethereum = "${RPC_ETHEREUM_MAINNET}"`).
+- `[profile.ci_sizes]` — only when CI needs different optimizer settings than defaults for the size check step (e.g. `optimizer_runs = 200` when the default profile uses a lower value).
 
-This repo uses the standard config with no deviations: `cancun`, `optimizer_runs=200`, no `via_ir`.
+**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
 
@@ -386,8 +370,10 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
       - name: Run tests
         run: forge test --fail-fast --summary --detailed --skip "*/script/**"
+        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:**
@@ -409,11 +395,60 @@ 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
 {
-  "name": "@bananapus/721-hook-v6",
+  "name": "@bananapus/package-name-v6",
   "version": "x.x.x",
   "license": "MIT",
   "repository": { "type": "git", "url": "git+https://github.com/Org/repo.git" },
@@ -433,13 +468,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
 
@@ -467,4 +551,8 @@ CI checks formatting via `forge fmt --check`.
 
 ### Contract Size Checks
 
-CI runs `FOUNDRY_PROFILE=ci_sizes forge build --sizes` to catch contracts approaching the 24KB limit. The `ci_sizes` profile uses `optimizer_runs = 200` for realistic size measurement even when the default profile has different optimizer settings.
+CI runs `forge build --sizes` to catch contracts approaching the 24KB limit. When the repo's default `optimizer_runs` differs from what you want for size checking, use `FOUNDRY_PROFILE=ci_sizes forge build --sizes` with a `[profile.ci_sizes]` section in `foundry.toml`.
+
+## Repo-Specific Deviations
+
+None. This repo follows the standard configuration exactly.

package/foundry.toml

@@ -5,9 +5,6 @@ optimizer_runs = 200
 libs = ["node_modules", "lib"]
 fs_permissions = [{ access = "read-write", path = "./"}]
 
-[profile.ci_sizes]
-optimizer_runs = 200
-
 [fuzz]
 runs = 4096
 
@@ -20,3 +17,6 @@ fail_on_revert = false
 number_underscore = "thousands"
 multiline_func_header = "all"
 wrap_comments = true
+
+[rpc_endpoints]
+ethereum = "${RPC_ETHEREUM_MAINNET}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/721-hook-v6",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -17,11 +17,11 @@
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'nana-721-hook-v6'"
   },
   "dependencies": {
-    "@bananapus/address-registry-v6": "^0.0.6",
-    "@bananapus/core-v6": "^0.0.12",
+    "@bananapus/address-registry-v6": "^0.0.8",
+    "@bananapus/core-v6": "^0.0.15",
     "@bananapus/ownable-v6": "^0.0.7",
-    "@bananapus/permission-ids-v6": "^0.0.6",
-    "@openzeppelin/contracts": "5.2.0",
+    "@bananapus/permission-ids-v6": "^0.0.7",
+    "@openzeppelin/contracts": "^5.6.1",
     "@prb/math": "^4.1.0",
     "solady": "^0.1.8"
   },

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

@@ -4,7 +4,7 @@ pragma solidity 0.8.26;
 import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
 import "@bananapus/address-registry-v6/script/helpers/AddressRegistryDeploymentLib.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 {JB721TiersHookDeployer} from "../src/JB721TiersHookDeployer.sol";

package/script/helpers/Hook721DeploymentLib.sol

@@ -4,7 +4,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 {IJB721TiersHookDeployer} from "../../src/interfaces/IJB721TiersHookDeployer.sol";
 import {IJB721TiersHookProjectDeployer} from "../../src/interfaces/IJB721TiersHookProjectDeployer.sol";

package/src/JB721TiersHook.sol

@@ -7,6 +7,7 @@ import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
 import {IJBRulesetDataHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetDataHook.sol";
 import {IJBRulesets} from "@bananapus/core-v6/src/interfaces/IJBRulesets.sol";
 import {IJBSplits} from "@bananapus/core-v6/src/interfaces/IJBSplits.sol";
+import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 import {JBMetadataResolver} from "@bananapus/core-v6/src/libraries/JBMetadataResolver.sol";
 import {JBRulesetMetadataResolver} from "@bananapus/core-v6/src/libraries/JBRulesetMetadataResolver.sol";
 import {JBAfterPayRecordedContext} from "@bananapus/core-v6/src/structs/JBAfterPayRecordedContext.sol";
@@ -16,6 +17,8 @@ import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
 import {JBOwnable} from "@bananapus/ownable-v6/src/JBOwnable.sol";
 import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
 import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {Context} from "@openzeppelin/contracts/utils/Context.sol";
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {JB721Hook} from "./abstract/JB721Hook.sol";
@@ -38,6 +41,8 @@ import {JB721TiersSetDiscountPercentConfig} from "./structs/JB721TiersSetDiscoun
 /// information specified by the payer. The project's owner can enable NFT cash outs through this hook, allowing
 /// holders to burn their NFTs to reclaim funds from the project (in proportion to the NFT's price).
 contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook {
+    using SafeERC20 for IERC20;
+
     //*********************************************************************//
     // --------------------------- custom errors ------------------------- //
     //*********************************************************************//
@@ -186,6 +191,18 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
         (uint256 totalSplitAmount, bytes memory splitMetadata) =
             JB721TiersHookLib.calculateSplitAmounts(STORE, address(this), METADATA_ID_TARGET, context.metadata);
 
+        // Convert split amounts from tier pricing to payment token denomination if currencies differ.
+        if (totalSplitAmount != 0) {
+            (totalSplitAmount, splitMetadata) = JB721TiersHookLib.convertSplitAmounts(
+                totalSplitAmount,
+                splitMetadata,
+                _packedPricingContext,
+                context.projectId,
+                context.amount.currency,
+                context.amount.decimals
+            );
+        }
+
         // Adjust weight so the terminal mints tokens only for the amount that actually enters the project.
         if (totalSplitAmount == 0 || STORE.flagsOf(address(this)).issueTokensForSplits) {
             // No splits, or hook configured to give full token credit regardless — full weight.
@@ -675,6 +692,12 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
 
         // Distribute any forwarded funds to tier split groups.
         if (context.hookMetadata.length != 0 && context.forwardedAmount.value != 0) {
+            // For ERC20 tokens, pull from terminal using the allowance it granted via _beforeTransferTo.
+            if (context.forwardedAmount.token != JBConstants.NATIVE_TOKEN) {
+                IERC20(context.forwardedAmount.token)
+                    .safeTransferFrom(msg.sender, address(this), context.forwardedAmount.value);
+            }
+
             JB721TiersHookLib.distributeAll(
                 DIRECTORY, SPLITS, PROJECT_ID, address(this), context.forwardedAmount.token, context.hookMetadata
             );

package/src/libraries/JB721TiersHookLib.sol

@@ -189,6 +189,50 @@ library JB721TiersHookLib {
         }
     }
 
+    /// @notice Converts split amounts from tier pricing denomination to payment token denomination.
+    /// @dev Called after `calculateSplitAmounts` when the payment currency differs from the tier pricing currency.
+    /// @param totalSplitAmount The total split amount in tier pricing denomination.
+    /// @param splitMetadata The encoded per-tier breakdown (tierIds, amounts) from calculateSplitAmounts.
+    /// @param packedPricingContext The packed pricing context (currency, decimals, prices address).
+    /// @param projectId The project ID.
+    /// @param amountCurrency The payment amount currency.
+    /// @param amountDecimals The payment amount decimals.
+    /// @return convertedTotal The total split amount converted to payment token denomination.
+    /// @return convertedMetadata The re-encoded per-tier breakdown with converted amounts.
+    function convertSplitAmounts(
+        uint256 totalSplitAmount,
+        bytes memory splitMetadata,
+        uint256 packedPricingContext,
+        uint256 projectId,
+        uint256 amountCurrency,
+        uint256 amountDecimals
+    )
+        external
+        view
+        returns (uint256 convertedTotal, bytes memory convertedMetadata)
+    {
+        uint256 pricingCurrency = uint256(uint32(packedPricingContext));
+        if (amountCurrency == pricingCurrency) return (totalSplitAmount, splitMetadata);
+
+        IJBPrices prices = IJBPrices(address(uint160(packedPricingContext >> 40)));
+        if (address(prices) == address(0)) return (totalSplitAmount, splitMetadata);
+
+        uint256 pricingDecimals = uint256(uint8(packedPricingContext >> 32));
+        uint256 ratio = prices.pricePerUnitOf({
+            projectId: projectId,
+            pricingCurrency: amountCurrency,
+            unitCurrency: pricingCurrency,
+            decimals: amountDecimals
+        });
+
+        (uint16[] memory tierIds, uint256[] memory amounts) = abi.decode(splitMetadata, (uint16[], uint256[]));
+        for (uint256 i; i < amounts.length; i++) {
+            amounts[i] = mulDiv(amounts[i], ratio, 10 ** pricingDecimals);
+            convertedTotal += amounts[i];
+        }
+        convertedMetadata = abi.encode(tierIds, amounts);
+    }
+
     /// @notice Sets split groups in JBSplits for tiers that have splits configured.
     function _setSplitGroupsFor(
         IJBSplits splits,

package/test/Fork.t.sol

@@ -122,12 +122,7 @@ contract Fork_721Hook_Test is Test {
     receive() external payable {}
 
     function setUp() public {
-        string memory rpcUrl = vm.envOr("RPC_ETHEREUM_MAINNET", string(""));
-        if (bytes(rpcUrl).length == 0) {
-            vm.skip(true);
-            return;
-        }
-        vm.createSelectFork(rpcUrl);
+        vm.createSelectFork("ethereum");
 
         _deployJBCore();
         _deploy721Hook();
@@ -345,7 +340,7 @@ contract Fork_721Hook_Test is Test {
 
     /// @dev Build pay metadata that requests specific tier IDs. `allowOverspending` controls revert behavior.
     function _buildPayMetadata(
-        address hook,
+        address,
         uint16[] memory tierIds,
         bool allowOverspending
     )
@@ -361,7 +356,7 @@ contract Fork_721Hook_Test is Test {
     }
 
     /// @dev Build cash out metadata that specifies token IDs to burn.
-    function _buildCashOutMetadata(address hook, uint256[] memory tokenIds) internal view returns (bytes memory) {
+    function _buildCashOutMetadata(address, uint256[] memory tokenIds) internal view returns (bytes memory) {
         bytes[] memory data = new bytes[](1);
         data[0] = abi.encode(tokenIds);
         bytes4[] memory ids = new bytes4[](1);
@@ -734,7 +729,7 @@ contract Fork_721Hook_Test is Test {
         tierConfigs[0].reserveFrequency = 0; // Initial tier has no reserves (allowed).
         JB721TiersHookFlags memory flags = _defaultFlags();
         flags.noNewTiersWithReserves = true;
-        (uint256 projectId, address hook) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
+        (, address hook) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
 
         // Try to add a new tier with reserves.
         JB721TierConfig[] memory newTiers = new JB721TierConfig[](1);
@@ -767,7 +762,7 @@ contract Fork_721Hook_Test is Test {
         JB721TierConfig[] memory tierConfigs = _makeStandardTiers(1, 10, false);
         JB721TiersHookFlags memory flags = _defaultFlags();
         flags.noNewTiersWithOwnerMinting = true;
-        (uint256 projectId, address hook) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
+        (, address hook) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
 
         JB721TierConfig[] memory newTiers = new JB721TierConfig[](1);
         newTiers[0] = JB721TierConfig({
@@ -799,7 +794,7 @@ contract Fork_721Hook_Test is Test {
         JB721TierConfig[] memory tierConfigs = _makeStandardTiers(1, 10, false);
         tierConfigs[0].cannotBeRemoved = true;
         JB721TiersHookFlags memory flags = _defaultFlags();
-        (uint256 projectId, address hook) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
+        (, address hook) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
 
         uint256[] memory toRemove = new uint256[](1);
         toRemove[0] = 1;
@@ -864,7 +859,7 @@ contract Fork_721Hook_Test is Test {
         tierConfigs[0].discountPercent = 50;
         tierConfigs[0].cannotIncreaseDiscountPercent = true;
         JB721TiersHookFlags memory flags = _defaultFlags();
-        (uint256 projectId, address hook) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
+        (, address hook) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
 
         vm.prank(multisig);
         vm.expectRevert();
@@ -1037,7 +1032,7 @@ contract Fork_721Hook_Test is Test {
         JB721TierConfig[] memory tierConfigs = _makeStandardTiers(1, 10, true); // allowOwnerMint=true
         tierConfigs[0].reserveFrequency = 0; // No reserves (required: can't have both).
         JB721TiersHookFlags memory flags = _defaultFlags();
-        (uint256 projectId, address hook) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
+        (, address hook) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
 
         uint16[] memory tierIds = new uint16[](2);
         tierIds[0] = 1;
@@ -1054,7 +1049,7 @@ contract Fork_721Hook_Test is Test {
         JB721TierConfig[] memory tierConfigs = _makeStandardTiers(1, 10, true);
         tierConfigs[0].reserveFrequency = 0;
         JB721TiersHookFlags memory flags = _defaultFlags();
-        (uint256 projectId, address hook) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
+        (, address hook) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
 
         uint16[] memory tierIds = new uint16[](1);
         tierIds[0] = 1;
@@ -1408,7 +1403,7 @@ contract Fork_721Hook_Test is Test {
 
     /// @notice Calling initialize() again on a deployed hook should revert.
     function test_fork_reInitialize_reverts() public {
-        (uint256 projectId, address hook,) = _launchStandardProject();
+        (, address hook,) = _launchStandardProject();
 
         JB721TierConfig[] memory emptyTiers = new JB721TierConfig[](0);
 
@@ -1468,7 +1463,7 @@ contract Fork_721Hook_Test is Test {
 
     /// @notice Non-owner cannot adjustTiers.
     function test_fork_adjustTiers_noPermission_reverts() public {
-        (uint256 projectId, address hook,) = _launchStandardProject();
+        (, address hook,) = _launchStandardProject();
 
         JB721TierConfig[] memory newTiers = new JB721TierConfig[](1);
         newTiers[0] = JB721TierConfig({
@@ -1906,7 +1901,7 @@ contract Fork_721Hook_Test is Test {
         JB721TiersHookFlags memory flags = _defaultFlags();
 
         (uint256 projectId1, address hook1) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
-        (uint256 projectId2, address hook2) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
+        (, address hook2) = _launchProject(tierConfigs, flags, 5000, true, 0x00);
 
         assertTrue(hook1 != hook2, "hooks are different clones");
 
@@ -1989,7 +1984,7 @@ contract Fork_721Hook_Test is Test {
         uint24 category
     )
         internal
-        view
+        pure
         returns (JB721TierConfig memory)
     {
         return JB721TierConfig({