@rootzero/contracts 1.20.0 → 1.22.0

package/codec/Readers.sol

@@ -45,6 +45,45 @@ library Readers {
         return cur.i != cur.source.length;
     }
 
+    /// @notice Return whether the current block has `key` and an empty payload.
+    /// @param cur Reader inspected without advancing.
+    /// @param key Expected block key.
+    /// @return Whether a complete matching empty block header occurs at the current position.
+    function isEmpty(Reader memory cur, bytes4 key) internal pure returns (bool) {
+        bytes memory source = cur.source;
+        uint i = cur.i;
+        if (i > source.length || source.length - i < Sizes.Header) return false;
+
+        uint header;
+        assembly ("memory-safe") {
+            header := mload(add(add(source, 0x20), i))
+        }
+        return bytes4(uint32(header >> 224)) == key && uint32(header >> 192) == 0;
+    }
+
+    /// @notice Consume a matching empty block from the reader when present.
+    /// @param cur Reader advanced only when the matching block is empty.
+    /// @param key Expected block key.
+    /// @return Whether an empty block was consumed.
+    function tryConsumeEmpty(Reader memory cur, bytes4 key) internal pure returns (bool) {
+        bytes memory source = cur.source;
+        uint i = cur.i;
+        if (i > source.length || source.length - i < Sizes.Header) revert InvalidBlock();
+
+        bytes4 current;
+        uint len;
+        assembly ("memory-safe") {
+            let header := mload(add(add(source, 0x20), i))
+            current := header
+            len := and(shr(192, header), 0xffffffff)
+        }
+
+        if (len > source.length - i - Sizes.Header) revert InvalidBlock();
+        if (current != key || len != 0) return false;
+        cur.i += Sizes.Header;
+        return true;
+    }
+
     /// @notice Validate and consume the current block, advancing `cur.i` past it.
     /// @param cur Reader to advance.
     /// @param key Expected block key.

package/codec/Schema.sol

@@ -8,24 +8,34 @@ pragma solidity ^0.8.33;
 //
 // Schema:
 // - block aliases are published separately from payload schemas
-// - payload schemas are written as `{ fields }`
+// - payload schemas are `""` or a comma-separated item sequence; one optional
+//   pair of outer braces may wrap a non-empty sequence without changing meaning
 // - an empty schema string means the block has no structured payload
 // - commas separate siblings at every level
-// - braces define the current block payload body
+// - braces are presentation-only and do not change payload layout
 // - command inputs are a single run when the input schema is non-empty
 // - command state is a single active state run without trailing globals
 // - run items may repeat at top level for batching
-// - `maybe #x` marks an optional block item
-// - `many #x` emits one generic list block containing repeated `#x` items
-// - endpoint descriptor lanes are `[key bytes4][item bytes4]`; normal keys widen to `[key][0]`
-// - descriptor lanes for `many #x` use `[Keys.List][keyOfX]`; bare `[Keys.List][0]`
-//   is incomplete discovery metadata and should be rejected by tooling
-// - `portal` fields are routing identifiers, often destination host IDs
+// - every declared child block header is present when its parent is non-empty
+// - any block may use a zero-length payload as its empty form
+// - `maybe #x` hints that the onchain consumer accepts the empty form of `#x`
+//   when emptiness is not already intrinsic to the referenced block type
+// - `many #x` alongside other items emits one generic list block containing
+//   zero or more repeated `#x` items; the list header is always present
+// - a custom schema consisting of exactly one `many #x` item uses its custom
+//   key for the outer list block and contains repeated `#x` items directly,
+//   whether or not the item is wrapped in braces
+// - endpoint descriptor lanes identify their top-level block key directly
+// - `portal` fields identify destination portal hosts. By convention the value
+//   is the portal implementation's host ID; core passes it through unchanged
+//   and hooks may validate or resolve it for their transport
 // - `resources` fields are chain-specific resource words. A portal adapter
 //   interprets them for the destination runtime. EVM resources use the low
 //   128 bits as native value.
 // - dotted field names and aliases, e.g. `dst.portal` or `#bytes as dst.payload`,
 //   are offchain projection metadata only and do not change runtime encoding
