@rootzero/contracts 0.9.2 → 0.9.3

package/commands/Deposit.sol

@@ -41,14 +41,14 @@ abstract contract Deposit is CommandBase, DepositHook {
     uint internal immutable depositId = commandId(NAME);
 
     constructor() {
-        emit Command(host, depositId, NAME, Schemas.Amount, Keys.Empty, Keys.Balance, false);
+        emit Command(host, depositId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false);
     }
 
     function deposit(
         CommandContext calldata c
     ) external onlyCommand(c.account) returns (bytes memory) {
-        (Cur memory request, uint count, ) = cursor(c.request, 1);
-        Writer memory writer = Writers.allocBalances(count);
+        (Cur memory request, uint groups) = cursor(c.request, 1);
+        Writer memory writer = Writers.allocBalances(groups);
 
         while (request.i < request.bound) {
             (bytes32 asset, bytes32 meta, uint amount) = request.unpackAmount();
@@ -69,14 +69,14 @@ abstract contract DepositPayable is CommandPayable, DepositPayableHook {
     uint internal immutable depositPayableId = commandId(NAME);
 
     constructor() {
-        emit Command(host, depositPayableId, NAME, Schemas.Amount, Keys.Empty, Keys.Balance, true);
+        emit Command(host, depositPayableId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, true);
     }
 
     function depositPayable(
         CommandContext calldata c
     ) external payable onlyCommand(c.account) returns (bytes memory) {
-        (Cur memory request, uint count, ) = cursor(c.request, 1);
-        Writer memory writer = Writers.allocBalances(count);
+        (Cur memory request, uint groups) = cursor(c.request, 1);
+        Writer memory writer = Writers.allocBalances(groups);
         Budget memory budget = Values.fromMsg();
 
         while (request.i < request.bound) {

package/commands/Pipe.sol

@@ -38,7 +38,7 @@ abstract contract PipePayable is CommandPayable, PipePayableHook {
     uint internal immutable pipePayableId = commandId(NAME);
 
     constructor() {
-        emit Command(host, pipePayableId, NAME, Schemas.Step, Keys.Empty, Keys.Empty, true);
+        emit Command(host, pipePayableId, NAME, "1:0:0", Schemas.Step, Keys.Empty, Keys.Empty, true);
     }
 
     function pipe(
@@ -47,7 +47,7 @@ abstract contract PipePayable is CommandPayable, PipePayableHook {
         bytes calldata steps,
         Budget memory budget
     ) internal returns (bytes memory) {
-        (Cur memory input, , ) = cursor(steps, 1);
+        (Cur memory input, ) = cursor(steps, 1);
 
         while (input.i < input.bound) {
             (uint target, uint value, bytes calldata request) = input.unpackStep();

package/commands/Provision.sol

@@ -37,12 +37,12 @@ abstract contract Provision is CommandBase, ProvisionHook {
     uint internal immutable provisionId = commandId(NAME);
 
     constructor() {
-        emit Command(host, provisionId, NAME, Schemas.Allocation, Keys.Empty, Keys.Custody, false);
+        emit Command(host, provisionId, NAME, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, false);
     }
 
     function provision(CommandContext calldata c) external onlyCommand(c.account) returns (bytes memory) {
-        (Cur memory request, uint count, ) = cursor(c.request, 1);
-        Writer memory writer = Writers.allocCustodies(count);
+        (Cur memory request, uint groups) = cursor(c.request, 1);
+        Writer memory writer = Writers.allocCustodies(groups);
 
         while (request.i < request.bound) {
             HostAmount memory allocation = request.unpackAllocationValue();
@@ -64,14 +64,14 @@ abstract contract ProvisionPayable is CommandPayable, ProvisionPayableHook {
     uint internal immutable provisionPayableId = commandId(NAME);
 
     constructor() {
-        emit Command(host, provisionPayableId, NAME, Schemas.Allocation, Keys.Empty, Keys.Custody, true);
+        emit Command(host, provisionPayableId, NAME, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, true);
     }
 
     function provisionPayable(
         CommandContext calldata c
     ) external payable onlyCommand(c.account) returns (bytes memory) {
-        (Cur memory request, uint count, ) = cursor(c.request, 1);
-        Writer memory writer = Writers.allocCustodies(count);
+        (Cur memory request, uint groups) = cursor(c.request, 1);
+        Writer memory writer = Writers.allocCustodies(groups);
         Budget memory budget = Values.fromMsg();
 
         while (request.i < request.bound) {

package/commands/Transfer.sol

@@ -23,7 +23,7 @@ abstract contract Transfer is CommandBase, TransferHook {
     uint internal immutable transferId = commandId(NAME);
 
     constructor() {
-        emit Command(host, transferId, NAME, Schemas.Payout, Keys.Empty, Keys.Empty, false);
+        emit Command(host, transferId, NAME, "1:0:0", Schemas.Payout, Keys.Empty, Keys.Empty, false);
     }
 
     /// @notice Override to customize request parsing or batching for transfers.
@@ -32,7 +32,7 @@ abstract contract Transfer is CommandBase, TransferHook {
     /// @param request Full request bytes.
     /// @return Empty bytes (transfers produce no state output).
     function transfer(bytes32 from, bytes calldata request) internal virtual returns (bytes memory) {
-        (Cur memory input, , ) = cursor(request, 1);
+        (Cur memory input, ) = cursor(request, 1);
         Tx memory value;
         value.from = from;
 

package/commands/Withdraw.sol

@@ -21,17 +21,18 @@ abstract contract WithdrawHook {
 /// For internal balance credits, use `creditAccount` instead.
 abstract contract Withdraw is CommandBase, WithdrawHook {
     string private constant NAME = "withdraw";
+    string private constant REQUEST = string.concat(Schemas.Empty, ";", Schemas.Account, "?");
 
     uint internal immutable withdrawId = commandId(NAME);
 
     constructor() {
-        emit Command(host, withdrawId, NAME, Schemas.Account, Keys.Balance, Keys.Empty, false);
+        emit Command(host, withdrawId, NAME, "0:1:0", REQUEST, Keys.Balance, Keys.Empty, false);
     }
 
     function withdraw(
         CommandContext calldata c
     ) external onlyCommand(c.account) returns (bytes memory) {
-        (Cur memory state, , ) = cursor(c.state, 1);
+        (Cur memory state, ) = cursor(c.state, 1);
         bytes32 to = Cursors.resolveAccount(c.request, c.account);
 
         while (state.i < state.bound) {

package/commands/admin/AllowAssets.sol

@@ -21,13 +21,13 @@ abstract contract AllowAssets is CommandBase, AdminEvent, AllowAssetsHook {
     uint internal immutable allowAssetsId = commandId(NAME);
 
     constructor() {
-        emit Admin(host, allowAssetsId, NAME, Schemas.Asset, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, allowAssetsId, NAME, "1:0:0", Schemas.Asset, Keys.Empty, Keys.Empty, false);
     }
 
     function allowAssets(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = cursor(c.request, 1);
+        (Cur memory request, ) = cursor(c.request, 1);
 
         while (request.i < request.bound) {
             (bytes32 asset, bytes32 meta) = request.unpackAsset();

package/commands/admin/Allowance.sol

@@ -26,11 +26,11 @@ abstract contract Allowance is CommandBase, AdminEvent, AllowanceHook {
     uint internal immutable allowanceId = commandId(NAME);
 
     constructor() {
-        emit Admin(host, allowanceId, NAME, Schemas.Allowance, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, allowanceId, NAME, "1:0:0", Schemas.Allowance, Keys.Empty, Keys.Empty, false);
     }
 
     function allowance(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = cursor(c.request, 1);
+        (Cur memory request, ) = cursor(c.request, 1);
 
         while (request.i < request.bound) {
             (uint peer, bytes32 asset, bytes32 meta, uint amount) = request.unpackAllowance();

package/commands/admin/Authorize.sol

@@ -16,13 +16,13 @@ abstract contract Authorize is CommandBase, AdminEvent {
     uint internal immutable authorizeId = commandId(NAME);
 
     constructor() {
-        emit Admin(host, authorizeId, NAME, Schemas.Node, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, authorizeId, NAME, "1:0:0", Schemas.Node, Keys.Empty, Keys.Empty, false);
     }
 
     function authorize(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = cursor(c.request, 1);
+        (Cur memory request, ) = cursor(c.request, 1);
 
         while (request.i < request.bound) {
             uint node = request.unpackNode();

package/commands/admin/DenyAssets.sol

@@ -21,13 +21,13 @@ abstract contract DenyAssets is CommandBase, AdminEvent, DenyAssetsHook {
     uint internal immutable denyAssetsId = commandId(NAME);
 
     constructor() {
-        emit Admin(host, denyAssetsId, NAME, Schemas.Asset, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, denyAssetsId, NAME, "1:0:0", Schemas.Asset, Keys.Empty, Keys.Empty, false);
     }
 
     function denyAssets(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = cursor(c.request, 1);
+        (Cur memory request, ) = cursor(c.request, 1);
 
         while (request.i < request.bound) {
             (bytes32 asset, bytes32 meta) = request.unpackAsset();

package/commands/admin/Destroy.sol

@@ -22,7 +22,7 @@ abstract contract Destroy is CommandBase, AdminEvent, DestroyHook {
     uint internal immutable destroyId = commandId(NAME);
 
     constructor(string memory input) {
-        emit Admin(host, destroyId, NAME, input, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, destroyId, NAME, "1:0:0", input, Keys.Empty, Keys.Empty, false);
     }
 
     function destroy(

package/commands/admin/Execute.sol

@@ -19,11 +19,11 @@ abstract contract ExecutePayable is CommandPayable, AdminEvent {
     uint internal immutable executePayableId = commandId(NAME);
 
     constructor() {
-        emit Admin(host, executePayableId, NAME, Schemas.Call, Keys.Empty, Keys.Empty, true);
+        emit Admin(host, executePayableId, NAME, "1:0:0", Schemas.Call, Keys.Empty, Keys.Empty, true);
     }
 
     function executePayable(CommandContext calldata c) external payable onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = cursor(c.request, 1);
+        (Cur memory request, ) = cursor(c.request, 1);
         Budget memory budget = Values.fromMsg();
 
         while (request.i < request.bound) {

package/commands/admin/Init.sol

@@ -22,7 +22,7 @@ abstract contract Init is CommandBase, AdminEvent, InitHook {
     uint internal immutable initId = commandId(NAME);
 
     constructor(string memory input) {
-        emit Admin(host, initId, NAME, input, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, initId, NAME, "1:0:0", input, Keys.Empty, Keys.Empty, false);
     }
 
     function init(

package/commands/admin/Unauthorize.sol

@@ -16,13 +16,13 @@ abstract contract Unauthorize is CommandBase, AdminEvent {
     uint internal immutable unauthorizeId = commandId(NAME);
 
     constructor() {
-        emit Admin(host, unauthorizeId, NAME, Schemas.Node, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, unauthorizeId, NAME, "1:0:0", Schemas.Node, Keys.Empty, Keys.Empty, false);
     }
 
     function unauthorize(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, , ) = cursor(c.request, 1);
+        (Cur memory request, ) = cursor(c.request, 1);
 
         while (request.i < request.bound) {
             uint node = request.unpackNode();

package/core/Context.sol

@@ -27,23 +27,22 @@ abstract contract RootZeroContext {
     /// @param source Calldata slice to parse.
     /// @param group Expected block group size (e.g. 1 for single, 2 for paired).
     /// @return cur Cursor with `bound` set to the end of the first run.
-    /// @return count Total number of blocks in the run (a multiple of `group`).
-    /// @return quotient Number of groups in the run (`count / group`).
-    function cursor(bytes calldata source, uint group) internal pure returns (Cur memory cur, uint count, uint quotient) {
+    /// @return groups Number of block groups in the run (`prime block count / group`).
+    function cursor(bytes calldata source, uint group) internal pure returns (Cur memory cur, uint groups) {
         cur = Cursors.open(source);
-        (, count, quotient) = cur.primeRun(group);
+        (, , groups) = cur.primeRun(group);
     }
 
-    /// @notice Open a cursor, prime it, and assert that its normalized quotient matches `expectedQuotient`.
-    /// Equivalent to `open(source)` followed by `primeRun(group)` and a direct quotient equality check.
-    /// Reverts with `Cursors.BadRatio` when the quotient does not match.
+    /// @notice Open a cursor, prime it, and assert that its group count matches `expectedGroups`.
+    /// Equivalent to `open(source)` followed by `primeRun(group)` and a direct group-count equality check.
+    /// Reverts with `Cursors.BadRatio` when the group count does not match.
     /// @param source Calldata slice to parse.
     /// @param group Expected block group size (e.g. 1 for single, 2 for paired).
-    /// @param expectedQuotient Required number of groups in the first run.
+    /// @param expectedGroups Required number of groups in the first run.
     /// @return cur Cursor with `bound` set to the end of the first run.
-    function cursor(bytes calldata source, uint group, uint expectedQuotient) internal pure returns (Cur memory cur) {
+    function cursor(bytes calldata source, uint group, uint expectedGroups) internal pure returns (Cur memory cur) {
         cur = Cursors.open(source);
-        (, , uint quotient) = cur.primeRun(group);
-        if (quotient != expectedQuotient) revert Cursors.BadRatio();
+        (, , uint groups) = cur.primeRun(group);
+        if (groups != expectedGroups) revert Cursors.BadRatio();
     }
 }

package/events/Admin.sol

@@ -4,13 +4,16 @@ pragma solidity ^0.8.33;
 import { EventEmitter } from "./Emitter.sol";
 
 string constant ABI =
-    "event Admin(uint indexed host, uint id, string name, string request, bytes4 state, bytes4 output, bool acceptsValue)";
+    "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 {
     /// @param host Host node ID that owns this admin command.
     /// @param id Command node ID.
     /// @param name Human-readable command name.
+    /// @param shape Per-operation prime block counts encoded as `request:state:output`.
+    /// Blocks outside the prime runs are global batch blocks and are excluded
+    /// from the counts.
     /// @param request Schema DSL string describing the request shape.
     /// @param state Block key expected for input state, or `Keys.Empty`.
     /// @param output Block key produced for output state, or `Keys.Empty`.
@@ -19,6 +22,7 @@ abstract contract AdminEvent is EventEmitter {
         uint indexed host,
         uint id,
         string name,
+        bytes32 shape,
         string request,
         bytes4 state,
         bytes4 output,

package/events/Command.sol

@@ -4,14 +4,18 @@ pragma solidity ^0.8.33;
 import { EventEmitter } from "./Emitter.sol";
 
 string constant ABI =
-    "event Command(uint indexed host, uint id, string name, string request, bytes4 state, bytes4 output, bool acceptsValue)";
+    "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 {
     /// @param host Host node ID that owns this command.
     /// @param id Command node ID.
     /// @param name Human-readable command name.
-    /// @param request Schema DSL string describing the request shape.
+    /// @param shape Per-operation prime block counts encoded as `request:state:output`.
+    /// Blocks outside the prime runs are global batch blocks and are excluded
+    /// from the counts.
+    /// @param request Schema DSL string describing the request shape; use `empty;...`
+    /// when the request has global blocks but no prime blocks.
     /// @param state Block key expected for input state, or `Keys.Empty`.
     /// @param output Block key produced for output state, or `Keys.Empty`.
     /// @param acceptsValue Whether the command entrypoint accepts nonzero `msg.value`.
@@ -19,6 +23,7 @@ abstract contract CommandEvent is EventEmitter {
         uint indexed host,
         uint id,
         string name,
+        bytes32 shape,
         string request,
         bytes4 state,
         bytes4 output,

package/events/Listing.sol

@@ -3,16 +3,15 @@ pragma solidity ^0.8.33;
 
 import { EventEmitter } from "./Emitter.sol";
 
-string constant ABI = "event Listing(uint indexed host, bytes32 asset, bytes32 meta, bool active, bool created)";
+string constant ABI = "event Listing(uint indexed host, bytes32 asset, bytes32 meta, bool active)";
 
-/// @notice Emitted when an asset listing is created or updated on a host.
+/// @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.
-    /// @param created True if the asset was created as part of this listing.
-    event Listing(uint indexed host, bytes32 asset, bytes32 meta, bool active, bool created);
+    event Listing(uint indexed host, bytes32 asset, bytes32 meta, bool active);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Peer.sol

@@ -4,16 +4,18 @@ pragma solidity ^0.8.33;
 import { EventEmitter } from "./Emitter.sol";
 
 string constant ABI =
-    "event Peer(uint indexed host, uint id, string name, string request, bool acceptsValue)";
+    "event Peer(uint indexed host, uint id, string name, bytes32 shape, string request, string response, bool acceptsValue)";
 
-/// @notice Emitted once per peer during host deployment to publish its request schema.
+/// @notice Emitted once per peer during host deployment to publish its request and response schemas.
 abstract contract PeerEvent is EventEmitter {
     /// @param host Host node ID that owns this peer.
     /// @param id Peer node ID.
     /// @param name Human-readable peer name.
+    /// @param shape Prime block counts as `request:response`; global blocks are excluded.
     /// @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, string request, 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/Query.sol

@@ -3,16 +3,19 @@ pragma solidity ^0.8.33;
 
 import {EventEmitter} from "./Emitter.sol";
 
-string constant ABI = "event Query(uint indexed host, uint id, string name, string request, string response)";
+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 {
     /// @param host Host node ID that owns this query.
     /// @param id Query node ID.
     /// @param name Human-readable query name.
+    /// @param shape Per-operation prime block counts encoded as `request:response`.
+    /// Blocks outside the prime runs are global batch blocks and are excluded
+    /// from the counts.
     /// @param request Schema DSL string describing the query request shape.
     /// @param response Schema DSL string describing the query response shape.
-    event Query(uint indexed host, uint id, string name, string request, string response);
+    event Query(uint indexed host, uint id, string name, bytes32 shape, string request, string response);
 
     constructor() {
         emit EventAbi(ABI);

package/package.json

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

package/peer/AllowAssets.sol

@@ -15,12 +15,12 @@ abstract contract PeerAllowAssets is PeerBase, AllowAssetsHook {
     uint internal immutable peerAllowAssetsId = peerId(NAME);
 
     constructor() {
-        emit Peer(host, peerAllowAssetsId, NAME, Schemas.Asset, false);
+        emit Peer(host, peerAllowAssetsId, NAME, "1:0", Schemas.Asset, "", false);
     }
 
     /// @notice Execute the allow-assets peer call.
     function peerAllowAssets(bytes calldata request) external onlyPeer returns (bytes memory) {
-        (Cur memory assets, , ) = cursor(request, 1);
+        (Cur memory assets, ) = cursor(request, 1);
 
         while (assets.i < assets.bound) {
             (bytes32 asset, bytes32 meta) = assets.unpackAsset();

package/peer/Allowance.sol

@@ -16,12 +16,12 @@ abstract contract PeerAllowance is PeerBase, AllowanceHook {
     uint internal immutable peerAllowanceId = peerId(NAME);
 
     constructor() {
-        emit Peer(host, peerAllowanceId, NAME, Schemas.Amount, false);
+        emit Peer(host, peerAllowanceId, NAME, "1:0", Schemas.Amount, "", false);
     }
 
     /// @notice Execute the allowance peer call.
     function peerAllowance(bytes calldata request) external onlyPeer returns (bytes memory) {
-        (Cur memory amounts, , ) = cursor(request, 1);
+        (Cur memory amounts, ) = cursor(request, 1);
         uint peer = caller();
 
         while (amounts.i < amounts.bound) {

package/peer/BalancePull.sol

@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import {PeerBase} from "./Base.sol";
+import {Cursors, Cur, Schemas} from "../Cursors.sol";
+
+using Cursors for Cur;
+
+abstract contract BalancePullHook {
+    /// @notice Override to process one incoming balance-based pull request from a peer host.
+    /// @param peer Peer host node ID for this request.
+    /// @param asset Requested asset identifier.
+    /// @param meta Requested asset metadata slot.
+    /// @param amount Requested amount in the asset's native units.
+    function balancePull(uint peer, bytes32 asset, bytes32 meta, uint amount) internal virtual;
+}
+
+/// @title PeerBalancePull
+/// @notice Peer that pulls requested balances from a peer host into this one.
+/// Each BALANCE block in the request calls `balancePull(peer, asset, meta, amount)`.
+/// Restricted to trusted peers.
+abstract contract PeerBalancePull is PeerBase, BalancePullHook {
+    string private constant NAME = "peerBalancePull";
+    uint internal immutable peerBalancePullId = peerId(NAME);
+
+    constructor() {
+        emit Peer(host, peerBalancePullId, NAME, "1:0", Schemas.Balance, "", false);
+    }
+
+    /// @notice Execute the balance-pull peer call.
+    function peerBalancePull(bytes calldata request) external onlyPeer returns (bytes memory) {
+        (Cur memory input, ) = cursor(request, 1);
+        uint peer = caller();
+
+        while (input.i < input.bound) {
+            (bytes32 asset, bytes32 meta, uint amount) = input.unpackBalance();
+            balancePull(peer, asset, meta, amount);
+        }
+
+        input.complete();
+        return "";
+    }
+}

package/peer/DenyAssets.sol

@@ -15,12 +15,12 @@ abstract contract PeerDenyAssets is PeerBase, DenyAssetsHook {
     uint internal immutable peerDenyAssetsId = peerId(NAME);
 
     constructor() {
-        emit Peer(host, peerDenyAssetsId, NAME, Schemas.Asset, false);
+        emit Peer(host, peerDenyAssetsId, NAME, "1:0", Schemas.Asset, "", false);
     }
 
     /// @notice Execute the deny-assets peer call.
     function peerDenyAssets(bytes calldata request) external onlyPeer returns (bytes memory) {
-        (Cur memory assets, , ) = cursor(request, 1);
+        (Cur memory assets, ) = cursor(request, 1);
 
         while (assets.i < assets.bound) {
             (bytes32 asset, bytes32 meta) = assets.unpackAsset();

package/peer/Settle.sol

@@ -15,12 +15,12 @@ abstract contract PeerSettle is PeerBase, TransferHook {
     uint internal immutable peerSettleId = peerId(NAME);
 
     constructor() {
-        emit Peer(host, peerSettleId, NAME, Schemas.Transaction, false);
+        emit Peer(host, peerSettleId, NAME, "1:0", Schemas.Transaction, "", false);
     }
 
     /// @notice Execute the peer-settle call.
     function peerSettle(bytes calldata request) external onlyPeer returns (bytes memory) {
-        (Cur memory state, , ) = cursor(request, 1);
+        (Cur memory state, ) = cursor(request, 1);
 
         while (state.i < state.bound) {
             transfer(state.unpackTxValue());

package/queries/Assets.sol

@@ -26,15 +26,15 @@ abstract contract IsAllowedAsset is QueryBase, IsAllowedAssetHook {
     uint public immutable isAllowedAssetId = queryId(NAME);
 
     constructor() {
-        emit Query(host, isAllowedAssetId, NAME, Schemas.Asset, Forms.Status);
+        emit Query(host, isAllowedAssetId, NAME, "1:1", Schemas.Asset, Forms.Status);
     }
 
     /// @notice Resolve allowlist status for a run of requested `(asset, meta)` tuples.
     /// @param request Block-stream request consisting of `asset(asset, meta)*`.
     /// @return Block-stream response containing one `status(ok)` per asset block.
     function isAllowedAsset(bytes calldata request) external view returns (bytes memory) {
-        (Cur memory query, uint count, ) = cursor(request, 1);
-        Writer memory response = Writers.allocStatuses(count);
+        (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();

package/queries/Balances.sol

@@ -26,15 +26,15 @@ abstract contract GetBalances is QueryBase, GetBalancesHook {
     uint public immutable getBalancesId = queryId(NAME);
 
     constructor() {
-        emit Query(host, getBalancesId, NAME, Forms.AccountAsset, Forms.AccountAmount);
+        emit Query(host, getBalancesId, NAME, "1:1", Forms.AccountAsset, Forms.AccountAmount);
     }
 
     /// @notice Resolve balances for a run of requested `(account, asset, meta)` tuples.
     /// @param request Block-stream request consisting of `accountAsset(account, asset, meta)*`.
     /// @return Block-stream response containing one `accountAmount(account, asset, meta, amount)` block per request block.
     function getBalances(bytes calldata request) external view returns (bytes memory) {
-        (Cur memory query, uint count, ) = cursor(request, 1);
-        Writer memory response = Writers.allocAccountAmounts(count);
+        (Cur memory query, uint groups) = cursor(request, 1);
+        Writer memory response = Writers.allocAccountAmounts(groups);
 
         while (query.i < query.bound) {
             (bytes32 account, bytes32 asset, bytes32 meta) = query.unpackAccountAsset();

package/queries/Positions.sol

@@ -34,7 +34,7 @@ abstract contract GetPosition is QueryBase, GetPositionHook {
 
     constructor(string memory output, uint responseSize) {
         positionResponseSize = responseSize;
-        emit Query(host, getPositionId, NAME, Forms.AccountAsset, output);
+        emit Query(host, getPositionId, NAME, "1:1", Forms.AccountAsset, output);
     }
 
     /// @notice Resolve positions for a run of requested `(account, asset, meta)` tuples.
@@ -43,8 +43,8 @@ abstract contract GetPosition is QueryBase, GetPositionHook {
     /// @param request Block-stream request consisting of `accountAsset(account, asset, meta)*`.
     /// @return Block-stream response containing one `response(bytes data)` block per position block.
     function getPosition(bytes calldata request) external view returns (bytes memory) {
-        (Cur memory query, uint count, ) = cursor(request, 1);
-        Writer memory response = Writers.allocBytes(count, positionResponseSize);
+        (Cur memory query, uint groups) = cursor(request, 1);
+        Writer memory response = Writers.allocBytes(groups, positionResponseSize);
 
         while (query.i < query.bound) {
             (bytes32 account, bytes32 asset, bytes32 meta) = query.unpackAccountAsset();

package/peer/AssetPull.sol

@@ -1,43 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import {PeerBase} from "./Base.sol";
-import {Cursors, Cur, Schemas} from "../Cursors.sol";
-
-using Cursors for Cur;
-
-abstract contract AssetPullHook {
-    /// @notice Override to process one incoming amount-based asset pull request from a peer host.
-    /// @param peer Peer host node ID for this request.
-    /// @param asset Requested asset identifier.
-    /// @param meta Requested asset metadata slot.
-    /// @param amount Requested amount in the asset's native units.
-    function assetPull(uint peer, bytes32 asset, bytes32 meta, uint amount) internal virtual;
-}
-
-/// @title PeerAssetPull
-/// @notice Peer that pulls requested asset amounts from a peer host into this one.
-/// Each AMOUNT block in the request calls `assetPull(peer, asset, meta, amount)`.
-/// Restricted to trusted peers.
-abstract contract PeerAssetPull is PeerBase, AssetPullHook {
-    string private constant NAME = "peerAssetPull";
-    uint internal immutable peerAssetPullId = peerId(NAME);
-
-    constructor() {
-        emit Peer(host, peerAssetPullId, NAME, Schemas.Amount, false);
-    }
-
-    /// @notice Execute the asset-pull peer call.
-    function peerAssetPull(bytes calldata request) external onlyPeer returns (bytes memory) {
-        (Cur memory assets, , ) = cursor(request, 1);
-        uint peer = caller();
-
-        while (assets.i < assets.bound) {
-            (bytes32 asset, bytes32 meta, uint amount) = assets.unpackAmount();
-            assetPull(peer, asset, meta, amount);
-        }
-
-        assets.complete();
-        return "";
-    }
-}