@rootzero/contracts 1.1.0 → 1.3.0

package/peer/Debit.sol

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import { PeerBase } from "./Base.sol";
+import { DebitAccountHook } from "../commands/Debit.sol";
+import { Cursors, Cur, Forms } from "../Cursors.sol";
+
+using Cursors for Cur;
+
+interface IPeerDebitFrom {
+    function peerDebitFrom(bytes calldata request) external returns (bytes memory);
+}
+
+/// @title PeerDebitFrom
+/// @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);
+
+    constructor() {
+        emit Peer(host, peerDebitFromId, "1:0", Forms.AccountAmount, "", false);
+        emit Labeled(peerDebitFromId, bytes32(0), "peerDebitFrom");
+    }
+
+    /// @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) {
+        (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);
+        }
+
+        amounts.complete();
+        return "";
+    }
+}

package/peer/DenyAssets.sol

@@ -7,22 +7,26 @@ import {Cursors, Cur, Schemas} from "../Cursors.sol";
 
 using Cursors for Cur;
 
+interface IPeerDenyAssets {
+    function peerDenyAssets(bytes calldata request) external returns (bytes memory);
+}
+
 /// @title PeerDenyAssets
 /// @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);
+abstract contract PeerDenyAssets is PeerBase, DenyAssetsHook, IPeerDenyAssets {
+    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.
     /// @param request ASSET block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function peerDenyAssets(bytes calldata request) external onlyPeer returns (bytes memory) {
-        (Cur memory assets, , ) = Cursors.init(request, 0, 1);
+        (Cur memory assets, , ) = Cursors.init(request, 1);
 
         while (assets.i < assets.len) {
             (bytes32 asset, bytes32 meta) = assets.unpackAsset();

package/peer/Dispatch.sol

@@ -9,14 +9,18 @@ import { Budget } from "../utils/Value.sol";
 
 using Cursors for Cur;
 
+interface IPeerDispatchPayable {
+    function peerDispatchPayable(bytes calldata request) external payable returns (bytes memory);
+}
+
 /// @title PeerDispatchPayable
 /// @notice Peer endpoint that forwards DISPATCH blocks to a host-defined dispatch hook.
-abstract contract PeerDispatchPayable is PeerBase, Payable, DispatchPayableHook {
-    string private constant NAME = "peerDispatchPayable";
-    uint internal immutable peerDispatchPayableId = peerId(NAME);
+abstract contract PeerDispatchPayable is PeerBase, Payable, DispatchPayableHook, IPeerDispatchPayable {
+    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.
@@ -25,7 +29,7 @@ abstract contract PeerDispatchPayable is PeerBase, Payable, DispatchPayableHook
     /// @param request DISPATCH block stream supplied by the trusted peer.
     /// @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);
+        (Cur memory input, , ) = Cursors.init(request, 1);
         Budget memory budget = valueBudget();
 
         while (input.i < input.len) {

package/peer/Pipe.sol

@@ -8,16 +8,20 @@ import {Budget} from "../utils/Value.sol";
 
 using Cursors for Cur;
 
+interface IPeerPipePayable {
+    function peerPipePayable(bytes calldata request) external payable returns (bytes memory);
+}
+
 /// @title PeerPipePayable
 /// @notice Peer that consumes PIPE blocks and executes each context step stream.
 /// 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);
+abstract contract PeerPipePayable is PeerBase, Pipeline, IPeerPipePayable {
+    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.
@@ -26,7 +30,7 @@ abstract contract PeerPipePayable is PeerBase, Pipeline {
     /// @param request PIPE block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function peerPipePayable(bytes calldata request) external payable onlyPeer returns (bytes memory) {
-        (Cur memory input, , ) = Cursors.init(request, 0, 1);
+        (Cur memory input, , ) = Cursors.init(request, 1);
         Budget memory budget = valueBudget();
 
         while (input.i < input.len) {

package/peer/Settle.sol

@@ -8,22 +8,26 @@ import { Cursors, Cur, Schemas } from "../Cursors.sol";
 
 using Cursors for Cur;
 
+interface IPeerSettle {
+    function peerSettle(bytes calldata request) external returns (bytes memory);
+}
+
 /// @title PeerSettle
 /// @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);
+abstract contract PeerSettle is PeerBase, DebitAccountHook, CreditAccountHook, IPeerSettle {
+    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.
     /// @param request TRANSACTION block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function peerSettle(bytes calldata request) external onlyPeer returns (bytes memory) {
-        (Cur memory state, , ) = Cursors.init(request, 0, 1);
+        (Cur memory state, , ) = Cursors.init(request, 1);
 
         while (state.i < state.len) {
             (bytes32 from, bytes32 to, bytes32 asset, bytes32 meta, uint amount) = state.unpackTransaction();

package/queries/Assets.sol

@@ -22,18 +22,18 @@ 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.
     /// @param request Block-stream request consisting of `#asset { bytes32 asset, bytes32 meta }` 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, 0, 1);
+        (Cur memory query, uint groups, ) = Cursors.init(request, 1);
         Writer memory response = Writers.allocStatuses(groups);
 
         while (query.i < query.len) {

package/queries/Balances.sol

@@ -22,18 +22,18 @@ 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.
     /// @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.
     function getBalances(bytes calldata request) external view returns (bytes memory) {
-        (Cur memory query, uint groups, ) = Cursors.init(request, 0, 1);
+        (Cur memory query, uint groups, ) = Cursors.init(request, 1);
         Writer memory response = Writers.allocAccountAmounts(groups);
 
         while (query.i < query.len) {

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.
@@ -42,7 +41,7 @@ abstract contract GetPosition is QueryBase, GetPositionHook {
     /// @param request Block-stream request consisting of `accountAsset(account, asset, meta)*`.
     /// @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, 0, 1);
+        (Cur memory query, uint groups, ) = Cursors.init(request, 1);
         Writer memory response = Writers.allocAny(groups);
 
         while (query.i < query.len) {