@rootzero/contracts 0.9.0 → 0.9.2

package/Commands.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.33;
 // Aggregator: re-exports command, admin, and peer abstractions.
 // Import this file to inherit from the full rootzero command surface without managing individual paths.
 
-import { CommandBase, CommandContext, CommandPayable, encodeCommandCall } from "./commands/Base.sol";
+import { CommandBase, CommandContext, CommandPayable } from "./commands/Base.sol";
 import { Keys } from "./blocks/Keys.sol";
 import { Burn, BurnHook } from "./commands/Burn.sol";
 import { CreditAccount, CreditAccountHook } from "./commands/Credit.sol";
@@ -20,12 +20,11 @@ import { ExecutePayable } from "./commands/admin/Execute.sol";
 import { Authorize } from "./commands/admin/Authorize.sol";
 import { DenyAssets, DenyAssetsHook } from "./commands/admin/DenyAssets.sol";
 import { Init, InitHook } from "./commands/admin/Init.sol";
-import { RelocatePayable } from "./commands/admin/Relocate.sol";
 import { Allowance, AllowanceHook } from "./commands/admin/Allowance.sol";
 import { Unauthorize } from "./commands/admin/Unauthorize.sol";
 import { PeerBase, encodePeerCall } from "./peer/Base.sol";
 import { PeerAllowance } from "./peer/Allowance.sol";
-import { PeerAssetPull, PeerAssetPullHook } from "./peer/AssetPull.sol";
+import { PeerAssetPull, AssetPullHook } from "./peer/AssetPull.sol";
 import { PeerAllowAssets } from "./peer/AllowAssets.sol";
 import { PeerDenyAssets } from "./peer/DenyAssets.sol";
 import { PeerSettle } from "./peer/Settle.sol";

package/Events.sol

@@ -5,6 +5,7 @@ pragma solidity ^0.8.33;
 // Import this file to get access to every event emitter in one import.
 
 import { AccessEvent } from "./events/Access.sol";
+import { AdminEvent } from "./events/Admin.sol";
 import { AssetEvent } from "./events/Asset.sol";
 import { BalanceEvent } from "./events/Balance.sol";
 import { CollateralEvent } from "./events/Collateral.sol";
@@ -18,7 +19,7 @@ import { HostAnnouncedEvent } from "./events/Host.sol";
 import { ListingEvent } from "./events/Listing.sol";
 import { PeerEvent } from "./events/Peer.sol";
 import { QueryEvent } from "./events/Query.sol";
-import { RootZeroEvent } from "./events/RootZero.sol";
+import { PipedEvent } from "./events/Piped.sol";
 import { SwapEvent } from "./events/Swap.sol";
 import { WithdrawalEvent } from "./events/Withdraw.sol";
 

package/Utils.sol

@@ -11,7 +11,7 @@ import { ECDSA } from "./utils/ECDSA.sol";
 import { Ids, Selectors } from "./utils/Ids.sol";
 import { Layout } from "./utils/Layout.sol";
 import { Schemas } from "./blocks/Schema.sol";
-import { addrOr, applyBps, beforeBps, bytes32ToInt, bytes32ToString, divisible, hash32, intToBytes32, isFamily, isLocal, isLocalFamily, matchesBase, MAX_BPS, max8, max16, max24, max32, max40, max64, max96, max128, max160, NotDivisible, retryTicket, toLocalBase, toLocalFamily, toUnspecifiedBase, ValueOverflow } from "./utils/Utils.sol";
+import { addrOr, applyBps, beforeBps, bytes32ToInt, bytes32ToString, divisible, hash32, intToBytes32, isFamily, isLocalChain, isLocalFamily, matchesBase, MAX_BPS, max8, max16, max24, max32, max40, max64, max96, max128, max160, NotDivisible, retryTicket, toLocalBase, toLocalFamily, toUnspecifiedBase, ValueOverflow } from "./utils/Utils.sol";
 import { Budget, Values } from "./utils/Value.sol";
 
 

package/blocks/Cursors.sol

