@rootzero/contracts 1.0.1 → 1.2.0

package/commands/Base.sol

@@ -3,8 +3,9 @@ pragma solidity ^0.8.33;
 
 import {NodeCalls} from "../core/Calls.sol";
 import {CommandEvent} from "../events/Command.sol";
+import {LabeledEvent} from "../events/Labeled.sol";
 import {Keys} from "../blocks/Keys.sol";
-import {Ids, Selectors} from "../utils/Ids.sol";
+import {Ids} from "../utils/Ids.sol";
 
 /// @notice Execution context passed to every command invocation.
 struct CommandContext {
@@ -19,8 +20,8 @@ struct CommandContext {
 /// @title CommandBase
 /// @notice Abstract base for all rootzero command contracts.
 /// Provides access control modifiers, event emission, and the `commandId`
-/// helper used to derive stable identifiers for named commands.
-abstract contract CommandBase is NodeCalls, CommandEvent {
+/// helper used to derive stable identifiers for command selectors.
+abstract contract CommandBase is NodeCalls, CommandEvent, LabeledEvent {
     /// @dev Thrown when `onlyActive` finds that `deadline` has already passed.
     error Expired();
 
@@ -44,12 +45,12 @@ abstract contract CommandBase is NodeCalls, CommandEvent {
         _;
     }
 
-    /// @notice Derive the deterministic node ID for a named command on this contract.
-    /// The ID encodes the ABI selector of `name((bytes32,bytes,bytes))` and
-    /// `address(this)`, making it unique per (function name, contract address) pair.
-    /// @param name Command function name (without argument list).
+    /// @notice Derive the deterministic node ID for a command selector on this contract.
+    /// The ID encodes the ABI selector and `address(this)`, making it unique
+    /// per (function selector, contract address) pair.
+    /// @param selector Command entrypoint selector.
     /// @return Command node ID.
-    function commandId(string memory name) internal view returns (uint) {
-        return Ids.toCommand(Selectors.command(name), address(this));
+    function commandId(bytes4 selector) internal view returns (uint) {
+        return Ids.toCommand(selector, address(this));
     }
 }

package/commands/Burn.sol

@@ -20,12 +20,11 @@ abstract contract BurnHook {
 /// @notice Command that irreversibly destroys each BALANCE state block via a virtual hook.
 /// Produces no output state.
 abstract contract Burn is CommandBase, BurnHook {
-    string private constant NAME = "burn";
-
-    uint internal immutable burnId = commandId(NAME);
+    uint internal immutable burnId = commandId(this.burn.selector);
 
     constructor() {
-        emit Command(host, burnId, NAME, "0:1:0", "", Keys.Balance, Keys.Empty, false, false);
+        emit Command(host, burnId, "0:1:0", "", Keys.Balance, Keys.Empty, false, false);
+        emit Labeled(burnId, bytes32(0), "burn");
     }
 
     /// @notice Burn each BALANCE block from the command state.

package/commands/Credit.sol

@@ -20,12 +20,11 @@ abstract contract CreditAccountHook {
 /// @notice Command that delivers BALANCE state blocks to an account via a virtual hook.
 /// Use for internally recording credits that have already been settled externally.
 abstract contract CreditAccount is CommandBase, CreditAccountHook {
-    string private constant NAME = "creditAccount";
-
-    uint internal immutable creditAccountId = commandId(NAME);
+    uint internal immutable creditAccountId = commandId(this.creditAccount.selector);
 
     constructor() {
-        emit Command(host, creditAccountId, NAME, "0:1:0", "", Keys.Balance, Keys.Empty, false, false);
+        emit Command(host, creditAccountId, "0:1:0", "", Keys.Balance, Keys.Empty, false, false);
+        emit Labeled(creditAccountId, bytes32(0), "creditAccount");
     }
 
     /// @notice Credit each BALANCE block from the command state to the command account.

package/commands/Debit.sol

@@ -22,12 +22,11 @@ abstract contract DebitAccountHook {
 /// 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 {
-    string private constant NAME = "debitAccount";
-
-    uint internal immutable debitAccountId = commandId(NAME);
+    uint internal immutable debitAccountId = commandId(this.debitAccount.selector);
 
     constructor() {
-        emit Command(host, debitAccountId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false, false);
+        emit Command(host, debitAccountId, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false, false);
+        emit Labeled(debitAccountId, bytes32(0), "debitAccount");
     }
 
     /// @notice Override to customize request parsing or batching for debits.

package/commands/Deposit.sol

@@ -37,12 +37,11 @@ abstract contract DepositPayableHook {
 /// Use `deposit` for assets arriving from outside the protocol (e.g. ERC-20 transfers, ETH).
 /// For internal balance deductions, use `debitAccount` instead.
 abstract contract Deposit is CommandBase, DepositHook {
-    string private constant NAME = "deposit";
-
-    uint internal immutable depositId = commandId(NAME);
+    uint internal immutable depositId = commandId(this.deposit.selector);
 
     constructor() {
-        emit Command(host, depositId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false, false);
+        emit Command(host, depositId, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false, false);
+        emit Labeled(depositId, bytes32(0), "deposit");
     }
 
     /// @notice Deposit AMOUNT request blocks into the command account and output matching BALANCE blocks.
@@ -69,12 +68,11 @@ abstract contract Deposit is CommandBase, DepositHook {
 /// @notice Command that receives externally sourced assets and records them as BALANCE state.
 /// Use `depositPayable` when the hook needs tracked access to `msg.value` via a mutable budget.
 abstract contract DepositPayable is CommandBase, Payable, DepositPayableHook {
-    string private constant NAME = "depositPayable";
-
-    uint internal immutable depositPayableId = commandId(NAME);
+    uint internal immutable depositPayableId = commandId(this.depositPayable.selector);
 
     constructor() {
-        emit Command(host, depositPayableId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false, true);
+        emit Command(host, depositPayableId, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false, true);
+        emit Labeled(depositPayableId, bytes32(0), "depositPayable");
     }
 
     /// @notice Deposit AMOUNT request blocks with access to a mutable native-value budget.

package/commands/Payout.sol

@@ -22,12 +22,11 @@ abstract contract PayoutHook {
 /// @notice Command that sinks BALANCE state blocks to matching ACCOUNT request blocks.
 /// Each BALANCE block is paired with one ACCOUNT block at the same position.
 abstract contract Payout is CommandBase, PayoutHook {
-    string private constant NAME = "payout";
-
-    uint internal immutable payoutId = commandId(NAME);
+    uint internal immutable payoutId = commandId(this.payout.selector);
 
     constructor() {
-        emit Command(host, payoutId, NAME, "1:1:0", Schemas.Account, Keys.Balance, Keys.Empty, false, false);
+        emit Command(host, payoutId, "1:1:0", Schemas.Account, Keys.Balance, Keys.Empty, false, false);
+        emit Labeled(payoutId, bytes32(0), "payout");
     }
 
     /// @notice Pay out BALANCE state blocks to matching ACCOUNT request blocks.

package/commands/Provision.sol

@@ -33,12 +33,11 @@ abstract contract ProvisionPayableHook {
 /// @notice Command that provisions assets to peer hosts from ALLOCATION request blocks.
 /// Each request block supplies the target host plus an asset amount; the output is a CUSTODY state stream.
 abstract contract Provision is CommandBase, ProvisionHook {
-    string private constant NAME = "provision";
-
-    uint internal immutable provisionId = commandId(NAME);
+    uint internal immutable provisionId = commandId(this.provision.selector);
 
     constructor() {
-        emit Command(host, provisionId, NAME, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, false, false);
+        emit Command(host, provisionId, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, false, false);
+        emit Labeled(provisionId, bytes32(0), "provision");
     }
 
     /// @notice Provision ALLOCATION request blocks and output matching CUSTODY state blocks.
@@ -64,12 +63,11 @@ abstract contract Provision is CommandBase, ProvisionHook {
 /// Each request block supplies the target host plus an asset amount; the output is a CUSTODY state stream.
 /// The hook receives a mutable native-value budget drawn from `msg.value`.
 abstract contract ProvisionPayable is CommandBase, Payable, ProvisionPayableHook {
-    string private constant NAME = "provisionPayable";
-
-    uint internal immutable provisionPayableId = commandId(NAME);
+    uint internal immutable provisionPayableId = commandId(this.provisionPayable.selector);
 
     constructor() {
-        emit Command(host, provisionPayableId, NAME, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, false, true);
+        emit Command(host, provisionPayableId, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, false, true);
+        emit Labeled(provisionPayableId, bytes32(0), "provisionPayable");
     }
 
     /// @notice Provision ALLOCATION request blocks with access to a mutable native-value budget.

package/commands/Relay.sol

@@ -8,24 +8,15 @@ import {Budget} from "../utils/Value.sol";
 
 using Cursors for Cur;
 
-abstract contract RelayPayableHook {
-    /// @notice Override to relay `steps` to `chain` with the current account and state.
-    /// @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 account Command account identifier.
-    /// @param state Current command state block stream.
-    /// @param steps Embedded destination step block stream.
-    /// @param budget Source-chain native-value budget available for transport
-    /// fees and destination resource funding.
-    function relay(
-        uint chain,
-        uint resources,
-        bytes32 account,
-        bytes calldata state,
-        bytes calldata steps,
-        Budget memory budget
-    ) internal virtual;
+abstract contract DispatchPayableHook {
+    /// @notice Override to dispatch an 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 memory payload, Budget memory budget) internal virtual;
 }
 
 /// @title RelayPayable
@@ -33,25 +24,26 @@ abstract contract RelayPayableHook {
 /// Reverts unless the request contains exactly one RELAY block, preventing
 /// the same state from being duplicated across multiple relays.
 /// Produces no output state.
-abstract contract RelayPayable is CommandBase, Payable, RelayPayableHook {
-    string private constant NAME = "relayPayable";
-
-    uint internal immutable relayPayableId = commandId(NAME);
+abstract contract RelayPayable is CommandBase, Payable, DispatchPayableHook {
+    uint internal immutable relayPayableId = commandId(this.relayPayable.selector);
 
     constructor() {
-        emit Command(host, relayPayableId, NAME, "1:0:0", Schemas.Relay, Keys.Any, Keys.Empty, false, true);
+        emit Command(host, relayPayableId, "1:0:0", Schemas.Relay, Keys.Any, Keys.Empty, false, true);
+        emit Labeled(relayPayableId, bytes32(0), "relayPayable");
     }
 
     /// @notice Relay one RELAY request block with the command account and current state.
     /// @param c Command context; `c.request` must contain exactly one RELAY block.
     /// @return output Empty output state.
     function relayPayable(CommandContext calldata c) external payable onlyCommand returns (bytes memory output) {
-        (Cur memory request, ) = Cursors.init(c.request, 0, 1, 1);
-        Budget memory budget = valueBudget();
-
-        (uint chain, uint resources, bytes calldata steps) = request.unpackRelay();
-        relay(chain, resources, c.account, c.state, steps, budget);
-        request.complete();
-        return "";
-    }
-}
+        (Cur memory request, ) = Cursors.init(c.request, 0, 1, 1);
+        Budget memory budget = valueBudget();
+
+        (uint chain, uint resources, bytes memory pipe) = request.relayToPipe(c.account, c.state);
+        dispatch(chain, resources, pipe, budget);
+        
+        settleValue(c.account, budget);
+        request.complete();
+        return "";
+    }
+}

package/commands/Withdraw.sol

@@ -20,12 +20,11 @@ abstract contract WithdrawHook {
 /// Use `withdraw` for assets being sent outside the protocol (e.g. ERC-20 transfers, ETH sends).
 /// For internal balance credits, use `creditAccount` instead.
 abstract contract Withdraw is CommandBase, WithdrawHook {
-    string private constant NAME = "withdraw";
-
-    uint internal immutable withdrawId = commandId(NAME);
+    uint internal immutable withdrawId = commandId(this.withdraw.selector);
 
     constructor() {
-        emit Command(host, withdrawId, NAME, "0:1:0", "", Keys.Balance, Keys.Empty, false, false);
+        emit Command(host, withdrawId, "0:1:0", "", Keys.Balance, Keys.Empty, false, false);
+        emit Labeled(withdrawId, bytes32(0), "withdraw");
     }
 
     /// @notice Withdraw each BALANCE block from the command state to the command account.

package/commands/admin/AllowAssets.sol

@@ -18,12 +18,11 @@ abstract contract AllowAssetsHook {
 /// @notice Admin command that permits a list of (asset, meta) pairs via a virtual hook.
 /// Each ASSET block in the request calls `allowAsset`. Only callable by the admin account.
 abstract contract AllowAssets is CommandBase, AdminEvent, AllowAssetsHook {
-    string private constant NAME = "allowAssets";
-
-    uint internal immutable allowAssetsId = commandId(NAME);
+    uint internal immutable allowAssetsId = commandId(this.allowAssets.selector);
 
     constructor() {
-        emit Admin(host, allowAssetsId, NAME, "1:0:0", Schemas.Asset, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, allowAssetsId, "1:0:0", Schemas.Asset, Keys.Empty, Keys.Empty, false, false);
+        emit Labeled(allowAssetsId, bytes32(0), "allowAssets");
     }
 
     /// @notice Allow each ASSET block in the admin request.

package/commands/admin/Allowance.sol

@@ -22,11 +22,11 @@ abstract contract AllowanceHook {
 /// @notice Admin command that applies cross-host allowance entries via a virtual hook.
 /// Each ALLOWANCE block grants or updates a host-scoped asset cap. Only callable by the admin account.
 abstract contract Allowance is CommandBase, AdminEvent, AllowanceHook {
-    string private constant NAME = "allowance";
-    uint internal immutable allowanceId = commandId(NAME);
+    uint internal immutable allowanceId = commandId(this.allowance.selector);
 
     constructor() {
-        emit Admin(host, allowanceId, NAME, "1:0:0", Schemas.Allowance, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, allowanceId, "1:0:0", Schemas.Allowance, Keys.Empty, Keys.Empty, false, false);
+        emit Labeled(allowanceId, bytes32(0), "allowance");
     }
 
     /// @notice Apply each ALLOWANCE block in the admin request.

package/commands/admin/Appoint.sol

@@ -11,12 +11,11 @@ using Cursors for Cur;
 /// Each ACCOUNT block in the request is enabled as a guardian on the host.
 /// Only callable by the admin account.
 abstract contract Appoint is CommandBase, AdminEvent {
-    string private constant NAME = "appoint";
-
-    uint internal immutable appointId = commandId(NAME);
+    uint internal immutable appointId = commandId(this.appoint.selector);
 
     constructor() {
-        emit Admin(host, appointId, NAME, "1:0:0", Schemas.Account, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, appointId, "1:0:0", Schemas.Account, Keys.Empty, Keys.Empty, false, false);
+        emit Labeled(appointId, bytes32(0), "appoint");
     }
 
     /// @notice Appoint each ACCOUNT block in the admin request as a guardian.

package/commands/admin/Authorize.sol

@@ -11,12 +11,11 @@ using Cursors for Cur;
 /// Each NODE block in the request is authorized on the host.
 /// Only callable by the admin account.
 abstract contract Authorize is CommandBase, AdminEvent {
-    string private constant NAME = "authorize";
-
-    uint internal immutable authorizeId = commandId(NAME);
+    uint internal immutable authorizeId = commandId(this.authorize.selector);
 
     constructor() {
-        emit Admin(host, authorizeId, NAME, "1:0:0", Schemas.Node, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, authorizeId, "1:0:0", Schemas.Node, Keys.Empty, Keys.Empty, false, false);
+        emit Labeled(authorizeId, bytes32(0), "authorize");
     }
 
     /// @notice Authorize each NODE block in the admin request.

package/commands/admin/DenyAssets.sol

@@ -18,12 +18,11 @@ abstract contract DenyAssetsHook {
 /// @notice Admin command that blocks a list of (asset, meta) pairs via a virtual hook.
 /// Each ASSET block in the request calls `denyAsset`. Only callable by the admin account.
 abstract contract DenyAssets is CommandBase, AdminEvent, DenyAssetsHook {
-    string private constant NAME = "denyAssets";
-
-    uint internal immutable denyAssetsId = commandId(NAME);
+    uint internal immutable denyAssetsId = commandId(this.denyAssets.selector);
 
     constructor() {
-        emit Admin(host, denyAssetsId, NAME, "1:0:0", Schemas.Asset, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, denyAssetsId, "1:0:0", Schemas.Asset, Keys.Empty, Keys.Empty, false, false);
+        emit Labeled(denyAssetsId, bytes32(0), "denyAssets");
     }
 
     /// @notice Deny each ASSET block in the admin request.

package/commands/admin/Destroy.sol

@@ -17,12 +17,11 @@ abstract contract DestroyHook {
 /// @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 CommandBase, AdminEvent, DestroyHook {
-    string private constant NAME = "destroy";
-
-    uint internal immutable destroyId = commandId(NAME);
+    uint internal immutable destroyId = commandId(this.destroy.selector);
 
     constructor(string memory input) {
-        emit Admin(host, destroyId, NAME, "1:0:0", input, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, destroyId, "1:0:0", input, Keys.Empty, Keys.Empty, false, false);
+        emit Labeled(destroyId, bytes32(0), "destroy");
     }
 
     /// @notice Run host teardown logic over the full admin request.

package/commands/admin/Dismiss.sol

@@ -11,12 +11,11 @@ using Cursors for Cur;
 /// Each ACCOUNT block in the request is disabled as a guardian on the host.
 /// Only callable by the admin account.
 abstract contract Dismiss is CommandBase, AdminEvent {
-    string private constant NAME = "dismiss";
-
-    uint internal immutable dismissId = commandId(NAME);
+    uint internal immutable dismissId = commandId(this.dismiss.selector);
 
     constructor() {
-        emit Admin(host, dismissId, NAME, "1:0:0", Schemas.Account, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, dismissId, "1:0:0", Schemas.Account, Keys.Empty, Keys.Empty, false, false);
+        emit Labeled(dismissId, bytes32(0), "dismiss");
     }
 
     /// @notice Dismiss each ACCOUNT block in the admin request from guardian status.

package/commands/admin/Execute.sol

@@ -12,16 +12,15 @@ using Cursors for Cur;
 
 /// @title ExecutePayable
 /// @notice Admin command that forwards raw calldata to one or more target nodes.
-/// Each CALL block specifies a target node ID, native value, and raw calldata payload.
+/// Each CALL block specifies a target node ID, chain resources, and raw calldata payload.
 /// Only callable by the admin account.
 /// Unspent top-level `msg.value` remains on this host.
 abstract contract ExecutePayable is CommandBase, Payable, AdminEvent {
-    string private constant NAME = "executePayable";
-
-    uint internal immutable executePayableId = commandId(NAME);
+    uint internal immutable executePayableId = commandId(this.executePayable.selector);
 
     constructor() {
-        emit Admin(host, executePayableId, NAME, "1:0:0", Schemas.Call, Keys.Empty, Keys.Empty, false, true);
+        emit Admin(host, executePayableId, "1:0:0", Schemas.Call, Keys.Empty, Keys.Empty, false, true);
+        emit Labeled(executePayableId, bytes32(0), "executePayable");
     }
 
     /// @notice Execute each CALL block in the admin request.
@@ -32,9 +31,9 @@ abstract contract ExecutePayable is CommandBase, Payable, AdminEvent {
         Budget memory budget = valueBudget();
 
         while (request.i < request.len) {
-            (uint target, uint value, bytes calldata data) = request.unpackCall();
+            (uint target, uint resources, bytes calldata data) = request.unpackCall();
             address addr = Ids.nodeAddr(target);
-            callAddr(addr, useValue(budget, value), data);
+            callAddr(addr, useValue(budget, resources), data);
         }
 
         request.complete();

package/commands/admin/Init.sol

@@ -17,12 +17,11 @@ abstract contract InitHook {
 /// @notice Admin command that runs host initialization logic via a virtual hook.
 /// The full request is passed to `init` as a cursor. Only callable by the admin account.
 abstract contract Init is CommandBase, AdminEvent, InitHook {
-    string private constant NAME = "init";
-
-    uint internal immutable initId = commandId(NAME);
+    uint internal immutable initId = commandId(this.init.selector);
 
     constructor(string memory input) {
-        emit Admin(host, initId, NAME, "1:0:0", input, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, initId, "1:0:0", input, Keys.Empty, Keys.Empty, false, false);
+        emit Labeled(initId, bytes32(0), "init");
     }
 
     /// @notice Run host initialization logic over the full admin request.

package/commands/admin/Label.sol

@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import {CommandBase, CommandContext, Keys} from "../Base.sol";
+import {Cursors, Cur, Schemas} from "../../Cursors.sol";
+import {AdminEvent} from "../../events/Admin.sol";
+using Cursors for Cur;
+
+/// @title Label
+/// @notice Admin command that publishes namespaced labels for node IDs.
+/// Each LABEL block in the request emits one `Labeled` event. Only callable by
+/// the admin account.
+abstract contract Label is CommandBase, AdminEvent {
+    uint internal immutable labelId = commandId(this.label.selector);
+
+    constructor() {
+        emit Admin(host, labelId, "1:0:0", Schemas.Label, Keys.Empty, Keys.Empty, false, false);
+        emit Labeled(labelId, bytes32(0), "label");
+    }
+
+    /// @notice Publish each LABEL block in the admin request.
+    /// @param c Admin command context; `c.request` must contain LABEL blocks.
+    /// @return Empty output state.
+    function label(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory) {
+        (Cur memory request, , ) = Cursors.init(c.request, 0, 1);
+
+        while (request.i < request.len) {
+            (uint id, bytes32 namespace, string memory name) = request.unpackLabel();
+            emit Labeled(id, namespace, name);
+        }
+
+        request.complete();
+        return "";
+    }
+}

package/commands/admin/Unauthorize.sol

@@ -11,12 +11,11 @@ using Cursors for Cur;
 /// Each NODE block in the request is deauthorized on the host.
 /// Only callable by the admin account.
 abstract contract Unauthorize is CommandBase, AdminEvent {
-    string private constant NAME = "unauthorize";
-
-    uint internal immutable unauthorizeId = commandId(NAME);
+    uint internal immutable unauthorizeId = commandId(this.unauthorize.selector);
 
     constructor() {
-        emit Admin(host, unauthorizeId, NAME, "1:0:0", Schemas.Node, Keys.Empty, Keys.Empty, false, false);
+        emit Admin(host, unauthorizeId, "1:0:0", Schemas.Node, Keys.Empty, Keys.Empty, false, false);
+        emit Labeled(unauthorizeId, bytes32(0), "unauthorize");
     }
 
     /// @notice Unauthorize each NODE block in the admin request.

package/core/Calls.sol

@@ -28,7 +28,7 @@ abstract contract NodeCalls is AccessControl {
     /// @param value Native value to forward in wei.
     /// @param data Encoded calldata to send.
     /// @return out Return data from the successful call.
-    function callAddr(address addr, uint value, bytes memory data) internal returns (bytes memory out) {
+    function callAddr(address addr, uint128 value, bytes memory data) internal returns (bytes memory out) {
         bool success;
         (success, out) = payable(addr).call{value: value}(data);
         if (!success) revert FailedCall(addr, bytes4(data), out);
@@ -53,7 +53,7 @@ abstract contract NodeCalls is AccessControl {
     /// @param value Native value to forward in wei.
     /// @param data Encoded calldata to send.
     /// @return out Return data from the successful call.
-    function callTo(uint node, uint value, bytes memory data) internal returns (bytes memory out) {
+    function callTo(uint node, uint128 value, bytes memory data) internal returns (bytes memory out) {
         ensureTrusted(node);
         address addr = Ids.nodeAddr(node);
         return callAddr(addr, value, data);
@@ -76,7 +76,7 @@ abstract contract NodeCalls is AccessControl {
     /// @param value Native value to forward in wei.
     /// @param ctx Command execution context.
     /// @return Decoded command output block stream.
-    function callCommand(uint id, uint value, CommandContext memory ctx) internal returns (bytes memory) {
+    function callCommand(uint id, uint128 value, CommandContext memory ctx) internal returns (bytes memory) {
         bytes4 selector = Ids.commandSelector(id);
         bytes memory data = abi.encodeWithSelector(selector, ctx);
         return abi.decode(callTo(id, value, data), (bytes));

package/core/Host.sol

@@ -7,6 +7,7 @@ import {Authorize} from "../commands/admin/Authorize.sol";
 import {Dismiss} from "../commands/admin/Dismiss.sol";
 import {Unauthorize} from "../commands/admin/Unauthorize.sol";
 import {ExecutePayable} from "../commands/admin/Execute.sol";
+import {Label} from "../commands/admin/Label.sol";
 import {Revoke} from "../guards/Revoke.sol";
 import {IntroductionEvent} from "../events/Introduction.sol";
 import {Ids} from "../utils/Ids.sol";
@@ -17,9 +18,7 @@ interface IHostIntroduction {
     /// @notice Record a host introduction claim.
     /// @param peer Host node ID being introduced.
     /// @param blocknum Block number at which the introduction was made.
-    /// @param version Protocol version the host is running.
-    /// @param namespace Human-readable namespace or label for the host.
-    function introduce(uint peer, uint blocknum, uint16 version, string calldata namespace) external;
+    function introduce(uint peer, uint blocknum) external;
 }
 
 /// @title Host
@@ -34,6 +33,7 @@ abstract contract Host is
     Revoke,
     Appoint,
     Dismiss,
+    Label,
     ExecutePayable,
     IntroductionEvent,
     IHostIntroduction
@@ -41,21 +41,17 @@ abstract contract Host is
     /// @param cmdr Commander address; passed to `AccessControl`.
     ///        If `cmdr` is a deployed contract, the host calls `introduce`
     ///        on it during construction.
-    /// @param version Protocol version number to publish in the announcement.
-    /// @param namespace Human-readable namespace string for the host.
-    constructor(address cmdr, uint16 version, string memory namespace) AccessControl(cmdr) {
+    constructor(address cmdr) AccessControl(cmdr) {
         if (cmdr == address(0) || cmdr == address(this) || cmdr.code.length == 0) return;
-        IHostIntroduction(cmdr).introduce(host, block.number, version, namespace);
+        IHostIntroduction(cmdr).introduce(host, block.number);
     }
 
     /// @notice Record a host introduction claim.
     /// @dev Validates that `peer` matches `msg.sender`; it does not authorize or trust the introduced host.
     /// @param peer Host node ID being introduced.
     /// @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.
-    function introduce(uint peer, uint blocknum, uint16 version, string calldata namespace) external {
-        emit Introduction(Ids.matchHost(peer, msg.sender), blocknum, version, namespace);
+    function introduce(uint peer, uint blocknum) external {
+        emit Introduction(Ids.matchHost(peer, msg.sender), blocknum);
     }
 
     /// @notice Accept native ETH transfers (e.g. from command value flows).

package/core/Payable.sol

@@ -18,20 +18,22 @@ abstract contract Payable {
         return Budget({remaining: msg.value});
     }
 
-    /// @notice Deduct `amount` from the budget and return it.
+    /// @notice Deduct the EVM value lane from a packed resource word and return it.
+    /// @dev EVM resources use the low 128 bits as native value/endowment.
     /// @param budget Mutable budget to deduct from.
-    /// @param amount Native value to spend.
-    /// @return The same `amount`, ready to forward to a callee.
-    function useValue(Budget memory budget, uint amount) internal pure returns (uint) {
-        return Values.use(budget, amount);
+    /// @param resources Packed chain resources.
+    /// @return value Native value to forward in wei.
+    function useValue(Budget memory budget, uint resources) internal pure returns (uint128 value) {
+        return Values.use(budget, uint128(resources));
     }
 
-    /// @notice Deduct `amount` from the budget and return it as a new sub-budget.
+    /// @notice Deduct the EVM value lane from a packed resource word as a new sub-budget.
+    /// @dev EVM resources use the low 128 bits as native value/endowment.
     /// @param budget Mutable parent budget to deduct from.
-    /// @param amount Native value to assign to the sub-budget.
-    /// @return A new budget with `amount` remaining.
-    function allocateValue(Budget memory budget, uint amount) internal pure returns (Budget memory) {
-        return Values.allocate(budget, amount);
+    /// @param resources Packed chain resources.
+    /// @return A new budget with the EVM value lane remaining.
+    function allocateValue(Budget memory budget, uint resources) internal pure returns (Budget memory) {
+        return Values.allocate(budget, uint128(resources));
     }
 
     /// @notice Drains the budget and settles any remaining native value.