@rootzero/contracts 1.11.0 → 1.13.0

package/commands/Debit.sol

@@ -3,34 +3,21 @@ pragma solidity ^0.8.33;
 
 import { CommandContext, CommandBase, Keys } from "./Base.sol";
 import { Cursors, Cur, Writer, Writers } from "../Cursors.sol";
+import { DebitAccountHook } from "../core/Settlement.sol";
 
 using Cursors for Cur;
 using Writers for Writer;
 
-abstract contract DebitAccountHook {
-    /// @notice Override to debit externally managed funds from `account`.
-    /// Called once per AMOUNT block before a matching BALANCE is emitted.
-    /// @param account Source account identifier.
-    /// @param asset Asset identifier.
-    /// @param amount Amount to debit.
-    function debitAccount(bytes32 account, bytes32 asset, uint amount) internal virtual;
-}
-
 /// @title DebitAccount
 /// @notice Command that deducts AMOUNT blocks from an account and emits matching BALANCE state.
 /// Use for internally recording debits. The virtual `debitAccount` hook is called once per
 /// AMOUNT block; the default batch implementation handles the full request loop.
 abstract contract DebitAccount is CommandBase, DebitAccountHook {
     bytes32 private immutable descriptor;
-    uint private immutable id;
+    uint internal immutable debitAccountId;
 
     constructor() {
-        (id, descriptor) = command("debitAccount", Keys.Empty, Keys.Amount, Keys.Balance, 0, false, false);
-    }
-
-    /// @notice Return true if `candidate` is this command's debit account ID.
-    function isDebitAccount(uint candidate) internal view returns (bool) {
-        return candidate == id;
+        (debitAccountId, descriptor) = command("debitAccount", Keys.Empty, Keys.Amount, Keys.Balance, 0, false, false);
     }
 
     /// @notice Override to customize request parsing or batching for debits.
@@ -52,10 +39,11 @@ abstract contract DebitAccount is CommandBase, DebitAccountHook {
     /// @notice Debit AMOUNT request blocks from the command account and output matching BALANCE blocks.
     /// @param c Command context; `c.input` must contain AMOUNT blocks.
     /// @return BALANCE block stream matching the debited amounts.
+    /// @return Empty transaction stream.
     function debitAccount(
         CommandContext calldata c
-    ) external onlyCommand returns (bytes memory) {
-        return debitAccount(c.account, c.input);
+    ) external onlyCommand returns (bytes memory, bytes memory) {
+        return (debitAccount(c.account, c.input), "");
     }
 }
 

package/commands/Deposit.sol

@@ -44,9 +44,10 @@ abstract contract Deposit is CommandBase, DepositHook {
     /// @notice Deposit AMOUNT request blocks into the command account and output matching BALANCE blocks.
     /// @param c Command context; `c.input` must contain AMOUNT blocks.
     /// @return BALANCE block stream matching the deposited amounts.
+    /// @return Empty transaction stream.
     function deposit(
         CommandContext calldata c
-    ) external onlyCommand returns (bytes memory) {
+    ) external onlyCommand returns (bytes memory, bytes memory) {
         (Cur memory input, uint outputs) = openInput(c.input, descriptor);
         Writer memory output = Writers.allocBalances(outputs);
 
@@ -56,7 +57,7 @@ abstract contract Deposit is CommandBase, DepositHook {
             output.appendBalance(asset, amount);
         }
 
-        return output.finish();
+        return (output.finish(), "");
     }
 }
 
@@ -73,9 +74,10 @@ abstract contract DepositPayable is CommandBase, Payable, DepositPayableHook {
     /// @notice Deposit AMOUNT request blocks with access to a mutable native-value budget.
     /// @param c Command context; `c.input` must contain AMOUNT blocks.
     /// @return BALANCE block stream matching the deposited amounts.
+    /// @return Remaining native value as a refund transaction stream.
     function depositPayable(
         CommandContext calldata c
-    ) external payable onlyCommand returns (bytes memory) {
+    ) external payable onlyCommand returns (bytes memory, bytes memory) {
         (Cur memory input, uint outputs) = openInput(c.input, descriptor);
         Writer memory output = Writers.allocBalances(outputs);
         Budget memory budget = openValue();
@@ -86,8 +88,7 @@ abstract contract DepositPayable is CommandBase, Payable, DepositPayableHook {
             output.appendBalance(asset, amount);
         }
 
-        closeValue(c.account, budget);
-        return output.finish();
+        return (output.finish(), closeValue(budget, c.account));
     }
 }
 

package/commands/Payout.sol

@@ -29,13 +29,14 @@ abstract contract Payout is CommandBase, PayoutHook {
     /// @notice Pay out BALANCE state blocks to matching ACCOUNT request blocks.
     /// @param c Command context; `c.state` must contain BALANCE blocks and `c.input` matching ACCOUNT blocks.
     /// @return Empty output state.
-    function payout(CommandContext calldata c) external onlyCommand returns (bytes memory) {
+    /// @return Empty transaction stream.
+    function payout(CommandContext calldata c) external onlyCommand returns (bytes memory, bytes memory) {
         (Cur memory input, Cur memory state, ) = openCommand(c, descriptor);
 
         while (state.i < state.len) {
             (bytes32 asset, uint amount) = state.unpackBalance();
             payout(c.account, input.unpackAccount(), asset, amount);
         }
-        return "";
+        return ("", "");
     }
 }

package/commands/Provision.sol

@@ -42,7 +42,8 @@ abstract contract Provision is CommandBase, ProvisionHook {
     /// @notice Provision ALLOCATION request blocks and output matching CUSTODY state blocks.
     /// @param c Command context; `c.input` must contain ALLOCATION blocks.
     /// @return CUSTODY block stream matching the provisioned allocations.
-    function provision(CommandContext calldata c) external onlyCommand returns (bytes memory) {
+    /// @return Empty transaction stream.
+    function provision(CommandContext calldata c) external onlyCommand returns (bytes memory, bytes memory) {
         (Cur memory input, uint outputs) = openInput(c.input, descriptor);
         Writer memory output = Writers.allocCustodies(outputs);
 
@@ -52,7 +53,7 @@ abstract contract Provision is CommandBase, ProvisionHook {
             output.appendCustody(allocation);
         }
 
-        return output.finish();
+        return (output.finish(), "");
     }
 }
 
@@ -70,9 +71,10 @@ abstract contract ProvisionPayable is CommandBase, Payable, ProvisionPayableHook
     /// @notice Provision ALLOCATION request blocks with access to a mutable native-value budget.
     /// @param c Command context; `c.input` must contain ALLOCATION blocks.
     /// @return CUSTODY block stream matching the provisioned allocations.
+    /// @return Remaining native value as a refund transaction stream.
     function provisionPayable(
         CommandContext calldata c
-    ) external payable onlyCommand returns (bytes memory) {
+    ) external payable onlyCommand returns (bytes memory, bytes memory) {
         (Cur memory input, uint outputs) = openInput(c.input, descriptor);
         Writer memory output = Writers.allocCustodies(outputs);
         Budget memory budget = openValue();
@@ -83,8 +85,7 @@ abstract contract ProvisionPayable is CommandBase, Payable, ProvisionPayableHook
             output.appendCustody(allocation);
         }
 
-        closeValue(c.account, budget);
-        return output.finish();
+        return (output.finish(), closeValue(budget, c.account));
     }
 }
 

package/commands/Recover.sol

@@ -32,7 +32,8 @@ abstract contract RecoverPayable is CommandBase, Payable, RecoverHook {
     /// @notice Recover each recover block in the command request.
     /// @param c Command context; `c.input` must contain Recover blocks.
     /// @return Empty output state.
-    function recoverPayable(CommandContext calldata c) external payable onlyCommand returns (bytes memory) {
+    /// @return Remaining native value as a refund transaction stream.
+    function recoverPayable(CommandContext calldata c) external payable onlyCommand returns (bytes memory, bytes memory) {
         (Cur memory input, ) = openInput(c.input, descriptor);
         Budget memory budget = openValue();
 
@@ -41,7 +42,6 @@ abstract contract RecoverPayable is CommandBase, Payable, RecoverHook {
             recover(handler, key, witness, useValue(budget, resources));
         }
 
-        closeValue(c.account, budget);
-        return "";
+        return ("", closeValue(budget, c.account));
     }
 }

package/commands/Relay.sol

@@ -35,14 +35,14 @@ abstract contract RelayPayable is CommandBase, Payable, RoutePayableHook {
     /// @notice Relay one RELAY request block with the command account and current state.
     /// @param c Command context; `c.input` must contain exactly one RELAY block.
     /// @return Empty output state.
-    function relayPayable(CommandContext calldata c) external payable onlyCommand returns (bytes memory) {
+    /// @return Remaining native value as a refund transaction stream.
+    function relayPayable(CommandContext calldata c) external payable onlyCommand returns (bytes memory, bytes memory) {
         (Cur memory input, , ) = openLane(c.input, descriptor, Lane.Input, 1);
         (uint portal, uint resources, bytes memory context) = input.relayToContext(c.account, c.state);
 
         Budget memory budget = openValue();
         route(portal, resources, context, budget);
 
-        closeValue(c.account, budget);
-        return "";
+        return ("", closeValue(budget, c.account));
     }
 }

package/commands/Withdraw.sol

@@ -28,16 +28,17 @@ abstract contract Withdraw is CommandBase, WithdrawHook {
     /// @notice Withdraw each BALANCE block from the command state to the command account.
     /// @param c Command context; `c.state` must contain BALANCE blocks.
     /// @return Empty output state.
+    /// @return Empty transaction stream.
     function withdraw(
         CommandContext calldata c
-    ) external onlyCommand returns (bytes memory) {
+    ) external onlyCommand returns (bytes memory, bytes memory) {
         (Cur memory state, ) = openState(c.state, descriptor);
 
         while (state.i < state.len) {
             (bytes32 asset, uint amount) = state.unpackBalance();
             withdraw(c.account, asset, amount);
         }
-        return "";
+        return ("", "");
     }
 }
 

package/commands/admin/AllowAssets.sol

@@ -25,16 +25,17 @@ abstract contract AllowAssets is AdminBase, AllowAssetsHook {
     /// @notice Allow each ASSET block in the admin request.
     /// @param c Admin command context; `c.input` must contain ASSET blocks.
     /// @return Empty output state.
+    /// @return Empty transaction stream.
     function allowAssets(
         CommandContext calldata c
-    ) external onlyAdmin(c.account) returns (bytes memory) {
+    ) external onlyAdmin(c.account) returns (bytes memory, bytes memory) {
         (Cur memory input, ) = openInput(c.input, descriptor);
 
         while (input.i < input.len) {
             bytes32 asset = input.unpackAsset();
             allowAsset(asset);
         }
-        return "";
+        return ("", "");
     }
 }
 

package/commands/admin/Allowance.sol

@@ -29,13 +29,14 @@ abstract contract Allowance is AdminBase, AllowanceHook {
     /// @notice Apply each ALLOWANCE block in the admin request.
     /// @param c Admin command context; `c.input` must contain ALLOWANCE blocks.
     /// @return Empty output state.
-    function allowance(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory) {
+    /// @return Empty transaction stream.
+    function allowance(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory, bytes memory) {
         (Cur memory input, ) = openInput(c.input, descriptor);
 
         while (input.i < input.len) {
             (uint peer, bytes32 asset, uint amount) = input.unpackAllowance();
             allowance(peer, asset, amount);
         }
-        return "";
+        return ("", "");
     }
 }

package/commands/admin/Appoint.sol

@@ -19,15 +19,16 @@ abstract contract Appoint is AdminBase {
     /// @notice Appoint each ACCOUNT block in the admin request as a guardian.
     /// @param c Admin command context; `c.input` must contain ACCOUNT blocks.
     /// @return Empty output state.
+    /// @return Empty transaction stream.
     function appoint(
         CommandContext calldata c
-    ) external onlyAdmin(c.account) returns (bytes memory) {
+    ) external onlyAdmin(c.account) returns (bytes memory, bytes memory) {
         (Cur memory input, ) = openInput(c.input, descriptor);
 
         while (input.i < input.len) {
             bytes32 account = input.unpackAccount();
             setGuardian(account, true);
         }
-        return "";
+        return ("", "");
     }
 }

package/commands/admin/Authorize.sol

@@ -1,8 +1,8 @@
 // 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";
+import {AdminBase, CommandContext, Keys} from "./Base.sol";
+import {Cursors, Cur} from "../../Cursors.sol";
 using Cursors for Cur;
 
 /// @title Authorize
@@ -11,28 +11,23 @@ using Cursors for Cur;
 /// Only callable by the admin account.
 abstract contract Authorize is AdminBase {
     bytes32 private immutable descriptor;
+    uint internal immutable authorizeId;
 
     constructor() {
-        (, descriptor) = command("authorize", Keys.Empty, Keys.Node, Keys.Empty, 0, false, true);
+        (authorizeId, descriptor) = command("authorize", Keys.Empty, Keys.Node, Keys.Empty, 0, false, true);
     }
 
     /// @notice Authorize each NODE block in the admin request.
     /// @param c Admin command context; `c.input` must contain NODE blocks.
     /// @return Empty output state.
-    function authorize(
-        CommandContext calldata c
-    ) external onlyAdmin(c.account) returns (bytes memory) {
+    /// @return Empty transaction stream.
+    function authorize(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory, bytes memory) {
         (Cur memory input, ) = openInput(c.input, descriptor);
 
         while (input.i < input.len) {
             uint node = input.unpackNode();
             setNode(node, true);
         }
-        return "";
+        return ("", "");
     }
 }
-
-
-
-
-

package/commands/admin/DenyAssets.sol

@@ -25,16 +25,17 @@ abstract contract DenyAssets is AdminBase, DenyAssetsHook {
     /// @notice Deny each ASSET block in the admin request.
     /// @param c Admin command context; `c.input` must contain ASSET blocks.
     /// @return Empty output state.
+    /// @return Empty transaction stream.
     function denyAssets(
         CommandContext calldata c
-    ) external onlyAdmin(c.account) returns (bytes memory) {
+    ) external onlyAdmin(c.account) returns (bytes memory, bytes memory) {
         (Cur memory input, ) = openInput(c.input, descriptor);
 
         while (input.i < input.len) {
             bytes32 asset = input.unpackAsset();
             denyAsset(asset);
         }
-        return "";
+        return ("", "");
     }
 }
 

package/commands/admin/Dismiss.sol

@@ -19,15 +19,16 @@ abstract contract Dismiss is AdminBase {
     /// @notice Dismiss each ACCOUNT block in the admin request from guardian status.
     /// @param c Admin command context; `c.input` must contain ACCOUNT blocks.
     /// @return Empty output state.
+    /// @return Empty transaction stream.
     function dismiss(
         CommandContext calldata c
-    ) external onlyAdmin(c.account) returns (bytes memory) {
+    ) external onlyAdmin(c.account) returns (bytes memory, bytes memory) {
         (Cur memory input, ) = openInput(c.input, descriptor);
 
         while (input.i < input.len) {
             bytes32 account = input.unpackAccount();
             setGuardian(account, false);
         }
-        return "";
+        return ("", "");
     }
 }

package/commands/admin/Execute.sol

@@ -23,7 +23,8 @@ abstract contract ExecutePayable is AdminBase, Payable {
     /// @notice Execute each CALL block in the admin request.
     /// @param c Admin command context; `c.input` must contain CALL blocks.
     /// @return Empty output state.
-    function executePayable(CommandContext calldata c) external payable onlyAdmin(c.account) returns (bytes memory) {
+    /// @return Empty transaction stream.
+    function executePayable(CommandContext calldata c) external payable onlyAdmin(c.account) returns (bytes memory, bytes memory) {
         (Cur memory input, ) = openInput(c.input, descriptor);
         Budget memory budget = openValue();
 
@@ -31,6 +32,6 @@ abstract contract ExecutePayable is AdminBase, Payable {
             (uint target, uint resources, bytes calldata data) = input.unpackCall();
             rawCall(target, useValue(budget, resources), data);
         }
-        return "";
+        return ("", "");
     }
 }

package/commands/admin/Label.sol

@@ -19,13 +19,14 @@ abstract contract Label is AdminBase {
     /// @notice Publish each LABEL block in the admin request.
     /// @param c Admin command context; `c.input` must contain LABEL blocks.
     /// @return Empty output state.
-    function label(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory) {
+    /// @return Empty transaction stream.
+    function label(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory, bytes memory) {
         (Cur memory input, ) = openInput(c.input, descriptor);
 
         while (input.i < input.len) {
             (uint node, bytes32 namespace, string memory name) = input.unpackLabel();
             emit Labeled(node, namespace, name);
         }
-        return "";
+        return ("", "");
     }
 }

package/commands/admin/Schemas.sol

@@ -0,0 +1,32 @@
+// 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;
+
+/// @title PublishSchema
+/// @notice Admin command that publishes block schemas for keys.
+/// Each SCHEMA block in the request emits one `Schema` event. Only callable by
+/// the admin account.
+abstract contract PublishSchema is AdminBase {
+    bytes32 private immutable descriptor;
+
+    constructor() {
+        (, descriptor) = command("publishSchema", Keys.Empty, Keys.Schema, Keys.Empty, 0, false, true);
+    }
+
+    /// @notice Publish each SCHEMA block in the admin request.
+    /// @param c Admin command context; `c.input` must contain SCHEMA blocks.
+    /// @return Empty output state.
+    /// @return Empty transaction stream.
+    function publishSchema(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory, bytes memory) {
+        (Cur memory input, ) = openInput(c.input, descriptor);
+
+        while (input.i < input.len) {
+            (bytes4 key, string memory body, bytes32 name) = input.unpackSchema();
+            emit Schema(host, key, body, name);
+        }
+        return ("", "");
+    }
+}

package/commands/admin/Unauthorize.sol

@@ -1,8 +1,8 @@
 // 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";
+import {AdminBase, CommandContext, Keys} from "./Base.sol";
+import {Cursors, Cur} from "../../Cursors.sol";
 using Cursors for Cur;
 
 /// @title Unauthorize
@@ -11,28 +11,23 @@ using Cursors for Cur;
 /// Only callable by the admin account.
 abstract contract Unauthorize is AdminBase {
     bytes32 private immutable descriptor;
+    uint internal immutable unauthorizeId;
 
     constructor() {
-        (, descriptor) = command("unauthorize", Keys.Empty, Keys.Node, Keys.Empty, 0, false, true);
+        (unauthorizeId, descriptor) = command("unauthorize", Keys.Empty, Keys.Node, Keys.Empty, 0, false, true);
     }
 
     /// @notice Unauthorize each NODE block in the admin request.
     /// @param c Admin command context; `c.input` must contain NODE blocks.
     /// @return Empty output state.
-    function unauthorize(
-        CommandContext calldata c
-    ) external onlyAdmin(c.account) returns (bytes memory) {
+    /// @return Empty transaction stream.
+    function unauthorize(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory, bytes memory) {
         (Cur memory input, ) = openInput(c.input, descriptor);
 
         while (input.i < input.len) {
             uint node = input.unpackNode();
             setNode(node, false);
         }
-        return "";
+        return ("", "");
     }
 }
-
-
-
-
-

package/core/Calls.sol

@@ -90,17 +90,18 @@ abstract contract CommandCalls is NodeCalls {
     /// @param account Command account identifier.
     /// @param state Current command state block stream.
     /// @param request Command input block stream.
-    /// @return Decoded command output block stream.
+    /// @return nextState Decoded command output state block stream.
+    /// @return transactions Decoded command transaction block stream.
     function callCommand(
         uint command,
         uint128 value,
         bytes32 account,
         bytes memory state,
         bytes calldata request
-    ) internal returns (bytes memory) {
+    ) internal returns (bytes memory nextState, bytes memory transactions) {
         bytes4 selector = Nodes.commandSelector(command);
         bytes memory data = abi.encodeWithSelector(selector, CommandContext(account, state, request));
-        return abi.decode(trustedCall(command, value, data), (bytes));
+        return abi.decode(trustedCall(command, value, data), (bytes, bytes));
     }
 }
 

package/core/Endpoint.sol

@@ -58,21 +58,6 @@ abstract contract EndpointBase is Runtime, EndpointEvent, LabeledEvent, SchemaEv
         if (size == 0) size = 1;
     }
 
-    /// @notice Return an 8-byte lane value for a generic LIST containing `item`.
-    /// @param item Block key expected inside each LIST payload.
-    /// @return Packed lane key `[Keys.List][item]`.
-    function many(bytes4 item) internal pure returns (bytes8) {
-        return bytes8(bytes.concat(Keys.List, item));
-    }
-
-    /// @notice Append an explicit group size to an 8-byte lane value.
-    /// @param value Packed lane key `[key][item]`.
-    /// @param size Explicit per-operation group size for the lane.
-    /// @return Packed lane key plus group byte.
-    function group(bytes8 value, uint8 size) internal pure returns (bytes9) {
-        return bytes9(bytes.concat(value, bytes1(size)));
-    }
-
     /// @dev Open a descriptor lane and return its effective group and output counts.
     /// An absent lane inherits `expected`; a present lane must match it when nonzero.
     /// @param source Block stream to open for the requested lane.
@@ -118,14 +103,38 @@ abstract contract EndpointBase is Runtime, EndpointEvent, LabeledEvent, SchemaEv
         (input, , outputs) = openLane(source, descriptor, Lane.Input, 0);
     }
 
-    /// @notice Publish a block schema and return its key for descriptor construction.
-    /// @param key Block key being defined.
+    /// @notice Return an 8-byte lane value for a generic LIST containing `item`.
+    /// @param item Block key expected inside each LIST payload.
+    /// @return Packed lane key `[Keys.List][item]`.
+    function many(bytes4 item) internal pure returns (bytes8) {
+        return bytes8(bytes.concat(Keys.List, item));
+    }
+
+    /// @notice Append an explicit group size to an 8-byte lane value.
+    /// @param value Packed lane key `[key][item]`.
+    /// @param size Explicit per-operation group size for the lane.
+    /// @return Packed lane key plus group byte.
+    function group(bytes8 value, uint8 size) internal pure returns (bytes9) {
+        return bytes9(bytes.concat(value, bytes1(size)));
+    }
+
+    /// @notice Publish a context-local block schema and return its key.
+    /// @param key Context-local key value.
+    /// @param body Schema DSL string describing the block payload body.
+    /// @return The context-local block key.
+    function schema(uint32 key, string memory body) internal returns (bytes4) {
+        return schema(key, body, bytes32(0));
+    }
+
+    /// @notice Publish a named context-local block schema and return its key.
+    /// @param key Context-local key value.
     /// @param body Schema DSL string describing the block payload body.
-    /// @param name Optional block alias used by descriptor tooling and nested schemas.
-    /// @return The same block key, for inline descriptor construction.
-    function schema(bytes4 key, string memory body, bytes32 name) internal returns (bytes4) {
-        emit Schema(host, key, body, name);
-        return key;
+    /// @param name Schema alias name, or zero for unnamed schemas.
+    /// @return The context-local block key.
+    function schema(uint32 key, string memory body, bytes32 name) internal returns (bytes4) {
+        bytes4 k = bytes4(key);
+        emit Schema(host, k, body, name);
+        return k;
     }
 
     /// @notice Create and publish endpoint metadata with a default label.

package/core/Host.sol

@@ -23,7 +23,7 @@ interface IHostIntroduction {
 
 /// @title Host
 /// @notice Abstract base contract for rootzero host implementations.
-/// Inherits admin command support (authorize, unauthorize, executePayable),
+/// Inherits admin command support (authorize, unauthorize, label, executePayable),
 /// guardian management, the default guardian revoke action, and
 /// optionally introduces itself to a commander host at deployment.
 /// Accepts native ETH payments via the `receive` function.
@@ -43,7 +43,15 @@ abstract contract Host is
     ///        on it during construction.
     constructor(address cmdr) AccessControl(cmdr) {
         if (cmdr == address(0) || cmdr == address(this) || cmdr.code.length == 0) return;
-        IHostIntroduction(cmdr).introduce(host, block.number);
+        introduceTo(Nodes.toHost(cmdr));
+    }
+
+    /// @notice Introduce this host to the contract address embedded in a local EVM node ID.
+    /// @dev Accepts host and endpoint IDs such as commands, ports, queries, and guards.
+    /// Reverts when `node` is not local or embeds the zero address.
+    /// @param node Local EVM node ID whose underlying contract receives the introduction.
+    function introduceTo(uint node) internal {
+        IHostIntroduction(Nodes.addr(node)).introduce(host, block.number);
     }
 
     /// @notice Record a host introduction claim.
@@ -51,7 +59,7 @@ abstract contract Host is
     /// @param peer Host node ID being introduced.
     /// @param blocknum Block number at which the host was deployed.
     function introduce(uint peer, uint blocknum) external {
-        emit Introduction(Nodes.matchHost(peer, msg.sender), blocknum);
+        emit Introduction(host, Nodes.matchHost(peer, msg.sender), blocknum);
     }
 
     /// @notice Accept native ETH transfers (e.g. from command value flows).