@rootzero/contracts 1.10.0 → 1.12.0

package/ports/AllowAssets.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import { PortBase } from "./Base.sol";
 import { AllowAssetsHook } from "../commands/admin/AllowAssets.sol";
-import { Cursors, Cur, Schemas } from "../Cursors.sol";
+import { Cursors, Cur, Keys } from "../Cursors.sol";
 
 using Cursors for Cur;
 
@@ -11,25 +11,22 @@ using Cursors for Cur;
 /// @notice Port 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 PortAllowAssets is PortBase, AllowAssetsHook {
-    uint internal immutable portAllowAssetsId = portId(this.portAllowAssets.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Port(host, portAllowAssetsId, "1:0", Schemas.Asset, "", false);
-        emit Labeled(portAllowAssetsId, bytes32(0), "portAllowAssets");
+        (, descriptor) = port("portAllowAssets", Keys.Asset, Keys.Empty, 0, false);
     }
 
     /// @notice Execute the allow-assets peer call.
     /// @param data ASSET block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function portAllowAssets(bytes calldata data) external onlyPeer returns (bytes memory) {
-        (Cur memory assets, ) = Cursors.init(data, 1);
+        (Cur memory input, ) = openInput(data, descriptor);
 
-        while (assets.i < assets.len) {
-            bytes32 asset = assets.unpackAsset();
+        while (input.i < input.len) {
+            bytes32 asset = input.unpackAsset();
             allowAsset(asset);
         }
-
-        assets.complete();
         return "";
     }
 }

package/ports/Allowance.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import {PortBase} from "./Base.sol";
 import {AllowanceHook} from "../commands/admin/Allowance.sol";
-import {Cursors, Cur, Schemas} from "../Cursors.sol";
+import {Cursors, Cur, Keys} from "../Cursors.sol";
 
 using Cursors for Cur;
 
