@rootzero/contracts 0.9.7 → 0.9.9

package/commands/Deposit.sol

@@ -42,22 +42,22 @@ abstract contract Deposit is CommandBase, DepositHook {
     uint internal immutable depositId = commandId(NAME);
 
     constructor() {
-        emit Command(host, depositId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false);
+        emit Command(host, depositId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false, false);
     }
 
     function deposit(
         CommandContext calldata c
     ) external onlyCommand returns (bytes memory) {
-        (Cur memory request, uint groups) = cursor(c.request, 1);
+        (Cur memory request, uint groups) = Cursors.first(c.request, 1);
         Writer memory writer = Writers.allocBalances(groups);
 
-        while (request.i < request.bound) {
+        while (request.i < request.len) {
             (bytes32 asset, bytes32 meta, uint amount) = request.unpackAmount();
             deposit(c.account, asset, meta, amount);
             writer.appendBalance(asset, meta, amount);
         }
 
-        request.close();
+        request.complete();
         return writer.finish();
     }
 }
@@ -71,24 +71,24 @@ abstract contract DepositPayable is CommandBase, Payable, DepositPayableHook {
     uint internal immutable depositPayableId = commandId(NAME);
 
     constructor() {
-        emit Command(host, depositPayableId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, true);
+        emit Command(host, depositPayableId, NAME, "1:0:1", Schemas.Amount, Keys.Empty, Keys.Balance, false, true);
     }
 
     function depositPayable(
         CommandContext calldata c
     ) external payable onlyCommand returns (bytes memory) {
-        (Cur memory request, uint groups) = cursor(c.request, 1);
+        (Cur memory request, uint groups) = Cursors.first(c.request, 1);
         Writer memory writer = Writers.allocBalances(groups);
         Budget memory budget = valueBudget();
 
-        while (request.i < request.bound) {
+        while (request.i < request.len) {
             (bytes32 asset, bytes32 meta, uint amount) = request.unpackAmount();
             deposit(c.account, asset, meta, amount, budget);
             writer.appendBalance(asset, meta, amount);
         }
 
         settleValue(c.account, budget);
-        request.close();
+        request.complete();
         return writer.finish();
     }
 }

package/commands/Payout.sol

@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import {CommandContext, CommandBase, Keys} from "./Base.sol";
+import {Cursors, Cur, Schemas} from "../Cursors.sol";
+
+using Cursors for Cur;
+
+abstract contract PayoutHook {
+    /// @notice Override to pay `amount` from `account` to `to`.
+    /// Called once per paired BALANCE state block and ACCOUNT request block.
+    /// @param account Source account identifier.
+    /// @param to Destination account identifier.
+    /// @param asset Asset identifier.
+    /// @param meta Asset metadata slot.
+    /// @param amount Amount to pay out.
+    function payout(bytes32 account, bytes32 to, bytes32 asset, bytes32 meta, uint amount) internal virtual;
+}
+
+/// @title Payout
+/// @notice Command that sinks BALANCE state blocks to matching ACCOUNT request blocks.
+/// Each BALANCE block is paired with one ACCOUNT block at the same position.
+abstract contract Payout is CommandBase, PayoutHook {
+    string private constant NAME = "payout";
+
+    uint internal immutable payoutId = commandId(NAME);
+
+    constructor() {
+        emit Command(host, payoutId, NAME, "1:1:0", Schemas.Account, Keys.Balance, Keys.Empty, false, false);
+    }
+
+    function payout(CommandContext calldata c) external onlyCommand returns (bytes memory) {
+        (Cur memory state, uint groups) = Cursors.first(c.state, 1);
+        Cur memory request = Cursors.first(c.request, 1, groups);
+
+        while (state.i < state.len) {
+            (bytes32 asset, bytes32 meta, uint amount) = state.unpackBalance();
+            bytes32 to = request.unpackAccount();
+            payout(c.account, to, asset, meta, amount);
+        }
+
+        state.complete();
+        return "";
+    }
+}

package/commands/Provision.sol

@@ -38,20 +38,20 @@ abstract contract Provision is CommandBase, ProvisionHook {
     uint internal immutable provisionId = commandId(NAME);
 
     constructor() {
-        emit Command(host, provisionId, NAME, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, false);
+        emit Command(host, provisionId, NAME, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, false, false);
     }
 
     function provision(CommandContext calldata c) external onlyCommand returns (bytes memory) {
-        (Cur memory request, uint groups) = cursor(c.request, 1);
+        (Cur memory request, uint groups) = Cursors.first(c.request, 1);
         Writer memory writer = Writers.allocCustodies(groups);
 
-        while (request.i < request.bound) {
+        while (request.i < request.len) {
             HostAmount memory allocation = request.unpackAllocationValue();
             provision(c.account, allocation);
             writer.appendCustody(allocation);
         }
 
-        request.close();
+        request.complete();
         return writer.finish();
     }
 }
@@ -66,24 +66,24 @@ abstract contract ProvisionPayable is CommandBase, Payable, ProvisionPayableHook
     uint internal immutable provisionPayableId = commandId(NAME);
 
     constructor() {
-        emit Command(host, provisionPayableId, NAME, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, true);
+        emit Command(host, provisionPayableId, NAME, "1:0:1", Schemas.Allocation, Keys.Empty, Keys.Custody, false, true);
     }
 
     function provisionPayable(
         CommandContext calldata c
     ) external payable onlyCommand returns (bytes memory) {
-        (Cur memory request, uint groups) = cursor(c.request, 1);
+        (Cur memory request, uint groups) = Cursors.first(c.request, 1);
         Writer memory writer = Writers.allocCustodies(groups);
         Budget memory budget = valueBudget();
 
-        while (request.i < request.bound) {
+        while (request.i < request.len) {
             HostAmount memory allocation = request.unpackAllocationValue();
             provision(c.account, allocation, budget);
             writer.appendCustody(allocation);
         }
 
         settleValue(c.account, budget);
-        request.close();
+        request.complete();
         return writer.finish();
     }
 }

package/commands/Withdraw.sol

@@ -2,13 +2,13 @@
 pragma solidity ^0.8.33;
 
 import { CommandContext, CommandBase, Keys } from "./Base.sol";
-import { Cursors, Cur, Schemas } from "../Cursors.sol";
+import { Cursors, Cur } from "../Cursors.sol";
 using Cursors for Cur;
 
 abstract contract WithdrawHook {
     /// @notice Override to send funds to `account`.
     /// Called once per BALANCE block in state.
-    /// @param account Destination account identifier (resolved from ACCOUNT block or caller).
+    /// @param account Destination account identifier.
     /// @param asset Asset identifier.
     /// @param meta Asset metadata slot.
     /// @param amount Amount to deliver.
@@ -21,26 +21,24 @@ 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.Unit, ", maybe ", Schemas.Account);
 
     uint internal immutable withdrawId = commandId(NAME);
 
     constructor() {
-        emit Command(host, withdrawId, NAME, "0:1:0", REQUEST, Keys.Balance, Keys.Empty, false);
+        emit Command(host, withdrawId, NAME, "0:1:0", "", Keys.Balance, Keys.Empty, false, false);
     }
 
     function withdraw(
         CommandContext calldata c
     ) external onlyCommand returns (bytes memory) {
-        (Cur memory state, ) = cursor(c.state, 1);
-        bytes32 to = Cursors.resolveAccount(c.request, c.account);
+        (Cur memory state, ) = Cursors.first(c.state, 1);
 
-        while (state.i < state.bound) {
+        while (state.i < state.len) {
             (bytes32 asset, bytes32 meta, uint amount) = state.unpackBalance();
-            withdraw(to, asset, meta, amount);
+            withdraw(c.account, asset, meta, amount);
         }
 
-        state.close();
+        state.complete();
         return "";
     }
 }

package/commands/admin/AllowAssets.sol

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

package/commands/admin/Allowance.sol

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

package/commands/admin/Appoint.sol

@@ -16,20 +16,20 @@ abstract contract Appoint is CommandBase, AdminEvent {
     uint internal immutable appointId = commandId(NAME);
 
     constructor() {
-        emit Admin(host, appointId, NAME, "1:0:0", Schemas.Account, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, appointId, NAME, "1:0:0", Schemas.Account, Keys.Empty, Keys.Empty, false, false);
     }
 
     function appoint(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, ) = cursor(c.request, 1);
+        (Cur memory request, ) = Cursors.first(c.request, 1);
 
-        while (request.i < request.bound) {
+        while (request.i < request.len) {
             bytes32 account = request.unpackAccount();
             setGuardian(account, true);
         }
 
-        request.close();
+        request.complete();
         return "";
     }
 }

package/commands/admin/Authorize.sol

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

package/commands/admin/DenyAssets.sol

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

package/commands/admin/Destroy.sol

@@ -22,13 +22,13 @@ abstract contract Destroy is CommandBase, AdminEvent, DestroyHook {
     uint internal immutable destroyId = commandId(NAME);
 
     constructor(string memory input) {
-        emit Admin(host, destroyId, NAME, "1:0:0", input, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, destroyId, NAME, "1:0:0", input, Keys.Empty, Keys.Empty, false, false);
     }
 
     function destroy(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        Cur memory input = cursor(c.request);
+        Cur memory input = Cursors.open(c.request);
         destroy(input);
         return "";
     }

package/commands/admin/Dismiss.sol

@@ -16,20 +16,20 @@ abstract contract Dismiss is CommandBase, AdminEvent {
     uint internal immutable dismissId = commandId(NAME);
 
     constructor() {
-        emit Admin(host, dismissId, NAME, "1:0:0", Schemas.Account, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, dismissId, NAME, "1:0:0", Schemas.Account, Keys.Empty, Keys.Empty, false, false);
     }
 
     function dismiss(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, ) = cursor(c.request, 1);
+        (Cur memory request, ) = Cursors.first(c.request, 1);
 
-        while (request.i < request.bound) {
+        while (request.i < request.len) {
             bytes32 account = request.unpackAccount();
             setGuardian(account, false);
         }
 
-        request.close();
+        request.complete();
         return "";
     }
 }

package/commands/admin/Execute.sol

@@ -20,20 +20,20 @@ abstract contract ExecutePayable is CommandBase, Payable, AdminEvent {
     uint internal immutable executePayableId = commandId(NAME);
 
     constructor() {
-        emit Admin(host, executePayableId, NAME, "1:0:0", Schemas.Call, Keys.Empty, Keys.Empty, true);
+        emit Admin(host, executePayableId, NAME, "1:0:0", Schemas.Call, Keys.Empty, Keys.Empty, false, true);
     }
 
     function executePayable(CommandContext calldata c) external payable onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, ) = cursor(c.request, 1);
+        (Cur memory request, ) = Cursors.first(c.request, 1);
         Budget memory budget = valueBudget();
 
-        while (request.i < request.bound) {
+        while (request.i < request.len) {
             (uint target, uint value, bytes calldata data) = request.unpackCall();
             address addr = Ids.nodeAddr(target);
             callAddr(addr, useValue(budget, value), data);
         }
 
-        request.close();
+        request.complete();
         settleValue(c.account, budget);
         return "";
     }

package/commands/admin/Init.sol

@@ -22,13 +22,13 @@ abstract contract Init is CommandBase, AdminEvent, InitHook {
     uint internal immutable initId = commandId(NAME);
 
     constructor(string memory input) {
-        emit Admin(host, initId, NAME, "1:0:0", input, Keys.Empty, Keys.Empty, false);
+        emit Admin(host, initId, NAME, "1:0:0", input, Keys.Empty, Keys.Empty, false, false);
     }
 
     function init(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        Cur memory input = cursor(c.request);
+        Cur memory input = Cursors.open(c.request);
         init(input);
         return "";
     }

package/commands/admin/Unauthorize.sol

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

package/core/Access.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import {NodeEvent} from "../events/Node.sol";
 import {GuardianEvent} from "../events/Guardian.sol";
-import {RootZeroContext} from "./Context.sol";
+import {Runtime} from "./Runtime.sol";
 import {Accounts} from "../utils/Accounts.sol";
 import {Ids} from "../utils/Ids.sol";
 import {addrOr} from "../utils/Utils.sol";
@@ -14,7 +14,7 @@ import {addrOr} from "../utils/Utils.sol";
 /// mapping of externally trusted node IDs. Inbound trust is host-based:
 /// trusted hosts, the commander, and this contract itself may interact
 /// with the host through the guarded command and peer entrypoints.
-abstract contract AccessControl is RootZeroContext, NodeEvent, GuardianEvent {
+abstract contract AccessControl is Runtime, NodeEvent, GuardianEvent {
     /// @dev Trusted commander address. All calls from this address are implicitly trusted.
     /// Defaults to `address(this)` when no external commander is provided.
     address internal immutable commander;

package/core/Host.sol

@@ -7,6 +7,7 @@ import {Authorize} from "../commands/admin/Authorize.sol";
 import {Dismiss} from "../commands/admin/Dismiss.sol";
 import {Unauthorize} from "../commands/admin/Unauthorize.sol";
 import {ExecutePayable} from "../commands/admin/Execute.sol";
+import {Revoke} from "../guards/Revoke.sol";
 import {IntroductionEvent} from "../events/Introduction.sol";
 import {Ids} from "../utils/Ids.sol";
 
@@ -23,10 +24,11 @@ interface IHostIntroduction {
 
 /// @title Host
 /// @notice Abstract base contract for rootzero host implementations.
-/// Inherits admin command support (authorize, unauthorize, executePayable) and
+/// Inherits admin command support (authorize, unauthorize, executePayable),
+/// guardian management, the default guardian revoke action, and
 /// optionally introduces itself to a commander host at deployment.
 /// Accepts native ETH payments via the `receive` function.
-abstract contract Host is Authorize, Unauthorize, Appoint, Dismiss, ExecutePayable, IntroductionEvent, IHostIntroduction {
+abstract contract Host is Authorize, Unauthorize, Revoke, Appoint, Dismiss, ExecutePayable, IntroductionEvent, IHostIntroduction {
     /// @param cmdr Commander address; passed to `AccessControl`.
     ///        If `cmdr` is a deployed contract, the host calls `introduce`
     ///        on it during construction.

package/core/Pipeline.sol

@@ -41,15 +41,15 @@ abstract contract Pipeline is Payable {
         bytes calldata steps,
         Budget memory budget
     ) internal {
-        (Cur memory input, ) = Cursors.init(steps, 1);
+        (Cur memory input, ) = Cursors.first(steps, 1);
 
-        while (input.i < input.bound) {
+        while (input.i < input.len) {
             (uint target, uint value, bytes calldata request) = input.unpackStep();
             state = dispatch(target, account, state, request, useValue(budget, value));
         }
 
         if (state.length != 0) revert UnexpectedState();
         settleValue(account, budget);
-        input.close();
+        input.complete();
     }
 }

package/core/Runtime.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import {Assets} from "../utils/Assets.sol";
+import {Ids} from "../utils/Ids.sol";
+
+/// @title Runtime
+/// @notice Shared runtime for host identity and native value identity.
+abstract contract Runtime {
+    /// @dev This contract's host node ID, set to `Ids.toHost(address(this))` at construction.
+    uint public immutable host = Ids.toHost(address(this));
+    /// @dev Asset ID for the native chain value (ETH), bound to the current chain at deployment.
+    bytes32 internal immutable valueAsset = Assets.toValue();
+}

package/core/Types.sol

@@ -21,7 +21,7 @@ struct AccountAsset {
     bytes32 meta;
 }
 
-/// @notice Account-scoped amount shape used by payout blocks and query responses.
+/// @notice Account-scoped amount shape for requests, responses, and reporting.
 struct AccountAmount {
     /// @dev Account identifier.
     bytes32 account;

package/docs/Schema.md

@@ -185,7 +185,6 @@ Common protocol schemas live in `contracts/blocks/Schema.sol`:
 #amount { bytes32 asset, bytes32 meta, uint amount }
 #balance { bytes32 asset, bytes32 meta, uint amount }
 #custody { uint host, bytes32 asset, bytes32 meta, uint amount }
-#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, #bytes as state, #bytes as request }

package/events/Admin.sol

@@ -6,18 +6,20 @@ import { EventEmitter } from "./Emitter.sol";
 /// @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)";
+        "event Admin(uint indexed host, uint id, string name, bytes32 shape, string request, bytes4 state, bytes4 output, bool checked, bool funded)";
 
     /// @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 shape Per-operation block counts encoded as `request:state:output`.
+    /// The request count covers only the input request run. If `checked` is true,
+    /// a constraint run follows the input run, or starts the request when `request`
+    /// is empty. State globals may follow the state run and are excluded.
+    /// @param request Schema DSL string describing the input request run, or empty if none.
     /// @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`.
+    /// @param checked Whether a constraint block run is expected to exist in the request.
+    /// @param funded Whether the command entrypoint accepts nonzero `msg.value`.
     event Admin(
         uint indexed host,
         uint id,
@@ -26,7 +28,8 @@ abstract contract AdminEvent is EventEmitter {
         string request,
         bytes4 state,
         bytes4 output,
-        bool acceptsValue
+        bool checked,
+        bool funded
     );
 
     constructor() {

package/events/Command.sol

@@ -6,18 +6,20 @@ import { EventEmitter } from "./Emitter.sol";
 /// @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)";
+        "event Command(uint indexed host, uint id, string name, bytes32 shape, string request, bytes4 state, bytes4 output, bool checked, bool funded)";
 
     /// @param host Host node ID that owns this 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 string describing the request shape.
+    /// @param shape Per-operation block counts encoded as `request:state:output`.
+    /// The request count covers only the input request run. If `checked` is true,
+    /// a constraint run follows the input run, or starts the request when `request`
+    /// is empty. State globals may follow the state run and are excluded.
+    /// @param request Schema string describing the input request run, or empty if none.
     /// @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`.
+    /// @param checked Whether a constraint block run is expected to exist in the request.
+    /// @param funded Whether the command entrypoint accepts nonzero `msg.value`.
     event Command(
         uint indexed host,
         uint id,
@@ -26,7 +28,8 @@ abstract contract CommandEvent is EventEmitter {
         string request,
         bytes4 state,
         bytes4 output,
-        bool acceptsValue
+        bool checked,
+        bool funded
     );
 
     constructor() {

package/events/Locked.sol

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