@bananapus/suckers-v6 0.0.68 → 0.0.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/suckers-v6",
-  "version": "0.0.68",
+  "version": "0.0.69",
   "license": "MIT",
   "repository": {
     "type": "git",

package/script/Deploy.s.sol

@@ -84,7 +84,7 @@ contract DeployScript is Script, Sphinx {
         bool registryAlreadyDeployed = _isDeployed({
             salt: _REGISTRY_SALT,
             creationCode: type(JBSuckerRegistry).creationCode,
-            arguments: abi.encode(core.directory, core.permissions, safeAddress(), trustedForwarder)
+            arguments: abi.encode(core.directory, core.permissions, core.prices, safeAddress(), trustedForwarder)
         });
 
         if (!registryAlreadyDeployed) {
@@ -93,6 +93,7 @@ contract DeployScript is Script, Sphinx {
                     new JBSuckerRegistry{salt: _REGISTRY_SALT}({
                         directory: core.directory,
                         permissions: core.permissions,
+                        prices: core.prices,
                         initialOwner: safeAddress(),
                         trustedForwarder: trustedForwarder
                     })
@@ -106,7 +107,7 @@ contract DeployScript is Script, Sphinx {
                     initCodeHash: keccak256(
                         abi.encodePacked(
                             type(JBSuckerRegistry).creationCode,
-                            abi.encode(core.directory, core.permissions, safeAddress(), trustedForwarder)
+                            abi.encode(core.directory, core.permissions, core.prices, safeAddress(), trustedForwarder)
                         )
                     ),
                     deployer: address(0x4e59b44847b379578588920cA78FbF26c0B4956C)
@@ -210,7 +211,6 @@ contract DeployScript is Script, Sphinx {
                     deployer: _opDeployer,
                     directory: core.directory,
                     permissions: core.permissions,
-                    prices: core.prices,
                     tokens: core.tokens,
                     feeProjectId: 1,
                     registry: registry,
@@ -262,7 +262,6 @@ contract DeployScript is Script, Sphinx {
                     deployer: _opDeployer,
                     directory: core.directory,
                     permissions: core.permissions,
-                    prices: core.prices,
                     tokens: core.tokens,
                     feeProjectId: 1,
                     registry: registry,
@@ -345,7 +344,6 @@ contract DeployScript is Script, Sphinx {
                     deployer: _baseDeployer,
                     directory: core.directory,
                     permissions: core.permissions,
-                    prices: core.prices,
                     tokens: core.tokens,
                     feeProjectId: 1,
                     registry: registry,
@@ -397,7 +395,6 @@ contract DeployScript is Script, Sphinx {
                     deployer: _baseDeployer,
                     directory: core.directory,
                     permissions: core.permissions,
-                    prices: core.prices,
                     tokens: core.tokens,
                     feeProjectId: 1,
                     registry: registry,
@@ -476,7 +473,6 @@ contract DeployScript is Script, Sphinx {
                     deployer: _arbDeployer,
                     directory: core.directory,
                     permissions: core.permissions,
-                    prices: core.prices,
                     tokens: core.tokens,
                     feeProjectId: 1,
                     registry: registry,
@@ -531,7 +527,6 @@ contract DeployScript is Script, Sphinx {
                     deployer: _arbDeployer,
                     directory: core.directory,
                     permissions: core.permissions,
-                    prices: core.prices,
                     tokens: core.tokens,
                     feeProjectId: 1,
                     registry: registry,
@@ -708,7 +703,6 @@ contract DeployScript is Script, Sphinx {
             salt: salt,
             directory: core.directory,
             permissions: core.permissions,
-            prices: core.prices,
             tokens: core.tokens,
             configurator: safeAddress(),
             forwarder: trustedForwarder,
@@ -725,7 +719,6 @@ contract DeployScript is Script, Sphinx {
         bytes32 salt,
         IJBDirectory directory,
         IJBPermissions permissions,
-        IJBPrices prices,
         IJBTokens tokens,
         address configurator,
         address forwarder,
@@ -781,7 +774,6 @@ contract DeployScript is Script, Sphinx {
                 directory: directory,
                 tokens: tokens,
                 permissions: permissions,
-                prices: prices,
                 feeProjectId: 1,
                 registry: registry,
                 trustedForwarder: forwarder

package/src/JBArbitrumSucker.sol

@@ -8,7 +8,6 @@ import {AddressAliasHelper} from "@arbitrum/nitro-contracts/src/libraries/Addres
 import {ArbSys} from "@arbitrum/nitro-contracts/src/precompiles/ArbSys.sol";
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
 import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
@@ -56,19 +55,17 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
 
     /// @param directory A contract storing directories of terminals and controllers for each project.
     /// @param permissions A contract storing permissions.
-    /// @param prices The price oracle used to convert peer-chain balances and surplus.
     /// @param tokens A contract that manages token minting and burning.
     constructor(
         JBArbitrumSuckerDeployer deployer,
         IJBDirectory directory,
         IJBPermissions permissions,
-        IJBPrices prices,
         IJBTokens tokens,
         uint256 feeProjectId,
         IJBSuckerRegistry registry,
         address trustedForwarder
     )
-        JBSucker(directory, permissions, prices, tokens, feeProjectId, registry, trustedForwarder)
+        JBSucker(directory, permissions, tokens, feeProjectId, registry, trustedForwarder)
     {
         GATEWAYROUTER = JBArbitrumSuckerDeployer(deployer).arbGatewayRouter();
         ARBINBOX = JBArbitrumSuckerDeployer(deployer).arbInbox();

package/src/JBBaseSucker.sol

@@ -3,7 +3,6 @@ pragma solidity 0.8.28;
 
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
 import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
 
 import {JBOptimismSucker} from "./JBOptimismSucker.sol";
@@ -19,19 +18,17 @@ contract JBBaseSucker is JBOptimismSucker {
     /// @param deployer A contract that deploys clones of this contract.
     /// @param directory A contract storing directories of terminals and controllers for each project.
     /// @param permissions A contract storing permissions.
-    /// @param prices The price oracle used to convert peer-chain balances and surplus.
     /// @param tokens A contract that manages token minting and burning.
     constructor(
         JBOptimismSuckerDeployer deployer,
         IJBDirectory directory,
         IJBPermissions permissions,
-        IJBPrices prices,
         IJBTokens tokens,
         uint256 feeProjectId,
         IJBSuckerRegistry registry,
         address trustedForwarder
     )
-        JBOptimismSucker(deployer, directory, permissions, prices, tokens, feeProjectId, registry, trustedForwarder)
+        JBOptimismSucker(deployer, directory, permissions, tokens, feeProjectId, registry, trustedForwarder)
     {}
 
     //*********************************************************************//

package/src/JBCCIPSucker.sol

@@ -4,7 +4,6 @@ pragma solidity 0.8.28;
 // External packages (alphabetized)
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
 import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 import {IAny2EVMMessageReceiver} from "@chainlink/contracts-ccip/contracts/interfaces/IAny2EVMMessageReceiver.sol";
@@ -83,7 +82,6 @@ contract JBCCIPSucker is JBSucker, IAny2EVMMessageReceiver {
     /// @param deployer A contract that deploys the clones for this contract.
     /// @param directory A contract storing directories of terminals and controllers for each project.
     /// @param permissions A contract storing permissions.
-    /// @param prices The price oracle used to convert peer-chain balances and surplus.
     /// @param tokens A contract that manages token minting and burning.
     /// @param feeProjectId The ID of the project that receives fees.
     /// @param registry The sucker registry that tracks deployed suckers.
@@ -92,13 +90,12 @@ contract JBCCIPSucker is JBSucker, IAny2EVMMessageReceiver {
         JBCCIPSuckerDeployer deployer,
         IJBDirectory directory,
         IJBPermissions permissions,
-        IJBPrices prices,
         IJBTokens tokens,
         uint256 feeProjectId,
         IJBSuckerRegistry registry,
         address trustedForwarder
     )
-        JBSucker(directory, permissions, prices, tokens, feeProjectId, registry, trustedForwarder)
+        JBSucker(directory, permissions, tokens, feeProjectId, registry, trustedForwarder)
     {
         // Read the remote chain ID from the deployer.
         REMOTE_CHAIN_ID = IJBCCIPSuckerDeployer(deployer).ccipRemoteChainId();

package/src/JBOptimismSucker.sol

@@ -3,7 +3,6 @@ pragma solidity 0.8.28;
 
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
 import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
@@ -39,19 +38,17 @@ contract JBOptimismSucker is JBSucker, IJBOptimismSucker {
     /// @param deployer A contract that deploys clones of this contract.
     /// @param directory A contract storing directories of terminals and controllers for each project.
     /// @param permissions A contract storing permissions.
-    /// @param prices The price oracle used to convert peer-chain balances and surplus.
     /// @param tokens A contract that manages token minting and burning.
     constructor(
         JBOptimismSuckerDeployer deployer,
         IJBDirectory directory,
         IJBPermissions permissions,
-        IJBPrices prices,
         IJBTokens tokens,
         uint256 feeProjectId,
         IJBSuckerRegistry registry,
         address trustedForwarder
     )
-        JBSucker(directory, permissions, prices, tokens, feeProjectId, registry, trustedForwarder)
+        JBSucker(directory, permissions, tokens, feeProjectId, registry, trustedForwarder)
     {
         // Fetch the messenger and bridge by doing a callback to the deployer contract.
         OPBRIDGE = JBOptimismSuckerDeployer(deployer).opBridge();

package/src/JBSucker.sol

@@ -7,11 +7,12 @@ import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPermissioned} from "@bananapus/core-v6/src/interfaces/IJBPermissioned.sol";
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
 import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
 import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
 import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
+import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+import {JBFixedPointNumber} from "@bananapus/core-v6/src/libraries/JBFixedPointNumber.sol";
 import {JBPermissioned} from "@bananapus/core-v6/src/abstract/JBPermissioned.sol";
 import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
 import {BitMaps} from "@openzeppelin/contracts/utils/structs/BitMaps.sol";
@@ -36,9 +37,10 @@ import {MerkleLib} from "./utils/MerkleLib.sol";
 
 // Local: structs (alphabetized)
 import {JBClaim} from "./structs/JBClaim.sol";
-import {JBDenominatedAmount} from "./structs/JBDenominatedAmount.sol";
 import {JBInboxTreeRoot} from "./structs/JBInboxTreeRoot.sol";
 import {JBMessageRoot} from "./structs/JBMessageRoot.sol";
+import {JBPeerChainContext} from "./structs/JBPeerChainContext.sol";
+import {JBSourceContext} from "./structs/JBSourceContext.sol";
 import {JBOutboxTree} from "./structs/JBOutboxTree.sol";
 import {JBPeerChainValue} from "./structs/JBPeerChainValue.sol";
 import {JBRemoteToken} from "./structs/JBRemoteToken.sol";
@@ -132,9 +134,6 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     /// @notice The project ID that receives the `toRemoteFee` payment. Typically the protocol project (ID 1).
     uint256 public immutable FEE_PROJECT_ID;
 
-    /// @notice The price oracle used to convert peer-chain balances and surplus.
-    IJBPrices public immutable PRICES;
-
     /// @notice The project registry (ERC-721 ownership).
     IJBProjects public immutable override PROJECTS;
 
@@ -177,6 +176,12 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     /// @notice The retained failed transport-payment refund ETH owed to each original bridge caller.
     mapping(address account => uint256 amount) public retainedTransportPaymentRefundOf;
 
+    /// @notice The source chain freshness key for the most recent accepted peer snapshot.
+    /// @dev Only snapshots with a strictly newer source freshness key are accepted, preventing stale rollbacks.
+    /// The historical name is retained for ABI compatibility with the `JBMessageRoot.sourceTimestamp` field.
+    /// Returns 0 if no snapshot has been received yet.
+    uint256 public snapshotTimestamp;
+
     //*********************************************************************//
     // -------------------- internal stored properties ------------------- //
     //*********************************************************************//
@@ -230,29 +235,28 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     // -------------------- private stored properties -------------------- //
     //*********************************************************************//
 
+    /// @notice Caches a local token's authoritative accounting-context currency, derived once and reused on later
+    /// snapshots. A project's accounting-context currency is immutable once set, so the cached value never goes stale;
+    /// only an authoritative read is cached (a not-yet-configured token uses the convention without caching, so a later
+    /// snapshot re-reads it once its context exists).
+    /// @custom:param token The local token.
+    mapping(address token => uint32 currency) private _cachedCurrencyOf;
+
     /// @notice The ID of the project (on the local chain) that this sucker is associated with.
     uint256 private _localProjectId;
 
-    /// @notice The last known project-wide surplus on the peer chain. Updated each time a bridge message is received.
-    /// @dev The `currency` and `decimals` fields describe the denomination; `value` is the surplus amount.
-    JBDenominatedAmount private _peerChainSurplus;
+    /// @notice Tie-breaker mixed into outbound snapshot freshness keys when multiple roots are sent at one timestamp.
+    uint256 private _outboundSnapshotSequence;
 
     /// @notice Optional explicit peer sucker address on the remote chain.
     /// @dev A zero value preserves the default same-address deterministic peer.
     bytes32 private _peer;
 
-    /// @notice The last known total recorded balance on the peer chain. Updated each time a bridge message is received.
-    /// @dev The `currency` and `decimals` fields describe the denomination; `value` is the balance amount.
-    JBDenominatedAmount private _peerChainBalance;
-
-    /// @notice The source chain freshness key for the most recent accepted peer snapshot.
-    /// @dev Only snapshots with a strictly newer source freshness key are accepted, preventing stale rollbacks.
-    /// The historical name is retained for ABI compatibility with the `JBMessageRoot.sourceTimestamp` field.
-    /// Returns 0 if no snapshot has been received yet.
-    uint256 public snapshotTimestamp;
-
-    /// @notice Tie-breaker mixed into outbound snapshot freshness keys when multiple roots are sent at one timestamp.
-    uint256 private _outboundSnapshotSequence;
+    /// @notice The peer chain's per-currency surplus and balance from the latest snapshot. Rebuilt in full each time a
+    /// fresher snapshot is received, so a context that dropped out of the new snapshot is simply absent — no
+    /// per-entry
+    /// versioning or clearing is needed. A read sums these and values them into the requested currency.
+    JBPeerChainContext[] private _peerContexts;
 
     //*********************************************************************//
     // ---------------------------- constructor -------------------------- //
@@ -260,7 +264,6 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
 
     /// @param directory A contract storing directories of terminals and controllers for each project.
     /// @param permissions A contract storing permissions.
-    /// @param prices The price oracle used to convert peer-chain balances and surplus.
     /// @param tokens A contract that manages token minting and burning.
     /// @param feeProjectId The project ID that receives the `toRemoteFee` payment (typically 1).
     /// @param registry The sucker registry that manages the global `toRemoteFee`.
@@ -268,7 +271,6 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     constructor(
         IJBDirectory directory,
         IJBPermissions permissions,
-        IJBPrices prices,
         IJBTokens tokens,
         uint256 feeProjectId,
         IJBSuckerRegistry registry,
@@ -279,7 +281,6 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     {
         DIRECTORY = directory;
         FEE_PROJECT_ID = feeProjectId;
-        PRICES = prices;
         PROJECTS = directory.PROJECTS();
         REGISTRY = registry;
         TOKENS = tokens;
@@ -514,18 +515,66 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         // This prevents a staler per-token message from rolling back shared state (surplus, balance, supply)
         // that was already updated by a fresher message for a different token.
         if (root.sourceTimestamp > snapshotTimestamp) {
+            // Advance the snapshot freshness key (used by the registry to dedup same-peer suckers).
             snapshotTimestamp = root.sourceTimestamp;
 
             // Update unconditionally — a legitimate zero supply must clear phantom cached supply.
             peerChainTotalSupply = root.sourceTotalSupply;
 
-            // Store the surplus and balance snapshots from the source chain.
-            _peerChainSurplus = JBDenominatedAmount({
-                value: root.sourceSurplus, currency: uint32(root.sourceCurrency), decimals: root.sourceDecimals
-            });
-            _peerChainBalance = JBDenominatedAmount({
-                value: root.sourceBalance, currency: uint32(root.sourceCurrency), decimals: root.sourceDecimals
-            });
+            // Rebuild the per-currency context set from scratch. A context that dropped out of this fresher snapshot is
+            // simply absent from the new set, so no per-entry clearing is needed.
+            delete _peerContexts;
+
+            // Fold each source context into the local currency it resolves to. Resolution prefers the token mapping (so
+            // a same-asset token at a different remote address binds to the right local context) and falls back to
+            // identity for same-address tokens; the local currency is then derived from that resolved local token's
+            // authoritative accounting context, NOT trusted from the wire, so a same-asset token at a different address
+            // still folds under the receiver's own currency. Multiple source contexts that resolve to the same local
+            // currency (e.g. the same token across multiple terminals) are summed.
+            uint256 numContexts = root.sourceContexts.length;
+            for (uint256 i; i < numContexts;) {
+                JBSourceContext calldata ctx = root.sourceContexts[i];
+
+                address contextToken = _localTokenForRemoteToken[ctx.token];
+                if (contextToken == address(0)) contextToken = _toAddress(ctx.token);
+                (uint32 contextCurrency, bool authoritative) = _localCurrencyOf(contextToken);
+                // Cache an authoritative currency so later snapshots reuse it instead of re-reading the terminal. The
+                // accounting-context currency is immutable, so the cache never goes stale; a not-yet-configured token
+                // is left uncached and re-read next time.
+                if (authoritative && _cachedCurrencyOf[contextToken] == 0) {
+                    _cachedCurrencyOf[contextToken] = contextCurrency;
+                }
+
+                // Accumulate into an existing same-currency entry, or append a new one. The context set is small
+                // (one entry per distinct local currency), so a linear scan is cheaper than a mapping.
+                uint256 numStored = _peerContexts.length;
+                bool merged;
+                for (uint256 j; j < numStored;) {
+                    if (_peerContexts[j].currency == contextCurrency) {
+                        _peerContexts[j].surplus = _saturatingAddU128(_peerContexts[j].surplus, ctx.surplus);
+                        _peerContexts[j].balance = _saturatingAddU128(_peerContexts[j].balance, ctx.balance);
+                        merged = true;
+                        break;
+                    }
+                    unchecked {
+                        ++j;
+                    }
+                }
+                if (!merged) {
+                    _peerContexts.push(
+                        JBPeerChainContext({
+                            currency: contextCurrency,
+                            decimals: ctx.decimals,
+                            surplus: ctx.surplus,
+                            balance: ctx.balance
+                        })
+                    );
+                }
+
+                unchecked {
+                    ++i;
+                }
+            }
         }
     }
 
@@ -774,78 +823,19 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         return _outboxOf[token];
     }
 
-    /// @notice The peer chain balance, converted from the source denomination to the requested currency and decimal
-    /// precision using the local JBPrices oracle.
-    /// @param decimals The decimal precision for the returned value.
-    /// @param currency The currency to normalize to (e.g. `uint256(uint160(JBConstants.NATIVE_TOKEN))` for ETH).
-    /// @return A `JBDenominatedAmount` with the converted value.
-    function peerChainBalanceOf(uint256 decimals, uint256 currency) external view returns (JBDenominatedAmount memory) {
-        return JBDenominatedAmount({
-            value: _convertPeerValue({source: _peerChainBalance, decimals: decimals, currency: currency}),
-            // forge-lint: disable-next-line(unsafe-typecast)
-            currency: uint32(currency),
-            // forge-lint: disable-next-line(unsafe-typecast)
-            decimals: uint8(decimals)
-        });
-    }
-
-    /// @notice The peer chain balance bundled with the peer chain ID and snapshot freshness key.
-    /// @dev Lets aggregators (e.g. `JBSuckerRegistry`) read the value, the peer chain it belongs to, and its
-    /// freshness in one call instead of three separate staticcalls. The `value` is identical to
-    /// `peerChainBalanceOf`.
-    /// @param decimals The decimal precision for the returned value.
-    /// @param currency The currency to normalize to (e.g. `uint256(uint160(JBConstants.NATIVE_TOKEN))` for ETH).
-    /// @return A `JBPeerChainValue` with the converted balance, peer chain ID, and snapshot freshness key.
-    function peerChainBalanceValueOf(
-        uint256 decimals,
-        uint256 currency
-    )
-        external
-        view
-        returns (JBPeerChainValue memory)
-    {
-        return JBPeerChainValue({
-            value: _convertPeerValue({source: _peerChainBalance, decimals: decimals, currency: currency}),
-            peerChainId: peerChainId(),
-            snapshotTimestamp: snapshotTimestamp
-        });
-    }
-
-    /// @notice The peer chain surplus, converted from the source denomination to the requested currency and decimal
-    /// precision using the local JBPrices oracle.
-    /// @param decimals The decimal precision for the returned value.
-    /// @param currency The currency to normalize to (e.g. `uint256(uint160(JBConstants.NATIVE_TOKEN))` for ETH).
-    /// @return A `JBDenominatedAmount` with the converted value.
-    function peerChainSurplusOf(uint256 decimals, uint256 currency) external view returns (JBDenominatedAmount memory) {
-        return JBDenominatedAmount({
-            value: _convertPeerValue({source: _peerChainSurplus, decimals: decimals, currency: currency}),
-            // forge-lint: disable-next-line(unsafe-typecast)
-            currency: uint32(currency),
-            // forge-lint: disable-next-line(unsafe-typecast)
-            decimals: uint8(decimals)
-        });
-    }
-
-    /// @notice The peer chain surplus bundled with the peer chain ID and snapshot freshness key.
-    /// @dev Lets aggregators (e.g. `JBSuckerRegistry`) read the value, the peer chain it belongs to, and its
-    /// freshness in one call instead of three separate staticcalls. The `value` is identical to
-    /// `peerChainSurplusOf`.
-    /// @param decimals The decimal precision for the returned value.
-    /// @param currency The currency to normalize to (e.g. `uint256(uint160(JBConstants.NATIVE_TOKEN))` for ETH).
-    /// @return A `JBPeerChainValue` with the converted surplus, peer chain ID, and snapshot freshness key.
-    function peerChainSurplusValueOf(
-        uint256 decimals,
-        uint256 currency
-    )
+    /// @notice The peer chain's raw per-context surplus and balance from the latest snapshot, bundled with the peer
+    /// chain ID and snapshot freshness key.
+    /// @dev The contexts are un-valued, in each context's own currency and decimals — the registry dedups same-peer
+    /// suckers by freshness, then values each context into a requested currency. The sucker consults no price oracle.
+    /// @return contexts The per-currency surplus and balance from the latest snapshot.
+    /// @return chainId The peer chain these contexts belong to.
+    /// @return snapshot The source freshness key of the latest snapshot.
+    function peerChainContextsOf()
         external
         view
-        returns (JBPeerChainValue memory)
+        returns (JBPeerChainContext[] memory contexts, uint256 chainId, uint256 snapshot)
     {
-        return JBPeerChainValue({
-            value: _convertPeerValue({source: _peerChainSurplus, decimals: decimals, currency: currency}),
-            peerChainId: peerChainId(),
-            snapshotTimestamp: snapshotTimestamp
-        });
+        return (_peerContexts, peerChainId(), snapshotTimestamp);
     }
 
     /// @notice The peer chain total supply bundled with the peer chain ID and snapshot freshness key.
@@ -1658,25 +1648,43 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         return ERC2771Context._contextSuffixLength();
     }
 
-    /// @notice Convert a peer chain snapshot value to the requested currency and decimal precision.
-    /// @dev Delegates to `JBSuckerLib.convertPeerValue` (deployed library, called via DELEGATECALL) to reduce
-    /// child contract bytecode.
-    /// @param source The peer chain snapshot containing value, currency, and decimals.
-    /// @param decimals The target decimal precision.
-    /// @param currency The target currency (e.g. `uint256(uint160(JBConstants.NATIVE_TOKEN))` for ETH).
-    /// @return converted The converted value.
-    function _convertPeerValue(
-        JBDenominatedAmount memory source,
-        uint256 decimals,
-        uint256 currency
-    )
-        internal
-        view
-        returns (uint256 converted)
-    {
-        converted = JBSuckerLib.convertPeerValue({
-            prices: PRICES, projectId: projectId(), source: source, decimals: decimals, currency: currency
-        });
+    /// @notice The authoritative accounting-context currency the project uses for a local token. Peer context is keyed
+    /// by this currency so a consumer reads it under the same currency it already works in (which the project may set
+    /// to a well-known id like USD rather than the token-keyed convention).
+    /// @dev Both lookups use a low-level staticcall guarded by a returndata-length check, so a missing or
+    /// non-conforming directory/terminal (including one that returns short/empty data) can't block a bridge message —
+    /// it just yields the fallback. Returns the cached value when one exists (the accounting-context currency is
+    /// immutable, so the cache never goes stale). Falls back to the conventional `uint32(uint160(token))` only when the
+    /// project has no local accounting context for the token yet; that fallback is NOT cached, so a later snapshot
+    /// re-reads it once the context exists.
+    /// @param token The resolved local token.
+    /// @return currency The project's accounting-context currency for the token.
+    /// @return authoritative Whether `currency` came from a cached or configured accounting context (true) or the
+    /// convention fallback (false). `fromRemote` caches only authoritative results, since those are immutable.
+    function _localCurrencyOf(address token) internal view returns (uint32 currency, bool authoritative) {
+        // Reuse the value derived on an earlier snapshot — no need to read the terminal again.
+        uint32 cached = _cachedCurrencyOf[token];
+        if (cached != 0) return (cached, true);
+
+        uint256 forProjectId = projectId();
+
+        // Resolve the project's primary terminal for the token. An `address` return needs a full word.
+        (bool terminalOk, bytes memory terminalData) =
+            address(DIRECTORY).staticcall(abi.encodeCall(IJBDirectory.primaryTerminalOf, (forProjectId, token)));
+        if (terminalOk && terminalData.length >= 32) {
+            address terminal = abi.decode(terminalData, (address));
+            if (terminal != address(0)) {
+                // Read the token's accounting context. The struct encodes to three words.
+                (bool contextOk, bytes memory contextData) =
+                    terminal.staticcall(abi.encodeCall(IJBTerminal.accountingContextForTokenOf, (forProjectId, token)));
+                if (contextOk && contextData.length >= 96) {
+                    JBAccountingContext memory accountingContext = abi.decode(contextData, (JBAccountingContext));
+                    if (accountingContext.currency != 0) return (accountingContext.currency, true);
+                }
+            }
+        }
+        // forge-lint: disable-next-line(unsafe-typecast)
+        return (uint32(uint160(token)), false);
     }
 
     /// @notice The calldata. Preferred to use over `msg.data`.
@@ -1746,6 +1754,21 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         }
     }
 
+    /// @notice Adds two `uint128` amounts, saturating at `type(uint128).max` instead of overflowing.
+    /// @dev Saturation keeps a pathological peer snapshot from reverting the receive path; the cap can only
+    /// under-report a remote amount, the safe direction.
+    /// @param a The first amount.
+    /// @param b The second amount.
+    /// @return The saturated sum.
+    function _saturatingAddU128(uint128 a, uint128 b) internal pure returns (uint128) {
+        unchecked {
+            uint256 sum = uint256(a) + uint256(b);
+            // The cast only runs when `sum <= type(uint128).max`, so it cannot truncate.
+            // forge-lint: disable-next-line(unsafe-typecast)
+            return sum > type(uint128).max ? type(uint128).max : uint128(sum);
+        }
+    }
+
     /// @notice Selects which retained inbox root a proof should be validated against, honoring a small window of
     /// recently-accepted roots rather than only the latest.
     /// @dev Computes the branch root implied by the proof once, then returns the first retained ring root it matches.
@@ -1857,7 +1880,6 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
 
         JBMessageRoot memory message = JBSuckerLib.buildSnapshotMessage({
             directory: DIRECTORY,
-            prices: PRICES,
             projectId: projectId(),
             remoteToken: remoteToken.addr,
             amount: amount,