@@ -12,26 +12,23 @@ 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 PortAllowance is PortBase, AllowanceHook {
-    uint internal immutable portAllowanceId = portId(this.portAllowance.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Port(host, portAllowanceId, "1:0", Schemas.Amount, "", false);
-        emit Labeled(portAllowanceId, bytes32(0), "portAllowance");
+        (, descriptor) = port("portAllowance", Keys.Amount, Keys.Empty, 0, false);
     }
 
     /// @notice Execute the allowance port call.
     /// @param data AMOUNT block stream requested by the trusted peer.
     /// @return Empty response bytes.
     function portAllowance(bytes calldata data) external onlyPeer returns (bytes memory) {
-        (Cur memory amounts, ) = Cursors.init(data, 1);
+        (Cur memory input, ) = openInput(data, descriptor);
         uint peer = caller();
 
-        while (amounts.i < amounts.len) {
-            (bytes32 asset, uint amount) = amounts.unpackAmount();
+        while (input.i < input.len) {
+            (bytes32 asset, uint amount) = input.unpackAmount();
             allowance(peer, asset, amount);
         }
-
-        amounts.complete();
         return "";
     }
 }

package/ports/Base.sol

@@ -2,15 +2,15 @@
 pragma solidity ^0.8.33;
 
 import { NodeCalls } from "../core/Calls.sol";
-import { PortEvent } from "../events/Port.sol";
-import { LabeledEvent } from "../events/Labeled.sol";
+import { EndpointBase } from "../core/Endpoint.sol";
 import { Nodes } from "../utils/Nodes.sol";
+import { Selectors } from "../utils/Selectors.sol";
 
 /// @title PortBase
 /// @notice Abstract base for peer-facing rootzero ports.
 /// Ports handle inter-host operations between cooperating hosts.
 /// Access is restricted to trusted peer callers via `onlyPeer`.
-abstract contract PortBase is NodeCalls, PortEvent, LabeledEvent {
+abstract contract PortBase is NodeCalls, EndpointBase {
     /// @dev Thrown when the commander attempts to call a port entrypoint directly.
     error CommanderNotAllowed();
 
@@ -21,10 +21,23 @@ abstract contract PortBase is NodeCalls, PortEvent, LabeledEvent {
         _;
     }
 
-    /// @notice Derive the deterministic node ID for a port selector on this contract.
-    /// @param selector Port entrypoint selector.
-    /// @return Port node ID.
-    function portId(bytes4 selector) internal view returns (uint) {
-        return Nodes.toPort(selector, address(this));
+    /// @notice Publish port metadata and a default label.
+    /// @param name Default human-readable port label and selector name.
+    /// @param input Packed input lane plus optional group byte.
+    /// @param output Packed output lane plus optional group byte.
+    /// @param selector Port ABI selector, or zero to derive it from `name`.
+    /// @param funded Whether the port accepts nonzero native value.
+    /// @return id Port node ID.
+    /// @return descriptor Packed endpoint lane metadata and flags.
+    function port(
+        string memory name,
+        bytes9 input,
+        bytes9 output,
+        bytes4 selector,
+        bool funded
+    ) internal returns (uint id, bytes32 descriptor) {
+        selector = selector == bytes4(0) ? Selectors.port(name) : selector;
+        id = Nodes.toPort(selector, address(this));
+        descriptor = endpoint(id, name, bytes9(0), input, output, funded, false);
     }
 }

package/ports/Credit.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import { PortBase } from "./Base.sol";
 import { CreditAccountHook } from "../commands/Credit.sol";
-import { Cursors, Cur, Forms } from "../Cursors.sol";
+import { Cursors, Cur, Keys } from "../Cursors.sol";
 
 using Cursors for Cur;
 
@@ -11,25 +11,22 @@ using Cursors for Cur;
 /// @notice Port that lets a trusted peer credit supplied accounts directly.
 /// Each ACCOUNT_AMOUNT block calls `creditAccount` for its account.
 abstract contract PortCreditAccount is PortBase, CreditAccountHook {
-    uint internal immutable portCreditAccountId = portId(this.portCreditAccount.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Port(host, portCreditAccountId, "1:0", Forms.AccountAmount, "", false);
-        emit Labeled(portCreditAccountId, bytes32(0), "portCreditAccount");
+        (, descriptor) = port("portCreditAccount", Keys.AccountAmount, Keys.Empty, 0, false);
     }
 
     /// @notice Execute the port-credit call.
     /// @param data ACCOUNT_AMOUNT block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function portCreditAccount(bytes calldata data) external onlyPeer returns (bytes memory) {
-        (Cur memory amounts, ) = Cursors.init(data, 1);
+        (Cur memory input, ) = openInput(data, descriptor);
 
-        while (amounts.i < amounts.len) {
-            (bytes32 account, bytes32 asset, uint amount) = amounts.unpackAccountAmount();
+        while (input.i < input.len) {
+            (bytes32 account, bytes32 asset, uint amount) = input.unpackAccountAmount();
             creditAccount(account, asset, amount);
         }
-
-        amounts.complete();
         return "";
     }
 }

package/ports/Debit.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import { PortBase } from "./Base.sol";
 import { DebitAccountHook } from "../commands/Debit.sol";
-import { Cursors, Cur, Forms } from "../Cursors.sol";
+import { Cursors, Cur, Keys } from "../Cursors.sol";
 
 using Cursors for Cur;
 
@@ -11,25 +11,22 @@ using Cursors for Cur;
 /// @notice Port that lets a trusted peer debit supplied accounts directly.
 /// Each ACCOUNT_AMOUNT block calls `debitAccount` for its account.
 abstract contract PortDebitAccount is PortBase, DebitAccountHook {
-    uint internal immutable portDebitAccountId = portId(this.portDebitAccount.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Port(host, portDebitAccountId, "1:0", Forms.AccountAmount, "", false);
-        emit Labeled(portDebitAccountId, bytes32(0), "portDebitAccount");
+        (, descriptor) = port("portDebitAccount", Keys.AccountAmount, Keys.Empty, 0, false);
     }
 
     /// @notice Execute the port-debit call.
     /// @param data ACCOUNT_AMOUNT block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function portDebitAccount(bytes calldata data) external onlyPeer returns (bytes memory) {
-        (Cur memory amounts, ) = Cursors.init(data, 1);
+        (Cur memory input, ) = openInput(data, descriptor);
 
-        while (amounts.i < amounts.len) {
-            (bytes32 account, bytes32 asset, uint amount) = amounts.unpackAccountAmount();
+        while (input.i < input.len) {
+            (bytes32 account, bytes32 asset, uint amount) = input.unpackAccountAmount();
             debitAccount(account, asset, amount);
         }
-
-        amounts.complete();
         return "";
     }
 }

package/ports/DenyAssets.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import {PortBase} from "./Base.sol";
 import {DenyAssetsHook} from "../commands/admin/DenyAssets.sol";
-import {Cursors, Cur, Schemas} from "../Cursors.sol";
+import {Cursors, Cur, Keys} from "../Cursors.sol";
 
 using Cursors for Cur;
 
@@ -11,25 +11,22 @@ using Cursors for Cur;
 /// @notice Port 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 PortDenyAssets is PortBase, DenyAssetsHook {
-    uint internal immutable portDenyAssetsId = portId(this.portDenyAssets.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Port(host, portDenyAssetsId, "1:0", Schemas.Asset, "", false);
-        emit Labeled(portDenyAssetsId, bytes32(0), "portDenyAssets");
+        (, descriptor) = port("portDenyAssets", Keys.Asset, Keys.Empty, 0, false);
     }
 
     /// @notice Execute the deny-assets peer call.
     /// @param data ASSET block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function portDenyAssets(bytes calldata data) external onlyPeer returns (bytes memory) {
-        (Cur memory assets, ) = Cursors.init(data, 1);
+        (Cur memory input, ) = openInput(data, descriptor);
 
-        while (assets.i < assets.len) {
-            bytes32 asset = assets.unpackAsset();
+        while (input.i < input.len) {
+            bytes32 asset = input.unpackAsset();
             denyAsset(asset);
         }
-
-        assets.complete();
         return "";
     }
 }

package/ports/Dispatch.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.33;
 import { PortBase } from "./Base.sol";
 import { Payable } from "../core/Payable.sol";
 import { RoutePayableHook } from "../commands/Relay.sol";
-import { Cursors, Cur, Schemas } from "../Cursors.sol";
+import { Cursors, Cur, Keys } from "../Cursors.sol";
 import { Budget } from "../utils/Value.sol";
 
 using Cursors for Cur;
@@ -12,28 +12,25 @@ using Cursors for Cur;
 /// @title PortDispatchPayable
 /// @notice Port endpoint that forwards DISPATCH blocks to a host-defined route hook.
 abstract contract PortDispatchPayable is PortBase, Payable, RoutePayableHook {
-    uint internal immutable portDispatchPayableId = portId(this.portDispatchPayable.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Port(host, portDispatchPayableId, "1:0", Schemas.Dispatch, "", true);
-        emit Labeled(portDispatchPayableId, bytes32(0), "portDispatchPayable");
+        (, descriptor) = port("portDispatchPayable", Keys.Dispatch, Keys.Empty, 0, true);
     }
 
     /// @notice Forward peer-supplied dispatches to the host-defined route hook.
     /// @dev Route hooks receive the shared top-level source value
     ///      budget. Any `msg.value` not spent by the hook remains on this host.
     /// @param data DISPATCH block stream supplied by the trusted peer.
-    /// @return output Empty response bytes.
-    function portDispatchPayable(bytes calldata data) external payable onlyPeer returns (bytes memory output) {
-        (Cur memory input, ) = Cursors.init(data, 1);
+    /// @return Empty response bytes.
+    function portDispatchPayable(bytes calldata data) external payable onlyPeer returns (bytes memory) {
+        (Cur memory input, ) = openInput(data, descriptor);
         Budget memory budget = openValue();
 
         while (input.i < input.len) {
             (uint portal, uint resources, bytes calldata payload) = input.unpackDispatch();
             route(portal, resources, bytes(payload), budget);
         }
-
-        input.complete();
         return "";
     }
 

package/ports/Pipe.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import {PortBase} from "./Base.sol";
 import {Pipeline} from "../core/Pipeline.sol";
-import {Cursors, Cur, Schemas} from "../Cursors.sol";
+import {Cursors, Cur, Keys} from "../Cursors.sol";
 import {Budget} from "../utils/Value.sol";
 
 using Cursors for Cur;
@@ -12,11 +12,10 @@ using Cursors for Cur;
 /// @notice Port that consumes CONTEXT blocks and executes each request as a step stream.
 /// Each context's request bytes are passed to the shared pipeline.
 abstract contract PortPipePayable is PortBase, Pipeline {
-    uint internal immutable portPipePayableId = portId(this.portPipePayable.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Port(host, portPipePayableId, "1:0", Schemas.Context, "", true);
-        emit Labeled(portPipePayableId, bytes32(0), "portPipePayable");
+        (, descriptor) = port("portPipePayable", Keys.Context, Keys.Empty, 0, true);
     }
 
     /// @notice Execute peer-supplied contexts through the shared payable pipe.
@@ -25,15 +24,13 @@ abstract contract PortPipePayable is PortBase, Pipeline {
     /// @param data CONTEXT block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function portPipePayable(bytes calldata data) external payable onlyPeer returns (bytes memory) {
-        (Cur memory input, ) = Cursors.init(data, 1);
+        (Cur memory input, ) = openInput(data, descriptor);
         Budget memory budget = openValue();
 
         while (input.i < input.len) {
             (bytes32 account, bytes calldata state, bytes calldata request) = input.unpackContext();
             pipe(account, state, request, budget);
         }
-
-        input.complete();
         return "";
     }
 }

package/ports/Redeem.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.33;
 
 import {PortBase} from "./Base.sol";
-import {Cursors, Cur, Schemas} from "../Cursors.sol";
+import {Cursors, Cur, Keys} from "../Cursors.sol";
 
 using Cursors for Cur;
 
@@ -19,26 +19,23 @@ abstract contract RedeemBalanceHook {
 /// Each BALANCE block in the request calls `redeemBalance(peer, asset, amount)`.
 /// Restricted to trusted peers.
 abstract contract PortRedeemBalance is PortBase, RedeemBalanceHook {
-    uint internal immutable portRedeemBalanceId = portId(this.portRedeemBalance.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Port(host, portRedeemBalanceId, "1:0", Schemas.Balance, "", false);
-        emit Labeled(portRedeemBalanceId, bytes32(0), "portRedeemBalance");
+        (, descriptor) = port("portRedeemBalance", Keys.Balance, Keys.Empty, 0, false);
     }
 
     /// @notice Execute the balance redemption port call.
     /// @param data BALANCE block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function portRedeemBalance(bytes calldata data) external onlyPeer returns (bytes memory) {
-        (Cur memory input, ) = Cursors.init(data, 1);
+        (Cur memory input, ) = openInput(data, descriptor);
         uint peer = caller();
 
         while (input.i < input.len) {
             (bytes32 asset, uint amount) = input.unpackBalance();
             redeemBalance(peer, asset, amount);
         }
-
-        input.complete();
         return "";
     }
 }

package/ports/Settle.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.33;
 import { PortBase } from "./Base.sol";
 import { CreditAccountHook } from "../commands/Credit.sol";
 import { DebitAccountHook } from "../commands/Debit.sol";
-import { Cursors, Cur, Schemas } from "../Cursors.sol";
+import { Cursors, Cur, Keys } from "../Cursors.sol";
 
 using Cursors for Cur;
 
@@ -12,26 +12,23 @@ using Cursors for Cur;
 /// @notice Port that consumes peer-supplied TRANSACTION blocks through debit and credit hooks.
 /// Each TRANSACTION block calls `debitAccount` for `from` and `creditAccount` for `to`.
 abstract contract PortSettle is PortBase, DebitAccountHook, CreditAccountHook {
-    uint internal immutable portSettleId = portId(this.portSettle.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Port(host, portSettleId, "1:0", Schemas.Transaction, "", false);
-        emit Labeled(portSettleId, bytes32(0), "portSettle");
+        (, descriptor) = port("portSettle", Keys.Transaction, Keys.Empty, 0, false);
     }
 
     /// @notice Execute the port-settle call.
     /// @param data TRANSACTION block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function portSettle(bytes calldata data) external onlyPeer returns (bytes memory) {
-        (Cur memory state, ) = Cursors.init(data, 1);
+        (Cur memory input, ) = openInput(data, descriptor);
 
-        while (state.i < state.len) {
-            (bytes32 from, bytes32 to, bytes32 asset, uint amount) = state.unpackTransaction();
+        while (input.i < input.len) {
+            (bytes32 from, bytes32 to, bytes32 asset, uint amount) = input.unpackTransaction();
             if (from != 0) debitAccount(from, asset, amount);
             if (to != 0) creditAccount(to, asset, amount);
         }
-
-        state.complete();
         return "";
     }
 }

package/queries/Assets.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {Cur, Cursors, Writer, Writers} from "../Cursors.sol";
-import {Forms, Schemas} from "../blocks/Schema.sol";
+import {Cur, Cursors, Keys, Writer, Writers} from "../Cursors.sol";
 import {QueryBase} from "./Base.sol";
 
 using Cursors for Cur;
@@ -21,27 +20,25 @@ 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 {
-    uint public immutable assetStatusId = queryId(this.assetStatus.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Query(host, assetStatusId, "1:1", Schemas.Asset, Forms.Status);
-        emit Labeled(assetStatusId, bytes32(0), "assetStatus");
+        (, descriptor) = query("assetStatus", Keys.Asset, Keys.Status, 0);
     }
 
     /// @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.
+    /// @param request Block-stream request consisting of `asset { bytes32 asset }` blocks.
+    /// @return Block-stream response containing one `status { uint code }` form block 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);
+        (Cur memory input, uint outputs) = openInput(request, descriptor);
+        Writer memory response = Writers.allocStatuses(outputs);
 
-        while (query.i < query.len) {
-            bytes32 asset = query.unpackAsset();
+        while (input.i < input.len) {
+            bytes32 asset = input.unpackAsset();
             uint status = assetStatus(asset);
             response.appendStatus(status);
         }
 
-        query.complete();
         return response.finish();
     }
 }

package/queries/Balances.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {Cur, Cursors, Forms, Writer, Writers} from "../Cursors.sol";
+import {Cur, Cursors, Keys, Writer, Writers} from "../Cursors.sol";
 import {QueryBase} from "./Base.sol";
 
 using Cursors for Cur;
@@ -21,27 +21,25 @@ 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 {
-    uint public immutable getBalancesId = queryId(this.getBalances.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Query(host, getBalancesId, "1:1", Forms.AccountAsset, Forms.AccountAmount);
-        emit Labeled(getBalancesId, bytes32(0), "getBalances");
+        (, descriptor) = query("getBalances", Keys.AccountAsset, Keys.AccountAmount, 0);
     }
 
     /// @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);
+        (Cur memory input, uint outputs) = openInput(request, descriptor);
+        Writer memory response = Writers.allocAccountAmounts(outputs);
 
-        while (query.i < query.len) {
-            (bytes32 account, bytes32 asset) = query.unpackAccountAsset();
+        while (input.i < input.len) {
+            (bytes32 account, bytes32 asset) = input.unpackAccountAsset();
             uint amount = getBalance(account, asset);
             response.appendAccountAmount(account, asset, amount);
         }
 
-        query.complete();
         return response.finish();
     }
 }

package/queries/Base.sol

@@ -1,23 +1,31 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import { Runtime } from "../core/Runtime.sol";
-import { LabeledEvent } from "../events/Labeled.sol";
-import { QueryEvent } from "../events/Query.sol";
+import { EndpointBase } from "../core/Endpoint.sol";
 import { Nodes } from "../utils/Nodes.sol";
+import { Selectors } from "../utils/Selectors.sol";
 
 /// @title QueryBase
 /// @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, LabeledEvent {
+abstract contract QueryBase is EndpointBase {
 
-    /// @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(bytes4 selector) internal view returns (uint) {
-        return Nodes.toQuery(selector, address(this));
+    /// @notice Publish query metadata and a default label.
+    /// @param name Default human-readable query label and selector name.
+    /// @param input Packed input lane plus optional group byte.
+    /// @param output Packed output lane plus optional group byte.
+    /// @param selector Query ABI selector, or zero to derive it from `name`.
+    /// @return id Query node ID.
+    /// @return descriptor Packed endpoint lane metadata and flags.
+    function query(
+        string memory name,
+        bytes9 input,
+        bytes9 output,
+        bytes4 selector
+    ) internal returns (uint id, bytes32 descriptor) {
+        selector = selector == bytes4(0) ? Selectors.query(name) : selector;
+        id = Nodes.toQuery(selector, address(this));
+        descriptor = endpoint(id, name, bytes9(0), input, output, false, false);
     }
 }

package/utils/Selectors.sol

@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+/// @title Selectors
+/// @notice Canonical ABI selector derivation for rootzero endpoint types.
+library Selectors {
+    /// @notice Derive the ABI selector for a command entrypoint.
+    /// @param name Command function name.
+    /// @return Selector for `name((bytes32,bytes,bytes))`.
+    function command(string memory name) internal pure returns (bytes4) {
+        return derive(name, "((bytes32,bytes,bytes))");
+    }
+
+    /// @notice Derive the ABI selector for a port entrypoint.
+    /// @param name Port function name.
+    /// @return Selector for `name(bytes)`.
+    function port(string memory name) internal pure returns (bytes4) {
+        return direct(name);
+    }
+
+    /// @notice Derive the ABI selector for a query entrypoint.
+    /// @param name Query function name.
+    /// @return Selector for `name(bytes)`.
+    function query(string memory name) internal pure returns (bytes4) {
+        return direct(name);
+    }
+
+    /// @notice Derive the ABI selector for a guard action entrypoint.
+    /// @param name Guard action function name.
+    /// @return Selector for `name(bytes)`.
+    function guard(string memory name) internal pure returns (bytes4) {
+        return direct(name);
+    }
+
+    /// @dev Derive a direct endpoint selector with a single `bytes` argument.
+    /// @param name Endpoint function name.
+    /// @return Selector for `name(bytes)`.
+    function direct(string memory name) private pure returns (bytes4) {
+        return derive(name, "(bytes)");
+    }
+
+    /// @dev Derive an ABI selector from a function name and argument signature suffix.
+    /// @param name Function name.
+    /// @param args Parenthesized ABI argument signature.
+    /// @return First four bytes of the function signature hash.
+    function derive(string memory name, string memory args) private pure returns (bytes4) {
+        return bytes4(keccak256(bytes(string.concat(name, args))));
+    }
+}

package/commands/admin/Destroy.sol

@@ -1,43 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import { AdminBase, CommandContext, Keys } from "./Base.sol";
-import { Cursors, Cur } from "../../Cursors.sol";
-
-using Cursors for Cur;
-
-abstract contract DestroyHook {
-    /// @notice Override to run host teardown or destruction logic.
-    /// @param input Cursor over the full request byte stream.
-    function destroy(Cur memory input) internal virtual;
-}
-
-/// @title Destroy
-/// @notice Admin command that runs host teardown logic via a virtual hook.
-/// The full request is passed to `destroy` as a cursor. Only callable by the admin account.
-abstract contract Destroy is AdminBase, DestroyHook {
-    uint internal immutable destroyId = commandId(this.destroy.selector);
-
-    /// @param input Request schema advertised for destruction input.
-    constructor(string memory input) {
-        emit Admin(host, destroyId, "1:0:0", input, Keys.Empty, Keys.Empty, false);
-        emit Labeled(destroyId, bytes32(0), "destroy");
-    }
-
-    /// @notice Run host teardown logic over the full admin request.
-    /// @param c Admin command context; `c.request` is passed through as a cursor.
-    /// @return Empty output state.
-    function destroy(
-        CommandContext calldata c
-    ) external onlyAdmin(c.account) returns (bytes memory) {
-        destroy(Cursors.open(c.request));
-        return "";
-    }
-}
-
-
-
-
-
-
-