@rootzero/contracts 1.8.0 → 1.10.0

package/commands/Recover.sol

@@ -8,37 +8,38 @@ import {Budget} from "../utils/Value.sol";
 
 using Cursors for Cur;
 
-abstract contract RecoverContextPayableHook {
-    /// @notice Override to recover one committed context witness.
-    /// @param port Recovery handler port node ID.
-    /// @param key Commitment or recovery lookup key.
-    /// @param resources Chain resources assigned to the recovery attempt.
-    /// @param context Cursor scoped to the embedded CONTEXT witness block.
-    /// @param budget Mutable native-value budget available to the recovery attempt.
-    function recoverContext(uint port, bytes32 key, uint resources, Cur memory context, Budget memory budget) internal virtual;
+abstract contract RecoverHook {
+    /// @notice Override to recover a witness through `handler`.
+    /// @param handler Port that should attempt recovery.
+    /// @param key Recovery lookup key.
+    /// @param witness Witness payload used to prove and replay recovery.
+    /// @param value Native EVM value assigned to the recovery attempt.
+    function recover(uint handler, bytes32 key, bytes calldata witness, uint128 value) internal virtual;
 }
 
-/// @title RecoverContextPayable
-/// @notice Command that forwards ContextRecovery request blocks to a virtual hook.
+/// @title RecoverPayable
+/// @notice Command that forwards recover request blocks to a virtual hook.
+/// Recovery is witness-driven: the command account pays and receives leftover
+/// value settlement, but the recovered subject is defined by each witness.
 /// Produces no output state.
-abstract contract RecoverContextPayable is CommandBase, Payable, RecoverContextPayableHook {
-    uint internal immutable recoverContextPayableId = commandId(this.recoverContextPayable.selector);
+abstract contract RecoverPayable is CommandBase, Payable, RecoverHook {
+    uint internal immutable recoverPayableId = commandId(this.recoverPayable.selector);
 
     constructor() {
-        emit Command(host, recoverContextPayableId, "1:0:0", Schemas.ContextRecovery, Keys.Empty, Keys.Empty, true);
-        emit Labeled(recoverContextPayableId, bytes32(0), "recoverContextPayable");
+        emit Command(host, recoverPayableId, "1:0:0", Schemas.Recover, Keys.Empty, Keys.Empty, true);
+        emit Labeled(recoverPayableId, bytes32(0), "recoverPayable");
     }
 
-    /// @notice Recover each ContextRecovery block in the command request.
-    /// @param c Command context; `c.request` must contain ContextRecovery blocks.
+    /// @notice Recover each recover block in the command request.
+    /// @param c Command context; `c.request` must contain Recover blocks.
     /// @return Empty output state.
-    function recoverContextPayable(CommandContext calldata c) external payable onlyCommand returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 1);
+    function recoverPayable(CommandContext calldata c) external payable onlyCommand returns (bytes memory) {
+        (Cur memory request, ) = Cursors.init(c.request, 1);
         Budget memory budget = openValue();
 
         while (request.i < request.len) {
-            (uint port, bytes32 key, uint resources, Cur memory context) = request.unpackContextRecovery();
-            recoverContext(port, key, resources, context, budget);
+            (uint handler, uint resources, bytes32 key, bytes calldata witness) = request.unpackRecover();
+            recover(handler, key, witness, useValue(budget, resources));
         }
 
         closeValue(c.account, budget);

package/commands/Relay.sol

@@ -8,15 +8,15 @@ import {Budget} from "../utils/Value.sol";
 
 using Cursors for Cur;
 
-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
+abstract contract RoutePayableHook {
+    /// @notice Override to route an encoded payload through `portal`.
+    /// @param portal Destination portal identifier, often the destination host ID.
+    /// @param resources Chain-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
+    /// @param budget Source 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;
+    function route(uint portal, uint resources, bytes memory payload, Budget memory budget) internal virtual;
 }
 
 /// @title RelayPayable
@@ -24,7 +24,7 @@ abstract contract DispatchPayableHook {
 /// 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, DispatchPayableHook {
+abstract contract RelayPayable is CommandBase, Payable, RoutePayableHook {
     uint internal immutable relayPayableId = commandId(this.relayPayable.selector);
 
     constructor() {
@@ -36,12 +36,12 @@ abstract contract RelayPayable is CommandBase, Payable, DispatchPayableHook {
     /// @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, 1, 1);
+        Cur memory request = Cursors.init(c.request, 1, 1);
         Budget memory budget = openValue();
 
-        (uint chain, uint resources, bytes memory context) = request.relayToContext(c.account, c.state);
-        dispatch(chain, resources, context, budget);
-        
+        (uint portal, uint resources, bytes memory context) = request.relayToContext(c.account, c.state);
+        route(portal, resources, context, budget);
+
         closeValue(c.account, budget);
         request.complete();
         return "";

package/commands/Withdraw.sol

@@ -32,7 +32,7 @@ abstract contract Withdraw is CommandBase, WithdrawHook {
     function withdraw(
         CommandContext calldata c
     ) external onlyCommand returns (bytes memory) {
-        (Cur memory state, , ) = Cursors.init(c.state, 1);
+        (Cur memory state, ) = Cursors.init(c.state, 1);
 
         while (state.i < state.len) {
             (bytes32 asset, uint amount) = state.unpackBalance();

package/commands/admin/AllowAssets.sol

@@ -29,7 +29,7 @@ abstract contract AllowAssets is AdminBase, AllowAssetsHook {
     function allowAssets(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 1);
+        (Cur memory request, ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
             bytes32 asset = request.unpackAsset();

package/commands/admin/Allowance.sol

@@ -31,7 +31,7 @@ abstract contract Allowance is AdminBase, AllowanceHook {
     /// @param c Admin command context; `c.request` must contain ALLOWANCE blocks.
     /// @return Empty output state.
     function allowance(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 1);
+        (Cur memory request, ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
             (uint peer, bytes32 asset, uint amount) = request.unpackAllowance();

package/commands/admin/Appoint.sol

@@ -23,7 +23,7 @@ abstract contract Appoint is AdminBase {
     function appoint(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 1);
+        (Cur memory request, ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
             bytes32 account = request.unpackAccount();

package/commands/admin/Authorize.sol

@@ -23,7 +23,7 @@ abstract contract Authorize is AdminBase {
     function authorize(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 1);
+        (Cur memory request, ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
             uint node = request.unpackNode();

package/commands/admin/DenyAssets.sol

@@ -29,7 +29,7 @@ abstract contract DenyAssets is AdminBase, DenyAssetsHook {
     function denyAssets(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 1);
+        (Cur memory request, ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
             bytes32 asset = request.unpackAsset();

package/commands/admin/Destroy.sol

@@ -18,6 +18,7 @@ abstract contract DestroyHook {
 abstract contract Destroy is AdminBase, DestroyHook {
     uint internal immutable destroyId = commandId(this.destroy.selector);
 
+    /// @param input Request schema advertised for destruction input.
     constructor(string memory input) {
         emit Admin(host, destroyId, "1:0:0", input, Keys.Empty, Keys.Empty, false);
         emit Labeled(destroyId, bytes32(0), "destroy");

package/commands/admin/Dismiss.sol

@@ -23,7 +23,7 @@ abstract contract Dismiss is AdminBase {
     function dismiss(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 1);
+        (Cur memory request, ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
             bytes32 account = request.unpackAccount();

package/commands/admin/Execute.sol

@@ -10,7 +10,7 @@ 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, chain resources, and raw calldata payload.
+/// Each CALL block specifies a target node ID, packed resources, and raw calldata payload.
 /// Only callable by the admin account.
 /// Unspent top-level `msg.value` remains on this host.
 abstract contract ExecutePayable is AdminBase, Payable {
@@ -25,7 +25,7 @@ abstract contract ExecutePayable is AdminBase, Payable {
     /// @param c Admin command context; `c.request` must contain CALL blocks.
     /// @return Empty output state.
     function executePayable(CommandContext calldata c) external payable onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 1);
+        (Cur memory request, ) = Cursors.init(c.request, 1);
         Budget memory budget = openValue();
 
         while (request.i < request.len) {

package/commands/admin/Init.sol

@@ -18,6 +18,7 @@ abstract contract InitHook {
 abstract contract Init is AdminBase, InitHook {
     uint internal immutable initId = commandId(this.init.selector);
 
+    /// @param input Request schema advertised for initialization input.
     constructor(string memory input) {
         emit Admin(host, initId, "1:0:0", input, Keys.Empty, Keys.Empty, false);
         emit Labeled(initId, bytes32(0), "init");

package/commands/admin/Label.sol

@@ -21,7 +21,7 @@ abstract contract Label is AdminBase {
     /// @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, 1);
+        (Cur memory request, ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
             (uint id, bytes32 namespace, string memory name) = request.unpackLabel();

package/commands/admin/Unauthorize.sol

@@ -23,7 +23,7 @@ abstract contract Unauthorize is AdminBase {
     function unauthorize(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = Cursors.init(c.request, 1);
+        (Cur memory request, ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
             uint node = request.unpackNode();

package/core/Access.sol

@@ -30,6 +30,7 @@ abstract contract AccessControl is Runtime, NodeEvent, GuardianEvent {
     /// @dev Thrown when a caller, account, or node lacks required access.
     error AccessDenied();
 
+    /// @param cmdr Commander address, or zero to make this contract self-managed.
     constructor(address cmdr) {
         commander = addrOr(cmdr, address(this));
         admin = Accounts.toAdmin(commander);

package/core/Calls.sol

@@ -107,12 +107,23 @@ abstract contract CommandCalls is NodeCalls {
 /// @title PortCalls
 /// @notice Trusted port-call helpers for contracts that route port nodes.
 abstract contract PortCalls is NodeCalls {
+    /// @notice Try to encode and call a trusted port node.
+    /// @param port Port node ID embedding the target selector.
+    /// @param value Native value to forward in wei.
+    /// @param input Port input block stream.
+    /// @return success True if the low-level port call succeeded.
+    function tryCallPort(uint port, uint128 value, bytes calldata input) internal returns (bool success) {
+        bytes4 selector = Nodes.portSelector(port);
+        bytes memory data = abi.encodeWithSelector(selector, input);
+        return tryTrustedCall(port, value, data);
+    }
+
     /// @notice Encode and call a trusted port node.
     /// @param port Port node ID embedding the target selector.
     /// @param value Native value to forward in wei.
     /// @param input Port input block stream.
     /// @return Decoded port output block stream.
-    function callPort(uint port, uint128 value, bytes memory input) internal returns (bytes memory) {
+    function callPort(uint port, uint128 value, bytes calldata input) internal returns (bytes memory) {
         bytes4 selector = Nodes.portSelector(port);
         bytes memory data = abi.encodeWithSelector(selector, input);
         return abi.decode(trustedCall(port, value, data), (bytes));

package/core/Payable.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.33;
 
 import {Budget, Values} from "../utils/Value.sol";
+import {max128} from "../utils/Utils.sol";
 
 /// @title Payable
 /// @notice Abstract mixin for entrypoints that accept native value (`msg.value`).
@@ -16,10 +17,16 @@ abstract contract Payable {
         return Budget({remaining: msg.value});
     }
 
+    /// @notice Return the current call's native value as a checked uint128.
+    /// @return value Current `msg.value` in wei.
+    function msgValue() internal view returns (uint128 value) {
+        return uint128(max128(msg.value));
+    }
+
     /// @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 resources Packed chain resources.
+    /// @param resources Packed resources.
     /// @return value Native value to forward in wei.
     function useValue(Budget memory budget, uint resources) internal pure returns (uint128 value) {
         value = uint128(resources);

package/core/Pipeline.sol

@@ -43,7 +43,7 @@ abstract contract Pipeline is Payable {
         bytes calldata steps,
         Budget memory budget
     ) internal {
-        (Cur memory input, , ) = Cursors.init(steps, 1);
+        (Cur memory input, ) = Cursors.init(steps, 1);
 
         while (input.i < input.len) {
             (uint target, uint resources, bytes calldata request) = input.unpackStep();

package/core/Portal.sol

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import {PortCalls} from "./Calls.sol";
+
+/// @title Portal
+/// @notice Base contract for hosts that route payloads through portal adapters.
+abstract contract Portal is PortCalls {
+    error BadWitness();
+
+    mapping(bytes32 key => bytes32 digest) internal undelivered;
+
+    /// @notice Try to forward `message` to `port`.
+    /// @dev Records and returns `keccak256(message)` under `key` only when forwarding fails.
+    /// @param port Port that should handle the forwarded message.
+    /// @param key Forwarding/recovery lookup key.
+    /// @param message Encoded port input to forward.
+    /// @param value Native EVM value assigned to the forwarding attempt.
+    /// @return miss Message digest recorded for recovery when forwarding fails; zero on success.
+    function forward(uint port, bytes32 key, bytes calldata message, uint128 value) internal returns (bytes32 miss) {
+        if (tryCallPort(port, value, message)) return bytes32(0);
+
+        miss = keccak256(message);
+        undelivered[key] = miss;
+    }
+
+    /// @notice Retry a previously undelivered witness through `port`.
+    /// @dev The witness must hash to the digest stored under `key`.
+    /// @param port Port that should attempt recovery.
+    /// @param key Recovery lookup key.
+    /// @param witness Witness payload used to prove and replay recovery.
+    /// @param value Native EVM value assigned to the recovery attempt.
+    function retry(uint port, bytes32 key, bytes calldata witness, uint128 value) internal virtual {
+        if (undelivered[key] != keccak256(witness)) revert BadWitness();
+
+        delete undelivered[key];
+        callPort(port, value, witness);
+    }
+}

package/docs/Schema.md

@@ -120,7 +120,7 @@ Aliases may be used on any block item, including child blocks and prime items.
 A child block without an inline body may also be used as a schema reference:
 
 ```txt
-#contextRecovery { uint port, bytes32 key, uint resources, #context as witness }
+#recover { uint handler, uint resources, bytes32 key, #bytes as witness }
 ```
 
 Alias resolution is context-dependent. A consumer may resolve `#context` from the
@@ -136,13 +136,13 @@ path does not change the block key, payload bytes, payload length, cursor
 behavior, or any onchain validation. It is metadata only.
 
 ```txt
-#dispatch { uint dst.chain, uint dst.resources, #bytes as dst.payload }
+#dispatch { uint dst.portal, uint dst.resources, #bytes as dst.payload }
 ```
 
 This has the same runtime layout as:
 
 ```txt
-#dispatch { uint chain, uint resources, #bytes as payload }
+#dispatch { uint portal, uint resources, #bytes as payload }
 ```
 
 Offchain tooling may decode the dotted form into a nested object:
@@ -150,7 +150,7 @@ Offchain tooling may decode the dotted form into a nested object:
 ```ts
 {
   dst: {
-    chain,
+    portal,
     resources,
     payload
   }
@@ -165,8 +165,8 @@ object.
 Tooling should reject duplicate full paths and prefix/value collisions:
 
 ```txt
-uint dst.chain, uint dst.chain      // duplicate path
-uint dst, uint dst.chain            // prefix/value collision
+uint dst.portal, uint dst.portal    // duplicate path
+uint dst, uint dst.portal           // prefix/value collision
 ```
 
 The same rule applies to block aliases:
@@ -196,10 +196,14 @@ true. `bytesN` values are encoded as exactly `N` bytes with no padding.
 
 ## Chain Resources
 
-Fields named `resources` are chain-specific resource words. Different chain
-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.
+Fields named `portal` are routing identifiers; they are often the destination
+host ID, but a transport adapter may define a different stable handle.
+
+Fields named `resources` are chain-specific resource words. A portal adapter
+interprets them for the destination runtime. Different runtimes may pack these
+words differently, but a given runtime 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
 
@@ -282,7 +286,7 @@ Common protocol schemas live in `contracts/blocks/Schema.sol`:
 #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 }
-#contextRecovery { uint port, bytes32 key, uint resources, #context as witness }
+#recover { uint handler, uint resources, bytes32 key, #bytes as witness }
 #auth { uint cid, uint deadline, #bytes as proof }
 ```
 

package/events/Dispatch.sol

@@ -5,14 +5,14 @@ import {EventEmitter} from "./Emitter.sol";
 
 /// @notice Emitted when a host records an outbound dispatch reference.
 abstract contract DispatchEvent is EventEmitter {
-    string private constant ABI = "event Dispatch(uint indexed host, uint chain, uint resources, bytes32 digest, bytes32 ref)";
+    string private constant ABI = "event Dispatch(uint indexed host, uint portal, uint resources, bytes32 key, bytes32 digest)";
 
     /// @param host Host node ID that owns the dispatch.
-    /// @param chain Destination chain/domain node ID.
-    /// @param resources Chain-adapter-specific resources assigned to the dispatch.
+    /// @param portal Destination portal identifier, often the destination host ID.
+    /// @param resources Chain-specific resources assigned to the dispatch.
+    /// @param key Dispatch correlation or recovery lookup key.
     /// @param digest Digest of the dispatched payload or canonical envelope.
-    /// @param ref Dispatch correlation or recovery reference.
-    event Dispatch(uint indexed host, uint chain, uint resources, bytes32 digest, bytes32 ref);
+    event Dispatch(uint indexed host, uint portal, uint resources, bytes32 key, bytes32 digest);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Recovered.sol

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import {EventEmitter} from "./Emitter.sol";
+
+/// @notice Emitted when a host recovers a previously recorded key.
+abstract contract RecoveredEvent is EventEmitter {
+    string private constant ABI = "event Recovered(uint indexed host, bytes32 key)";
+
+    /// @param host Host node ID that owns the recovered key.
+    /// @param key Recovery lookup key.
+    event Recovered(uint indexed host, bytes32 key);
+
+    constructor() {
+        emit EventAbi(ABI);
+    }
+}

package/events/Route.sol

@@ -3,14 +3,14 @@ pragma solidity ^0.8.33;
 
 import {EventEmitter} from "./Emitter.sol";
 
-/// @notice Emitted when a host announces a route to another chain/domain.
+/// @notice Emitted when a host updates a portal route.
 abstract contract RouteEvent is EventEmitter {
-    string private constant ABI = "event Route(uint indexed host, uint chain, uint context)";
+    string private constant ABI = "event Route(uint indexed host, uint portal, uint status)";
 
     /// @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);
+    /// @param portal Destination portal identifier, often the destination host ID.
+    /// @param status Route status. Zero means inactive; nonzero means active.
+    event Route(uint indexed host, uint portal, uint status);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Undelivered.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 records an undelivered portal message.
+abstract contract UndeliveredEvent is EventEmitter {
+    string private constant ABI = "event Undelivered(uint indexed host, bytes32 key, bytes32 digest)";
+
+    /// @param host Host node ID that owns the undelivered message.
+    /// @param key Delivery lookup key.
+    /// @param digest Digest of the undelivered message.
+    event Undelivered(uint indexed host, bytes32 key, bytes32 digest);
+
+    constructor() {
+        emit EventAbi(ABI);
+    }
+}

package/guards/Revoke.sol

@@ -18,7 +18,7 @@ abstract contract Revoke is GuardBase {
     }
 
     function revoke(bytes calldata request) external onlyGuardian {
-        (Cur memory input, , ) = Cursors.init(request, 1);
+        (Cur memory input, ) = Cursors.init(request, 1);
 
         while (input.i < input.len) {
             uint node = input.unpackNode();

package/package.json

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

package/ports/AllowAssets.sol

@@ -22,7 +22,7 @@ abstract contract PortAllowAssets is PortBase, AllowAssetsHook {
     /// @param data ASSET block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function portAllowAssets(bytes calldata data) external onlyPeer returns (bytes memory) {
-        (Cur memory assets, , ) = Cursors.init(data, 1);
+        (Cur memory assets, ) = Cursors.init(data, 1);
 
         while (assets.i < assets.len) {
             bytes32 asset = assets.unpackAsset();

package/ports/Allowance.sol

@@ -23,7 +23,7 @@ abstract contract PortAllowance is PortBase, AllowanceHook {
     /// @param data AMOUNT block stream requested by the trusted peer.
     /// @return Empty response bytes.
     function portAllowance(bytes calldata data) external onlyPeer returns (bytes memory) {
-        (Cur memory amounts, , ) = Cursors.init(data, 1);
+        (Cur memory amounts, ) = Cursors.init(data, 1);
         uint peer = caller();
 
         while (amounts.i < amounts.len) {

package/ports/Credit.sol

@@ -22,7 +22,7 @@ abstract contract PortCreditAccount is PortBase, CreditAccountHook {
     /// @param data ACCOUNT_AMOUNT block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function portCreditAccount(bytes calldata data) external onlyPeer returns (bytes memory) {
-        (Cur memory amounts, , ) = Cursors.init(data, 1);
+        (Cur memory amounts, ) = Cursors.init(data, 1);
 
         while (amounts.i < amounts.len) {
             (bytes32 account, bytes32 asset, uint amount) = amounts.unpackAccountAmount();

package/ports/Debit.sol

@@ -22,7 +22,7 @@ abstract contract PortDebitAccount is PortBase, DebitAccountHook {
     /// @param data ACCOUNT_AMOUNT block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function portDebitAccount(bytes calldata data) external onlyPeer returns (bytes memory) {
-        (Cur memory amounts, , ) = Cursors.init(data, 1);
+        (Cur memory amounts, ) = Cursors.init(data, 1);
 
         while (amounts.i < amounts.len) {
             (bytes32 account, bytes32 asset, uint amount) = amounts.unpackAccountAmount();

package/ports/DenyAssets.sol

@@ -22,7 +22,7 @@ abstract contract PortDenyAssets is PortBase, DenyAssetsHook {
     /// @param data ASSET block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function portDenyAssets(bytes calldata data) external onlyPeer returns (bytes memory) {
-        (Cur memory assets, , ) = Cursors.init(data, 1);
+        (Cur memory assets, ) = Cursors.init(data, 1);
 
         while (assets.i < assets.len) {
             bytes32 asset = assets.unpackAsset();

package/ports/Dispatch.sol

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

package/ports/Pipe.sol

@@ -25,7 +25,7 @@ abstract contract PortPipePayable is PortBase, Pipeline {
     /// @param data CONTEXT block stream supplied by the trusted peer.
     /// @return Empty response bytes.
     function portPipePayable(bytes calldata data) external payable onlyPeer returns (bytes memory) {
-        (Cur memory input, , ) = Cursors.init(data, 1);
+        (Cur memory input, ) = Cursors.init(data, 1);
         Budget memory budget = openValue();
 
         while (input.i < input.len) {