@rootzero/contracts 0.9.4 → 0.9.6

package/Core.sol

@@ -7,14 +7,12 @@ pragma solidity ^0.8.33;
 import { AccessControl } from "./core/Access.sol";
 import { Balances } from "./core/Balances.sol";
 import { RootZeroContext } from "./core/Context.sol";
-import { Host } from "./core/Host.sol";
+import { Host, IHostIntroduction } from "./core/Host.sol";
 import { FailedCall, NodeCalls } 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";
 import { Validator } from "./core/Validator.sol";
-import { HostDiscovery } from "./core/Host.sol";
-import { IHostDiscovery } from "./interfaces/IHostDiscovery.sol";
 
 
 

package/Events.sol

@@ -6,22 +6,20 @@ pragma solidity ^0.8.33;
 
 import { AccessEvent } from "./events/Access.sol";
 import { AdminEvent } from "./events/Admin.sol";
-import { AssetEvent } from "./events/Asset.sol";
+import { AssetStatusEvent } from "./events/Asset.sol";
 import { BalanceEvent } from "./events/Balance.sol";
 import { CollateralEvent } from "./events/Collateral.sol";
 import { CommandEvent } from "./events/Command.sol";
+import { Contexts } from "./events/Contexts.sol";
 import { DebtEvent } from "./events/Debt.sol";
-import { DepositEvent } from "./events/Deposit.sol";
-import { AssetPositionEvent } from "./events/Position.sol";
+import { PositionEvent } from "./events/Position.sol";
+import { ReceivedEvent } from "./events/Received.sol";
 import { EventEmitter } from "./events/Emitter.sol";
-import { GovernedEvent } from "./events/Governed.sol";
-import { HostAnnouncedEvent } from "./events/Host.sol";
-import { ListingEvent } from "./events/Listing.sol";
+import { IntroductionEvent } from "./events/Introduction.sol";
 import { PeerEvent } from "./events/Peer.sol";
 import { QueryEvent } from "./events/Query.sol";
-import { PipedEvent } from "./events/Piped.sol";
-import { SwapEvent } from "./events/Swap.sol";
-import { WithdrawalEvent } from "./events/Withdraw.sol";
+import { RootedEvent } from "./events/Rooted.sol";
+import { SpentEvent } from "./events/Spent.sol";
 
 
 

package/Queries.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.33;
 // Aggregator: re-exports query abstractions and reusable query bases.
 // Import this file to build rootzero query contracts without managing individual paths.
 
-import { IsAllowedAsset, IsAllowedAssetHook } from "./queries/Assets.sol";
+import { AssetStatus, AssetStatusHook } from "./queries/Assets.sol";
 import { GetPosition, GetPositionHook } from "./queries/Positions.sol";
 import { GetBalances, GetBalancesHook } from "./queries/Balances.sol";
 import { QueryBase, encodeQueryCall } from "./queries/Base.sol";

package/blocks/Cursors.sol

