@rootzero/contracts 1.7.0 → 1.8.0

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 Until the protocol reaches integration-stable status, minor versions may include
 breaking API changes. Breaking changes are called out explicitly.
 
+## 1.8.0
+
+### Breaking Changes
+
+- Removed per-port `IPort*` interfaces. Port callers should use port node IDs,
+  discovery metadata, and `PortCalls.callPort`.
+- Removed unused standalone ABI encoder helpers: `encodePortCall`,
+  `encodeGuardCall`, and `encodeQueryCall`.
+- Reworked `NodeCalls` into a low-level node-call layer:
+  - `callAddr` and `queryAddr` were removed.
+  - `callTo` and `queryTo` were removed.
+  - Raw node calls now use `rawCall`, `tryRawCall`, and `rawQuery`.
+
+### Added
+
+- Added `trustedCall`, `tryTrustedCall`, and `trustedQuery` as shared trusted
+  wrappers over the raw node-call helpers.
+- Added `CommandCalls.callCommand` and `PortCalls.callPort` for selector-based
+  trusted calls to command and port nodes.
+
 ## 1.7.0
 
 ### Breaking Changes

package/Core.sol

@@ -10,7 +10,7 @@ import { Commitments } from "./core/Commitments.sol";
 import { Escrows, InsufficientEscrow } from "./core/Escrows.sol";
 import { NativeAsset, Runtime } from "./core/Runtime.sol";
 import { Host, IHostIntroduction } from "./core/Host.sol";
-import { FailedCall, NodeCalls } from "./core/Calls.sol";
+import { CommandCalls, FailedCall, NodeCalls, PortCalls } from "./core/Calls.sol";
 import { Payable } from "./core/Payable.sol";
 import { Pipeline } from "./core/Pipeline.sol";
 import { AssetAmount, AccountAsset, AccountAmount, HostAmount, HostAccountAsset, HostAccountAmount, Tx } from "./core/Types.sol";

package/Endpoints.sol

@@ -35,23 +35,23 @@ import { Label } from "./commands/admin/Label.sol";
 import { Unauthorize } from "./commands/admin/Unauthorize.sol";
 
 // Port endpoints
-import { PortBase, encodePortCall } from "./ports/Base.sol";
-import { PortAllowAssets, IPortAllowAssets } from "./ports/AllowAssets.sol";
-import { PortAllowance, IPortAllowance } from "./ports/Allowance.sol";
-import { PortRedeemBalance, RedeemBalanceHook, IPortRedeemBalance } from "./ports/Redeem.sol";
-import { PortCreditAccount, IPortCreditAccount } from "./ports/Credit.sol";
-import { PortDebitAccount, IPortDebitAccount } from "./ports/Debit.sol";
-import { PortDenyAssets, IPortDenyAssets } from "./ports/DenyAssets.sol";
-import { PortPipePayable, IPortPipePayable } from "./ports/Pipe.sol";
-import { PortDispatchPayable, IPortDispatchPayable } from "./ports/Dispatch.sol";
-import { PortSettle, IPortSettle } from "./ports/Settle.sol";
+import { PortBase } from "./ports/Base.sol";
+import { PortAllowAssets } from "./ports/AllowAssets.sol";
+import { PortAllowance } from "./ports/Allowance.sol";
+import { PortRedeemBalance, RedeemBalanceHook } from "./ports/Redeem.sol";
+import { PortCreditAccount } from "./ports/Credit.sol";
+import { PortDebitAccount } from "./ports/Debit.sol";
+import { PortDenyAssets } from "./ports/DenyAssets.sol";
+import { PortPipePayable } from "./ports/Pipe.sol";
+import { PortDispatchPayable } from "./ports/Dispatch.sol";
+import { PortSettle } from "./ports/Settle.sol";
 
 // Guard endpoints
-import { GuardBase, encodeGuardCall } from "./guards/Base.sol";
+import { GuardBase } from "./guards/Base.sol";
 import { Revoke } from "./guards/Revoke.sol";
 
 // Query endpoints