@@ -47,9 +47,6 @@ library Cursors {
     error UnexpectedValue();
     /// @dev Input and output block counts are not proportional to their declared group sizes.
     error BadRatio();
-    /// @dev A fixed-width low-level unpacker received an invalid final-word keep length.
-    error InvalidKeep();
-
     // -------------------------------------------------------------------------
     // Cursor construction and navigation
     // -------------------------------------------------------------------------
@@ -218,17 +215,6 @@ library Cursors {
         cur.i = next;
     }
 
-    /// @notice Load a payload word and mask away any omitted tail bytes on the right.
-    /// @param abs Absolute calldata offset of the word start.
-    /// @param tail Number of trailing bytes omitted from the logical payload (0..31).
-    /// @return value Decoded word with omitted tail bytes zeroed.
-    function mask(uint abs, uint tail) internal pure returns (bytes32 value) {
-        assembly ("memory-safe") {
-            value := calldataload(abs)
-        }
-        if (tail != 0) value &= bytes32(type(uint256).max << (tail * 8));
-    }
-
     /// @notice Enter a Bundle block at the current position and return the next offset.
     /// Advances `cur.i` past the bundle header so the bundled members can be parsed
     /// directly from the same cursor. The returned `next` is the byte offset
@@ -561,12 +547,9 @@ library Cursors {
     /// @param cur Cursor; advanced past the block.
     /// @param key Expected dynamic block key.
     /// @return value Decoded bytes32.
-    /// @param keep Number of bytes to keep from the final payload word (1..32).
-    function unpack32(Cur memory cur, bytes4 key, uint keep) internal pure returns (bytes32 value) {
-        if (keep == 0 || keep > 32) revert InvalidKeep();
-        uint len = keep;
-        uint abs = consume(cur, key, len, len);
-        value = mask(abs, 32 - keep);
+    function unpack32(Cur memory cur, bytes4 key) internal pure returns (bytes32 value) {
+        uint abs = consume(cur, key, 32, 32);
+        value = bytes32(msg.data[abs:abs + 32]);
     }
 
     /// @notice Consume a dynamic block with two bytes32 payload words.
@@ -574,13 +557,10 @@ library Cursors {
     /// @param key Expected dynamic block key.
     /// @return a First decoded bytes32.
     /// @return b Second decoded bytes32.
-    /// @param keep Number of bytes to keep from the final payload word (1..32).
-    function unpack64(Cur memory cur, bytes4 key, uint keep) internal pure returns (bytes32 a, bytes32 b) {
-        if (keep == 0 || keep > 32) revert InvalidKeep();
-        uint len = 32 + keep;
-        uint abs = consume(cur, key, len, len);
+    function unpack64(Cur memory cur, bytes4 key) internal pure returns (bytes32 a, bytes32 b) {
+        uint abs = consume(cur, key, 64, 64);
         a = bytes32(msg.data[abs:abs + 32]);
-        b = mask(abs + 32, 32 - keep);
+        b = bytes32(msg.data[abs + 32:abs + 64]);
     }
 
     /// @notice Consume a dynamic block with three bytes32 payload words.
@@ -589,14 +569,11 @@ library Cursors {
     /// @return a First decoded bytes32.
     /// @return b Second decoded bytes32.
     /// @return c Third decoded bytes32.
-    /// @param keep Number of bytes to keep from the final payload word (1..32).
-    function unpack96(Cur memory cur, bytes4 key, uint keep) internal pure returns (bytes32 a, bytes32 b, bytes32 c) {
-        if (keep == 0 || keep > 32) revert InvalidKeep();
-        uint len = 64 + keep;
-        uint abs = consume(cur, key, len, len);
+    function unpack96(Cur memory cur, bytes4 key) internal pure returns (bytes32 a, bytes32 b, bytes32 c) {
+        uint abs = consume(cur, key, 96, 96);
         a = bytes32(msg.data[abs:abs + 32]);
         b = bytes32(msg.data[abs + 32:abs + 64]);
-        c = mask(abs + 64, 32 - keep);
+        c = bytes32(msg.data[abs + 64:abs + 96]);
     }
 
     /// @notice Consume a dynamic block with a 128-byte payload (four 32-byte words).
@@ -606,19 +583,15 @@ library Cursors {
     /// @return b Second decoded bytes32.
     /// @return c Third decoded bytes32.
     /// @return d Fourth decoded bytes32.
-    /// @param keep Number of bytes to keep from the final payload word (1..32).
     function unpack128(
         Cur memory cur,
-        bytes4 key,
-        uint keep
+        bytes4 key
     ) internal pure returns (bytes32 a, bytes32 b, bytes32 c, bytes32 d) {
-        if (keep == 0 || keep > 32) revert InvalidKeep();
-        uint len = 96 + keep;
-        uint abs = consume(cur, key, len, len);
+        uint abs = consume(cur, key, 128, 128);
         a = bytes32(msg.data[abs:abs + 32]);
         b = bytes32(msg.data[abs + 32:abs + 64]);
         c = bytes32(msg.data[abs + 64:abs + 96]);
-        d = mask(abs + 96, 32 - keep);
+        d = bytes32(msg.data[abs + 96:abs + 128]);
     }
 
     /// @notice Consume a dynamic block with a 160-byte payload (five 32-byte words).
@@ -629,20 +602,16 @@ library Cursors {
     /// @return c Third decoded bytes32.
     /// @return d Fourth decoded bytes32.
     /// @return e Fifth decoded bytes32.
-    /// @param keep Number of bytes to keep from the final payload word (1..32).
     function unpack160(
         Cur memory cur,
-        bytes4 key,
-        uint keep
+        bytes4 key
     ) internal pure returns (bytes32 a, bytes32 b, bytes32 c, bytes32 d, bytes32 e) {
-        if (keep == 0 || keep > 32) revert InvalidKeep();
-        uint len = 128 + keep;
-        uint abs = consume(cur, key, len, len);
+        uint abs = consume(cur, key, 160, 160);
         a = bytes32(msg.data[abs:abs + 32]);
         b = bytes32(msg.data[abs + 32:abs + 64]);
         c = bytes32(msg.data[abs + 64:abs + 96]);
         d = bytes32(msg.data[abs + 96:abs + 128]);
-        e = mask(abs + 128, 32 - keep);
+        e = bytes32(msg.data[abs + 128:abs + 160]);
     }
 
     /// @notice Consume a dynamic block with a single uint payload.
@@ -650,7 +619,7 @@ library Cursors {
     /// @param key Expected dynamic block key.
     /// @return value Decoded uint value.
     function unpackUint(Cur memory cur, bytes4 key) internal pure returns (uint value) {
-        value = uint(unpack32(cur, key, 32));
+        value = uint(unpack32(cur, key));
     }
 
     /// @notice Consume a dynamic block with two uint payload words.
@@ -659,7 +628,7 @@ library Cursors {
     /// @return a First decoded uint.
     /// @return b Second decoded uint.
     function unpack2Uint(Cur memory cur, bytes4 key) internal pure returns (uint a, uint b) {
-        (bytes32 x, bytes32 y) = unpack64(cur, key, 32);
+        (bytes32 x, bytes32 y) = unpack64(cur, key);
         return (uint(x), uint(y));
     }
 
@@ -670,7 +639,7 @@ library Cursors {
     /// @return b Second decoded uint.
     /// @return c Third decoded uint.
     function unpack3Uint(Cur memory cur, bytes4 key) internal pure returns (uint a, uint b, uint c) {
-        (bytes32 x, bytes32 y, bytes32 z) = unpack96(cur, key, 32);
+        (bytes32 x, bytes32 y, bytes32 z) = unpack96(cur, key);
         return (uint(x), uint(y), uint(z));
     }
 
@@ -839,35 +808,35 @@ library Cursors {
     /// @param cur Cursor; advanced past the block.
     /// @return account Account identifier.
     function unpackAccount(Cur memory cur) internal pure returns (bytes32 account) {
-        account = unpack32(cur, Keys.Account, 32);
+        account = unpack32(cur, Keys.Account);
     }
 
     /// @notice Consume a NODE block and return the node ID.
     /// @param cur Cursor; advanced past the block.
     /// @return node Node identifier.
     function unpackNode(Cur memory cur) internal pure returns (uint node) {
-        node = uint(unpack32(cur, Keys.Node, 32));
+        node = uint(unpack32(cur, Keys.Node));
     }
 
     /// @notice Consume a RATE block and return the value.
     /// @param cur Cursor; advanced past the block.
     /// @return value Encoded ratio or rate.
     function unpackRate(Cur memory cur) internal pure returns (uint value) {
-        value = uint(unpack32(cur, Keys.Rate, 32));
+        value = uint(unpack32(cur, Keys.Rate));
     }
 
     /// @notice Consume a QUANTITY block and return the amount.
     /// @param cur Cursor; advanced past the block.
     /// @return amount Scalar quantity value.
     function unpackQuantity(Cur memory cur) internal pure returns (uint amount) {
-        amount = uint(unpack32(cur, Keys.Quantity, 32));
+        amount = uint(unpack32(cur, Keys.Quantity));
     }
 
     /// @notice Consume a FEE block and return the amount.
     /// @param cur Cursor; advanced past the block.
     /// @return amount Fee amount.
     function unpackFee(Cur memory cur) internal pure returns (uint amount) {
-        amount = uint(unpack32(cur, Keys.Fee, 32));
+        amount = uint(unpack32(cur, Keys.Fee));
     }
 
     /// @notice Consume an ASSET block and return the asset descriptor fields.
@@ -875,7 +844,7 @@ library Cursors {
     /// @return asset Asset identifier.
     /// @return meta Asset metadata slot.
     function unpackAsset(Cur memory cur) internal pure returns (bytes32 asset, bytes32 meta) {
-        (asset, meta) = unpack64(cur, Keys.Asset, 32);
+        (asset, meta) = unpack64(cur, Keys.Asset);
     }
 
     /// @notice Consume an ACCOUNT_ASSET form block and return its fields as separate values.
@@ -897,20 +866,12 @@ library Cursors {
         (value.account, value.asset, value.meta) = unpackAccountAsset(cur);
     }
 
-    /// @notice Consume a RELOCATION block and return the host and amount.
-    /// @param cur Cursor; advanced past the block.
-    /// @return host Host node ID receiving the funding.
-    /// @return amount Funding amount.
-    function unpackRelocation(Cur memory cur) internal pure returns (uint host, uint amount) {
-        (host, amount) = unpack2Uint(cur, Keys.Relocation);
-    }
-
     /// @notice Consume a BOUNTY block and return the reward amount and relayer.
     /// @param cur Cursor; advanced past the block.
     /// @return amount Relayer reward amount.
     /// @return relayer Relayer account identifier.
     function unpackBounty(Cur memory cur) internal pure returns (uint amount, bytes32 relayer) {
-        (bytes32 x, bytes32 y) = unpack64(cur, Keys.Bounty, 32);
+        (bytes32 x, bytes32 y) = unpack64(cur, Keys.Bounty);
         amount = uint(x);
         relayer = y;
     }

package/blocks/Keys.sol

@@ -68,8 +68,6 @@ library Keys {
     bytes4 constant Asset = bytes4(keccak256("asset(bytes32 asset, bytes32 meta)"));
     /// @dev Node identifier - (uint id)
     bytes4 constant Node = bytes4(keccak256("node(uint id)"));
-    /// @dev Native value relocation entry - (uint host, uint amount)
-    bytes4 constant Relocation = bytes4(keccak256("relocation(uint host, uint amount)"));
     /// @dev Relayer bounty - (uint amount, bytes32 relayer)
     bytes4 constant Bounty = bytes4(keccak256("bounty(uint amount, bytes32 relayer)"));
 

package/blocks/Schema.sol

@@ -114,7 +114,6 @@ library Schemas {
     string constant Allocation = "allocation(uint host, bytes32 asset, bytes32 meta, uint amount)";
     string constant Allowance = "allowance(uint host, bytes32 asset, bytes32 meta, uint amount)";
     string constant Transaction = "transaction(bytes32 from, bytes32 to, bytes32 asset, bytes32 meta, uint amount)";
-    string constant Relocation = "relocation(uint host, uint amount)";
     string constant Call = "call(uint target, uint value, bytes data)";
     string constant Step = "step(uint target, uint value, bytes request)";
     string constant Bounty = "bounty(uint amount, bytes32 relayer)";

package/commands/Base.sol

@@ -18,25 +18,6 @@ struct CommandContext {
     bytes request;
 }
 
-/// @notice ABI-encode a command call from a command ID and execution context.
-/// @dev Derives the function selector from `cid` via `Ids.commandSelector(cid)`.
-/// Reverts if `cid` is not a valid command ID.
-/// @param cid Command node ID embedding the target selector.
-/// @param account Caller account identifier for the command context.
-/// @param state Current state block stream passed to the command.
-/// @param request Input block stream for the command invocation.
-/// @return ABI-encoded calldata for the command entry point.
-function encodeCommandCall(
-    uint cid,
-    bytes32 account,
-    bytes memory state,
-    bytes calldata request
-) pure returns (bytes memory) {
-    bytes4 selector = Ids.commandSelector(cid);
-    CommandContext memory ctx = CommandContext(account, state, request);
-    return abi.encodeWithSelector(selector, ctx);
-}
-
 /// @title CommandBase
 /// @notice Abstract base for all rootzero command contracts.
 /// Provides access control modifiers, event emission, and the `commandId`

package/commands/Burn.sol

@@ -5,8 +5,6 @@ import { CommandBase, CommandContext, Keys } from "./Base.sol";
 import { Cursors, Cur } from "../Cursors.sol";
 using Cursors for Cur;
 
-string constant NAME = "burn";
-
 abstract contract BurnHook {
     /// @notice Override to burn or consume the provided balance amount.
     /// Called once per BALANCE block in state.
@@ -22,6 +20,8 @@ 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);
 
     constructor() {

package/commands/Credit.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.33;
 
 import { CommandBase, CommandContext, Keys } from "./Base.sol";
 import { Cursors, Cur, Schemas } from "../Cursors.sol";
-string constant NAME = "creditAccount";
 
 using Cursors for Cur;
 
@@ -22,6 +21,8 @@ abstract contract CreditAccountHook {
 /// Use for internally recording credits that have already been settled externally.
 /// An optional ACCOUNT block in the request overrides the default `c.account` destination.
 abstract contract CreditAccount is CommandBase, CreditAccountHook {
+    string private constant NAME = "creditAccount";
+
     uint internal immutable creditAccountId = commandId(NAME);
 
     constructor() {

package/commands/Debit.sol

@@ -4,8 +4,6 @@ pragma solidity ^0.8.33;
 import { CommandContext, CommandBase, Keys } from "./Base.sol";
 import { Cursors, Cur, Schemas, Writer, Writers } from "../Cursors.sol";
 
-string constant NAME = "debitAccount";
-
 using Cursors for Cur;
 using Writers for Writer;
 
@@ -24,6 +22,8 @@ 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);
 
     constructor() {

package/commands/Deposit.sol

@@ -5,9 +5,6 @@ import { CommandContext, CommandBase, CommandPayable, Keys } from "./Base.sol";
 import { Cursors, Cur, Schemas, Writer, Writers } from "../Cursors.sol";
 import { Budget, Values } from "../utils/Value.sol";
 
-string constant DEPOSIT = "deposit";
-string constant DEPOSIT_PAYABLE = "depositPayable";
-
 using Cursors for Cur;
 using Writers for Writer;
 
@@ -39,10 +36,12 @@ 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 {
-    uint internal immutable depositId = commandId(DEPOSIT);
+    string private constant NAME = "deposit";
+
+    uint internal immutable depositId = commandId(NAME);
 
     constructor() {
-        emit Command(host, depositId, DEPOSIT, Schemas.Amount, Keys.Empty, Keys.Balance, false);
+        emit Command(host, depositId, NAME, Schemas.Amount, Keys.Empty, Keys.Balance, false);
     }
 
     function deposit(
@@ -65,10 +64,12 @@ 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 CommandPayable, DepositPayableHook {
-    uint internal immutable depositPayableId = commandId(DEPOSIT_PAYABLE);
+    string private constant NAME = "depositPayable";
+
+    uint internal immutable depositPayableId = commandId(NAME);
 
     constructor() {
-        emit Command(host, depositPayableId, DEPOSIT_PAYABLE, Schemas.Amount, Keys.Empty, Keys.Balance, true);
+        emit Command(host, depositPayableId, NAME, Schemas.Amount, Keys.Empty, Keys.Balance, true);
     }
 
     function depositPayable(

package/commands/Pipe.sol

@@ -8,11 +8,18 @@ import {Budget, Values} from "../utils/Value.sol";
 
 using Cursors for Cur;
 
-string constant NAME = "pipePayable";
-
 abstract contract PipePayableHook {
-    function dispatchStep(
-        uint target,
+    /// @notice Override to dispatch one piped command step.
+    /// Called once per STEP block. The returned bytes become the state passed to
+    /// the next step.
+    /// @param id Command node ID to invoke or handle.
+    /// @param account Account identifier for the piped command context.
+    /// @param state Current threaded state block stream.
+    /// @param request Step request block stream.
+    /// @param value Native value assigned to this step.
+    /// @return Updated state block stream for the next step.
+    function dispatchCommand(
+        uint id,
         bytes32 account,
         bytes memory state,
         bytes calldata request,
@@ -22,10 +29,12 @@ abstract contract PipePayableHook {
 
 /// @title PipePayable
 /// @notice Command that sequences multiple sub-command STEP invocations in a single transaction.
-/// Each STEP block carries a target node, native value to forward, and an embedded request.
+/// Each STEP block carries a command node, native value to forward, and an embedded request.
 /// State threads through the steps: each step's output becomes the next step's state.
 /// Admin accounts are not permitted to use `pipePayable`.
 abstract contract PipePayable is CommandPayable, PipePayableHook {
+    string private constant NAME = "pipePayable";
+
     uint internal immutable pipePayableId = commandId(NAME);
 
     constructor() {
@@ -43,7 +52,7 @@ abstract contract PipePayable is CommandPayable, PipePayableHook {
         while (input.i < input.bound) {
             (uint target, uint value, bytes calldata request) = input.unpackStep();
             uint spend = Values.use(budget, value);
-            state = dispatchStep(target, account, state, request, spend);
+            state = dispatchCommand(target, account, state, request, spend);
         }
 
         settleValue(account, budget);
@@ -52,11 +61,7 @@ abstract contract PipePayable is CommandPayable, PipePayableHook {
     }
 
     /// @notice Execute the pipePayable command.
-    function pipePayable(
-        CommandContext calldata c
-    ) external payable onlyCommand(c.account) returns (bytes memory) {
-        if (Accounts.isAdmin(c.account)) revert Accounts.InvalidAccount();
-        Budget memory budget = Values.fromMsg();
-        return pipe(c.account, c.state, c.request, budget);
+    function pipePayable(CommandContext calldata c) external payable onlyCommand(c.account) returns (bytes memory) {
+        return pipe(Accounts.ensureNotAdmin(c.account), c.state, c.request, Values.fromMsg());
     }
 }

package/commands/Provision.sol

@@ -7,9 +7,6 @@ import {Budget, Values} from "../utils/Value.sol";
 using Cursors for Cur;
 using Writers for Writer;
 
-string constant PROVISION = "provision";
-string constant PP = "provisionPayable";
-
 /// @notice Shared provision hook used by `Provision`.
 abstract contract ProvisionHook {
     /// @notice Override to send or provision a custody value.
@@ -32,13 +29,15 @@ abstract contract ProvisionPayableHook {
 }
 
 /// @title Provision
-/// @notice Command that provisions assets to remote hosts from ALLOCATION request blocks.
+/// @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 {
-    uint internal immutable provisionId = commandId(PROVISION);
+    string private constant NAME = "provision";
+
+    uint internal immutable provisionId = commandId(NAME);
 
     constructor() {
-        emit Command(host, provisionId, PROVISION, Schemas.Allocation, Keys.Empty, Keys.Custody, false);
+        emit Command(host, provisionId, NAME, Schemas.Allocation, Keys.Empty, Keys.Custody, false);
     }
 
     function provision(CommandContext calldata c) external onlyCommand(c.account) returns (bytes memory) {
@@ -56,14 +55,16 @@ abstract contract Provision is CommandBase, ProvisionHook {
 }
 
 /// @title ProvisionPayable
-/// @notice Command that provisions assets to remote hosts from ALLOCATION request blocks.
+/// @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.
 /// The hook receives a mutable native-value budget drawn from `msg.value`.
 abstract contract ProvisionPayable is CommandPayable, ProvisionPayableHook {
-    uint internal immutable provisionPayableId = commandId(PP);
+    string private constant NAME = "provisionPayable";
+
+    uint internal immutable provisionPayableId = commandId(NAME);
 
     constructor() {
-        emit Command(host, provisionPayableId, PP, Schemas.Allocation, Keys.Empty, Keys.Custody, true);
+        emit Command(host, provisionPayableId, NAME, Schemas.Allocation, Keys.Empty, Keys.Custody, true);
     }
 
     function provisionPayable(

package/commands/Transfer.sol

@@ -6,8 +6,6 @@ import { Cursors, Cur, Schemas, Tx } from "../Cursors.sol";
 import { Accounts } from "../utils/Accounts.sol";
 using Cursors for Cur;
 
-string constant NAME = "transfer";
-
 abstract contract TransferHook {
     /// @notice Override to execute a single transfer record from the request pipeline.
     /// Called once per PAYOUT block in the request.
@@ -20,6 +18,8 @@ abstract contract TransferHook {
 /// PAYOUT request blocks. Produces no state output.
 /// The virtual `transfer(value)` hook is called once per entry.
 abstract contract Transfer is CommandBase, TransferHook {
+    string private constant NAME = "transfer";
+
     uint internal immutable transferId = commandId(NAME);
 
     constructor() {

package/commands/Withdraw.sol

@@ -5,8 +5,6 @@ import { CommandContext, CommandBase, Keys } from "./Base.sol";
 import { Cursors, Cur, Schemas } from "../Cursors.sol";
 using Cursors for Cur;
 
-string constant NAME = "withdraw";
-
 abstract contract WithdrawHook {
     /// @notice Override to send funds to `account`.
     /// Called once per BALANCE block in state.
@@ -22,6 +20,8 @@ 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);
 
     constructor() {

package/commands/admin/AllowAssets.sol

@@ -3,24 +3,25 @@ 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;
 
-string constant NAME = "allowAssets";
-
 abstract contract AllowAssetsHook {
     /// @dev Override to allow a single asset/meta pair.
     /// Called once per ASSET block in the request.
-    function allowAsset(bytes32 asset, bytes32 meta) internal virtual returns (bool);
+    function allowAsset(bytes32 asset, bytes32 meta) internal virtual;
 }
 
 /// @title AllowAssets
 /// @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, AllowAssetsHook {
+abstract contract AllowAssets is CommandBase, AdminEvent, AllowAssetsHook {
+    string private constant NAME = "allowAssets";
+
     uint internal immutable allowAssetsId = commandId(NAME);
 
     constructor() {
-        emit Command(host, allowAssetsId, NAME, Schemas.Asset, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, allowAssetsId, NAME, Schemas.Asset, Keys.Empty, Keys.Empty, false);
     }
 
     function allowAssets(

package/commands/admin/Allowance.sol

@@ -1,12 +1,11 @@
 // 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 {CommandBase, CommandContext, Keys} from "../Base.sol";
+import {Cursors, Cur, Schemas} from "../../Cursors.sol";
+import {AdminEvent} from "../../events/Admin.sol";
 using Cursors for Cur;
 
-string constant NAME = "allowance";
-
 abstract contract AllowanceHook {
     /// @notice Apply or revoke one host-scoped allowance.
     /// Called once per ALLOWANCE block in the request. Implementations decide
@@ -22,11 +21,12 @@ abstract contract AllowanceHook {
 /// @title Allowance
 /// @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, AllowanceHook {
+abstract contract Allowance is CommandBase, AdminEvent, AllowanceHook {
+    string private constant NAME = "allowance";
     uint internal immutable allowanceId = commandId(NAME);
 
     constructor() {
-        emit Command(host, allowanceId, NAME, Schemas.Allowance, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, allowanceId, NAME, Schemas.Allowance, Keys.Empty, Keys.Empty, false);
     }
 
     function allowance(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory) {

package/commands/admin/Authorize.sol

@@ -3,19 +3,20 @@ 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;
 
-string constant NAME = "authorize";
-
 /// @title Authorize
 /// @notice Admin command that grants authorization to a list of node IDs.
 /// Each NODE block in the request is authorized on the host.
 /// Only callable by the admin account.
-abstract contract Authorize is CommandBase {
+abstract contract Authorize is CommandBase, AdminEvent {
+    string private constant NAME = "authorize";
+
     uint internal immutable authorizeId = commandId(NAME);
 
     constructor() {
-        emit Command(host, authorizeId, NAME, Schemas.Node, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, authorizeId, NAME, Schemas.Node, Keys.Empty, Keys.Empty, false);
     }
 
     function authorize(

package/commands/admin/DenyAssets.sol

@@ -3,24 +3,25 @@ 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;
 
-string constant NAME = "denyAssets";
-
 abstract contract DenyAssetsHook {
     /// @dev Override to deny a single asset/meta pair.
     /// Called once per ASSET block in the request.
-    function denyAsset(bytes32 asset, bytes32 meta) internal virtual returns (bool);
+    function denyAsset(bytes32 asset, bytes32 meta) internal virtual;
 }
 
 /// @title DenyAssets
 /// @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, DenyAssetsHook {
+abstract contract DenyAssets is CommandBase, AdminEvent, DenyAssetsHook {
+    string private constant NAME = "denyAssets";
+
     uint internal immutable denyAssetsId = commandId(NAME);
 
     constructor() {
-        emit Command(host, denyAssetsId, NAME, Schemas.Asset, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, denyAssetsId, NAME, Schemas.Asset, Keys.Empty, Keys.Empty, false);
     }
 
     function denyAssets(

package/commands/admin/Destroy.sol

@@ -3,8 +3,7 @@ pragma solidity ^0.8.33;
 
 import { CommandBase, CommandContext, Keys } from "../Base.sol";
 import { Cursors, Cur } from "../../Cursors.sol";
-
-string constant NAME = "destroy";
+import { AdminEvent } from "../../events/Admin.sol";
 
 using Cursors for Cur;
 
@@ -17,11 +16,13 @@ abstract contract DestroyHook {
 /// @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 CommandBase, DestroyHook {
+abstract contract Destroy is CommandBase, AdminEvent, DestroyHook {
+    string private constant NAME = "destroy";
+
     uint internal immutable destroyId = commandId(NAME);
 
     constructor(string memory input) {
-        emit Command(host, destroyId, NAME, input, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, destroyId, NAME, input, Keys.Empty, Keys.Empty, false);
     }
 
     function destroy(

package/commands/admin/Execute.sol

@@ -3,22 +3,23 @@ pragma solidity ^0.8.33;
 
 import {CommandContext, CommandPayable, Keys} from "../Base.sol";
 import {Cursors, Cur, Schemas} from "../../Cursors.sol";
+import {AdminEvent} from "../../events/Admin.sol";
 import {Budget, Values} from "../../utils/Value.sol";
 import {Ids} from "../../utils/Ids.sol";
 
 using Cursors for Cur;
 
-string constant NAME = "executePayable";
-
 /// @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.
 /// Only callable by the admin account.
-abstract contract ExecutePayable is CommandPayable {
+abstract contract ExecutePayable is CommandPayable, AdminEvent {
+    string private constant NAME = "executePayable";
+
     uint internal immutable executePayableId = commandId(NAME);
 
     constructor() {
-        emit Command(host, executePayableId, NAME, Schemas.Call, Keys.Empty, Keys.Empty, true);
+        emit Admin(host, executePayableId, NAME, Schemas.Call, Keys.Empty, Keys.Empty, true);
     }
 
     function executePayable(CommandContext calldata c) external payable onlyAdmin(c.account) returns (bytes memory) {

package/commands/admin/Init.sol

@@ -3,8 +3,7 @@ pragma solidity ^0.8.33;
 
 import { CommandBase, CommandContext, Keys } from "../Base.sol";
 import { Cursors, Cur } from "../../Cursors.sol";
-
-string constant NAME = "init";
+import { AdminEvent } from "../../events/Admin.sol";
 
 using Cursors for Cur;
 
@@ -17,11 +16,13 @@ abstract contract InitHook {
 /// @title Init
 /// @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, InitHook {
+abstract contract Init is CommandBase, AdminEvent, InitHook {
+    string private constant NAME = "init";
+
     uint internal immutable initId = commandId(NAME);
 
     constructor(string memory input) {
-        emit Command(host, initId, NAME, input, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, initId, NAME, input, Keys.Empty, Keys.Empty, false);
     }
 
     function init(

package/commands/admin/Unauthorize.sol

@@ -3,19 +3,20 @@ 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;
 
-string constant NAME = "unauthorize";
-
 /// @title Unauthorize
 /// @notice Admin command that revokes authorization from a list of node IDs.
 /// Each NODE block in the request is deauthorized on the host.
 /// Only callable by the admin account.
-abstract contract Unauthorize is CommandBase {
+abstract contract Unauthorize is CommandBase, AdminEvent {
+    string private constant NAME = "unauthorize";
+
     uint internal immutable unauthorizeId = commandId(NAME);
 
     constructor() {
-        emit Command(host, unauthorizeId, NAME, Schemas.Node, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, unauthorizeId, NAME, Schemas.Node, Keys.Empty, Keys.Empty, false);
     }
 
     function unauthorize(

package/core/Calls.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.33;
 
 import {AccessControl} from "./Access.sol";
+import {CommandContext} from "../commands/Base.sol";
 import {Ids} from "../utils/Ids.sol";
 
 /// @dev Emitted when a trusted inter-node call fails.
@@ -53,7 +54,8 @@ abstract contract NodeCalls is AccessControl {
     /// @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) {
-        address addr = Ids.nodeAddr(ensureTrusted(node));
+        ensureTrusted(node);
+        address addr = Ids.nodeAddr(node);
         return callAddr(addr, value, data);
     }
 
@@ -64,7 +66,19 @@ abstract contract NodeCalls is AccessControl {
     /// @param data Encoded calldata to send.
     /// @return out Return data from the successful query.
     function queryTo(uint node, bytes memory data) internal view returns (bytes memory out) {
-        address addr = Ids.nodeAddr(ensureTrusted(node));
+        ensureTrusted(node);
+        address addr = Ids.nodeAddr(node);
         return queryAddr(addr, data);
     }
+
+    /// @notice Encode and call a trusted command node.
+    /// @param ctx Command execution context.
+    /// @param cid Command node ID embedding the target selector.
+    /// @param value Native value to forward in wei.
+    /// @return Decoded command output block stream.
+    function callCommand(CommandContext memory ctx, uint cid, uint value) internal returns (bytes memory) {
+        bytes4 selector = Ids.commandSelector(cid);
+        bytes memory data = abi.encodeWithSelector(selector, ctx);
+        return abi.decode(callTo(cid, value, data), (bytes));
+    }
 }

package/core/Host.sol

@@ -5,7 +5,6 @@ import {AccessControl} from "./Access.sol";
 import {Authorize} from "../commands/admin/Authorize.sol";
 import {Unauthorize} from "../commands/admin/Unauthorize.sol";
 import {ExecutePayable} from "../commands/admin/Execute.sol";
-import {RelocatePayable} from "../commands/admin/Relocate.sol";
 import {HostAnnouncedEvent} from "../events/Host.sol";
 import {IHostDiscovery} from "../interfaces/IHostDiscovery.sol";
 import {Ids} from "../utils/Ids.sol";
@@ -26,10 +25,10 @@ abstract contract HostDiscovery is HostAnnouncedEvent, IHostDiscovery {
 
 /// @title Host
 /// @notice Abstract base contract for rootzero host implementations.
-/// Inherits admin command support (authorize, unauthorize, executePayable, relocatePayable) and
+/// Inherits admin command support (authorize, unauthorize, executePayable) and
 /// optionally announces itself to a discovery contract at deployment.
 /// Accepts native ETH payments via the `receive` function.
-abstract contract Host is Authorize, Unauthorize, ExecutePayable, RelocatePayable {
+abstract contract Host is Authorize, Unauthorize, ExecutePayable {
     /// @param cmdr Commander address; passed to `AccessControl`.
     ///        If `cmdr` is a deployed contract, the host calls `announceHost`
     ///        on it during construction to register with the discovery registry.

package/events/Admin.sol

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import { EventEmitter } from "./Emitter.sol";
+
+string constant ABI =
+    "event Admin(uint indexed host, uint id, string name, string request, bytes4 state, bytes4 output, bool acceptsValue)";
+
+/// @notice Emitted once per admin command during host deployment to publish its request schema and state keys.
+abstract contract AdminEvent is EventEmitter {
+    /// @param host Host node ID that owns this admin command.
+    /// @param id Command node ID.
+    /// @param name Human-readable command name.
+    /// @param request Schema DSL string describing the request shape.
+    /// @param state Block key expected for input state, or `Keys.Empty`.
+    /// @param output Block key produced for output state, or `Keys.Empty`.
+    /// @param acceptsValue Whether the command entrypoint accepts nonzero `msg.value`.
+    event Admin(
+        uint indexed host,
+        uint id,
+        string name,
+        string request,
+        bytes4 state,
+        bytes4 output,
+        bool acceptsValue
+    );
+
+    constructor() {
+        emit EventAbi(ABI);
+    }
+}

package/events/Peer.sol

@@ -4,16 +4,16 @@ pragma solidity ^0.8.33;
 import { EventEmitter } from "./Emitter.sol";
 
 string constant ABI =
-    "event Peer(uint indexed host, uint id, string name, string schema, bool acceptsValue)";
+    "event Peer(uint indexed host, uint id, string name, string request, bool acceptsValue)";
 
-/// @notice Emitted once per peer during host deployment to publish its schema.
+/// @notice Emitted once per peer during host deployment to publish its request schema.
 abstract contract PeerEvent is EventEmitter {
     /// @param host Host node ID that owns this peer.
     /// @param id Peer node ID.
     /// @param name Human-readable peer name.
-    /// @param schema Schema DSL string describing the peer request shape.
+    /// @param request Schema DSL string describing the peer request shape.
     /// @param acceptsValue Whether the peer entrypoint accepts nonzero `msg.value`.
-    event Peer(uint indexed host, uint id, string name, string schema, bool acceptsValue);
+    event Peer(uint indexed host, uint id, string name, string request, bool acceptsValue);
 
     constructor() {
         emit EventAbi(ABI);

package/events/{RootZero.sol → Piped.sol}

@@ -3,14 +3,14 @@ pragma solidity ^0.8.33;
 
 import { EventEmitter } from "./Emitter.sol";
 
-string constant ABI = "event RootZero(bytes32 indexed account, uint deadline, uint value)";
+string constant ABI = "event Piped(bytes32 indexed account, uint deadline, uint value)";
 
 /// @notice Emitted for root-level protocol actions (e.g. governance or protocol-wide operations).
-abstract contract RootZeroEvent is EventEmitter {
+abstract contract PipedEvent is EventEmitter {
     /// @param account Account identifier associated with the action.
     /// @param deadline Expiry timestamp of the action.
     /// @param value Native value associated with the action.
-    event RootZero(bytes32 indexed account, uint deadline, uint value);
+    event Piped(bytes32 indexed account, uint deadline, uint value);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Query.sol

@@ -3,16 +3,16 @@ pragma solidity ^0.8.33;
 
 import {EventEmitter} from "./Emitter.sol";
 
-string constant ABI = "event Query(uint indexed host, uint id, string name, string input, string output)";
+string constant ABI = "event Query(uint indexed host, uint id, string name, string request, string response)";
 
 /// @notice Emitted once per query during host deployment to publish its request and response schemas.
 abstract contract QueryEvent is EventEmitter {
     /// @param host Host node ID that owns this query.
     /// @param id Query node ID.
     /// @param name Human-readable query name.
-    /// @param input Schema DSL string describing the query request shape.
-    /// @param output Schema DSL string describing the query response shape.
-    event Query(uint indexed host, uint id, string name, string input, string output);
+    /// @param request Schema DSL string describing the query request shape.
+    /// @param response Schema DSL string describing the query response shape.
+    event Query(uint indexed host, uint id, string name, string request, string response);
 
     constructor() {
         emit EventAbi(ABI);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rootzero/contracts",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "Solidity contracts and protocol building blocks for rootzero hosts and commands.",
   "private": false,
   "license": "GPL-3.0-only",

package/peer/AllowAssets.sol

@@ -7,12 +7,11 @@ import { Cursors, Cur, Schemas } from "../Cursors.sol";
 
 using Cursors for Cur;
 
-string constant NAME = "peerAllowAssets";
-
 /// @title PeerAllowAssets
-/// @notice Peer that permits a list of (asset, meta) pairs on behalf of a remote host.
+/// @notice Peer that permits a list of (asset, meta) pairs on behalf of a peer host.
 /// Each ASSET block in the request calls `allowAsset`. Restricted to trusted peers.
 abstract contract PeerAllowAssets is PeerBase, AllowAssetsHook {
+    string private constant NAME = "peerAllowAssets";
     uint internal immutable peerAllowAssetsId = peerId(NAME);
 
     constructor() {

package/peer/Allowance.sol

@@ -7,13 +7,12 @@ import {Cursors, Cur, Schemas} from "../Cursors.sol";
 
 using Cursors for Cur;
 
-string constant NAME = "peerAllowance";
-
 /// @title PeerAllowance
-/// @notice Peer that lets a trusted remote host request or refresh its own allowance.
-/// Each AMOUNT block in the request is scoped to `caller()` and passed to the shared
-/// allowance hook as a host-scoped allowance. Restricted to trusted peers.
+/// @notice Peer that lets a trusted peer host request or refresh its own allowance.
+/// Each AMOUNT block in the request is scoped to the peer host and passed to the
+/// shared allowance hook as a host-scoped allowance. Restricted to trusted peers.
 abstract contract PeerAllowance is PeerBase, AllowanceHook {
+    string private constant NAME = "peerAllowance";
     uint internal immutable peerAllowanceId = peerId(NAME);
 
     constructor() {

package/peer/AssetPull.sol

@@ -4,24 +4,23 @@ pragma solidity ^0.8.33;
 import {PeerBase} from "./Base.sol";
 import {Cursors, Cur, Schemas} from "../Cursors.sol";
 
-string constant NAME = "peerAssetPull";
-
 using Cursors for Cur;
 
-abstract contract PeerAssetPullHook {
-    /// @notice Override to process one incoming amount-based asset pull request from a remote host.
-    /// @param peer Host node ID derived from the caller address.
+abstract contract AssetPullHook {
+    /// @notice Override to process one incoming amount-based asset pull request from a peer host.
+    /// @param peer Peer host node ID for this request.
     /// @param asset Requested asset identifier.
     /// @param meta Requested asset metadata slot.
     /// @param amount Requested amount in the asset's native units.
-    function peerAssetPull(uint peer, bytes32 asset, bytes32 meta, uint amount) internal virtual;
+    function assetPull(uint peer, bytes32 asset, bytes32 meta, uint amount) internal virtual;
 }
 
 /// @title PeerAssetPull
-/// @notice Peer that pulls requested asset amounts from a remote host into this one.
-/// Each AMOUNT block in the request calls `peerAssetPull(peer, asset, meta, amount)`, where `peer`
-/// is derived from `msg.sender`. Restricted to trusted peers.
-abstract contract PeerAssetPull is PeerBase, PeerAssetPullHook {
+/// @notice Peer that pulls requested asset amounts from a peer host into this one.
+/// Each AMOUNT block in the request calls `assetPull(peer, asset, meta, amount)`.
+/// Restricted to trusted peers.
+abstract contract PeerAssetPull is PeerBase, AssetPullHook {
+    string private constant NAME = "peerAssetPull";
     uint internal immutable peerAssetPullId = peerId(NAME);
 
     constructor() {
@@ -35,7 +34,7 @@ abstract contract PeerAssetPull is PeerBase, PeerAssetPullHook {
 
         while (assets.i < assets.bound) {
             (bytes32 asset, bytes32 meta, uint amount) = assets.unpackAmount();
-            peerAssetPull(peer, asset, meta, amount);
+            assetPull(peer, asset, meta, amount);
         }
 
         assets.complete();

package/peer/DenyAssets.sol

@@ -7,12 +7,11 @@ import {Cursors, Cur, Schemas} from "../Cursors.sol";
 
 using Cursors for Cur;
 
-string constant NAME = "peerDenyAssets";
-
 /// @title PeerDenyAssets
-/// @notice Peer that blocks a list of (asset, meta) pairs on behalf of a remote host.
+/// @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);
 
     constructor() {

package/peer/Settle.sol

@@ -7,12 +7,11 @@ import { Cursors, Cur, Schemas } from "../Cursors.sol";
 
 using Cursors for Cur;
 
-string constant NAME = "peerSettle";
-
 /// @title PeerSettle
 /// @notice Peer that consumes peer-supplied TRANSACTION blocks through the shared transfer hook.
 /// Each TRANSACTION block in the request calls `transfer(value)`. Restricted to trusted peers.
 abstract contract PeerSettle is PeerBase, TransferHook {
+    string private constant NAME = "peerSettle";
     uint internal immutable peerSettleId = peerId(NAME);
 
     constructor() {

package/queries/Assets.sol

@@ -8,8 +8,6 @@ import {QueryBase} from "./Base.sol";
 using Cursors for Cur;
 using Writers for Writer;
 
-string constant NAME = "isAllowedAsset";
-
 abstract contract IsAllowedAssetHook {
     /// @notice Resolve whether one asset tuple is allowed.
     /// Concrete implementations define the allowlist policy.
@@ -24,6 +22,7 @@ abstract contract IsAllowedAssetHook {
 /// The request is a run of `ASSET` blocks.
 /// The response returns one `STATUS` form block per query entry, preserving request order.
 abstract contract IsAllowedAsset is QueryBase, IsAllowedAssetHook {
+    string private constant NAME = "isAllowedAsset";
     uint public immutable isAllowedAssetId = queryId(NAME);
 
     constructor() {

package/queries/Balances.sol

@@ -7,8 +7,6 @@ import {QueryBase} from "./Base.sol";
 using Cursors for Cur;
 using Writers for Writer;
 
-string constant NAME = "getBalances";
-
 abstract contract GetBalancesHook {
     /// @notice Resolve one account's balance for one supported asset.
     /// Concrete implementations define how assets are resolved.
@@ -24,6 +22,7 @@ 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);
 
     constructor() {

package/queries/Positions.sol

@@ -7,8 +7,6 @@ import {QueryBase} from "./Base.sol";
 
 using Cursors for Cur;
 
-string constant NAME = "getPosition";
-
 abstract contract GetPositionHook {
     /// @notice Resolve the position payload for one requested position.
     /// Concrete implementations must append exactly one `RESPONSE` block whose payload
@@ -30,6 +28,7 @@ abstract contract GetPositionHook {
 /// The request is a run of `ACCOUNT_ASSET` form blocks.
 /// The response returns one dynamic `RESPONSE` 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 internal immutable positionResponseSize;
 

package/utils/Accounts.sol

@@ -92,6 +92,14 @@ library Accounts {
         return account;
     }
 
+    /// @notice Assert that `account` is not an admin account and return it unchanged.
+    /// @param account Account ID to validate.
+    /// @return The same `account` value if valid.
+    function ensureNotAdmin(bytes32 account) internal pure returns (bytes32) {
+        if (isAdmin(account)) revert InvalidAccount();
+        return account;
+    }
+
     /// @notice Extract the EVM address embedded in an EVM-family account ID.
     /// Reverts if `account` is not an EVM-family account.
     /// @param account EVM-family account ID.

package/utils/Ids.sol

@@ -47,6 +47,11 @@ library Ids {
         return uint32(id >> 224) == Query;
     }
 
+    /// @notice Return true if `id` is a local node ID for this contract.
+    function isLocalNode(uint id) internal view returns (bool) {
+        return isLocalFamily(id, Node) && address(uint160(id)) == address(this);
+    }
+
     /// @notice Assert that `id` is a command ID and return it unchanged.
     /// @param id Node ID to validate.
     /// @return cid The same `id` value if it is a command.

package/utils/Utils.sol

@@ -170,7 +170,7 @@ function isFamily(uint value, uint24 family) pure returns (bool) {
 /// @notice Check whether `value` was created on the current chain.
 /// @param value ID to test.
 /// @return True if bits [223:192] of `value` equal `block.chainid`.
-function isLocal(uint value) view returns (bool) {
+function isLocalChain(uint value) view returns (bool) {
     return uint32(value >> 192) == block.chainid;
 }
 
@@ -179,7 +179,7 @@ function isLocal(uint value) view returns (bool) {
 /// @param family Expected 24-bit family tag.
 /// @return True if both the family and chainid fields match.
 function isLocalFamily(uint value, uint24 family) view returns (bool) {
-    return isFamily(value, family) && isLocal(value);
+    return isFamily(value, family) && isLocalChain(value);
 }
 
 /// @notice Check whether two IDs share the same 64-bit base (type tag + chainid).

package/commands/admin/Relocate.sol

@@ -1,43 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import { CommandContext, CommandPayable, Keys } from "../Base.sol";
-import { Cursors, Cur, Schemas } from "../../Cursors.sol";
-import { Budget, Values } from "../../utils/Value.sol";
-using Cursors for Cur;
-
-string constant NAME = "relocatePayable";
-
-/// @title RelocatePayable
-/// @notice Admin command that forwards native value (ETH) to one or more destination hosts.
-/// Each RELOCATION block in the request specifies a target host node ID and an amount to forward.
-/// Only callable by the admin account.
-abstract contract RelocatePayable is CommandPayable {
-    uint internal immutable relocatePayableId = commandId(NAME);
-
-    constructor() {
-        emit Command(host, relocatePayableId, NAME, Schemas.Relocation, Keys.Empty, Keys.Empty, true);
-    }
-
-    function relocatePayable(
-        CommandContext calldata c
-    ) external payable onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = cursor(c.request, 1);
-        Budget memory budget = Values.fromMsg();
-
-        while (request.i < request.bound) {
-            (uint peer, uint amount) = request.unpackRelocation();
-            callTo(peer, Values.use(budget, amount), "");
-        }
-
-        request.complete();
-        settleValue(c.account, budget);
-        return "";
-    }
-}
-
-
-
-
-
-