@@ -524,17 +524,26 @@ library Cursors {
 
     /// @notice Encode a CONTEXT block.
     /// @param account Command account identifier.
-    /// @param value Native value budget assigned to the context.
     /// @param state Embedded state block stream.
     /// @param request Embedded request block stream.
     /// @return Encoded CONTEXT block bytes.
-    function toContextBlock(
-        bytes32 account,
+    function toContextBlock(bytes32 account, bytes memory state, bytes memory request) internal pure returns (bytes memory) {
+        return createBlock(Keys.Context, bytes.concat(account, toBytesBlock(state), toBytesBlock(request)));
+    }
+
+    /// @notice Encode a PIPE block.
+    /// @param value Native value assigned to the pipe.
+    /// @param account Command account identifier.
+    /// @param state Embedded state block stream.
+    /// @param request Embedded request block stream.
+    /// @return Encoded PIPE block bytes.
+    function toPipeBlock(
         uint value,
+        bytes32 account,
         bytes memory state,
         bytes memory request
     ) internal pure returns (bytes memory) {
-        return createBlock(Keys.Context, bytes.concat(account, bytes32(value), toBytesBlock(state), toBytesBlock(request)));
+        return createBlock(Keys.Pipe, bytes.concat(bytes32(value), toContextBlock(account, state, request)));
     }
 
     // -------------------------------------------------------------------------
@@ -1091,20 +1100,31 @@ library Cursors {
     /// The `state` and `request` slices are the raw payloads of the required BYTES children.
     /// @param cur Cursor; advanced past the block.
     /// @return account Command account identifier.
-    /// @return value Native value budget assigned to the context.
     /// @return state Embedded state block stream.
     /// @return request Embedded request block stream.
-    function unpackContext(
-        Cur memory cur
-    ) internal pure returns (bytes32 account, uint value, bytes calldata state, bytes calldata request) {
-        uint end = cur.enter(Keys.Context, 64 + 2 * Sizes.Header, 0);
+    function unpackContext(Cur memory cur) internal pure returns (bytes32 account, bytes calldata state, bytes calldata request) {
+        uint end = cur.enter(Keys.Context, 32 + 2 * Sizes.Header, 0);
         account = cur.read32();
-        value = uint(cur.read32());
         state = cur.unpackBytes();
         request = cur.unpackBytes();
         cur.exit(end);
     }
 
+    /// @notice Consume a PIPE block and return its value and context fields.
+    /// @param cur Cursor; advanced past the block.
+    /// @return value Native value assigned to the pipe.
+    /// @return account Command account identifier.
+    /// @return state Embedded state block stream.
+    /// @return request Embedded request block stream.
+    function unpackPipe(
+        Cur memory cur
+    ) internal pure returns (uint value, bytes32 account, bytes calldata state, bytes calldata request) {
+        uint end = cur.enter(Keys.Pipe, 32 + Sizes.Header + 32 + 2 * Sizes.Header, 0);
+        value = uint(cur.read32());
+        (account, state, request) = cur.unpackContext();
+        cur.exit(end);
+    }
+
     // Type-specific validators
 
     /// @notice Validate an AUTH block at position `i` and extract deadline and proof.

package/blocks/Keys.sol

@@ -43,6 +43,8 @@ library Keys {
     bytes4 constant Call = bytes4(keccak256("#call"));
     /// @dev Command context transport - (bytes32 account, #bytes as state, #bytes as request)
     bytes4 constant Context = bytes4(keccak256("#context"));
+    /// @dev Pipeline invocation - (uint value, #context)
+    bytes4 constant Pipe = bytes4(keccak256("#pipe"));
     /// @dev Authentication proof - (uint cid, uint deadline, #bytes as proof); must appear last in its segment
     bytes4 constant Auth = bytes4(keccak256("#auth"));
     /// @dev Asset descriptor without amount - (bytes32 asset, bytes32 meta)
@@ -52,7 +54,7 @@ library Keys {
     /// @dev Relayer bounty - (uint amount, bytes32 relayer)
     bytes4 constant Bounty = bytes4(keccak256("#bounty"));
 
-    /// @dev Structural status form - (bool ok)
+    /// @dev Structural status form - (uint code)
     bytes4 constant Status = bytes4(keccak256("#status"));
     /// @dev Structural asset amount form - (bytes32 asset, bytes32 meta, uint amount)
     bytes4 constant AssetAmount = bytes4(keccak256("#assetAmount"));

package/blocks/Schema.sol

@@ -59,9 +59,10 @@ 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 Context = "#context { bytes32 account, #bytes as state, #bytes as request }";
+    string constant Pipe = "#pipe { uint value, #context { bytes32 account, #bytes as state, #bytes as request } }";
     string constant Call = "#call { uint target, uint value, #bytes as payload }";
     string constant Step = "#step { uint target, uint value, #bytes as request }";
-    string constant Context = "#context { bytes32 account, uint value, #bytes as state, #bytes as request }";
     string constant Bounty = "#bounty { uint amount, bytes32 relayer }";
     string constant Fee = "#fee { uint amount }";
     string constant Auth = "#auth { uint cid, uint deadline, #bytes as proof }";
@@ -75,13 +76,14 @@ library Schemas {
 /// @notice Reusable structural block schemas for core tuple shapes.
 /// These describe payload form without assigning command or query semantics.
 library Forms {
-    string constant Status = "#status { bool ok }";
+    string constant Status = "#status { uint code }";
     string constant AssetAmount = "#assetAmount { bytes32 asset, bytes32 meta, uint amount }";
     string constant AccountAsset = "#accountAsset { bytes32 account, bytes32 asset, bytes32 meta }";
     string constant AccountAmount = "#accountAmount { bytes32 account, bytes32 asset, bytes32 meta, uint amount }";
     string constant HostAmount = "#hostAmount { uint host, bytes32 asset, bytes32 meta, uint amount }";
     string constant HostAccountAsset = "#hostAccountAsset { uint host, bytes32 account, bytes32 asset, bytes32 meta }";
-    string constant HostAccountAmount = "#hostAccountAmount { uint host, bytes32 account, bytes32 asset, bytes32 meta, uint amount }";
+    string constant HostAccountAmount =
+        "#hostAccountAmount { uint host, bytes32 account, bytes32 asset, bytes32 meta, uint amount }";
 }
 
 /// @title Sizes
@@ -105,8 +107,8 @@ library Sizes {
     uint constant Proof = 85;
     /// @dev AUTH block: 8 header + 32 cid + 32 deadline + nested BYTES block with 85-byte proof = 165 bytes
     uint constant Auth = B64 + Header + Proof;
-    /// @dev STATUS block: 8 header + 1 bool byte = 9 bytes
-    uint constant Status = Header + 1;
+    /// @dev STATUS block: 8 header + 32 status code = 40 bytes
+    uint constant Status = B32;
     /// @dev AMOUNT block: 8 header + 32 asset + 32 meta + 32 amount = 104 bytes
     uint constant Amount = B96;
     /// @dev BALANCE block: 8 header + 32 asset + 32 meta + 32 amount = 104 bytes

package/blocks/Writers.sol

@@ -27,6 +27,7 @@ library Hints {
     uint constant Step = 256;
     uint constant Call = 256;
     uint constant Context = 512;
+    uint constant Pipe = 608;
 }
 
 /// @title Writers
@@ -223,6 +224,14 @@ library Writers {
         return allocFromHint(count, Hints.Context);
     }
 
+    /// @notice Allocate a writer for `count` PIPE blocks using a per-block capacity hint.
+    /// @dev The backing buffer expands automatically if encoded pipes exceed the initial hint.
+    /// @param count Number of pipe blocks to allocate space for.
+    /// @return writer Allocated growable writer.
+    function allocPipes(uint count) internal pure returns (Writer memory writer) {
+        return allocFromHint(count, Hints.Pipe);
+    }
+
     // -------------------------------------------------------------------------
     // Fixed-width write helpers
     // -------------------------------------------------------------------------
@@ -871,27 +880,46 @@ library Writers {
         appendBlock64Bytes(writer, Keys.Call, bytes32(target), bytes32(value), data);
     }
 
-    /// @notice Append a CONTEXT block with a value budget and nested state/request BYTES payloads.
+    /// @notice Append a CONTEXT block with nested state/request BYTES payloads.
     /// @param writer Destination writer; `i` is advanced by the encoded CONTEXT block length.
     /// @param account Command account identifier.
-    /// @param value Native value budget assigned to the context.
     /// @param state Raw nested state payload.
     /// @param request Raw nested request payload.
-    function appendContext(
+    function appendContext(Writer memory writer, bytes32 account, bytes memory state, bytes memory request) internal pure {
+        appendBlock32BytesBytes(writer, Keys.Context, account, state, request);
+    }
+
+    /// @notice Append a PIPE block with a nested CONTEXT block.
+    /// @param writer Destination writer; `i` is advanced by the encoded PIPE block length.
+    /// @param value Native value assigned to the pipe.
+    /// @param account Command account identifier.
+    /// @param state Raw nested state payload.
+    /// @param request Raw nested request payload.
+    function appendPipe(
         Writer memory writer,
-        bytes32 account,
         uint value,
+        bytes32 account,
         bytes memory state,
         bytes memory request
     ) internal pure {
-        appendBlock64BytesBytes(writer, Keys.Context, account, bytes32(value), state, request);
+        uint i = writer.i;
+        uint len = 64 + 3 * Sizes.Header + state.length + request.length;
+        uint next = i + Sizes.Header + len;
+        i = reserve(writer, next, next);
+
+        uint p = writeHeader(writer.dst, i, Keys.Pipe, uint32(max32(len)));
+        assembly ("memory-safe") {
+            mstore(add(p, 0x08), value)
+        }
+
+        writeBlock32BytesBytes(writer.dst, i + Sizes.Header + 32, Keys.Context, account, state, request);
     }
 
     /// @notice Append a STATUS form block.
     /// @param writer Destination writer; `i` is advanced by `Sizes.Status`.
-    /// @param ok Status value to encode.
-    function appendStatus(Writer memory writer, bool ok) internal pure {
-        appendBlock32(writer, Keys.Status, ok ? bytes32(uint(1) << 248) : bytes32(0), 1);
+    /// @param code Status code to encode.
+    function appendStatus(Writer memory writer, uint code) internal pure {
+        appendBlock32(writer, Keys.Status, bytes32(code), 32);
     }
 
     /// @notice Append a BALANCE block using separate field values.

package/core/Calls.sol

@@ -72,13 +72,13 @@ abstract contract NodeCalls is AccessControl {
     }
 
     /// @notice Encode and call a trusted command node.
-    /// @param ctx Command execution context.
-    /// @param cid Command node ID embedding the target selector.
+    /// @param id Command node ID embedding the target selector.
     /// @param value Native value to forward in wei.
+    /// @param ctx Command execution context.
     /// @return Decoded command output block stream.
-    function callCommand(CommandContext memory ctx, uint cid, uint value) internal returns (bytes memory) {
-        bytes4 selector = Ids.commandSelector(cid);
+    function callCommand(uint id, uint value, CommandContext memory ctx) internal returns (bytes memory) {
+        bytes4 selector = Ids.commandSelector(id);
         bytes memory data = abi.encodeWithSelector(selector, ctx);
-        return abi.decode(callTo(cid, value, data), (bytes));
+        return abi.decode(callTo(id, value, data), (bytes));
     }
 }

package/core/Host.sol

@@ -5,38 +5,44 @@ 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 {HostAnnouncedEvent} from "../events/Host.sol";
-import {IHostDiscovery} from "../interfaces/IHostDiscovery.sol";
+import {IntroductionEvent} from "../events/Introduction.sol";
 import {Ids} from "../utils/Ids.sol";
 
-/// @notice Mixin that allows a contract to act as a host discovery registry.
-/// Hosts call `announceHost` on a discovery contract to register themselves.
-abstract contract HostDiscovery is HostAnnouncedEvent, IHostDiscovery {
-    /// @notice Announce this host to the discovery registry.
-    /// Validates that `id` matches `msg.sender` before emitting.
-    /// @param id Host node ID (must equal `Ids.toHost(msg.sender)`).
-    /// @param blocknum Block number at which the host was deployed.
-    /// @param version Protocol version the host implements.
-    /// @param namespace Human-readable namespace string for the host.
-    function announceHost(uint id, uint blocknum, uint16 version, string calldata namespace) external {
-        emit HostAnnounced(Ids.matchHost(id, msg.sender), blocknum, version, namespace);
-    }
+/// @title IHostIntroduction
+/// @notice Interface implemented by hosts that accept introductions from other hosts.
+interface IHostIntroduction {
+    /// @notice Record a host introduction claim.
+    /// @param peer Host node ID being introduced.
+    /// @param blocknum Block number at which the introduction was made.
+    /// @param version Protocol version the host is running.
+    /// @param namespace Human-readable namespace or label for the host.
+    function introduce(uint peer, uint blocknum, uint16 version, string calldata namespace) external;
 }
 
 /// @title Host
 /// @notice Abstract base contract for rootzero host implementations.
 /// Inherits admin command support (authorize, unauthorize, executePayable) and
-/// optionally announces itself to a discovery contract at deployment.
+/// optionally introduces itself to a commander host at deployment.
 /// Accepts native ETH payments via the `receive` function.
-abstract contract Host is Authorize, Unauthorize, ExecutePayable {
+abstract contract Host is Authorize, Unauthorize, ExecutePayable, IntroductionEvent, IHostIntroduction {
     /// @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.
+    ///        If `cmdr` is a deployed contract, the host calls `introduce`
+    ///        on it during construction.
     /// @param version Protocol version number to publish in the announcement.
     /// @param namespace Human-readable namespace string for the host.
     constructor(address cmdr, uint16 version, string memory namespace) AccessControl(cmdr) {
         if (cmdr == address(0) || cmdr == address(this) || cmdr.code.length == 0) return;
-        IHostDiscovery(cmdr).announceHost(host, block.number, version, namespace);
+        IHostIntroduction(cmdr).introduce(host, block.number, version, namespace);
+    }
+
+    /// @notice Record a host introduction claim.
+    /// @dev Validates that `peer` matches `msg.sender`; it does not authorize or trust the introduced host.
+    /// @param peer Host node ID being introduced.
+    /// @param blocknum Block number at which the host was deployed.
+    /// @param version Protocol version the host implements.
+    /// @param namespace Human-readable namespace string for the host.
+    function introduce(uint peer, uint blocknum, uint16 version, string calldata namespace) external {
+        emit Introduction(Ids.matchHost(peer, msg.sender), blocknum, version, namespace);
     }
 
     /// @notice Accept native ETH transfers (e.g. from command value flows).

package/docs/Schema.md

@@ -57,7 +57,8 @@ Once a child block appears, no more fixed fields may follow.
 
 ```txt
 #call { uint target, uint value, #bytes as payload }
-#context { bytes32 account, uint value, #bytes as state, #bytes as request }
+#context { bytes32 account, #bytes as state, #bytes as request }
+#pipe { uint value, #context { bytes32 account, #bytes as state, #bytes as request } }
 ```
 
 The tail is embedded directly as child block bytes. There is no wrapper around a
@@ -187,7 +188,8 @@ Common protocol schemas live in `contracts/blocks/Schema.sol`:
 #payout { bytes32 account, bytes32 asset, bytes32 meta, uint amount }
 #call { uint target, uint value, #bytes as payload }
 #step { uint target, uint value, #bytes as request }
-#context { bytes32 account, uint value, #bytes as state, #bytes as request }
+#context { bytes32 account, #bytes as state, #bytes as request }
+#pipe { uint value, #context { bytes32 account, #bytes as state, #bytes as request } }
 #auth { uint cid, uint deadline, #bytes as proof }
 ```
 

package/events/Access.sol

@@ -3,10 +3,10 @@ pragma solidity ^0.8.33;
 
 import { EventEmitter } from "./Emitter.sol";
 
-string constant ABI = "event Access(uint indexed host, uint node, bool trusted)";
-
 /// @notice Emitted when a node's authorization status changes on a host.
 abstract contract AccessEvent is EventEmitter {
+    string private constant ABI = "event Access(uint indexed host, uint node, bool trusted)";
+
     /// @param host Host node ID where the authorization change occurred.
     /// @param node Node ID that was authorized or deauthorized.
     /// @param trusted True if the node was authorized, false if deauthorized.

package/events/Admin.sol

@@ -3,11 +3,11 @@ pragma solidity ^0.8.33;
 
 import { EventEmitter } from "./Emitter.sol";
 
-string constant ABI =
-    "event Admin(uint indexed host, uint id, string name, bytes32 shape, 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 {
+    string private constant ABI =
+        "event Admin(uint indexed host, uint id, string name, bytes32 shape, string request, bytes4 state, bytes4 output, bool acceptsValue)";
+
     /// @param host Host node ID that owns this admin command.
     /// @param id Command node ID.
     /// @param name Human-readable command name.

package/events/Asset.sol

@@ -3,14 +3,15 @@ pragma solidity ^0.8.33;
 
 import { EventEmitter } from "./Emitter.sol";
 
-string constant ABI = "event Asset(uint indexed host, bytes32 name, uint32 prefix)";
+/// @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)";
 
-/// @notice Emitted when an asset is registered or updated on a host.
-abstract contract AssetEvent is EventEmitter {
-    /// @param host Host node ID that registered the asset.
-    /// @param name Asset name encoded as a bytes32 string.
-    /// @param prefix 4-byte type prefix of the asset ID.
-    event Asset(uint indexed host, bytes32 name, uint32 prefix);
+    /// @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);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Balance.sol

@@ -3,10 +3,10 @@ pragma solidity ^0.8.33;
 
 import { EventEmitter } from "./Emitter.sol";
 
-string constant ABI = "event Balance(bytes32 indexed account, bytes32 asset, bytes32 meta, uint balance, int change, uint access)";
-
 /// @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)";
+
     /// @param account Account identifier whose balance changed.
     /// @param asset Asset identifier.
     /// @param meta Asset metadata slot.

package/events/Collateral.sol

@@ -3,11 +3,11 @@ pragma solidity ^0.8.33;
 
 import { EventEmitter } from "./Emitter.sol";
 
-string constant ABI = "event Collateral(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint access)";
-
 /// @notice Emitted when an account's collateral position changes.
 /// Off-chain indexers should query the access command to retrieve the precise collateral details.
 abstract contract CollateralEvent is EventEmitter {
+    string private constant ABI = "event Collateral(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint access)";
+
     /// @param account Account identifier that holds the collateral.
     /// @param asset Asset identifier of the collateral.
     /// @param meta Asset metadata slot.

package/events/Command.sol

@@ -3,11 +3,11 @@ pragma solidity ^0.8.33;
 
 import { EventEmitter } from "./Emitter.sol";
 
-string constant ABI =
-    "event Command(uint indexed host, uint id, string name, bytes32 shape, string request, bytes4 state, bytes4 output, bool acceptsValue)";
-
 /// @notice Emitted once per command during host deployment to publish its request schema and state keys.
 abstract contract CommandEvent is EventEmitter {
+    string private constant ABI =
+        "event Command(uint indexed host, uint id, string name, bytes32 shape, string request, bytes4 state, bytes4 output, bool acceptsValue)";
+
     /// @param host Host node ID that owns this command.
     /// @param id Command node ID.
     /// @param name Human-readable command name.

package/events/Contexts.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+/// @notice Standard context codes for generic asset activity events.
+library Contexts {
+    uint constant Deposit = 1;
+    uint constant Withdraw = 2;
+    uint constant Fee = 3;
+    uint constant Mint = 4;
+    uint constant Burn = 5;
+    uint constant Swap = 6;
+}

package/events/Debt.sol

@@ -3,11 +3,11 @@ pragma solidity ^0.8.33;
 
 import { EventEmitter } from "./Emitter.sol";
 
-string constant ABI = "event Debt(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint mode, uint access)";
-
 /// @notice Emitted when an account's debt position changes.
 /// Off-chain indexers should query the access command to retrieve precise debt details.
 abstract contract DebtEvent is EventEmitter {
+    string private constant ABI = "event Debt(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint mode, uint access)";
+
     /// @param account Account identifier that holds the debt.
     /// @param asset Asset identifier of the debt.
     /// @param meta Asset metadata slot.

package/events/Introduction.sol

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import { EventEmitter } from "./Emitter.sol";
+
+/// @notice Emitted when a host introduces itself to another host.
+abstract contract IntroductionEvent is EventEmitter {
+    string private constant ABI = "event Introduction(uint indexed host, uint blocknum, uint16 version, string namespace)";
+
+    /// @param host Host node ID of the introducing contract.
+    /// @param blocknum Block number at which the host was deployed.
+    /// @param version Protocol version the host implements.
+    /// @param namespace Human-readable namespace string for the host.
+    event Introduction(uint indexed host, uint blocknum, uint16 version, string namespace);
+
+    constructor() {
+        emit EventAbi(ABI);
+    }
+}
+
+
+

package/events/Peer.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import { EventEmitter } from "./Emitter.sol";
-
-string constant ABI =
-    "event Peer(uint indexed host, uint id, string name, bytes32 shape, string request, string response, bool acceptsValue)";
+import {EventEmitter} from "./Emitter.sol";
 
 /// @notice Emitted once per peer during host deployment to publish its request and response schemas.
 abstract contract PeerEvent is EventEmitter {
+    string private constant ABI =
+        "event Peer(uint indexed host, uint id, string name, bytes32 shape, string request, string response, bool acceptsValue)";
+
     /// @param host Host node ID that owns this peer.
     /// @param id Peer node ID.
     /// @param name Human-readable peer name.
@@ -15,12 +15,17 @@ abstract contract PeerEvent is EventEmitter {
     /// @param request Schema DSL string describing the peer request shape.
     /// @param response Schema DSL string describing the peer response shape.
     /// @param acceptsValue Whether the peer entrypoint accepts nonzero `msg.value`.
-    event Peer(uint indexed host, uint id, string name, bytes32 shape, string request, string response, bool acceptsValue);
+    event Peer(
+        uint indexed host,
+        uint id,
+        string name,
+        bytes32 shape,
+        string request,
+        string response,
+        bool acceptsValue
+    );
 
     constructor() {
         emit EventAbi(ABI);
     }
 }
-
-
-

package/events/Position.sol

@@ -3,17 +3,17 @@ pragma solidity ^0.8.33;
 
 import {EventEmitter} from "./Emitter.sol";
 
-string constant ABI = "event AssetPosition(bytes32 indexed account, bytes32 asset, bytes32 meta, uint value, uint queryId)";
-
 /// @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 AssetPositionEvent is EventEmitter {
+abstract contract PositionEvent is EventEmitter {
+    string private constant ABI = "event Position(bytes32 indexed account, bytes32 asset, bytes32 meta, uint value, 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 queryId Query ID associated with the position lookup or reporting context.
-    event AssetPosition(bytes32 indexed account, bytes32 asset, bytes32 meta, uint value, uint queryId);
+    event Position(bytes32 indexed account, bytes32 asset, bytes32 meta, uint value, uint queryId);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Query.sol

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

package/events/Received.sol

@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+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, uint context)";
+
+    /// @param account Account identifier that received the asset.
+    /// @param asset Asset identifier.
+    /// @param meta Asset metadata slot.
+    /// @param amount Amount received.
+    /// @param context Operation context identifier associated with this receipt.
+    event Received(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint context);
+
+    constructor() {
+        emit EventAbi(ABI);
+    }
+}

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

@@ -3,14 +3,14 @@ pragma solidity ^0.8.33;
 
 import { EventEmitter } from "./Emitter.sol";
 
-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 PipedEvent is EventEmitter {
+abstract contract RootedEvent is EventEmitter {
+    string private constant ABI = "event Rooted(bytes32 indexed account, uint deadline, uint value)";
+
     /// @param account Account identifier associated with the action.
     /// @param deadline Expiry timestamp of the action.
     /// @param value Native value associated with the action.
-    event Piped(bytes32 indexed account, uint deadline, uint value);
+    event Rooted(bytes32 indexed account, uint deadline, uint value);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Spent.sol

@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+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, uint context)";
+
+    /// @param account Account identifier that spent the asset.
+    /// @param asset Asset identifier.
+    /// @param meta Asset metadata slot.
+    /// @param amount Amount spent.
+    /// @param context Operation context identifier associated with this spend.
+    event Spent(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint context);
+
+    constructor() {
+        emit EventAbi(ABI);
+    }
+}

package/package.json

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

package/peer/Pipe.sol

@@ -9,26 +9,26 @@ import {Budget} from "../utils/Value.sol";
 using Cursors for Cur;
 
 /// @title PeerPipePayable
-/// @notice Peer that consumes CONTEXT blocks and executes each context request as a STEP stream.
-/// Each CONTEXT block carries an account, state, and request; the request is passed to the
-/// shared pipeline as the step stream.
+/// @notice Peer that consumes PIPE blocks and executes each context request as a STEP stream.
+/// Each PIPE block carries a value budget plus a CONTEXT block; the nested
+/// context request is passed to the shared pipeline as the step stream.
 abstract contract PeerPipePayable is PeerBase, Pipeline {
     string private constant NAME = "peerPipePayable";
     uint internal immutable peerPipePayableId = peerId(NAME);
 
     constructor() {
-        emit Peer(host, peerPipePayableId, NAME, "1:0", Schemas.Context, "", true);
+        emit Peer(host, peerPipePayableId, NAME, "1:0", Schemas.Pipe, "", true);
     }
 
-    /// @notice Execute peer-supplied contexts through the shared payable pipe.
-    /// @dev Each context receives its own explicit value sub-budget. Any top-level
-    ///      `msg.value` not assigned to a context remains on this host.
+    /// @notice Execute peer-supplied pipes through the shared payable pipe.
+    /// @dev Each pipe receives its own explicit value sub-budget. Any top-level
+    ///      `msg.value` not assigned to a pipe remains on this host.
     function peerPipePayable(bytes calldata request) external payable onlyPeer returns (bytes memory) {
         (Cur memory input, ) = cursor(request, 1);
         Budget memory budget = valueBudget();
 
         while (input.i < input.bound) {
-            (bytes32 account, uint value, bytes calldata state, bytes calldata steps) = input.unpackContext();
+            (uint value, bytes32 account, bytes calldata state, bytes calldata steps) = input.unpackPipe();
             pipe(account, state, steps, allocateValue(budget, value));
         }
 

package/queries/Assets.sol

@@ -8,38 +8,38 @@ import {QueryBase} from "./Base.sol";
 using Cursors for Cur;
 using Writers for Writer;
 
-abstract contract IsAllowedAssetHook {
-    /// @notice Resolve whether one asset tuple is allowed.
-    /// Concrete implementations define the allowlist policy.
+abstract contract AssetStatusHook {
+    /// @notice Resolve support status for one asset tuple.
+    /// Concrete implementations define the support policy and optional context codes.
     /// @param asset Requested asset identifier.
     /// @param meta Requested asset metadata slot.
-    /// @return allowed Whether the asset tuple is allowed.
-    function isAllowedAsset(bytes32 asset, bytes32 meta) internal view virtual returns (bool allowed);
+    /// @return status Asset support status. Zero means unsupported; nonzero means supported.
+    function assetStatus(bytes32 asset, bytes32 meta) internal view virtual returns (uint status);
 }
 
-/// @title IsAllowedAsset
-/// @notice Rootzero query that checks whether one or more `(asset, meta)` tuples are allowed.
+/// @title AssetStatus
+/// @notice Rootzero query that checks support status for one or more `(asset, meta)` tuples.
 /// 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);
+abstract contract AssetStatus is QueryBase, AssetStatusHook {
+    string private constant NAME = "assetStatus";
+    uint public immutable assetStatusId = queryId(NAME);
 
     constructor() {
-        emit Query(host, isAllowedAssetId, NAME, "1:1", Schemas.Asset, Forms.Status);
+        emit Query(host, assetStatusId, NAME, "1:1", Schemas.Asset, Forms.Status);
     }
 
-    /// @notice Resolve allowlist status for a run of requested `(asset, meta)` tuples.
+    /// @notice Resolve asset support status for a run of requested `(asset, meta)` tuples.
     /// @param request Block-stream request consisting of `#asset { bytes32 asset, bytes32 meta }` blocks.
-    /// @return Block-stream response containing one `#status { bool ok }` per asset block.
-    function isAllowedAsset(bytes calldata request) external view returns (bytes memory) {
+    /// @return Block-stream response containing one `#status { uint code }` per asset block.
+    function assetStatus(bytes calldata request) external view returns (bytes memory) {
         (Cur memory query, uint groups) = cursor(request, 1);
         Writer memory response = Writers.allocStatuses(groups);
 
         while (query.i < query.bound) {
             (bytes32 asset, bytes32 meta) = query.unpackAsset();
-            bool allowed = isAllowedAsset(asset, meta);
-            response.appendStatus(allowed);
+            uint status = assetStatus(asset, meta);
+            response.appendStatus(status);
         }
 
         query.close();

package/utils/Assets.sol

@@ -17,6 +17,8 @@ import {matchesBase, toLocalBase} from "./Utils.sol";
 library Assets {
     /// @dev Thrown when an asset ID does not match the expected type or chain.
     error InvalidAsset();
+    /// @dev Thrown when an asset is not authorized for the requested operation.
+    error UnauthorizedAsset();
 
     /// @dev Full 4-byte type prefix for the native value asset.
     uint32 constant Value = (uint32(Layout.Evm32) << 16) | (uint32(Layout.Asset) << 8) | uint32(Layout.Value);

package/events/Deposit.sol

@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import { EventEmitter } from "./Emitter.sol";
-
-string constant ABI = "event Deposit(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount)";
-
-/// @notice Emitted when assets are deposited into an account.
-abstract contract DepositEvent is EventEmitter {
-    /// @param account Destination account identifier.
-    /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
-    /// @param amount Amount deposited.
-    event Deposit(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount);
-
-    constructor() {
-        emit EventAbi(ABI);
-    }
-}
-
-
-

package/events/Governed.sol

@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import { EventEmitter } from "./Emitter.sol";
-
-string constant ABI = "event Governed(uint indexed host, uint deadline, uint value)";
-
-/// @notice Emitted when a governance action is recorded on a host.
-abstract contract GovernedEvent is EventEmitter {
-    /// @param host Host node ID where the governance action occurred.
-    /// @param deadline Expiry timestamp of the governance action.
-    /// @param value Native value associated with the action.
-    event Governed(uint indexed host, uint deadline, uint value);
-
-    constructor() {
-        emit EventAbi(ABI);
-    }
-}
-
-
-

package/events/Host.sol

@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import { EventEmitter } from "./Emitter.sol";
-
-string constant ABI = "event HostAnnounced(uint indexed host, uint blocknum, uint16 version, string namespace)";
-
-/// @notice Emitted by the discovery contract when a host registers itself.
-abstract contract HostAnnouncedEvent is EventEmitter {
-    /// @param host Host node ID of the registering contract.
-    /// @param blocknum Block number at which the host was deployed.
-    /// @param version Protocol version the host implements.
-    /// @param namespace Human-readable namespace string for the host.
-    event HostAnnounced(uint indexed host, uint blocknum, uint16 version, string namespace);
-
-    constructor() {
-        emit EventAbi(ABI);
-    }
-}
-
-
-

package/events/Listing.sol

@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import { EventEmitter } from "./Emitter.sol";
-
-string constant ABI = "event Listing(uint indexed host, bytes32 asset, bytes32 meta, bool active)";
-
-/// @notice Emitted when an asset listing is updated on a host.
-abstract contract ListingEvent is EventEmitter {
-    /// @param host Host node ID that manages this listing.
-    /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
-    /// @param active True if the listing is currently active.
-    event Listing(uint indexed host, bytes32 asset, bytes32 meta, bool active);
-
-    constructor() {
-        emit EventAbi(ABI);
-    }
-}
-
-
-

package/events/Swap.sol

@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import { EventEmitter } from "./Emitter.sol";
-
-string constant ABI = "event Swap(bytes32 indexed account, bytes32 assetIn, uint amountIn, bytes32 assetOut, uint amountOut)";
-
-/// @notice Emitted when an account swaps one asset for another.
-abstract contract SwapEvent is EventEmitter {
-    /// @param account Account identifier performing the swap.
-    /// @param assetIn Input asset identifier.
-    /// @param amountIn Input amount spent.
-    /// @param assetOut Output asset identifier.
-    /// @param amountOut Output amount received.
-    event Swap(bytes32 indexed account, bytes32 assetIn, uint amountIn, bytes32 assetOut, uint amountOut);
-
-    constructor() {
-        emit EventAbi(ABI);
-    }
-}

package/events/Withdraw.sol

@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import { EventEmitter } from "./Emitter.sol";
-
-string constant ABI = "event Withdrawal(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount)";
-
-/// @notice Emitted when assets are withdrawn from an account.
-abstract contract WithdrawalEvent is EventEmitter {
-    /// @param account Source account identifier.
-    /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
-    /// @param amount Amount withdrawn.
-    event Withdrawal(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount);
-
-    constructor() {
-        emit EventAbi(ABI);
-    }
-}
-
-
-

package/interfaces/IHostDiscovery.sol

@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-/// @title IHostDiscovery
-/// @notice Interface implemented by a discovery registry that hosts announce themselves to.
-interface IHostDiscovery {
-    /// @notice Register or refresh a host entry in the discovery registry.
-    /// @param id Host node ID.
-    /// @param blocknum Block number at which the announcement was made.
-    /// @param version Protocol version the host is running.
-    /// @param namespace Human-readable namespace or label for the host.
-    function announceHost(uint id, uint blocknum, uint16 version, string calldata namespace) external;
-}
-
-
-