@rootzero/contracts 1.3.0 → 1.5.0

package/core/Calls.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import {AccessControl} from "./Access.sol";
 import {CommandContext} from "../commands/Base.sol";
-import {Ids} from "../utils/Ids.sol";
+import {Nodes} from "../utils/Nodes.sol";
 
 /// @dev Emitted when a trusted inter-node call fails.
 /// @param addr Contract address that was called.
@@ -18,7 +18,7 @@ abstract contract NodeCalls is AccessControl {
     /// @dev Encodes `msg.sender` as a host ID using the local-chain host layout.
     /// @return Host node ID for `msg.sender`.
     function caller() internal view returns (uint) {
-        return Ids.toHost(msg.sender);
+        return Nodes.toHost(msg.sender);
     }
 
     /// @notice Make a low-level call to an address.
@@ -47,7 +47,7 @@ abstract contract NodeCalls is AccessControl {
     }
 
     /// @notice Make a trusted call to another node in the network.
-    /// Looks up the node's contract address via `ensureTrusted` + `Ids.nodeAddr`,
+    /// Looks up the node's contract address via `ensureTrusted` + `Nodes.addr`,
     /// then issues a low-level call forwarding `value` ETH and `data`.
     /// @param node Node ID of the callee (must be in the authorized set).
     /// @param value Native value to forward in wei.
@@ -55,19 +55,19 @@ abstract contract NodeCalls is AccessControl {
     /// @return out Return data from the successful call.
     function callTo(uint node, uint128 value, bytes memory data) internal returns (bytes memory out) {
         ensureTrusted(node);
-        address addr = Ids.nodeAddr(node);
+        address addr = Nodes.addr(node);
         return callAddr(addr, value, data);
     }
 
     /// @notice Make a trusted query to another node in the network.
-    /// Looks up the node's contract address via `ensureTrusted` + `Ids.nodeAddr`,
+    /// Looks up the node's contract address via `ensureTrusted` + `Nodes.addr`,
     /// then issues a low-level `staticcall` with `data`.
     /// @param node Node ID of the callee (must be in the authorized set).
     /// @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) {
         ensureTrusted(node);
-        address addr = Ids.nodeAddr(node);
+        address addr = Nodes.addr(node);
         return queryAddr(addr, data);
     }
 
@@ -77,7 +77,7 @@ abstract contract NodeCalls is AccessControl {
     /// @param ctx Command execution context.
     /// @return Decoded command output block stream.
     function callCommand(uint id, uint128 value, CommandContext memory ctx) internal returns (bytes memory) {
-        bytes4 selector = Ids.commandSelector(id);
+        bytes4 selector = Nodes.commandSelector(id);
         bytes memory data = abi.encodeWithSelector(selector, ctx);
         return abi.decode(callTo(id, value, data), (bytes));
     }

package/core/Host.sol

@@ -10,7 +10,7 @@ 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";
+import {Nodes} from "../utils/Nodes.sol";
 
 /// @title IHostIntroduction
 /// @notice Interface implemented by hosts that accept introductions from other hosts.
@@ -51,7 +51,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(Ids.matchHost(peer, msg.sender), blocknum);
+        emit Introduction(Nodes.matchHost(peer, msg.sender), blocknum);
     }
 
     /// @notice Accept native ETH transfers (e.g. from command value flows).

package/core/Runtime.sol

@@ -2,13 +2,13 @@
 pragma solidity ^0.8.33;
 
 import {Assets} from "../utils/Assets.sol";
-import {Ids} from "../utils/Ids.sol";
+import {Nodes} from "../utils/Nodes.sol";
 
 /// @title Runtime
 /// @notice Shared runtime for host identity and native asset identity.
 abstract contract Runtime {
-    /// @dev This contract's host node ID, set to `Ids.toHost(address(this))` at construction.
-    uint public immutable host = Ids.toHost(address(this));
+    /// @dev This contract's host node ID, set to `Nodes.toHost(address(this))` at construction.
+    uint public immutable host = Nodes.toHost(address(this));
     /// @dev Asset ID for the native chain coin/token, bound to the current chain at deployment.
     bytes32 internal immutable nativeAsset = Assets.toNative();
 }

package/core/Types.sol

@@ -5,8 +5,6 @@ pragma solidity ^0.8.33;
 struct AssetAmount {
     /// @dev Asset identifier.
     bytes32 asset;
-    /// @dev Asset metadata slot.
-    bytes32 meta;
     /// @dev Token amount in the asset's native units.
     uint amount;
 }
@@ -17,8 +15,6 @@ struct AccountAsset {
     bytes32 account;
     /// @dev Asset identifier.
     bytes32 asset;
-    /// @dev Asset metadata slot.
-    bytes32 meta;
 }
 
 /// @notice Account-scoped amount shape for requests, responses, and reporting.
@@ -27,8 +23,6 @@ struct AccountAmount {
     bytes32 account;
     /// @dev Asset identifier.
     bytes32 asset;
-    /// @dev Asset metadata slot.
-    bytes32 meta;
     /// @dev Token amount in the asset's native units.
     uint amount;
 }
@@ -39,8 +33,6 @@ struct HostAmount {
     uint host;
     /// @dev Asset identifier.
     bytes32 asset;
-    /// @dev Asset metadata slot.
-    bytes32 meta;
     /// @dev Token amount in the asset's native units.
     uint amount;
 }
@@ -53,8 +45,6 @@ struct HostAccountAsset {
     bytes32 account;
     /// @dev Asset identifier.
     bytes32 asset;
-    /// @dev Asset metadata slot.
-    bytes32 meta;
 }
 
 /// @notice Host-scoped account amount shape.
@@ -65,8 +55,6 @@ struct HostAccountAmount {
     bytes32 account;
     /// @dev Asset identifier.
     bytes32 asset;
-    /// @dev Asset metadata slot.
-    bytes32 meta;
     /// @dev Token amount in the asset's native units.
     uint amount;
 }
@@ -79,8 +67,6 @@ struct Tx {
     bytes32 to;
     /// @dev Asset identifier.
     bytes32 asset;
-    /// @dev Asset metadata slot.
-    bytes32 meta;
     /// @dev Transfer amount in the asset's native units.
     uint amount;
 }

package/docs/Schema.md

@@ -21,7 +21,7 @@ The block key is:
 bytes4(keccak256("#name"))
 ```
 
-For example, `#amount { bytes32 asset, bytes32 meta, uint amount }` uses the key
+For example, `#amount { bytes32 asset, uint amount }` uses the key
 derived from `#amount`. Blocks must not be overloaded: one block name should have
 one protocol meaning.
 
@@ -30,7 +30,7 @@ one protocol meaning.
 A block starts with `#`. Fixed fields are written in braces:
 
 ```txt
-#amount { bytes32 asset, bytes32 meta, uint amount }
+#amount { bytes32 asset, uint amount }
 #account { bytes32 account }
 ```
 
@@ -46,7 +46,7 @@ Empty braces are invalid. A zero-payload block must omit braces.
 A schema is a comma-separated list of items. Order is significant.
 
 ```txt
-#amount { bytes32 asset, bytes32 meta, uint amount },
+#amount { bytes32 asset, uint amount },
 maybe #account { bytes32 account }
 ```
 
@@ -76,10 +76,10 @@ alias to give those bytes a presentation name:
 Cardinality is expressed with prefix keywords:
 
 ```txt
-#balance { bytes32 asset, bytes32 meta, uint amount }
-maybe #balance { bytes32 asset, bytes32 meta, uint amount }
-many #balance { bytes32 asset, bytes32 meta, uint amount }
-maybe many #balance { bytes32 asset, bytes32 meta, uint amount }
+#balance { bytes32 asset, uint amount }
+maybe #balance { bytes32 asset, uint amount }
+many #balance { bytes32 asset, uint amount }
+maybe many #balance { bytes32 asset, uint amount }
 ```
 
 - no prefix: one required item
@@ -190,6 +190,25 @@ types may pack these words differently, but a given chain type must use one
 stable format everywhere. For EVM chains, the low 128 bits are native value /
 endowment in wei; higher bits are reserved for execution resources such as gas.
 
+## Protocol IDs
+
+Account, asset, and node ID fields use one 32-byte convention:
+
+- first byte `0x00`: opaque ID, encoded as `0x00 || bytes31(hash)`. The full
+  preimage must come from a lookup table or witness data when native metadata is
+  needed.
+- first byte nonzero: structured ID. The value may be deconstructed according
+  to its chain/runtime layout.
+
+Opaque preimages must start with a one-byte format/hash tag; `0x01` means
+keccak256. The remaining bytes are host/domain-specific until the protocol
+standardizes a fuller preimage payload format.
+
+The field name supplies the protocol role for opaque IDs. For example, a
+`bytes32 asset` whose first byte is zero is still an asset in that block; it
+just cannot be decoded without external context. Runtime helpers that inspect
+the layout of an ID only apply to structured IDs.
+
 ## Identifiers
 
 Block names use lower camelCase ASCII identifiers. Field names and aliases use
@@ -246,9 +265,9 @@ expands to:
 Common protocol schemas live in `contracts/blocks/Schema.sol`:
 
 ```txt
-#amount { bytes32 asset, bytes32 meta, uint amount }
-#balance { bytes32 asset, bytes32 meta, uint amount }
-#custody { uint host, bytes32 asset, bytes32 meta, uint amount }
+#amount { bytes32 asset, uint amount }
+#balance { bytes32 asset, uint amount }
+#custody { uint host, bytes32 asset, uint amount }
 #call { uint target, uint resources, #bytes as payload }
 #step { uint target, uint resources, #bytes as request }
 #context { bytes32 account, #bytes as state, #bytes as request }

package/events/Asset.sol

@@ -3,15 +3,29 @@ pragma solidity ^0.8.33;
 
 import { EventEmitter } from "./Emitter.sol";
 
+/// @notice Emitted when a host declares the preimage for an opaque asset ID.
+abstract contract AssetEvent is EventEmitter {
+    string private constant ABI = "event Asset(uint indexed host, bytes32 asset, bytes preimage)";
+
+    /// @param host Host node ID that manages this asset declaration.
+    /// @param asset Asset identifier, typically `0x00 || bytes31(hash(preimage))`.
+    /// @param preimage Canonical preimage used to derive or resolve the opaque asset ID.
+    /// The first byte is a format/hash tag; `0x01` means keccak256.
+    event Asset(uint indexed host, bytes32 asset, bytes preimage);
+
+    constructor() {
+        emit EventAbi(ABI);
+    }
+}
+
 /// @notice Emitted when an asset support status is updated on a host.
 abstract contract AssetStatusEvent is EventEmitter {
-    string private constant ABI = "event AssetStatus(uint indexed host, bytes32 asset, bytes32 meta, uint status)";
+    string private constant ABI = "event AssetStatus(uint indexed host, bytes32 asset, uint status)";
 
     /// @param host Host node ID that manages this listing.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param status Asset support status. Zero means unsupported; nonzero means supported.
-    event AssetStatus(uint indexed host, bytes32 asset, bytes32 meta, uint status);
+    event AssetStatus(uint indexed host, bytes32 asset, uint status);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Balance.sol

@@ -5,15 +5,14 @@ import { EventEmitter } from "./Emitter.sol";
 
 /// @notice Emitted when an account balance changes.
 abstract contract BalanceEvent is EventEmitter {
-    string private constant ABI = "event Balance(bytes32 indexed account, bytes32 asset, bytes32 meta, uint balance, int change, uint access)";
+    string private constant ABI = "event Balance(bytes32 indexed account, bytes32 asset, uint balance, int change, uint access)";
 
     /// @param account Account identifier whose balance changed.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param balance New balance after the change.
     /// @param change Signed delta applied to the balance (positive = credit, negative = debit).
     /// @param access Command ID or context identifier associated with this change.
-    event Balance(bytes32 indexed account, bytes32 asset, bytes32 meta, uint balance, int change, uint access);
+    event Balance(bytes32 indexed account, bytes32 asset, uint balance, int change, uint access);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Commander.sol

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import {EventEmitter} from "./Emitter.sol";
+
+/// @notice Emitted when a commander is announced for a chain/domain.
+abstract contract CommanderEvent is EventEmitter {
+    string private constant ABI = "event Commander(uint indexed host, uint chain, bytes32 native, bytes32 admin)";
+
+    /// @param host Commander host node ID for the chain.
+    /// @param chain Chain/domain node ID.
+    /// @param native Native asset ID for the chain.
+    /// @param admin Admin account for the commander host on the chain.
+    event Commander(uint indexed host, uint chain, bytes32 native, bytes32 admin);
+
+    constructor() {
+        emit EventAbi(ABI);
+    }
+}

package/events/Labeled.sol

@@ -3,17 +3,17 @@ pragma solidity ^0.8.33;
 
 import {EventEmitter} from "./Emitter.sol";
 
-/// @notice Emitted to attach a human-readable namespaced label to a node ID.
+/// @notice Emitted to attach a human-readable namespaced label to an entity.
 /// @dev Labels are claims by the emitting contract. Any contract may emit a
-/// label for any ID, so off-chain indexers must decide which emitters are
-/// trusted for each labeled ID or namespace.
+/// label for any entity, so off-chain indexers must decide which emitters are
+/// trusted for each labeled entity or namespace.
 abstract contract LabeledEvent is EventEmitter {
-    string private constant ABI = "event Labeled(uint indexed id, bytes32 namespace, string name)";
+    string private constant ABI = "event Labeled(uint indexed entity, bytes32 namespace, string name)";
 
-    /// @param id Node or capability ID being labeled.
+    /// @param entity Entity being labeled.
     /// @param namespace Label namespace.
     /// @param name Human-readable name within the namespace.
-    event Labeled(uint indexed id, bytes32 namespace, string name);
+    event Labeled(uint indexed entity, bytes32 namespace, string name);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Locked.sol

@@ -5,15 +5,14 @@ import { EventEmitter } from "./Emitter.sol";
 
 /// @notice Emitted when an account locks an asset in a protocol operation.
 abstract contract LockedEvent is EventEmitter {
-    string private constant ABI = "event Locked(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context)";
+    string private constant ABI = "event Locked(bytes32 indexed account, bytes32 asset, uint amount, uint32 action, uint context)";
 
     /// @param account Account identifier that locked the asset.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Amount locked.
     /// @param action Primary operation hint from `Actions`.
     /// @param context Reserved context value for future use.
-    event Locked(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context);
+    event Locked(bytes32 indexed account, bytes32 asset, uint amount, uint32 action, uint context);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Position.sol

@@ -6,16 +6,15 @@ import {EventEmitter} from "./Emitter.sol";
 /// @notice Emitted when the reported value of an asset-backed position changes or is observed.
 /// A value of 0 should be interpreted as a closed position.
 abstract contract PositionEvent is EventEmitter {
-    string private constant ABI = "event Position(bytes32 indexed account, bytes32 asset, bytes32 meta, uint value, uint32 action, uint context, uint queryId)";
+    string private constant ABI = "event Position(bytes32 indexed account, bytes32 asset, uint value, uint32 action, uint context, uint queryId)";
 
     /// @param account Account identifier that owns or is associated with the position.
     /// @param asset Asset identifier for the asset class.
-    /// @param meta Asset metadata slot carrying the position context.
     /// @param value Context-specific position value; 0 indicates a closed position.
     /// @param action Primary operation hint from `Actions`.
     /// @param context Reserved context value for future use.
     /// @param queryId Query ID associated with the position lookup or reporting context.
-    event Position(bytes32 indexed account, bytes32 asset, bytes32 meta, uint value, uint32 action, uint context, uint queryId);
+    event Position(bytes32 indexed account, bytes32 asset, uint value, uint32 action, uint context, uint queryId);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Received.sol

@@ -5,15 +5,14 @@ import { EventEmitter } from "./Emitter.sol";
 
 /// @notice Emitted when an account receives an asset in a protocol operation.
 abstract contract ReceivedEvent is EventEmitter {
-    string private constant ABI = "event Received(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context)";
+    string private constant ABI = "event Received(bytes32 indexed account, bytes32 asset, uint amount, uint32 action, uint context)";
 
     /// @param account Account identifier that received the asset.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Amount received.
     /// @param action Primary operation hint from `Actions`.
     /// @param context Reserved context value for future use.
-    event Received(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context);
+    event Received(bytes32 indexed account, bytes32 asset, uint amount, uint32 action, uint context);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Route.sol

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import {EventEmitter} from "./Emitter.sol";
+
+/// @notice Emitted when a host announces a route to another chain/domain.
+abstract contract RouteEvent is EventEmitter {
+    string private constant ABI = "event Route(uint indexed host, uint chain, uint context)";
+
+    /// @param host Host node ID that owns the route.
+    /// @param chain Destination chain/domain node ID.
+    /// @param context Route context identifier.
+    event Route(uint indexed host, uint chain, uint context);
+
+    constructor() {
+        emit EventAbi(ABI);
+    }
+}

package/events/Spent.sol

@@ -5,15 +5,14 @@ import { EventEmitter } from "./Emitter.sol";
 
 /// @notice Emitted when an account spends an asset in a protocol operation.
 abstract contract SpentEvent is EventEmitter {
-    string private constant ABI = "event Spent(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context)";
+    string private constant ABI = "event Spent(bytes32 indexed account, bytes32 asset, uint amount, uint32 action, uint context)";
 
     /// @param account Account identifier that spent the asset.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Amount spent.
     /// @param action Primary operation hint from `Actions`.
     /// @param context Reserved context value for future use.
-    event Spent(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context);
+    event Spent(bytes32 indexed account, bytes32 asset, uint amount, uint32 action, uint context);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Unlocked.sol

@@ -5,15 +5,14 @@ import { EventEmitter } from "./Emitter.sol";
 
 /// @notice Emitted when an account unlocks an asset in a protocol operation.
 abstract contract UnlockedEvent is EventEmitter {
-    string private constant ABI = "event Unlocked(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context)";
+    string private constant ABI = "event Unlocked(bytes32 indexed account, bytes32 asset, uint amount, uint32 action, uint context)";
 
     /// @param account Account identifier that unlocked the asset.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Amount unlocked.
     /// @param action Primary operation hint from `Actions`.
     /// @param context Reserved context value for future use.
-    event Unlocked(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context);
+    event Unlocked(bytes32 indexed account, bytes32 asset, uint amount, uint32 action, uint context);
 
     constructor() {
         emit EventAbi(ABI);

package/guards/Base.sol

@@ -4,16 +4,16 @@ pragma solidity ^0.8.33;
 import {AccessControl} from "../core/Access.sol";
 import {GuardEvent} from "../events/Guard.sol";
 import {LabeledEvent} from "../events/Labeled.sol";
-import {Ids} from "../utils/Ids.sol";
+import {Nodes} from "../utils/Nodes.sol";
 
 /// @notice ABI-encode a guard action call from a target guard ID and request block stream.
-/// @dev Derives the function selector from `target` via `Ids.guardSelector(target)`.
+/// @dev Derives the function selector from `target` via `Nodes.guardSelector(target)`.
 /// Reverts if `target` is not a valid guard ID.
 /// @param target Destination guard action node ID embedding the target selector.
 /// @param request Input block stream for the guard invocation.
 /// @return ABI-encoded calldata for the guard action entry point.
 function encodeGuardCall(uint target, bytes calldata request) pure returns (bytes memory) {
-    bytes4 selector = Ids.guardSelector(target);
+    bytes4 selector = Nodes.guardSelector(target);
     return abi.encodeWithSelector(selector, request);
 }
 
@@ -31,6 +31,6 @@ abstract contract GuardBase is AccessControl, GuardEvent, LabeledEvent {
     /// @param selector Guard action entrypoint selector.
     /// @return Guard action node ID.
     function guardId(bytes4 selector) internal view returns (uint) {
-        return Ids.toGuard(selector, address(this));
+        return Nodes.toGuard(selector, address(this));
     }
 }

package/package.json

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

package/peer/AllowAssets.sol

@@ -12,7 +12,7 @@ interface IPeerAllowAssets {
 }
 
 /// @title PeerAllowAssets
-/// @notice Peer that permits a list of (asset, meta) pairs on behalf of a peer host.
+/// @notice Peer that permits a list of assets on behalf of a peer host.
 /// Each ASSET block in the request calls `allowAsset`. Restricted to trusted peers.
 abstract contract PeerAllowAssets is PeerBase, AllowAssetsHook, IPeerAllowAssets {
     uint internal immutable peerAllowAssetsId = peerId(this.peerAllowAssets.selector);
@@ -29,8 +29,8 @@ abstract contract PeerAllowAssets is PeerBase, AllowAssetsHook, IPeerAllowAssets
         (Cur memory assets, , ) = Cursors.init(request, 1);
 
         while (assets.i < assets.len) {
-            (bytes32 asset, bytes32 meta) = assets.unpackAsset();
-            allowAsset(asset, meta);
+            bytes32 asset = assets.unpackAsset();
+            allowAsset(asset);
         }
 
         assets.complete();

package/peer/Allowance.sol

@@ -31,8 +31,8 @@ abstract contract PeerAllowance is PeerBase, AllowanceHook, IPeerAllowance {
         uint peer = caller();
 
         while (amounts.i < amounts.len) {
-            (bytes32 asset, bytes32 meta, uint amount) = amounts.unpackAmount();
-            allowance(peer, asset, meta, amount);
+            (bytes32 asset, uint amount) = amounts.unpackAmount();
+            allowance(peer, asset, amount);
         }
 
         amounts.complete();

package/peer/Base.sol

@@ -4,16 +4,16 @@ pragma solidity ^0.8.33;
 import { NodeCalls } from "../core/Calls.sol";
 import { PeerEvent } from "../events/Peer.sol";
 import { LabeledEvent } from "../events/Labeled.sol";
-import { Ids } from "../utils/Ids.sol";
+import { Nodes } from "../utils/Nodes.sol";
 
 /// @notice ABI-encode a peer call from a target peer ID and request block stream.
-/// @dev Derives the function selector from `target` via `Ids.peerSelector(target)`.
+/// @dev Derives the function selector from `target` via `Nodes.peerSelector(target)`.
 /// Reverts if `target` is not a valid peer ID.
 /// @param target Destination peer node ID embedding the target selector.
 /// @param request Input block stream for the peer invocation.
 /// @return ABI-encoded calldata for the peer entry point.
 function encodePeerCall(uint target, bytes calldata request) pure returns (bytes memory) {
-    bytes4 selector = Ids.peerSelector(target);
+    bytes4 selector = Nodes.peerSelector(target);
     return abi.encodeWithSelector(selector, request);
 }
 
@@ -36,6 +36,6 @@ abstract contract PeerBase is NodeCalls, PeerEvent, LabeledEvent {
     /// @param selector Peer entrypoint selector.
     /// @return Peer node ID.
     function peerId(bytes4 selector) internal view returns (uint) {
-        return Ids.toPeer(selector, address(this));
+        return Nodes.toPeer(selector, address(this));
     }
 }

package/peer/Credit.sol

@@ -7,30 +7,30 @@ import { Cursors, Cur, Forms } from "../Cursors.sol";
 
 using Cursors for Cur;
 
-interface IPeerCreditTo {
-    function peerCreditTo(bytes calldata request) external returns (bytes memory);
+interface IPeerCreditAccount {
+    function peerCreditAccount(bytes calldata request) external returns (bytes memory);
 }
 
-/// @title PeerCreditTo
+/// @title PeerCreditAccount
 /// @notice Peer that lets a trusted peer credit supplied accounts directly.
 /// Each ACCOUNT_AMOUNT block calls `creditAccount` for its account.
-abstract contract PeerCreditTo is PeerBase, CreditAccountHook, IPeerCreditTo {
-    uint internal immutable peerCreditToId = peerId(this.peerCreditTo.selector);
+abstract contract PeerCreditAccount is PeerBase, CreditAccountHook, IPeerCreditAccount {
+    uint internal immutable peerCreditAccountId = peerId(this.peerCreditAccount.selector);
 
     constructor() {
-        emit Peer(host, peerCreditToId, "1:0", Forms.AccountAmount, "", false);
-        emit Labeled(peerCreditToId, bytes32(0), "peerCreditTo");
+        emit Peer(host, peerCreditAccountId, "1:0", Forms.AccountAmount, "", false);
+        emit Labeled(peerCreditAccountId, bytes32(0), "peerCreditAccount");
     }
 
     /// @notice Execute the peer-credit call.
     /// @param request ACCOUNT_AMOUNT block stream supplied by the trusted peer.
     /// @return Empty response bytes.
-    function peerCreditTo(bytes calldata request) external onlyPeer returns (bytes memory) {
+    function peerCreditAccount(bytes calldata request) external onlyPeer returns (bytes memory) {
         (Cur memory amounts, , ) = Cursors.init(request, 1);
 
         while (amounts.i < amounts.len) {
-            (bytes32 account, bytes32 asset, bytes32 meta, uint amount) = amounts.unpackAccountAmount();
-            creditAccount(account, asset, meta, amount);
+            (bytes32 account, bytes32 asset, uint amount) = amounts.unpackAccountAmount();
+            creditAccount(account, asset, amount);
         }
 
         amounts.complete();

package/peer/Debit.sol

@@ -7,30 +7,30 @@ import { Cursors, Cur, Forms } from "../Cursors.sol";
 
 using Cursors for Cur;
 
-interface IPeerDebitFrom {
-    function peerDebitFrom(bytes calldata request) external returns (bytes memory);
+interface IPeerDebitAccount {
+    function peerDebitAccount(bytes calldata request) external returns (bytes memory);
 }
 
-/// @title PeerDebitFrom
+/// @title PeerDebitAccount
 /// @notice Peer that lets a trusted peer debit supplied accounts directly.
 /// Each ACCOUNT_AMOUNT block calls `debitAccount` for its account.
-abstract contract PeerDebitFrom is PeerBase, DebitAccountHook, IPeerDebitFrom {
-    uint internal immutable peerDebitFromId = peerId(this.peerDebitFrom.selector);
+abstract contract PeerDebitAccount is PeerBase, DebitAccountHook, IPeerDebitAccount {
+    uint internal immutable peerDebitAccountId = peerId(this.peerDebitAccount.selector);
 
     constructor() {
-        emit Peer(host, peerDebitFromId, "1:0", Forms.AccountAmount, "", false);
-        emit Labeled(peerDebitFromId, bytes32(0), "peerDebitFrom");
+        emit Peer(host, peerDebitAccountId, "1:0", Forms.AccountAmount, "", false);
+        emit Labeled(peerDebitAccountId, bytes32(0), "peerDebitAccount");
     }
 
     /// @notice Execute the peer-debit call.
     /// @param request ACCOUNT_AMOUNT block stream supplied by the trusted peer.
     /// @return Empty response bytes.
-    function peerDebitFrom(bytes calldata request) external onlyPeer returns (bytes memory) {
+    function peerDebitAccount(bytes calldata request) external onlyPeer returns (bytes memory) {
         (Cur memory amounts, , ) = Cursors.init(request, 1);
 
         while (amounts.i < amounts.len) {
-            (bytes32 account, bytes32 asset, bytes32 meta, uint amount) = amounts.unpackAccountAmount();
-            debitAccount(account, asset, meta, amount);
+            (bytes32 account, bytes32 asset, uint amount) = amounts.unpackAccountAmount();
+            debitAccount(account, asset, amount);
         }
 
         amounts.complete();