@rootzero/contracts 1.0.1 → 1.2.0

package/core/Pipeline.sol

@@ -20,14 +20,14 @@ abstract contract Pipeline is Payable {
     /// @param account Account identifier for the piped context.
     /// @param state Current threaded state block stream.
     /// @param request Step request block stream.
-    /// @param value Native value assigned to this step.
+    /// @param value Native EVM value assigned to this step.
     /// @return Updated state block stream for the next step.
     function dispatch(
         uint target,
         bytes32 account,
         bytes memory state,
         bytes calldata request,
-        uint value
+        uint128 value
     ) internal virtual returns (bytes memory);
 
     /// @notice Execute a STEP block stream through the pipeline.
@@ -45,8 +45,8 @@ abstract contract Pipeline is Payable {
         (Cur memory input, , ) = Cursors.init(steps, 0, 1);
 
         while (input.i < input.len) {
-            (uint target, uint value, bytes calldata request) = input.unpackStep();
-            state = dispatch(target, account, state, request, useValue(budget, value));
+            (uint target, uint resources, bytes calldata request) = input.unpackStep();
+            state = dispatch(target, account, state, request, useValue(budget, resources));
         }
 
         if (state.length != 0) revert UnexpectedState();

package/docs/Schema.md

@@ -56,9 +56,9 @@ A block payload has fixed fields first, followed by an optional child-block tail
 Once a child block appears, no more fixed fields may follow.
 
 ```txt
-#call { uint target, uint value, #bytes as payload }
+#call { uint target, uint resources, #bytes as payload }
 #context { bytes32 account, #bytes as state, #bytes as request }
-#pipe { uint value, #context { bytes32 account, #bytes as state, #bytes as request } }
+#pipe { uint resources, #context { bytes32 account, #bytes as state, #bytes as steps } }
 ```
 
 The tail is embedded directly as child block bytes. There is no wrapper around a
@@ -108,7 +108,7 @@ or runtime keys.
 
 ```txt
 maybe #account { bytes32 account } as recipient
-#call { uint target, uint value, #bytes as payload }
+#call { uint target, uint resources, #bytes as payload }
 ```
 
 Aliases may be used on any block item, including child blocks and prime items.
@@ -131,6 +131,13 @@ Integers are encoded big-endian. Signed integers use two's-complement encoding
 for their declared width. `bool` is one byte: `0x00` for false and `0x01` for
 true. `bytesN` values are encoded as exactly `N` bytes with no padding.
 
+## Chain Resources
+
+Fields named `resources` are chain-specific resource words. Different chain
+types may pack these words differently, but a given chain type must use one
+stable format everywhere. For EVM chains, the low 128 bits are native value /
+endowment in wei; higher bits are reserved for execution resources such as gas.
+
 ## Identifiers
 
 Block names, field names, and aliases use lower camelCase ASCII identifiers:
@@ -185,10 +192,10 @@ Common protocol schemas live in `contracts/blocks/Schema.sol`:
 #amount { bytes32 asset, bytes32 meta, uint amount }
 #balance { bytes32 asset, bytes32 meta, uint amount }
 #custody { uint host, bytes32 asset, bytes32 meta, uint amount }
-#call { uint target, uint value, #bytes as payload }
-#step { uint target, uint value, #bytes as request }
+#call { uint target, uint resources, #bytes as payload }
+#step { uint target, uint resources, #bytes as request }
 #context { bytes32 account, #bytes as state, #bytes as request }
-#pipe { uint value, #context { bytes32 account, #bytes as state, #bytes as request } }
+#pipe { uint resources, #context { bytes32 account, #bytes as state, #bytes as steps } }
 #auth { uint cid, uint deadline, #bytes as proof }
 ```
 

package/events/Admin.sol

@@ -1,16 +1,15 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import { EventEmitter } from "./Emitter.sol";
+import {EventEmitter} from "./Emitter.sol";
 
 /// @notice Emitted once per admin command during host deployment to publish its request schema and state keys.
 abstract contract AdminEvent is EventEmitter {
     string private constant ABI =
-        "event Admin(uint indexed host, uint id, string name, bytes32 shape, string request, bytes4 state, bytes4 output, bool postcheck, bool funded)";
+        "event Admin(uint indexed host, uint id, bytes32 shape, string request, bytes4 state, bytes4 output, bool postcheck, bool funded)";
 
     /// @param host Host node ID that owns this admin command.
     /// @param id Command node ID.
-    /// @param name Human-readable command name.
     /// @param shape Per-operation block counts encoded as `request:state:output`.
     /// The request count covers only the input request run. If `postcheck` is true,
     /// a constraint run follows the input run, or starts the request when `request`
@@ -23,7 +22,6 @@ abstract contract AdminEvent is EventEmitter {
     event Admin(
         uint indexed host,
         uint id,
-        string name,
         bytes32 shape,
         string request,
         bytes4 state,

package/events/Chain.sol

@@ -5,14 +5,13 @@ import {EventEmitter} from "./Emitter.sol";
 
 /// @notice Emitted when a chain/domain node is announced.
 abstract contract ChainEvent is EventEmitter {
-    string private constant ABI = "event Chain(uint indexed chain, bytes32 native, uint commander, bytes32 admin, string name)";
+    string private constant ABI = "event Chain(uint indexed chain, bytes32 native, uint commander, bytes32 admin)";
 
     /// @param chain Chain node ID.
     /// @param native Native asset ID for the chain.
     /// @param commander Commander host node ID for the chain.
     /// @param admin Admin account for the commander host on the chain.
-    /// @param name Chain or domain name.
-    event Chain(uint indexed chain, bytes32 native, uint commander, bytes32 admin, string name);
+    event Chain(uint indexed chain, bytes32 native, uint commander, bytes32 admin);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Command.sol

@@ -1,16 +1,15 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import { EventEmitter } from "./Emitter.sol";
+import {EventEmitter} from "./Emitter.sol";
 
 /// @notice Emitted once per command during host deployment to publish its request schema and state keys.
 abstract contract CommandEvent is EventEmitter {
     string private constant ABI =
-        "event Command(uint indexed host, uint id, string name, bytes32 shape, string request, bytes4 state, bytes4 output, bool postcheck, bool funded)";
+        "event Command(uint indexed host, uint id, bytes32 shape, string request, bytes4 state, bytes4 output, bool postcheck, bool funded)";
 
     /// @param host Host node ID that owns this command.
     /// @param id Command node ID.
-    /// @param name Human-readable command name.
     /// @param shape Per-operation block counts encoded as `request:state:output`.
     /// The request count covers only the input request run. If `postcheck` is true,
     /// a constraint run follows the input run, or starts the request when `request`
@@ -23,7 +22,6 @@ abstract contract CommandEvent is EventEmitter {
     event Command(
         uint indexed host,
         uint id,
-        string name,
         bytes32 shape,
         string request,
         bytes4 state,

package/events/Guard.sol

@@ -5,13 +5,12 @@ import {EventEmitter} from "./Emitter.sol";
 
 /// @notice Emitted once per guard action during host deployment to publish its request schema.
 abstract contract GuardEvent is EventEmitter {
-    string private constant ABI = "event Guard(uint indexed host, uint id, string name, string request)";
+    string private constant ABI = "event Guard(uint indexed host, uint id, string request)";
 
     /// @param host Host node ID that owns this guard action.
     /// @param id Guard action node ID.
-    /// @param name Human-readable guard action name.
     /// @param request Schema DSL string describing the guard action request shape.
-    event Guard(uint indexed host, uint id, string name, string request);
+    event Guard(uint indexed host, uint id, string request);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Introduction.sol

@@ -5,13 +5,11 @@ import { EventEmitter } from "./Emitter.sol";
 
 /// @notice Emitted when a host introduces itself to another host.
 abstract contract IntroductionEvent is EventEmitter {
-    string private constant ABI = "event Introduction(uint indexed host, uint blocknum, uint16 version, string namespace)";
+    string private constant ABI = "event Introduction(uint indexed host, uint blocknum)";
 
     /// @param host Host node ID of the introducing contract.
     /// @param blocknum Block number at which the host was deployed.
-    /// @param version Protocol version the host implements.
-    /// @param namespace Human-readable namespace string for the host.
-    event Introduction(uint indexed host, uint blocknum, uint16 version, string namespace);
+    event Introduction(uint indexed host, uint blocknum);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Labeled.sol

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import {EventEmitter} from "./Emitter.sol";
+
+/// @notice Emitted to attach a human-readable namespaced label to a node ID.
+abstract contract LabeledEvent is EventEmitter {
+    string private constant ABI = "event Labeled(uint indexed id, bytes32 namespace, string name)";
+
+    /// @param id Node or capability ID being labeled.
+    /// @param namespace Label namespace.
+    /// @param name Human-readable name within the namespace.
+    event Labeled(uint indexed id, bytes32 namespace, string name);
+
+    constructor() {
+        emit EventAbi(ABI);
+    }
+}

package/events/Peer.sol

@@ -6,24 +6,15 @@ import {EventEmitter} from "./Emitter.sol";
 /// @notice Emitted once per peer during host deployment to publish its request and response schemas.
 abstract contract PeerEvent is EventEmitter {
     string private constant ABI =
-        "event Peer(uint indexed host, uint id, string name, bytes32 shape, string request, string response, bool funded)";
+        "event Peer(uint indexed host, uint id, bytes32 shape, string request, string response, bool funded)";
 
     /// @param host Host node ID that owns this peer.
     /// @param id Peer node ID.
-    /// @param name Human-readable peer name.
     /// @param shape Per-operation block counts encoded as `request:response`.
     /// @param request Schema DSL string describing the input request run, or empty if none.
     /// @param response Schema DSL string describing the peer response shape.
     /// @param funded Whether the peer entrypoint accepts nonzero `msg.value`.
-    event Peer(
-        uint indexed host,
-        uint id,
-        string name,
-        bytes32 shape,
-        string request,
-        string response,
-        bool funded
-    );
+    event Peer(uint indexed host, uint id, bytes32 shape, string request, string response, bool funded);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Query.sol

@@ -5,15 +5,14 @@ import {EventEmitter} from "./Emitter.sol";
 
 /// @notice Emitted once per query during host deployment to publish its request and response schemas.
 abstract contract QueryEvent is EventEmitter {
-    string private constant ABI = "event Query(uint indexed host, uint id, string name, bytes32 shape, string request, string response)";
+    string private constant ABI = "event Query(uint indexed host, uint id, bytes32 shape, string request, string response)";
 
     /// @param host Host node ID that owns this query.
     /// @param id Query node ID.
-    /// @param name Human-readable query name.
     /// @param shape Per-operation block counts encoded as `request:response`.
     /// @param request Schema DSL string describing the input request run, or empty if none.
     /// @param response Schema DSL string describing the query response shape.
-    event Query(uint indexed host, uint id, string name, bytes32 shape, string request, string response);
+    event Query(uint indexed host, uint id, bytes32 shape, string request, string response);
 
     constructor() {
         emit EventAbi(ABI);

package/guards/Base.sol

@@ -3,7 +3,8 @@ pragma solidity ^0.8.33;
 
 import {AccessControl} from "../core/Access.sol";
 import {GuardEvent} from "../events/Guard.sol";
-import {Ids, Selectors} from "../utils/Ids.sol";
+import {LabeledEvent} from "../events/Labeled.sol";
+import {Ids} from "../utils/Ids.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)`.
@@ -19,17 +20,17 @@ function encodeGuardCall(uint target, bytes calldata request) pure returns (byte
 /// @title GuardBase
 /// @notice Abstract base for guardian-only direct host actions.
 /// Guard actions are non-payable direct calls with no command context, state, or response.
-abstract contract GuardBase is AccessControl, GuardEvent {
+abstract contract GuardBase is AccessControl, GuardEvent, LabeledEvent {
     /// @dev Restrict execution to active guardian addresses.
     modifier onlyGuardian() {
         if (!isGuardian(msg.sender)) revert AccessDenied();
         _;
     }
 
-    /// @notice Derive the deterministic node ID for a named guard action on this contract.
-    /// @param name Guard action function name (without argument list).
+    /// @notice Derive the deterministic node ID for a guard action selector on this contract.
+    /// @param selector Guard action entrypoint selector.
     /// @return Guard action node ID.
-    function guardId(string memory name) internal view returns (uint) {
-        return Ids.toGuard(Selectors.guard(name), address(this));
+    function guardId(bytes4 selector) internal view returns (uint) {
+        return Ids.toGuard(selector, address(this));
     }
 }

package/guards/Revoke.sol

@@ -10,12 +10,11 @@ using Cursors for Cur;
 /// Each NODE block in the request is deauthorized on the host.
 /// Only callable by active guardian addresses.
 abstract contract Revoke is GuardBase {
-    string private constant NAME = "revoke";
-
-    uint internal immutable revokeId = guardId(NAME);
+    uint internal immutable revokeId = guardId(this.revoke.selector);
 
     constructor() {
-        emit Guard(host, revokeId, NAME, Schemas.Node);
+        emit Guard(host, revokeId, Schemas.Node);
+        emit Labeled(revokeId, bytes32(0), "revoke");
     }
 
     function revoke(bytes calldata request) external onlyGuardian {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rootzero/contracts",
-  "version": "1.0.1",
+  "version": "1.2.0",
   "description": "Solidity contracts and protocol building blocks for rootzero hosts and commands.",
   "private": false,
   "license": "GPL-3.0-only",
@@ -8,6 +8,7 @@
   "files": [
     "**/*.sol",
     "README.md",
+    "CHANGELOG.md",
     "LICENSE",
     "docs/Schema.md"
   ],

package/peer/AllowAssets.sol

@@ -11,11 +11,11 @@ using Cursors for Cur;
 /// @notice Peer that permits a list of (asset, meta) pairs on behalf of a peer host.
 /// Each ASSET block in the request calls `allowAsset`. Restricted to trusted peers.
 abstract contract PeerAllowAssets is PeerBase, AllowAssetsHook {
-    string private constant NAME = "peerAllowAssets";
-    uint internal immutable peerAllowAssetsId = peerId(NAME);
+    uint internal immutable peerAllowAssetsId = peerId(this.peerAllowAssets.selector);
 
     constructor() {
-        emit Peer(host, peerAllowAssetsId, NAME, "1:0", Schemas.Asset, "", false);
+        emit Peer(host, peerAllowAssetsId, "1:0", Schemas.Asset, "", false);
+        emit Labeled(peerAllowAssetsId, bytes32(0), "peerAllowAssets");
     }
 
     /// @notice Execute the allow-assets peer call.

package/peer/Allowance.sol

@@ -12,11 +12,11 @@ using Cursors for Cur;
 /// Each AMOUNT block in the request is scoped to the peer host and passed to the
 /// shared allowance hook as a host-scoped allowance. Restricted to trusted peers.
 abstract contract PeerAllowance is PeerBase, AllowanceHook {
-    string private constant NAME = "peerAllowance";
-    uint internal immutable peerAllowanceId = peerId(NAME);
+    uint internal immutable peerAllowanceId = peerId(this.peerAllowance.selector);
 
     constructor() {
-        emit Peer(host, peerAllowanceId, NAME, "1:0", Schemas.Amount, "", false);
+        emit Peer(host, peerAllowanceId, "1:0", Schemas.Amount, "", false);
+        emit Labeled(peerAllowanceId, bytes32(0), "peerAllowance");
     }
 
     /// @notice Execute the allowance peer call.

package/peer/BalancePull.sol

@@ -20,11 +20,11 @@ abstract contract BalancePullHook {
 /// Each BALANCE block in the request calls `balancePull(peer, asset, meta, amount)`.
 /// Restricted to trusted peers.
 abstract contract PeerBalancePull is PeerBase, BalancePullHook {
-    string private constant NAME = "peerBalancePull";
-    uint internal immutable peerBalancePullId = peerId(NAME);
+    uint internal immutable peerBalancePullId = peerId(this.peerBalancePull.selector);
 
     constructor() {
-        emit Peer(host, peerBalancePullId, NAME, "1:0", Schemas.Balance, "", false);
+        emit Peer(host, peerBalancePullId, "1:0", Schemas.Balance, "", false);
+        emit Labeled(peerBalancePullId, bytes32(0), "peerBalancePull");
     }
 
     /// @notice Execute the balance-pull peer call.

package/peer/Base.sol

@@ -3,7 +3,8 @@ pragma solidity ^0.8.33;
 
 import { NodeCalls } from "../core/Calls.sol";
 import { PeerEvent } from "../events/Peer.sol";
-import { Ids, Selectors } from "../utils/Ids.sol";
+import { LabeledEvent } from "../events/Labeled.sol";
+import { Ids } from "../utils/Ids.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)`.
@@ -20,7 +21,7 @@ function encodePeerCall(uint target, bytes calldata request) pure returns (bytes
 /// @notice Abstract base for all rootzero peer contracts.
 /// Peers handle inter-host operations and asset allow/deny management
 /// between cooperating hosts. Access is restricted to trusted callers via `onlyPeer`.
-abstract contract PeerBase is NodeCalls, PeerEvent {
+abstract contract PeerBase is NodeCalls, PeerEvent, LabeledEvent {
     /// @dev Thrown when the commander attempts to call a peer entrypoint directly.
     error CommanderNotAllowed();
 
@@ -31,10 +32,10 @@ abstract contract PeerBase is NodeCalls, PeerEvent {
         _;
     }
 
-    /// @notice Derive the deterministic node ID for a named peer on this contract.
-    /// @param name Peer function name (without argument list).
+    /// @notice Derive the deterministic node ID for a peer selector on this contract.
+    /// @param selector Peer entrypoint selector.
     /// @return Peer node ID.
-    function peerId(string memory name) internal view returns (uint) {
-        return Ids.toPeer(Selectors.peer(name), address(this));
+    function peerId(bytes4 selector) internal view returns (uint) {
+        return Ids.toPeer(selector, address(this));
     }
 }

package/peer/DenyAssets.sol

@@ -11,11 +11,11 @@ using Cursors for Cur;
 /// @notice Peer that blocks a list of (asset, meta) pairs on behalf of a peer host.
 /// Each ASSET block in the request calls `denyAsset`. Restricted to trusted peers.
 abstract contract PeerDenyAssets is PeerBase, DenyAssetsHook {
-    string private constant NAME = "peerDenyAssets";
-    uint internal immutable peerDenyAssetsId = peerId(NAME);
+    uint internal immutable peerDenyAssetsId = peerId(this.peerDenyAssets.selector);
 
     constructor() {
-        emit Peer(host, peerDenyAssetsId, NAME, "1:0", Schemas.Asset, "", false);
+        emit Peer(host, peerDenyAssetsId, "1:0", Schemas.Asset, "", false);
+        emit Labeled(peerDenyAssetsId, bytes32(0), "peerDenyAssets");
     }
 
     /// @notice Execute the deny-assets peer call.

package/peer/Dispatch.sol

@@ -4,29 +4,19 @@ pragma solidity ^0.8.33;
 import { PeerBase } from "./Base.sol";
 import { Payable } from "../core/Payable.sol";
 import { Cursors, Cur, Schemas } from "../Cursors.sol";
+import { DispatchPayableHook } from "../commands/Relay.sol";
 import { Budget } from "../utils/Value.sol";
 
 using Cursors for Cur;
 
-abstract contract PeerDispatchPayableHook {
-    /// @notice Override to dispatch an already encoded payload to `chain`.
-    /// @param chain Destination chain node ID.
-    /// @param resources Chain-adapter-specific destination resources. EVM adapters
-    /// may interpret this as packed execution gas and destination value.
-    /// @param payload Encoded payload ready for the transport layer.
-    /// @param budget Source-chain native-value budget available for transport
-    /// fees and destination resource funding.
-    function dispatch(uint chain, uint resources, bytes calldata payload, Budget memory budget) internal virtual;
-}
-
 /// @title PeerDispatchPayable
 /// @notice Peer endpoint that forwards DISPATCH blocks to a host-defined dispatch hook.
-abstract contract PeerDispatchPayable is PeerBase, Payable, PeerDispatchPayableHook {
-    string private constant NAME = "peerDispatchPayable";
-    uint internal immutable peerDispatchPayableId = peerId(NAME);
+abstract contract PeerDispatchPayable is PeerBase, Payable, DispatchPayableHook {
+    uint internal immutable peerDispatchPayableId = peerId(this.peerDispatchPayable.selector);
 
     constructor() {
-        emit Peer(host, peerDispatchPayableId, NAME, "1:0", Schemas.Dispatch, "", true);
+        emit Peer(host, peerDispatchPayableId, "1:0", Schemas.Dispatch, "", true);
+        emit Labeled(peerDispatchPayableId, bytes32(0), "peerDispatchPayable");
     }
 
     /// @notice Forward peer-supplied dispatches to the host-defined dispatch hook.
@@ -36,14 +26,14 @@ abstract contract PeerDispatchPayable is PeerBase, Payable, PeerDispatchPayableH
     /// @return output Empty response bytes.
     function peerDispatchPayable(bytes calldata request) external payable onlyPeer returns (bytes memory output) {
         (Cur memory input, , ) = Cursors.init(request, 0, 1);
-        Budget memory budget = valueBudget();
-
-        while (input.i < input.len) {
-            (uint chain, uint resources, bytes calldata payload) = input.unpackDispatch();
-            dispatch(chain, resources, payload, budget);
-        }
-
-        input.complete();
+        Budget memory budget = valueBudget();
+
+        while (input.i < input.len) {
+            (uint chain, uint resources, bytes calldata payload) = input.unpackDispatch();
+            dispatch(chain, resources, bytes(payload), budget);
+        }
+
+        input.complete();
         return "";
     }
 

package/peer/Pipe.sol

@@ -10,18 +10,18 @@ using Cursors for Cur;
 
 /// @title PeerPipePayable
 /// @notice Peer that consumes PIPE blocks and executes each context step stream.
-/// Each PIPE block carries a value budget plus a CONTEXT block; the nested
+/// Each PIPE block carries chain resources plus a CONTEXT block; the nested
 /// context steps are passed to the shared pipeline as the step stream.
 abstract contract PeerPipePayable is PeerBase, Pipeline {
-    string private constant NAME = "peerPipePayable";
-    uint internal immutable peerPipePayableId = peerId(NAME);
+    uint internal immutable peerPipePayableId = peerId(this.peerPipePayable.selector);
 
     constructor() {
-        emit Peer(host, peerPipePayableId, NAME, "1:0", Schemas.Pipe, "", true);
+        emit Peer(host, peerPipePayableId, "1:0", Schemas.Pipe, "", true);
+        emit Labeled(peerPipePayableId, bytes32(0), "peerPipePayable");
     }
 
     /// @notice Execute peer-supplied pipes through the shared payable pipe.
-    /// @dev Each pipe receives its own explicit value sub-budget. Any top-level
+    /// @dev Each pipe receives its own explicit EVM value sub-budget. Any top-level
     ///      `msg.value` not assigned to a pipe remains on this host.
     /// @param request PIPE block stream supplied by the trusted peer.
     /// @return Empty response bytes.
@@ -30,8 +30,8 @@ abstract contract PeerPipePayable is PeerBase, Pipeline {
         Budget memory budget = valueBudget();
 
         while (input.i < input.len) {
-            (uint value, bytes32 account, bytes calldata state, bytes calldata steps) = input.unpackPipe();
-            pipe(account, state, steps, allocateValue(budget, value));
+            (uint resources, bytes32 account, bytes calldata state, bytes calldata steps) = input.unpackPipe();
+            pipe(account, state, steps, allocateValue(budget, resources));
         }
 
         input.complete();

package/peer/Settle.sol

@@ -12,11 +12,11 @@ using Cursors for Cur;
 /// @notice Peer that consumes peer-supplied TRANSACTION blocks through debit and credit hooks.
 /// Each TRANSACTION block calls `debitAccount` for `from` and `creditAccount` for `to`.
 abstract contract PeerSettle is PeerBase, DebitAccountHook, CreditAccountHook {
-    string private constant NAME = "peerSettle";
-    uint internal immutable peerSettleId = peerId(NAME);
+    uint internal immutable peerSettleId = peerId(this.peerSettle.selector);
 
     constructor() {
-        emit Peer(host, peerSettleId, NAME, "1:0", Schemas.Transaction, "", false);
+        emit Peer(host, peerSettleId, "1:0", Schemas.Transaction, "", false);
+        emit Labeled(peerSettleId, bytes32(0), "peerSettle");
     }
 
     /// @notice Execute the peer-settle call.

package/queries/Assets.sol

@@ -22,11 +22,11 @@ abstract contract AssetStatusHook {
 /// 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 {
-    string private constant NAME = "assetStatus";
-    uint public immutable assetStatusId = queryId(NAME);
+    uint public immutable assetStatusId = queryId(this.assetStatus.selector);
 
     constructor() {
-        emit Query(host, assetStatusId, NAME, "1:1", Schemas.Asset, Forms.Status);
+        emit Query(host, assetStatusId, "1:1", Schemas.Asset, Forms.Status);
+        emit Labeled(assetStatusId, bytes32(0), "assetStatus");
     }
 
     /// @notice Resolve asset support status for a run of requested `(asset, meta)` tuples.

package/queries/Balances.sol

@@ -22,11 +22,11 @@ abstract contract GetBalancesHook {
 /// 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 {
-    string private constant NAME = "getBalances";
-    uint public immutable getBalancesId = queryId(NAME);
+    uint public immutable getBalancesId = queryId(this.getBalances.selector);
 
     constructor() {
-        emit Query(host, getBalancesId, NAME, "1:1", Forms.AccountAsset, Forms.AccountAmount);
+        emit Query(host, getBalancesId, "1:1", Forms.AccountAsset, Forms.AccountAmount);
+        emit Labeled(getBalancesId, bytes32(0), "getBalances");
     }
 
     /// @notice Resolve balances for a run of requested `(account, asset, meta)` tuples.

package/queries/Base.sol

@@ -2,8 +2,9 @@
 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, Selectors } from "../utils/Ids.sol";
+import { Ids } from "../utils/Ids.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)`.
@@ -20,14 +21,14 @@ function encodeQueryCall(uint target, bytes calldata request) pure returns (byte
 /// @notice Abstract base for rootzero query contracts.
 /// Queries are view-only entry points that consume a block-stream request and
 /// return a block-stream response.
-abstract contract QueryBase is Runtime, QueryEvent {
+abstract contract QueryBase is Runtime, QueryEvent, LabeledEvent {
 
-    /// @notice Derive the deterministic node ID for a named query on this contract.
-    /// The ID encodes the ABI selector of `name(bytes)` and `address(this)`,
-    /// making it unique per (function name, contract address) pair.
-    /// @param name Query function name (without argument list).
+    /// @notice Derive the deterministic node ID for a query selector on this contract.
+    /// The ID encodes the ABI selector and `address(this)`, making it unique
+    /// per (function selector, contract address) pair.
+    /// @param selector Query entrypoint selector.
     /// @return Query node ID.
-    function queryId(string memory name) internal view returns (uint) {
-        return Ids.toQuery(Selectors.query(name), address(this));
+    function queryId(bytes4 selector) internal view returns (uint) {
+        return Ids.toQuery(selector, address(this));
     }
 }

package/queries/Positions.sol

@@ -29,12 +29,11 @@ abstract contract GetPositionHook {
 /// The request is a run of `ACCOUNT_ASSET` form blocks.
 /// The response returns one output-schema block per position entry, preserving request order.
 abstract contract GetPosition is QueryBase, GetPositionHook {
-    string private constant NAME = "getPosition";
-
-    uint public immutable getPositionId = queryId(NAME);
+    uint public immutable getPositionId = queryId(this.getPosition.selector);
 
     constructor(string memory output) {
-        emit Query(host, getPositionId, NAME, "1:1", Forms.AccountAsset, output);
+        emit Query(host, getPositionId, "1:1", Forms.AccountAsset, output);
+        emit Labeled(getPositionId, bytes32(0), "getPosition");
     }
 
     /// @notice Resolve positions for a run of requested `(account, asset, meta)` tuples.

package/utils/Value.sol

@@ -18,9 +18,10 @@ library Values {
     /// @param budget Mutable budget to deduct from.
     /// @param amount Native value to spend in wei.
     /// @return The same `amount`, ready to forward to a callee.
-    function use(Budget memory budget, uint amount) internal pure returns (uint) {
-        if (amount > budget.remaining) revert InsufficientValue();
-        budget.remaining -= amount;
+    function use(Budget memory budget, uint128 amount) internal pure returns (uint128) {
+        uint value = uint(amount);
+        if (value > budget.remaining) revert InsufficientValue();
+        budget.remaining -= value;
         return amount;
     }
 
@@ -29,7 +30,7 @@ library Values {
     /// @param budget Mutable parent budget to deduct from.
     /// @param amount Native value to assign to the sub-budget, in wei.
     /// @return A new budget with `amount` remaining.
-    function allocate(Budget memory budget, uint amount) internal pure returns (Budget memory) {
+    function allocate(Budget memory budget, uint128 amount) internal pure returns (Budget memory) {
         return Budget({remaining: use(budget, amount)});
     }
 }