-import { QueryBase, encodeQueryCall } from "./queries/Base.sol";
+import { QueryBase } from "./queries/Base.sol";
 import { AssetStatus, AssetStatusHook } from "./queries/Assets.sol";
 import { GetBalances, GetBalancesHook } from "./queries/Balances.sol";
 import { GetPosition, GetPositionHook } from "./queries/Positions.sol";

package/commands/admin/Execute.sol

@@ -5,7 +5,6 @@ import {AdminBase, CommandContext, Keys} from "./Base.sol";
 import {Payable} from "../../core/Payable.sol";
 import {Cursors, Cur, Schemas} from "../../Cursors.sol";
 import {Budget} from "../../utils/Value.sol";
-import {Nodes} from "../../utils/Nodes.sol";
 
 using Cursors for Cur;
 
@@ -31,8 +30,7 @@ abstract contract ExecutePayable is AdminBase, Payable {
 
         while (request.i < request.len) {
             (uint target, uint resources, bytes calldata data) = request.unpackCall();
-            address addr = Nodes.addr(target);
-            callAddr(addr, useValue(budget, resources), data);
+            rawCall(target, useValue(budget, resources), data);
         }
 
         request.complete();

package/core/Calls.sol

@@ -12,7 +12,7 @@ import {Nodes} from "../utils/Nodes.sol";
 error FailedCall(address addr, bytes4 selector, bytes err);
 
 /// @title NodeCalls
-/// @notice Shared trusted inter-node call helpers for contracts that can talk to other nodes.
+/// @notice Shared low-level inter-node call helpers for contracts that can talk to other nodes.
 abstract contract NodeCalls is AccessControl {
     /// @notice Return the host node ID corresponding to the current caller.
     /// @dev Encodes `msg.sender` as a host ID using the local-chain host layout.
@@ -21,64 +21,100 @@ abstract contract NodeCalls is AccessControl {
         return Nodes.toHost(msg.sender);
     }
 
-    /// @notice Make a low-level call to an address.
-    /// Forwards `value` ETH and `data` to `addr`.
-    /// Reverts with `FailedCall` if the call is unsuccessful.
-    /// @param addr Contract address to call.
+    /// @notice Try a raw low-level call to another node and return whether it succeeded.
+    /// @param node Node ID of the callee.
     /// @param value Native value to forward in wei.
     /// @param data Encoded calldata to send.
-    /// @return out Return data from the successful call.
-    function callAddr(address addr, uint128 value, bytes memory data) internal returns (bytes memory out) {
-        bool success;
-        (success, out) = payable(addr).call{value: value}(data);
-        if (!success) revert FailedCall(addr, bytes4(data), out);
+    /// @return success True if the low-level call succeeded.
+    function tryRawCall(uint node, uint128 value, bytes memory data) internal returns (bool success) {
+        address addr = Nodes.addr(node);
+        (success, ) = payable(addr).call{value: value}(data);
     }
 
-    /// @notice Make a low-level read-only query to an address.
-    /// Issues a low-level `staticcall` with `data`.
-    /// Reverts with `FailedCall` if the call is unsuccessful.
-    /// @param addr Contract address to query.
+    /// @notice Try a trusted low-level call to another node and return whether it succeeded.
+    /// @param node Node ID of the callee.
+    /// @param value Native value to forward in wei.
     /// @param data Encoded calldata to send.
-    /// @return out Return data from the successful query.
-    function queryAddr(address addr, bytes memory data) internal view returns (bytes memory out) {
+    /// @return success True if the low-level call succeeded.
+    function tryTrustedCall(uint node, uint128 value, bytes memory data) internal returns (bool success) {
+        return tryRawCall(ensureTrusted(node), value, data);
+    }
+
+    /// @notice Make a raw low-level call to another node and revert when it fails.
+    /// @param node Node ID of the callee.
+    /// @param value Native value to forward in wei.
+    /// @param data Encoded calldata to send.
+    /// @return out Return data from the successful call.
+    function rawCall(uint node, uint128 value, bytes memory data) internal returns (bytes memory out) {
         bool success;
-        (success, out) = addr.staticcall(data);
+        address addr = Nodes.addr(node);
+        (success, out) = payable(addr).call{value: value}(data);
         if (!success) revert FailedCall(addr, bytes4(data), out);
     }
 
-    /// @notice Make a trusted call to another node in the network.
-    /// 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).
+    /// @notice Make a trusted low-level call to another node and revert when it fails.
+    /// @param node Node ID of the callee.
     /// @param value Native value to forward in wei.
     /// @param data Encoded calldata to send.
     /// @return out Return data from the successful call.
-    function callTo(uint node, uint128 value, bytes memory data) internal returns (bytes memory out) {
-        ensureTrusted(node);
-        address addr = Nodes.addr(node);
-        return callAddr(addr, value, data);
+    function trustedCall(uint node, uint128 value, bytes memory data) internal returns (bytes memory out) {
+        return rawCall(ensureTrusted(node), value, data);
     }
 
-    /// @notice Make a trusted query to another node in the network.
-    /// 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).
+    /// @notice Make a raw low-level read-only query to another node and revert when it fails.
+    /// @param node Node ID of the callee.
     /// @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);
+    function rawQuery(uint node, bytes memory data) internal view returns (bytes memory out) {
+        bool success;
         address addr = Nodes.addr(node);
-        return queryAddr(addr, data);
+        (success, out) = addr.staticcall(data);
+        if (!success) revert FailedCall(addr, bytes4(data), out);
+    }
+
+    /// @notice Make a trusted low-level read-only query to another node and revert when it fails.
+    /// @param node Node ID of the callee.
+    /// @param data Encoded calldata to send.
+    /// @return out Return data from the successful query.
+    function trustedQuery(uint node, bytes memory data) internal view returns (bytes memory out) {
+        return rawQuery(ensureTrusted(node), data);
     }
+}
 
+/// @title CommandCalls
+/// @notice Trusted command-call helpers for contracts that route command nodes.
+abstract contract CommandCalls is NodeCalls {
     /// @notice Encode and call a trusted command node.
-    /// @param id Command node ID embedding the target selector.
+    /// @param command Command node ID embedding the target selector.
     /// @param value Native value to forward in wei.
-    /// @param ctx Command execution context.
+    /// @param account Command account identifier.
+    /// @param state Current command state block stream.
+    /// @param request Command input block stream.
     /// @return Decoded command output block stream.
-    function callCommand(uint id, uint128 value, CommandContext memory ctx) internal returns (bytes memory) {
-        bytes4 selector = Nodes.commandSelector(id);
-        bytes memory data = abi.encodeWithSelector(selector, ctx);
-        return abi.decode(callTo(id, value, data), (bytes));
+    function callCommand(
+        uint command,
+        uint128 value,
+        bytes32 account,
+        bytes memory state,
+        bytes calldata request
+    ) internal returns (bytes memory) {
+        bytes4 selector = Nodes.commandSelector(command);
+        bytes memory data = abi.encodeWithSelector(selector, CommandContext(account, state, request));
+        return abi.decode(trustedCall(command, value, data), (bytes));
+    }
+}
+
+/// @title PortCalls
+/// @notice Trusted port-call helpers for contracts that route port nodes.
+abstract contract PortCalls is NodeCalls {
+    /// @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) {
+        bytes4 selector = Nodes.portSelector(port);
+        bytes memory data = abi.encodeWithSelector(selector, input);
+        return abi.decode(trustedCall(port, value, data), (bytes));
     }
 }

package/guards/Base.sol

@@ -6,17 +6,6 @@ import {GuardEvent} from "../events/Guard.sol";
 import {LabeledEvent} from "../events/Labeled.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 `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 = Nodes.guardSelector(target);
-    return abi.encodeWithSelector(selector, request);
-}
-
 /// @title GuardBase
 /// @notice Abstract base for guardian-only direct host actions.
 /// Guard actions are non-payable direct calls with no command context, state, or response.

package/package.json

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

package/ports/AllowAssets.sol

@@ -7,14 +7,10 @@ import { Cursors, Cur, Schemas } from "../Cursors.sol";
 
 using Cursors for Cur;
 
-interface IPortAllowAssets {
-    function portAllowAssets(bytes calldata data) external returns (bytes memory);
-}
-
 /// @title PortAllowAssets
 /// @notice Port 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 PortAllowAssets is PortBase, AllowAssetsHook, IPortAllowAssets {
+abstract contract PortAllowAssets is PortBase, AllowAssetsHook {
     uint internal immutable portAllowAssetsId = portId(this.portAllowAssets.selector);
 
     constructor() {

package/ports/Allowance.sol

@@ -7,15 +7,11 @@ import {Cursors, Cur, Schemas} from "../Cursors.sol";
 
 using Cursors for Cur;
 
-interface IPortAllowance {
-    function portAllowance(bytes calldata data) external returns (bytes memory);
-}
-
 /// @title PortAllowance
 /// @notice Port 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 PortAllowance is PortBase, AllowanceHook, IPortAllowance {
+abstract contract PortAllowance is PortBase, AllowanceHook {
     uint internal immutable portAllowanceId = portId(this.portAllowance.selector);
 
     constructor() {

package/ports/Base.sol

@@ -6,17 +6,6 @@ import { PortEvent } from "../events/Port.sol";
 import { LabeledEvent } from "../events/Labeled.sol";
 import { Nodes } from "../utils/Nodes.sol";
 
-/// @notice ABI-encode a port call from a target port ID and data block stream.
-/// @dev Derives the function selector from `target` via `Nodes.portSelector(target)`.
-/// Reverts if `target` is not a valid port ID.
-/// @param target Destination port node ID embedding the target selector.
-/// @param data Input block stream for the port invocation.
-/// @return ABI-encoded calldata for the port entry point.
-function encodePortCall(uint target, bytes calldata data) pure returns (bytes memory) {
-    bytes4 selector = Nodes.portSelector(target);
-    return abi.encodeWithSelector(selector, data);
-}
-
 /// @title PortBase
 /// @notice Abstract base for peer-facing rootzero ports.
 /// Ports handle inter-host operations between cooperating hosts.

package/ports/Credit.sol

@@ -7,14 +7,10 @@ import { Cursors, Cur, Forms } from "../Cursors.sol";
 
 using Cursors for Cur;
 
-interface IPortCreditAccount {
-    function portCreditAccount(bytes calldata data) external returns (bytes memory);
-}
-
 /// @title PortCreditAccount
 /// @notice Port that lets a trusted peer credit supplied accounts directly.
 /// Each ACCOUNT_AMOUNT block calls `creditAccount` for its account.
-abstract contract PortCreditAccount is PortBase, CreditAccountHook, IPortCreditAccount {
+abstract contract PortCreditAccount is PortBase, CreditAccountHook {
     uint internal immutable portCreditAccountId = portId(this.portCreditAccount.selector);
 
     constructor() {

package/ports/Debit.sol

@@ -7,14 +7,10 @@ import { Cursors, Cur, Forms } from "../Cursors.sol";
 
 using Cursors for Cur;
 
-interface IPortDebitAccount {
-    function portDebitAccount(bytes calldata data) external returns (bytes memory);
-}
-
 /// @title PortDebitAccount
 /// @notice Port that lets a trusted peer debit supplied accounts directly.
 /// Each ACCOUNT_AMOUNT block calls `debitAccount` for its account.
-abstract contract PortDebitAccount is PortBase, DebitAccountHook, IPortDebitAccount {
+abstract contract PortDebitAccount is PortBase, DebitAccountHook {
     uint internal immutable portDebitAccountId = portId(this.portDebitAccount.selector);
 
     constructor() {

package/ports/DenyAssets.sol

@@ -7,14 +7,10 @@ import {Cursors, Cur, Schemas} from "../Cursors.sol";
 
 using Cursors for Cur;
 
-interface IPortDenyAssets {
-    function portDenyAssets(bytes calldata data) external returns (bytes memory);
-}
-
 /// @title PortDenyAssets
 /// @notice Port that blocks a list of assets on behalf of a peer host.
 /// Each ASSET block in the request calls `denyAsset`. Restricted to trusted peers.
-abstract contract PortDenyAssets is PortBase, DenyAssetsHook, IPortDenyAssets {
+abstract contract PortDenyAssets is PortBase, DenyAssetsHook {
     uint internal immutable portDenyAssetsId = portId(this.portDenyAssets.selector);
 
     constructor() {

package/ports/Dispatch.sol

@@ -9,13 +9,9 @@ import { Budget } from "../utils/Value.sol";
 
 using Cursors for Cur;
 
-interface IPortDispatchPayable {
-    function portDispatchPayable(bytes calldata data) external payable returns (bytes memory);
-}
-
 /// @title PortDispatchPayable
 /// @notice Port endpoint that forwards DISPATCH blocks to a host-defined dispatch hook.
-abstract contract PortDispatchPayable is PortBase, Payable, DispatchPayableHook, IPortDispatchPayable {
+abstract contract PortDispatchPayable is PortBase, Payable, DispatchPayableHook {
     uint internal immutable portDispatchPayableId = portId(this.portDispatchPayable.selector);
 
     constructor() {

package/ports/Pipe.sol

@@ -8,14 +8,10 @@ import {Budget} from "../utils/Value.sol";
 
 using Cursors for Cur;
 
-interface IPortPipePayable {
-    function portPipePayable(bytes calldata data) external payable returns (bytes memory);
-}
-
 /// @title PortPipePayable
 /// @notice Port that consumes CONTEXT blocks and executes each request as a step stream.
 /// Each context's request bytes are passed to the shared pipeline.
-abstract contract PortPipePayable is PortBase, Pipeline, IPortPipePayable {
+abstract contract PortPipePayable is PortBase, Pipeline {
     uint internal immutable portPipePayableId = portId(this.portPipePayable.selector);
 
     constructor() {

package/ports/Redeem.sol

@@ -6,10 +6,6 @@ import {Cursors, Cur, Schemas} from "../Cursors.sol";
 
 using Cursors for Cur;
 
-interface IPortRedeemBalance {
-    function portRedeemBalance(bytes calldata data) external returns (bytes memory);
-}
-
 abstract contract RedeemBalanceHook {
     /// @notice Override to redeem one balance claim from a peer host into local assets.
     /// @param peer Peer host node ID for this request.
@@ -22,7 +18,7 @@ abstract contract RedeemBalanceHook {
 /// @notice Port that redeems balance state from a peer host into local assets.
 /// Each BALANCE block in the request calls `redeemBalance(peer, asset, amount)`.
 /// Restricted to trusted peers.
-abstract contract PortRedeemBalance is PortBase, RedeemBalanceHook, IPortRedeemBalance {
+abstract contract PortRedeemBalance is PortBase, RedeemBalanceHook {
     uint internal immutable portRedeemBalanceId = portId(this.portRedeemBalance.selector);
 
     constructor() {

package/ports/Settle.sol

@@ -8,14 +8,10 @@ import { Cursors, Cur, Schemas } from "../Cursors.sol";
 
 using Cursors for Cur;
 
-interface IPortSettle {
-    function portSettle(bytes calldata data) external returns (bytes memory);
-}
-
 /// @title PortSettle
 /// @notice Port that consumes peer-supplied TRANSACTION blocks through debit and credit hooks.
 /// Each TRANSACTION block calls `debitAccount` for `from` and `creditAccount` for `to`.
-abstract contract PortSettle is PortBase, DebitAccountHook, CreditAccountHook, IPortSettle {
+abstract contract PortSettle is PortBase, DebitAccountHook, CreditAccountHook {
     uint internal immutable portSettleId = portId(this.portSettle.selector);
 
     constructor() {

package/queries/Base.sol

@@ -6,17 +6,6 @@ import { LabeledEvent } from "../events/Labeled.sol";
 import { QueryEvent } from "../events/Query.sol";
 import { Nodes } from "../utils/Nodes.sol";
 
-/// @notice ABI-encode a query call from a target query ID and request block stream.
-/// @dev Derives the function selector from `target` via `Nodes.querySelector(target)`.
-/// Reverts if `target` is not a valid query ID.
-/// @param target Destination query node ID embedding the target selector.
-/// @param request Input block stream for the query invocation.
-/// @return ABI-encoded calldata for the query entry point.
-function encodeQueryCall(uint target, bytes calldata request) pure returns (bytes memory) {
-    bytes4 selector = Nodes.querySelector(target);
-    return abi.encodeWithSelector(selector, request);
-}
-
 /// @title QueryBase
 /// @notice Abstract base for rootzero query contracts.
 /// Queries are view-only entry points that consume a block-stream request and