@rootzero/contracts 1.4.0 → 1.6.0

package/events/Position.sol

@@ -6,16 +6,15 @@ import {EventEmitter} from "./Emitter.sol";
 /// @notice Emitted when the reported value of an asset-backed position changes or is observed.
 /// A value of 0 should be interpreted as a closed position.
 abstract contract PositionEvent is EventEmitter {
-    string private constant ABI = "event Position(bytes32 indexed account, bytes32 asset, bytes32 meta, uint value, uint32 action, uint context, uint queryId)";
+    string private constant ABI = "event Position(bytes32 indexed account, bytes32 asset, uint value, uint32 action, uint context, uint queryId)";
 
     /// @param account Account identifier that owns or is associated with the position.
     /// @param asset Asset identifier for the asset class.
-    /// @param meta Asset metadata slot carrying the position context.
     /// @param value Context-specific position value; 0 indicates a closed position.
     /// @param action Primary operation hint from `Actions`.
     /// @param context Reserved context value for future use.
     /// @param queryId Query ID associated with the position lookup or reporting context.
-    event Position(bytes32 indexed account, bytes32 asset, bytes32 meta, uint value, uint32 action, uint context, uint queryId);
+    event Position(bytes32 indexed account, bytes32 asset, uint value, uint32 action, uint context, uint queryId);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Received.sol

@@ -5,15 +5,14 @@ import { EventEmitter } from "./Emitter.sol";
 
 /// @notice Emitted when an account receives an asset in a protocol operation.
 abstract contract ReceivedEvent is EventEmitter {
-    string private constant ABI = "event Received(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context)";
+    string private constant ABI = "event Received(bytes32 indexed account, bytes32 asset, uint amount, uint32 action, uint context)";
 
     /// @param account Account identifier that received the asset.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Amount received.
     /// @param action Primary operation hint from `Actions`.
     /// @param context Reserved context value for future use.
-    event Received(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context);
+    event Received(bytes32 indexed account, bytes32 asset, uint amount, uint32 action, uint context);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Spent.sol

@@ -5,15 +5,14 @@ import { EventEmitter } from "./Emitter.sol";
 
 /// @notice Emitted when an account spends an asset in a protocol operation.
 abstract contract SpentEvent is EventEmitter {
-    string private constant ABI = "event Spent(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context)";
+    string private constant ABI = "event Spent(bytes32 indexed account, bytes32 asset, uint amount, uint32 action, uint context)";
 
     /// @param account Account identifier that spent the asset.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Amount spent.
     /// @param action Primary operation hint from `Actions`.
     /// @param context Reserved context value for future use.
-    event Spent(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context);
+    event Spent(bytes32 indexed account, bytes32 asset, uint amount, uint32 action, uint context);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Unlocked.sol

@@ -5,15 +5,14 @@ import { EventEmitter } from "./Emitter.sol";
 
 /// @notice Emitted when an account unlocks an asset in a protocol operation.
 abstract contract UnlockedEvent is EventEmitter {
-    string private constant ABI = "event Unlocked(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context)";
+    string private constant ABI = "event Unlocked(bytes32 indexed account, bytes32 asset, uint amount, uint32 action, uint context)";
 
     /// @param account Account identifier that unlocked the asset.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Amount unlocked.
     /// @param action Primary operation hint from `Actions`.
     /// @param context Reserved context value for future use.
-    event Unlocked(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context);
+    event Unlocked(bytes32 indexed account, bytes32 asset, uint amount, uint32 action, uint context);
 
     constructor() {
         emit EventAbi(ABI);

package/guards/Base.sol

@@ -4,16 +4,16 @@ pragma solidity ^0.8.33;
 import {AccessControl} from "../core/Access.sol";
 import {GuardEvent} from "../events/Guard.sol";
 import {LabeledEvent} from "../events/Labeled.sol";
-import {Ids} from "../utils/Ids.sol";
+import {Nodes} from "../utils/Nodes.sol";
 
 /// @notice ABI-encode a guard action call from a target guard ID and request block stream.
-/// @dev Derives the function selector from `target` via `Ids.guardSelector(target)`.
+/// @dev Derives the function selector from `target` via `Nodes.guardSelector(target)`.
 /// Reverts if `target` is not a valid guard ID.
 /// @param target Destination guard action node ID embedding the target selector.
 /// @param request Input block stream for the guard invocation.
 /// @return ABI-encoded calldata for the guard action entry point.
 function encodeGuardCall(uint target, bytes calldata request) pure returns (bytes memory) {
-    bytes4 selector = Ids.guardSelector(target);
+    bytes4 selector = Nodes.guardSelector(target);
     return abi.encodeWithSelector(selector, request);
 }
 
@@ -31,6 +31,6 @@ abstract contract GuardBase is AccessControl, GuardEvent, LabeledEvent {
     /// @param selector Guard action entrypoint selector.
     /// @return Guard action node ID.
     function guardId(bytes4 selector) internal view returns (uint) {
-        return Ids.toGuard(selector, address(this));
+        return Nodes.toGuard(selector, address(this));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rootzero/contracts",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "Solidity contracts and protocol building blocks for rootzero hosts and commands.",
   "private": false,
   "license": "GPL-3.0-only",

package/peer/AllowAssets.sol

@@ -12,7 +12,7 @@ interface IPeerAllowAssets {
 }
 
 /// @title PeerAllowAssets
-/// @notice Peer that permits a list of (asset, meta) pairs on behalf of a peer host.
+/// @notice Peer that permits a list of assets on behalf of a peer host.
 /// Each ASSET block in the request calls `allowAsset`. Restricted to trusted peers.
 abstract contract PeerAllowAssets is PeerBase, AllowAssetsHook, IPeerAllowAssets {
     uint internal immutable peerAllowAssetsId = peerId(this.peerAllowAssets.selector);
@@ -29,8 +29,8 @@ abstract contract PeerAllowAssets is PeerBase, AllowAssetsHook, IPeerAllowAssets
         (Cur memory assets, , ) = Cursors.init(request, 1);
 
         while (assets.i < assets.len) {
-            (bytes32 asset, bytes32 meta) = assets.unpackAsset();
-            allowAsset(asset, meta);
+            bytes32 asset = assets.unpackAsset();
+            allowAsset(asset);
         }
 
         assets.complete();

package/peer/Allowance.sol

@@ -31,8 +31,8 @@ abstract contract PeerAllowance is PeerBase, AllowanceHook, IPeerAllowance {
         uint peer = caller();
 
         while (amounts.i < amounts.len) {
-            (bytes32 asset, bytes32 meta, uint amount) = amounts.unpackAmount();
-            allowance(peer, asset, meta, amount);
+            (bytes32 asset, uint amount) = amounts.unpackAmount();
+            allowance(peer, asset, amount);
         }
 
         amounts.complete();

package/peer/Base.sol

@@ -4,16 +4,16 @@ pragma solidity ^0.8.33;
 import { NodeCalls } from "../core/Calls.sol";
 import { PeerEvent } from "../events/Peer.sol";
 import { LabeledEvent } from "../events/Labeled.sol";
-import { Ids } from "../utils/Ids.sol";
+import { Nodes } from "../utils/Nodes.sol";
 
 /// @notice ABI-encode a peer call from a target peer ID and request block stream.
-/// @dev Derives the function selector from `target` via `Ids.peerSelector(target)`.
+/// @dev Derives the function selector from `target` via `Nodes.peerSelector(target)`.
 /// Reverts if `target` is not a valid peer ID.
 /// @param target Destination peer node ID embedding the target selector.
 /// @param request Input block stream for the peer invocation.
 /// @return ABI-encoded calldata for the peer entry point.
 function encodePeerCall(uint target, bytes calldata request) pure returns (bytes memory) {
-    bytes4 selector = Ids.peerSelector(target);
+    bytes4 selector = Nodes.peerSelector(target);
     return abi.encodeWithSelector(selector, request);
 }
 
@@ -36,6 +36,6 @@ abstract contract PeerBase is NodeCalls, PeerEvent, LabeledEvent {
     /// @param selector Peer entrypoint selector.
     /// @return Peer node ID.
     function peerId(bytes4 selector) internal view returns (uint) {
-        return Ids.toPeer(selector, address(this));
+        return Nodes.toPeer(selector, address(this));
     }
 }

package/peer/Credit.sol

@@ -7,30 +7,30 @@ import { Cursors, Cur, Forms } from "../Cursors.sol";
 
 using Cursors for Cur;
 
-interface IPeerCreditTo {
-    function peerCreditTo(bytes calldata request) external returns (bytes memory);
+interface IPeerCreditAccount {
+    function peerCreditAccount(bytes calldata request) external returns (bytes memory);
 }
 
-/// @title PeerCreditTo
+/// @title PeerCreditAccount
 /// @notice Peer that lets a trusted peer credit supplied accounts directly.
 /// Each ACCOUNT_AMOUNT block calls `creditAccount` for its account.
-abstract contract PeerCreditTo is PeerBase, CreditAccountHook, IPeerCreditTo {
-    uint internal immutable peerCreditToId = peerId(this.peerCreditTo.selector);
+abstract contract PeerCreditAccount is PeerBase, CreditAccountHook, IPeerCreditAccount {
+    uint internal immutable peerCreditAccountId = peerId(this.peerCreditAccount.selector);
 
     constructor() {
-        emit Peer(host, peerCreditToId, "1:0", Forms.AccountAmount, "", false);
-        emit Labeled(peerCreditToId, bytes32(0), "peerCreditTo");
+        emit Peer(host, peerCreditAccountId, "1:0", Forms.AccountAmount, "", false);
+        emit Labeled(peerCreditAccountId, bytes32(0), "peerCreditAccount");
     }
 
     /// @notice Execute the peer-credit call.
     /// @param request ACCOUNT_AMOUNT block stream supplied by the trusted peer.
     /// @return Empty response bytes.
-    function peerCreditTo(bytes calldata request) external onlyPeer returns (bytes memory) {
+    function peerCreditAccount(bytes calldata request) external onlyPeer returns (bytes memory) {
         (Cur memory amounts, , ) = Cursors.init(request, 1);
 
         while (amounts.i < amounts.len) {
-            (bytes32 account, bytes32 asset, bytes32 meta, uint amount) = amounts.unpackAccountAmount();
-            creditAccount(account, asset, meta, amount);
+            (bytes32 account, bytes32 asset, uint amount) = amounts.unpackAccountAmount();
+            creditAccount(account, asset, amount);
         }
 
         amounts.complete();

package/peer/Debit.sol

@@ -7,30 +7,30 @@ import { Cursors, Cur, Forms } from "../Cursors.sol";
 
 using Cursors for Cur;
 
-interface IPeerDebitFrom {
-    function peerDebitFrom(bytes calldata request) external returns (bytes memory);
+interface IPeerDebitAccount {
+    function peerDebitAccount(bytes calldata request) external returns (bytes memory);
 }
 
-/// @title PeerDebitFrom
+/// @title PeerDebitAccount
 /// @notice Peer that lets a trusted peer debit supplied accounts directly.
 /// Each ACCOUNT_AMOUNT block calls `debitAccount` for its account.
-abstract contract PeerDebitFrom is PeerBase, DebitAccountHook, IPeerDebitFrom {
-    uint internal immutable peerDebitFromId = peerId(this.peerDebitFrom.selector);
+abstract contract PeerDebitAccount is PeerBase, DebitAccountHook, IPeerDebitAccount {
+    uint internal immutable peerDebitAccountId = peerId(this.peerDebitAccount.selector);
 
     constructor() {
-        emit Peer(host, peerDebitFromId, "1:0", Forms.AccountAmount, "", false);
-        emit Labeled(peerDebitFromId, bytes32(0), "peerDebitFrom");
+        emit Peer(host, peerDebitAccountId, "1:0", Forms.AccountAmount, "", false);
+        emit Labeled(peerDebitAccountId, bytes32(0), "peerDebitAccount");
     }
 
     /// @notice Execute the peer-debit call.
     /// @param request ACCOUNT_AMOUNT block stream supplied by the trusted peer.
     /// @return Empty response bytes.
-    function peerDebitFrom(bytes calldata request) external onlyPeer returns (bytes memory) {
+    function peerDebitAccount(bytes calldata request) external onlyPeer returns (bytes memory) {
         (Cur memory amounts, , ) = Cursors.init(request, 1);
 
         while (amounts.i < amounts.len) {
-            (bytes32 account, bytes32 asset, bytes32 meta, uint amount) = amounts.unpackAccountAmount();
-            debitAccount(account, asset, meta, amount);
+            (bytes32 account, bytes32 asset, uint amount) = amounts.unpackAccountAmount();
+            debitAccount(account, asset, amount);
         }
 
         amounts.complete();

package/peer/DenyAssets.sol

@@ -12,7 +12,7 @@ interface IPeerDenyAssets {
 }
 
 /// @title PeerDenyAssets
-/// @notice Peer that blocks a list of (asset, meta) pairs on behalf of a peer host.
+/// @notice Peer that blocks a list of assets on behalf of a peer host.
 /// Each ASSET block in the request calls `denyAsset`. Restricted to trusted peers.
 abstract contract PeerDenyAssets is PeerBase, DenyAssetsHook, IPeerDenyAssets {
     uint internal immutable peerDenyAssetsId = peerId(this.peerDenyAssets.selector);
@@ -29,8 +29,8 @@ abstract contract PeerDenyAssets is PeerBase, DenyAssetsHook, IPeerDenyAssets {
         (Cur memory assets, , ) = Cursors.init(request, 1);
 
         while (assets.i < assets.len) {
-            (bytes32 asset, bytes32 meta) = assets.unpackAsset();
-            denyAsset(asset, meta);
+            bytes32 asset = assets.unpackAsset();
+            denyAsset(asset);
         }
 
         assets.complete();

package/peer/Recover.sol

@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import {PeerBase} from "./Base.sol";
+import {Cursors, Cur, Schemas} from "../Cursors.sol";
+
+using Cursors for Cur;
+
+interface IPeerRecover {
+    function peerRecover(bytes calldata request) external returns (bytes memory);
+}
+
+abstract contract RecoverHook {
+    /// @notice Override to recover one incoming pipe context from a peer host.
+    /// @dev Implementations may refund, retry, compensate, reconcile, or otherwise
+    ///      handle the supplied state and remaining steps.
+    /// @param account Account identifier for the recovery context.
+    /// @param state Embedded recovery state block stream.
+    /// @param steps Embedded recovery step block stream.
+    function recover(bytes32 account, bytes calldata state, bytes calldata steps) internal virtual;
+}
+
+/// @title PeerRecover
+/// @notice Peer endpoint for recovering an interrupted or failed pipe context.
+/// @dev Commonly used when a cross-chain pipe fails at its destination, but the
+///      hook is host-defined and may implement any recovery strategy. Each PIPE
+///      block carries chain resources plus a CONTEXT block; the nested context
+///      is passed to the recovery hook and resources are not allocated.
+abstract contract PeerRecover is PeerBase, RecoverHook, IPeerRecover {
+    uint internal immutable peerRecoverId = peerId(this.peerRecover.selector);
+
+    constructor() {
+        emit Peer(host, peerRecoverId, "1:0", Schemas.Pipe, "", false);
+        emit Labeled(peerRecoverId, bytes32(0), "peerRecover");
+    }
+
+    /// @notice Forward peer-supplied recovery pipes to the host-defined recovery hook.
+    /// @param request PIPE block stream supplied by the trusted peer.
+    /// @return Empty response bytes.
+    function peerRecover(bytes calldata request) external onlyPeer returns (bytes memory) {
+        (Cur memory input, , ) = Cursors.init(request, 1);
+
+        while (input.i < input.len) {
+            (, bytes32 account, bytes calldata state, bytes calldata steps) = input.unpackPipe();
+            recover(account, state, steps);
+        }
+
+        input.complete();
+        return "";
+    }
+}

package/peer/Redeem.sol

@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import {PeerBase} from "./Base.sol";
+import {Cursors, Cur, Schemas} from "../Cursors.sol";
+
+using Cursors for Cur;
+
+interface IPeerRedeemBalance {
+    function peerRedeemBalance(bytes calldata request) external returns (bytes memory);
+}
+
+abstract contract RedeemBalanceHook {
+    /// @notice Override to redeem one balance claim from a peer host into local assets.
+    /// @param peer Peer host node ID for this request.
+    /// @param asset Asset identifier to redeem locally.
+    /// @param amount Amount to redeem in the asset's native units.
+    function redeemBalance(uint peer, bytes32 asset, uint amount) internal virtual;
+}
+
+/// @title PeerRedeemBalance
+/// @notice Peer that redeems balance state from a peer host into local assets.
+/// Each BALANCE block in the request calls `redeemBalance(peer, asset, amount)`.
+/// Restricted to trusted peers.
+abstract contract PeerRedeemBalance is PeerBase, RedeemBalanceHook, IPeerRedeemBalance {
+    uint internal immutable peerRedeemBalanceId = peerId(this.peerRedeemBalance.selector);
+
+    constructor() {
+        emit Peer(host, peerRedeemBalanceId, "1:0", Schemas.Balance, "", false);
+        emit Labeled(peerRedeemBalanceId, bytes32(0), "peerRedeemBalance");
+    }
+
+    /// @notice Execute the balance redemption peer call.
+    /// @param request BALANCE block stream supplied by the trusted peer.
+    /// @return Empty response bytes.
+    function peerRedeemBalance(bytes calldata request) external onlyPeer returns (bytes memory) {
+        (Cur memory input, , ) = Cursors.init(request, 1);
+        uint peer = caller();
+
+        while (input.i < input.len) {
+            (bytes32 asset, uint amount) = input.unpackBalance();
+            redeemBalance(peer, asset, amount);
+        }
+
+        input.complete();
+        return "";
+    }
+}

package/peer/Settle.sol

@@ -30,9 +30,9 @@ abstract contract PeerSettle is PeerBase, DebitAccountHook, CreditAccountHook, I
         (Cur memory state, , ) = Cursors.init(request, 1);
 
         while (state.i < state.len) {
-            (bytes32 from, bytes32 to, bytes32 asset, bytes32 meta, uint amount) = state.unpackTransaction();
-            if (from != 0) debitAccount(from, asset, meta, amount);
-            if (to != 0) creditAccount(to, asset, meta, amount);
+            (bytes32 from, bytes32 to, bytes32 asset, uint amount) = state.unpackTransaction();
+            if (from != 0) debitAccount(from, asset, amount);
+            if (to != 0) creditAccount(to, asset, amount);
         }
 
         state.complete();

package/queries/Assets.sol

@@ -9,16 +9,15 @@ using Cursors for Cur;
 using Writers for Writer;
 
 abstract contract AssetStatusHook {
-    /// @notice Resolve support status for one asset tuple.
+    /// @notice Resolve support status for one asset.
     /// Concrete implementations define the support policy and optional context codes.
     /// @param asset Requested asset identifier.
-    /// @param meta Requested asset metadata slot.
     /// @return status Asset support status. Zero means unsupported; nonzero means supported.
-    function assetStatus(bytes32 asset, bytes32 meta) internal view virtual returns (uint status);
+    function assetStatus(bytes32 asset) internal view virtual returns (uint status);
 }
 
 /// @title AssetStatus
-/// @notice Rootzero query that checks support status for one or more `(asset, meta)` tuples.
+/// @notice Rootzero query that checks support status for one or more assets.
 /// The request is a run of `ASSET` blocks.
 /// The response returns one `STATUS` form block per query entry, preserving request order.
 abstract contract AssetStatus is QueryBase, AssetStatusHook {
@@ -29,16 +28,16 @@ abstract contract AssetStatus is QueryBase, AssetStatusHook {
         emit Labeled(assetStatusId, bytes32(0), "assetStatus");
     }
 
-    /// @notice Resolve asset support status for a run of requested `(asset, meta)` tuples.
-    /// @param request Block-stream request consisting of `#asset { bytes32 asset, bytes32 meta }` blocks.
+    /// @notice Resolve asset support status for a run of requested assets.
+    /// @param request Block-stream request consisting of `#asset { bytes32 asset }` blocks.
     /// @return Block-stream response containing one `#status { uint code }` per asset block.
     function assetStatus(bytes calldata request) external view returns (bytes memory) {
         (Cur memory query, uint groups, ) = Cursors.init(request, 1);
         Writer memory response = Writers.allocStatuses(groups);
 
         while (query.i < query.len) {
-            (bytes32 asset, bytes32 meta) = query.unpackAsset();
-            uint status = assetStatus(asset, meta);
+            bytes32 asset = query.unpackAsset();
+            uint status = assetStatus(asset);
             response.appendStatus(status);
         }
 

package/queries/Balances.sol

@@ -12,13 +12,12 @@ abstract contract GetBalancesHook {
     /// Concrete implementations define how assets are resolved.
     /// @param account Account identifier carried by the query payload.
     /// @param asset Requested asset identifier.
-    /// @param meta Requested asset metadata slot.
     /// @return amount Current balance in the asset's native units.
-    function getBalance(bytes32 account, bytes32 asset, bytes32 meta) internal view virtual returns (uint amount);
+    function getBalance(bytes32 account, bytes32 asset) internal view virtual returns (uint amount);
 }
 
 /// @title GetBalances
-/// @notice Rootzero query that resolves balances for one or more `(account, asset, meta)` tuples.
+/// @notice Rootzero query that resolves balances for one or more `(account, asset)` tuples.
 /// The request is a run of `ACCOUNT_ASSET` form blocks.
 /// The response returns one `ACCOUNT_AMOUNT` form block per requested position, preserving request order.
 abstract contract GetBalances is QueryBase, GetBalancesHook {
@@ -29,17 +28,17 @@ abstract contract GetBalances is QueryBase, GetBalancesHook {
         emit Labeled(getBalancesId, bytes32(0), "getBalances");
     }
 
-    /// @notice Resolve balances for a run of requested `(account, asset, meta)` tuples.
-    /// @param request Block-stream request consisting of `accountAsset(account, asset, meta)*`.
-    /// @return Block-stream response containing one `accountAmount(account, asset, meta, amount)` block per request block.
+    /// @notice Resolve balances for a run of requested `(account, asset)` tuples.
+    /// @param request Block-stream request consisting of `accountAsset(account, asset)*`.
+    /// @return Block-stream response containing one `accountAmount(account, asset, amount)` block per request block.
     function getBalances(bytes calldata request) external view returns (bytes memory) {
         (Cur memory query, uint groups, ) = Cursors.init(request, 1);
         Writer memory response = Writers.allocAccountAmounts(groups);
 
         while (query.i < query.len) {
-            (bytes32 account, bytes32 asset, bytes32 meta) = query.unpackAccountAsset();
-            uint amount = getBalance(account, asset, meta);
-            response.appendAccountAmount(account, asset, meta, amount);
+            (bytes32 account, bytes32 asset) = query.unpackAccountAsset();
+            uint amount = getBalance(account, asset);
+            response.appendAccountAmount(account, asset, amount);
         }
 
         query.complete();

package/queries/Base.sol

@@ -4,16 +4,16 @@ pragma solidity ^0.8.33;
 import { Runtime } from "../core/Runtime.sol";
 import { LabeledEvent } from "../events/Labeled.sol";
 import { QueryEvent } from "../events/Query.sol";
-import { Ids } from "../utils/Ids.sol";
+import { Nodes } from "../utils/Nodes.sol";
 
 /// @notice ABI-encode a query call from a target query ID and request block stream.
-/// @dev Derives the function selector from `target` via `Ids.querySelector(target)`.
+/// @dev Derives the function selector from `target` via `Nodes.querySelector(target)`.
 /// Reverts if `target` is not a valid query ID.
 /// @param target Destination query node ID embedding the target selector.
 /// @param request Input block stream for the query invocation.
 /// @return ABI-encoded calldata for the query entry point.
 function encodeQueryCall(uint target, bytes calldata request) pure returns (bytes memory) {
-    bytes4 selector = Ids.querySelector(target);
+    bytes4 selector = Nodes.querySelector(target);
     return abi.encodeWithSelector(selector, request);
 }
 
@@ -29,6 +29,6 @@ abstract contract QueryBase is Runtime, QueryEvent, LabeledEvent {
     /// @param selector Query entrypoint selector.
     /// @return Query node ID.
     function queryId(bytes4 selector) internal view returns (uint) {
-        return Ids.toQuery(selector, address(this));
+        return Nodes.toQuery(selector, address(this));
     }
 }

package/queries/Positions.sol

@@ -14,12 +14,10 @@ abstract contract GetPositionHook {
     /// the query output schema.
     /// @param account Requested account identifier.
     /// @param asset Requested asset identifier.
-    /// @param meta Requested asset metadata slot.
     /// @param response Destination writer for the response stream.
     function appendPosition(
         bytes32 account,
         bytes32 asset,
-        bytes32 meta,
         Writer memory response
     ) internal view virtual;
 }
@@ -36,17 +34,17 @@ abstract contract GetPosition is QueryBase, GetPositionHook {
         emit Labeled(getPositionId, bytes32(0), "getPosition");
     }
 
-    /// @notice Resolve positions for a run of requested `(account, asset, meta)` tuples.
+    /// @notice Resolve positions for a run of requested `(account, asset)` tuples.
     /// @dev Allocates from a per-block capacity hint and grows when position outputs exceed it.
-    /// @param request Block-stream request consisting of `accountAsset(account, asset, meta)*`.
+    /// @param request Block-stream request consisting of `accountAsset(account, asset)*`.
     /// @return Block-stream response containing one output-schema block per position block.
     function getPosition(bytes calldata request) external view returns (bytes memory) {
         (Cur memory query, uint groups, ) = Cursors.init(request, 1);
         Writer memory response = Writers.allocAny(groups);
 
         while (query.i < query.len) {
-            (bytes32 account, bytes32 asset, bytes32 meta) = query.unpackAccountAsset();
-            appendPosition(account, asset, meta, response);
+            (bytes32 account, bytes32 asset) = query.unpackAccountAsset();
+            appendPosition(account, asset, response);
         }
 
         query.complete();