+// - `at N` assigns an offchain presentation position to one sibling; explicit
+//   positions are reserved first and unannotated siblings retain relative order
 // - child blocks resolve by alias in the active schema context; unresolved aliases are invalid
 // - schema strings describe the payload body only; the `Block` event carries the alias
 // - items are encoded in declaration order
@@ -63,7 +73,6 @@ pragma solidity ^0.8.33;
 library Schemas {
     // Empty and reserved payloads
 
-    string constant Unit = "";
     string constant Bytes = "";
     string constant String = "";
     string constant List = "";
@@ -71,47 +80,47 @@ library Schemas {
 
     // One-word payloads
 
-    string constant Node = "{ uint id }";
-    string constant Account = "{ bytes32 account }";
-    string constant Asset = "{ bytes32 asset }";
-    string constant Status = "{ uint code }";
+    string constant Node = "uint node";
+    string constant Account = "bytes32 account";
+    string constant Asset = "bytes32 asset";
+    string constant Status = "uint code";
 
     // Two-word payloads
 
-    string constant Amount = "{ bytes32 asset, uint amount }";
-    string constant Balance = "{ bytes32 asset, uint amount }";
-    string constant AccountAsset = "{ bytes32 account, bytes32 asset }";
-    string constant HostAsset = "{ uint host, bytes32 asset }";
+    string constant Amount = "bytes32 asset, uint amount";
+    string constant Balance = "bytes32 asset, uint amount";
+    string constant AccountAsset = "bytes32 account, bytes32 asset";
+    string constant HostAsset = "uint host, bytes32 asset";
 
     // Three-word payloads
 
-    string constant Allocation = "{ uint host, bytes32 asset, uint amount }";
-    string constant Allowance = "{ uint host, bytes32 asset, uint amount }";
-    string constant Custody = "{ uint host, bytes32 asset, uint amount }";
-    string constant AccountAmount = "{ bytes32 account, bytes32 asset, uint amount }";
-    string constant HostAmount = "{ uint host, bytes32 asset, uint amount }";
-    string constant HostAccountAsset = "{ uint host, bytes32 account, bytes32 asset }";
+    string constant Allocation = "uint host, bytes32 asset, uint amount";
+    string constant Allowance = "uint host, bytes32 asset, uint amount";
+    string constant Custody = "uint host, bytes32 asset, uint amount";
+    string constant AccountAmount = "bytes32 account, bytes32 asset, uint amount";
+    string constant HostAmount = "uint host, bytes32 asset, uint amount";
+    string constant HostAccountAsset = "uint host, bytes32 account, bytes32 asset";
 
     // Four-word payloads
 
-    string constant Position = "{ bytes32 asset, uint amount, bytes32 liability, uint debt }";
-    string constant Transaction = "{ bytes32 from, bytes32 to, bytes32 asset, uint amount }";
-    string constant HostAccountAmount = "{ uint host, bytes32 account, bytes32 asset, uint amount }";
+    string constant Position = "bytes32 asset, uint amount, bytes32 liability, uint debt";
+    string constant Transaction = "bytes32 from, bytes32 to, bytes32 asset, uint amount";
+    string constant HostAccountAmount = "uint host, bytes32 account, bytes32 asset, uint amount";
 
     // Composite payloads
 
-    string constant Call = "{ uint target, uint resources, #bytes as payload }";
-    string constant Step = "{ uint cmd, uint resources, #bytes as input }";
-    string constant Relay = "{ uint portal, uint resources, #bytes as input }";
-    string constant Dispatch = "{ uint portal, uint resources, #bytes as payload }";
-    string constant Context = "{ bytes32 account, #bytes as state, #bytes as input }";
-    string constant Recover = "{ uint handler, uint resources, bytes32 key, #bytes as witness }";
-    string constant Annotation = "{ uint entity, #bytes as data }";
+    string constant Call = "uint target, uint resources, #bytes as payload";
+    string constant Step = "uint cmd, uint resources, #bytes as input";
+    string constant Relay = "uint portal, uint resources, #bytes as input";
+    string constant Dispatch = "uint portal, uint resources, #bytes as payload";
+    string constant Context = "bytes32 account, #bytes as state, #bytes as input";
+    string constant Recover = "uint handler, uint resources, bytes32 key, #bytes as witness";
+    string constant Annotation = "uint entity, #bytes as data";
 
     // Annotation payloads
 
-    string constant Action = "{ uint action }";
-    string constant Label = "{ bytes32 namespace, #string as name }";
-    string constant Schema = "{ uint spec, #string as body, bytes32 name }";
+    string constant Action = "uint action";
+    string constant Label = "bytes32 namespace, #string as name";
+    string constant Schema = "uint spec, #string as body, bytes32 name";
 }
 

package/codec/Specs.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.33;
 
 import {Keys} from "./Keys.sol";
-import {max24, replace8, replace32} from "../utils/Utils.sol";
+import {max24, replace8} from "../utils/Utils.sol";
 
 /// @title Sizes
 /// @notice Total byte sizes for fixed-width block types, including the 8-byte header (4-byte key + 4-byte payloadLen).
@@ -39,15 +39,13 @@ library Sizes {
 
 /// @title Specs
 /// @notice Word-aligned block specifications encoded as
-/// `[key:4][min:4][max:4][hint:3][stride:1][container:4][reserved:12]`.
+/// `[key:4][min:4][max:4][hint:3][stride:1][reserved:16]`.
 /// The upper eight bytes of a fixed-layout spec are its encoded block header,
 /// allowing the entire spec word to be written directly as that header.
 /// A maximum of zero means unbounded and requires a growable writer.
 library Specs {
     /// @dev A payload is incompatible with its block specification.
     error InvalidSpec();
-    /// @dev A direct specification cannot contain a wrapper block.
-    error InvalidContainer();
     uint private constant SizeFields = (uint(1) << 192) | (uint(1) << 160) | (uint(1) << 136);
 
     // Reusable field shapes keep public specs readable while remaining valid
@@ -156,29 +154,20 @@ library Specs {
 
     /// @notice Return the canonical form of `spec` with implicit defaults resolved.
     /// @param spec Packed block specification.
-    /// @param direct Whether the specification must not contain a wrapper block.
     /// @dev A present spec with an encoded zero stride receives stride one;
     /// the empty spec remains unchanged.
     /// @return Canonical specification.
-    function normalize(uint spec, bool direct) internal pure returns (uint) {
-        if (direct && uint32(spec >> 96) != 0) revert InvalidContainer();
+    function normalize(uint spec) internal pure returns (uint) {
         if (stride(spec) == 0 && key(spec) != bytes4(0)) spec |= uint(1) << 128;
         return spec;
     }
 
-    /// @notice Return the effective outer block key and optional wrapped child key.
-    /// @dev A direct spec returns its own key as `outer` and a zero `child`.
+    /// @notice Return the canonical descriptor lane metadata for `spec`.
     /// @param spec Packed block specification.
-    /// @return outer Effective outer block key.
-    /// @return child Wrapped child key, or zero for a direct specification.
-    function keys(uint spec) internal pure returns (bytes4 outer, bytes4 child) {
-        child = key(spec);
-        outer = bytes4(uint32(spec >> 96));
-
-        if (outer == bytes4(0)) {
-            outer = child;
-            child = bytes4(0);
-        }
+    /// @return Packed `[key:4][stride:1]` lane metadata.
+    function lane(uint spec) internal pure returns (uint40) {
+        spec = normalize(spec);
+        return (uint40(uint32(key(spec))) << 8) | stride(spec);
     }
 
     /// @notice Return whether a payload size lies within a specification's bounds.
@@ -213,7 +202,7 @@ library Specs {
     /// @param groups Number of groups.
     /// @return Number of blocks across all groups.
     function count(uint spec, uint groups) internal pure returns (uint) {
-        return groups * stride(normalize(spec, false));
+        return groups * stride(normalize(spec));
     }
 
     /// @notice Return the buffer configuration for `groups` of `spec`.
@@ -227,13 +216,6 @@ library Specs {
         growable = uint32(spec >> 160) == 0;
     }
 
-    /// @notice Return `spec` annotated as a generic LIST item.
-    /// @param spec Child block specification.
-    /// @return Specification wrapped in a LIST container.
-    function many(uint spec) internal pure returns (uint) {
-        return replace32(spec, 96, uint32(key(List)));
-    }
-
     /// @notice Return `spec` grouped with an explicit stride.
     /// @param spec Packed block specification.
     /// @param n Number of blocks per group.

package/codec/Writers.sol

@@ -73,6 +73,14 @@ library Writers {
     // Append helpers
     // -------------------------------------------------------------------------
 
+    /// @notice Append an empty block.
+    /// @param writer Destination writer.
+    /// @param key Block key.
+    function appendEmpty(Writer memory writer, bytes4 key) internal pure {
+        uint i = reserve(writer, Sizes.Header);
+        Blocks.writeEmpty(writer.dst, i, key);
+    }
+
     /// @notice Append arbitrary bytes to the writer.
     /// @param writer Destination writer; `i` is advanced by `data.length`.
     /// @param data Bytes to append.

package/commands/Allocate.sol

@@ -24,7 +24,7 @@ abstract contract Allocate is CommandBase, AllocateHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("allocate", Specs.Balance, Specs.Node, Specs.Custody, 0, false, false);
+        (, descriptor) = command("allocate", Specs.Balance, Specs.Node, Specs.Custody, 0, 0);
     }
 
     /// @notice Allocate BALANCE state blocks to matching NODE input blocks.

package/commands/Base.sol

@@ -9,7 +9,7 @@ import {HostAmount, Position} from "../core/Types.sol";
 import {Execution, Executions, Lanes} from "../execution/Execution.sol";
 import {ReceivedEvent} from "../events/Received.sol";
 import {Actions} from "../utils/Actions.sol";
-import {Descriptors} from "../codec/Descriptors.sol";
+import {Descriptors, Flags} from "../codec/Descriptors.sol";
 import {Nodes} from "../utils/Nodes.sol";
 import {Cursors} from "../utils/Cursors.sol";
 
@@ -44,8 +44,7 @@ abstract contract CommandBase is CallerAccess, EndpointBase, ReceivedEvent {
     /// @param input Input block specification.
     /// @param output Output block specification.
     /// @param transactions Number of transaction blocks produced per batch, or zero for none.
-    /// @param funded Whether the command accepts nonzero native value.
-    /// @param admin Whether the command is restricted to the admin account.
+    /// @param flags Packed command behavior flags.
     /// @return id Command node ID.
     /// @return descriptor Packed endpoint lane metadata and flags.
     function command(
@@ -54,12 +53,8 @@ abstract contract CommandBase is CallerAccess, EndpointBase, ReceivedEvent {
         uint input,
         uint output,
         uint8 transactions,
-        bool funded,
-        bool admin
+        uint8 flags
     ) internal returns (uint id, uint descriptor) {
-        uint8 flags = 0;
-        if (funded) flags |= Descriptors.Funded;
-        if (admin) flags |= Descriptors.Admin;
         descriptor = Descriptors.create(state, input, output, transactions, flags);
         return command(name, descriptor);
     }

package/commands/Burn.sol

@@ -25,7 +25,7 @@ abstract contract Burn is CommandBase, BurnHook, Action {
 
     constructor() {
         uint id;
-        (id, descriptor) = command("burn", Specs.Balance, Specs.Empty, Specs.Empty, 0, false, false);
+        (id, descriptor) = command("burn", Specs.Balance, Specs.Empty, Specs.Empty, 0, 0);
         action(id, Actions.Burn);
     }
 

package/commands/Credit.sol

@@ -17,7 +17,7 @@ abstract contract CreditAccount is CommandBase, CreditAccountHook {
     uint private immutable id;
 
     constructor() {
-        (id, descriptor) = command("creditAccount", Specs.Balance, Specs.Empty, Specs.Empty, 0, false, false);
+        (id, descriptor) = command("creditAccount", Specs.Balance, Specs.Empty, Specs.Empty, 0, 0);
     }
 
     /// @notice Return the registered CREDIT_ACCOUNT command ID.

package/commands/Debit.sol

@@ -20,7 +20,7 @@ abstract contract DebitAccount is CommandBase, DebitAccountHook {
     uint private immutable id;
 
     constructor() {
-        (id, descriptor) = command("debitAccount", Specs.Empty, Specs.Amount, Specs.Balance, 0, false, false);
+        (id, descriptor) = command("debitAccount", Specs.Empty, Specs.Amount, Specs.Balance, 0, 0);
     }
 
     /// @notice Return the registered DEBIT_ACCOUNT command ID.

package/commands/Deposit.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import { Execution, Executions, CommandBase, Lanes, Specs } from "./Base.sol";
+import {Execution, Executions, CommandBase, Flags, Lanes, Specs} from "./Base.sol";
 import {Action} from "../annotations/Action.sol";
 import {Actions} from "../utils/Actions.sol";
 
@@ -39,7 +39,7 @@ abstract contract Deposit is CommandBase, DepositHook, Action {
 
     constructor() {
         uint id;
-        (id, descriptor) = command("deposit", Specs.Empty, Specs.Amount, Specs.Balance, 0, false, false);
+        (id, descriptor) = command("deposit", Specs.Empty, Specs.Amount, Specs.Balance, 0, 0);
         action(id, Actions.Deposit);
     }
 
@@ -72,7 +72,7 @@ abstract contract DepositPayable is CommandBase, DepositPayableHook, Action {
 
     constructor() {
         uint id;
-        (id, descriptor) = command("depositPayable", Specs.Empty, Specs.Amount, Specs.Balance, 0, true, false);
+        (id, descriptor) = command("depositPayable", Specs.Empty, Specs.Amount, Specs.Balance, 0, Flags.Funded);
         action(id, Actions.Deposit);
     }
 
@@ -96,10 +96,3 @@ abstract contract DepositPayable is CommandBase, DepositPayableHook, Action {
         return close(exec, account);
     }
 }
-
-
-
-
-
-
-

package/commands/Payout.sol

@@ -26,7 +26,7 @@ abstract contract Payout is CommandBase, PayoutHook, Action {
 
     constructor() {
         uint id;
-        (id, descriptor) = command("payout", Specs.Balance, Specs.Account, Specs.Empty, 0, false, false);
+        (id, descriptor) = command("payout", Specs.Balance, Specs.Account, Specs.Empty, 0, 0);
         action(id, Actions.Payout);
     }
 

package/commands/Provision.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {Execution, Executions, CommandBase, HostAmount, Lanes, Specs} from "./Base.sol";
+import {Execution, Executions, CommandBase, Flags, HostAmount, Lanes, Specs} from "./Base.sol";
 using Executions for Execution;
 
 /// @notice Shared provision hook used by `Provision`.
@@ -32,7 +32,7 @@ abstract contract Provision is CommandBase, ProvisionHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("provision", Specs.Empty, Specs.Allocation, Specs.Custody, 0, false, false);
+        (, descriptor) = command("provision", Specs.Empty, Specs.Allocation, Specs.Custody, 0, 0);
     }
 
     /// @notice Provision ALLOCATION input blocks and output matching CUSTODY state blocks.
@@ -64,7 +64,7 @@ abstract contract ProvisionPayable is CommandBase, ProvisionPayableHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("provisionPayable", Specs.Empty, Specs.Allocation, Specs.Custody, 0, true, false);
+        (, descriptor) = command("provisionPayable", Specs.Empty, Specs.Allocation, Specs.Custody, 0, Flags.Funded);
     }
 
     /// @notice Provision ALLOCATION input blocks with access to a mutable native-value budget.

package/commands/Recover.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {Execution, Executions, CommandBase, Lanes, Specs} from "./Base.sol";
+import {Execution, Executions, CommandBase, Flags, Lanes, Specs} from "./Base.sol";
 
 using Executions for Execution;
 
-/// @notice Hook implemented by hosts that recover previously undelivered payloads.
+/// @notice Hook implemented by hosts that recover previously unresolved payloads.
 abstract contract RecoverPayableHook {
     /// @notice Override to recover a witness through `handler`.
     /// @param handler Port that should attempt recovery.
@@ -31,7 +31,7 @@ abstract contract RecoverPayable is CommandBase, RecoverPayableHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("recoverPayable", Specs.Empty, Specs.Recover, Specs.Empty, 0, true, false);
+        (, descriptor) = command("recoverPayable", Specs.Empty, Specs.Recover, Specs.Empty, 0, Flags.Funded);
     }
 
     /// @notice Recover each recover block in the command input.

package/commands/Relay.sol

@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {Execution, Executions, CommandBase, Lanes, Specs} from "./Base.sol";
+import {Execution, Executions, CommandBase, Flags, Lanes, Specs} from "./Base.sol";
 
 using Executions for Execution;
 
 /// @notice Hook implemented by hosts that relay command contexts.
 abstract contract RelayPayableHook {
     /// @notice Override to relay a command context to `portal`.
-    /// @param portal Destination portal identifier, often the destination host ID.
+    /// @param portal Destination portal implementation's host ID. Implementations
+    /// may validate or resolve it for their transport.
     /// @param resources Chain-specific destination resources. EVM adapters
     /// may interpret this as packed execution gas and destination value.
     /// @param account Destination command account.
@@ -32,7 +33,7 @@ abstract contract RelayPayable is CommandBase, RelayPayableHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("relayPayable", Specs.Empty, Specs.Relay, Specs.Empty, 0, true, false);
+        (, descriptor) = command("relayPayable", Specs.Empty, Specs.Relay, Specs.Empty, 0, Flags.Funded);
     }
 
     /// @notice Relay one RELAY input block with the command account and empty state.
@@ -58,7 +59,7 @@ abstract contract RelayBalancePayable is CommandBase, RelayPayableHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("relayBalancePayable", Specs.Balance, Specs.Relay, Specs.Empty, 0, true, false);
+        (, descriptor) = command("relayBalancePayable", Specs.Balance, Specs.Relay, Specs.Empty, 0, Flags.Funded);
     }
 
     /// @notice Relay one RELAY input block with the command account and current state.

package/commands/Repay.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {Execution, Executions, CommandBase, Lanes, Specs} from "./Base.sol";
+import {Execution, Executions, CommandBase, Flags, Lanes, Specs} from "./Base.sol";
 import {RepayHook} from "../core/Settlement.sol";
 import {Action} from "../annotations/Action.sol";
 import {Actions} from "../utils/Actions.sol";
@@ -25,7 +25,7 @@ abstract contract Repay is CommandBase, RepayHook, Action {
 
     constructor() {
         uint id;
-        (id, descriptor) = command("repay", Specs.Position, Specs.Empty, Specs.Balance, 0, false, false);
+        (id, descriptor) = command("repay", Specs.Position, Specs.Empty, Specs.Balance, 0, 0);
         action(id, Actions.Settle);
     }
 
@@ -57,7 +57,7 @@ abstract contract RepayPayable is CommandBase, RepayPayableHook, Action {
 
     constructor() {
         uint id;
-        (id, descriptor) = command("repayPayable", Specs.Position, Specs.Empty, Specs.Balance, 0, true, false);
+        (id, descriptor) = command("repayPayable", Specs.Position, Specs.Empty, Specs.Balance, 0, Flags.Funded);
         action(id, Actions.Settle);
     }
 

package/commands/Settle.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {Execution, Executions, CommandBase, Lanes, Specs} from "./Base.sol";
+import {Execution, Executions, CommandBase, Flags, Lanes, Specs} from "./Base.sol";
 import {SettleHook} from "../core/Settlement.sol";
 import {Action} from "../annotations/Action.sol";
 import {Actions} from "../utils/Actions.sol";
@@ -37,7 +37,7 @@ abstract contract Settle is CommandBase, SettleHook, Action {
     uint private immutable id;
 
     constructor() {
-        (id, descriptor) = command("settle", Specs.Position, Specs.Empty, Specs.Empty, 0, false, false);
+        (id, descriptor) = command("settle", Specs.Position, Specs.Empty, Specs.Empty, 0, 0);
         action(id, Actions.Settle);
     }
 
@@ -73,7 +73,7 @@ abstract contract SettlePayable is CommandBase, SettlePayableHook, Action {
 
     constructor() {
         uint id;
-        (id, descriptor) = command("settlePayable", Specs.Position, Specs.Empty, Specs.Empty, 0, true, false);
+        (id, descriptor) = command("settlePayable", Specs.Position, Specs.Empty, Specs.Empty, 0, Flags.Funded);
         action(id, Actions.Settle);
     }
 

package/commands/Withdraw.sol

@@ -25,7 +25,7 @@ abstract contract Withdraw is CommandBase, WithdrawHook, Action {
 
     constructor() {
         uint id;
-        (id, descriptor) = command("withdraw", Specs.Balance, Specs.Empty, Specs.Empty, 0, false, false);
+        (id, descriptor) = command("withdraw", Specs.Balance, Specs.Empty, Specs.Empty, 0, 0);
         action(id, Actions.Withdraw);
     }
 

package/commands/admin/AllowAssets.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import { AdminBase, Execution, Executions, Lanes, Specs } from "./Base.sol";
+import { AdminBase, Execution, Executions, Flags, Lanes, Specs } from "./Base.sol";
 using Executions for Execution;
 
 /// @notice Hook implemented by hosts that allow assets.
@@ -19,7 +19,7 @@ abstract contract AllowAssets is AdminBase, AllowAssetsHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("allowAssets", Specs.Empty, Specs.Asset, Specs.Empty, 0, false, true);
+        (, descriptor) = command("allowAssets", Specs.Empty, Specs.Asset, Specs.Empty, 0, Flags.Admin);
     }
 
     /// @notice Allow each ASSET block in the admin input.

package/commands/admin/Allowance.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {AdminBase, Execution, Executions, Lanes, Specs} from "./Base.sol";
+import {AdminBase, Execution, Executions, Flags, Lanes, Specs} from "./Base.sol";
 using Executions for Execution;
 
 /// @notice Hook implemented by hosts that configure peer asset allowances.
@@ -23,7 +23,7 @@ abstract contract Allowance is AdminBase, AllowanceHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("allowance", Specs.Empty, Specs.Allowance, Specs.Empty, 0, false, true);
+        (, descriptor) = command("allowance", Specs.Empty, Specs.Allowance, Specs.Empty, 0, Flags.Admin);
     }
 
     /// @notice Apply each ALLOWANCE block in the admin input.

package/commands/admin/Annotate.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {AdminBase, Execution, Executions, Lanes, Specs} from "./Base.sol";
+import {AdminBase, Execution, Executions, Flags, Lanes, Specs} from "./Base.sol";
 using Executions for Execution;
 
 /// @title Annotate
@@ -12,7 +12,7 @@ abstract contract Annotate is AdminBase {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("annotate", Specs.Empty, Specs.Annotation, Specs.Empty, 0, false, true);
+        (, descriptor) = command("annotate", Specs.Empty, Specs.Annotation, Specs.Empty, 0, Flags.Admin);
     }
 
     /// @notice Publish each ANNOTATION block in the admin input.

package/commands/admin/Appoint.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import { AdminBase, Execution, Executions, Lanes, Specs } from "./Base.sol";
+import { AdminBase, Execution, Executions, Flags, Lanes, Specs } from "./Base.sol";
 import { GuardianAccess } from "../../core/Access.sol";
 using Executions for Execution;
 
@@ -13,7 +13,7 @@ abstract contract Appoint is GuardianAccess, AdminBase {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("appoint", Specs.Empty, Specs.Account, Specs.Empty, 0, false, true);
+        (, descriptor) = command("appoint", Specs.Empty, Specs.Account, Specs.Empty, 0, Flags.Admin);
     }
 
     /// @notice Appoint each user ACCOUNT block in the admin input as a guardian.

package/commands/admin/Authorize.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {AdminBase, Execution, Executions, Lanes, Specs} from "./Base.sol";
+import {AdminBase, Execution, Executions, Flags, Lanes, Specs} from "./Base.sol";
 using Executions for Execution;
 
 /// @title Authorize
@@ -13,7 +13,7 @@ abstract contract Authorize is AdminBase {
     uint private immutable id;
 
     constructor() {
-        (id, descriptor) = command("authorize", Specs.Empty, Specs.Node, Specs.Empty, 0, false, true);
+        (id, descriptor) = command("authorize", Specs.Empty, Specs.Node, Specs.Empty, 0, Flags.Admin);
     }
 
     /// @notice Return the registered AUTHORIZE command ID.