@rootzero/contracts 1.10.0 → 1.12.0

package/commands/Relay.sol

@@ -2,8 +2,9 @@
 pragma solidity ^0.8.33;
 
 import {CommandBase, CommandContext, Keys} from "./Base.sol";
+import {Lane} from "../core/Endpoint.sol";
 import {Payable} from "../core/Payable.sol";
-import {Cursors, Cur, Schemas} from "../Cursors.sol";
+import {Cursors, Cur} from "../Cursors.sol";
 import {Budget} from "../utils/Value.sol";
 
 using Cursors for Cur;
@@ -25,25 +26,23 @@ abstract contract RoutePayableHook {
 /// the same state from being duplicated across multiple relays.
 /// Produces no output state.
 abstract contract RelayPayable is CommandBase, Payable, RoutePayableHook {
-    uint internal immutable relayPayableId = commandId(this.relayPayable.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Command(host, relayPayableId, "1:0:0", Schemas.Relay, Keys.Any, Keys.Empty, true);
-        emit Labeled(relayPayableId, bytes32(0), "relayPayable");
+        (, descriptor) = command("relayPayable", Keys.Any, Keys.Relay, Keys.Empty, 0, true, false);
     }
 
     /// @notice Relay one RELAY request block with the command account and current state.
-    /// @param c Command context; `c.request` must contain exactly one RELAY block.
-    /// @return output Empty output state.
-    function relayPayable(CommandContext calldata c) external payable onlyCommand returns (bytes memory output) {
-        Cur memory request = Cursors.init(c.request, 1, 1);
-        Budget memory budget = openValue();
+    /// @param c Command context; `c.input` must contain exactly one RELAY block.
+    /// @return Empty output state.
+    function relayPayable(CommandContext calldata c) external payable onlyCommand returns (bytes memory) {
+        (Cur memory input, , ) = openLane(c.input, descriptor, Lane.Input, 1);
+        (uint portal, uint resources, bytes memory context) = input.relayToContext(c.account, c.state);
 
-        (uint portal, uint resources, bytes memory context) = request.relayToContext(c.account, c.state);
+        Budget memory budget = openValue();
         route(portal, resources, context, budget);
 
         closeValue(c.account, budget);
-        request.complete();
         return "";
     }
 }

package/commands/Withdraw.sol

@@ -19,11 +19,10 @@ abstract contract WithdrawHook {
 /// Use `withdraw` for assets being sent outside the protocol (e.g. ERC-20 transfers, ETH sends).
 /// For internal balance credits, use `creditAccount` instead.
 abstract contract Withdraw is CommandBase, WithdrawHook {
-    uint internal immutable withdrawId = commandId(this.withdraw.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Command(host, withdrawId, "0:1:0", "", Keys.Balance, Keys.Empty, false);
-        emit Labeled(withdrawId, bytes32(0), "withdraw");
+        (, descriptor) = command("withdraw", Keys.Balance, Keys.Empty, Keys.Empty, 0, false, false);
     }
 
     /// @notice Withdraw each BALANCE block from the command state to the command account.
@@ -32,14 +31,12 @@ abstract contract Withdraw is CommandBase, WithdrawHook {
     function withdraw(
         CommandContext calldata c
     ) external onlyCommand returns (bytes memory) {
-        (Cur memory state, ) = Cursors.init(c.state, 1);
+        (Cur memory state, ) = openState(c.state, descriptor);
 
         while (state.i < state.len) {
             (bytes32 asset, uint amount) = state.unpackBalance();
             withdraw(c.account, asset, amount);
         }
-
-        state.complete();
         return "";
     }
 }

package/commands/admin/AllowAssets.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.33;
 
 import { AdminBase, CommandContext, Keys } from "./Base.sol";
-import { Cursors, Cur, Schemas } from "../../Cursors.sol";
+import { Cursors, Cur } from "../../Cursors.sol";
 using Cursors for Cur;
 
 abstract contract AllowAssetsHook {
@@ -16,27 +16,24 @@ abstract contract AllowAssetsHook {
 /// @notice Admin command that permits a list of assets via a virtual hook.
 /// Each ASSET block in the request calls `allowAsset`. Only callable by the admin account.
 abstract contract AllowAssets is AdminBase, AllowAssetsHook {
-    uint internal immutable allowAssetsId = commandId(this.allowAssets.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Admin(host, allowAssetsId, "1:0:0", Schemas.Asset, Keys.Empty, Keys.Empty, false);
-        emit Labeled(allowAssetsId, bytes32(0), "allowAssets");
+        (, descriptor) = command("allowAssets", Keys.Empty, Keys.Asset, Keys.Empty, 0, false, true);
     }
 
     /// @notice Allow each ASSET block in the admin request.
-    /// @param c Admin command context; `c.request` must contain ASSET blocks.
+    /// @param c Admin command context; `c.input` must contain ASSET blocks.
     /// @return Empty output state.
     function allowAssets(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, ) = Cursors.init(c.request, 1);
+        (Cur memory input, ) = openInput(c.input, descriptor);
 
-        while (request.i < request.len) {
-            bytes32 asset = request.unpackAsset();
+        while (input.i < input.len) {
+            bytes32 asset = input.unpackAsset();
             allowAsset(asset);
         }
-
-        request.complete();
         return "";
     }
 }

package/commands/admin/Allowance.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.33;
 
 import {AdminBase, CommandContext, Keys} from "./Base.sol";
-import {Cursors, Cur, Schemas} from "../../Cursors.sol";
+import {Cursors, Cur} from "../../Cursors.sol";
 using Cursors for Cur;
 
 abstract contract AllowanceHook {
@@ -20,25 +20,22 @@ abstract contract AllowanceHook {
 /// @notice Admin command that applies cross-host allowance entries via a virtual hook.
 /// Each ALLOWANCE block grants or updates a host-scoped asset cap. Only callable by the admin account.
 abstract contract Allowance is AdminBase, AllowanceHook {
-    uint internal immutable allowanceId = commandId(this.allowance.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Admin(host, allowanceId, "1:0:0", Schemas.Allowance, Keys.Empty, Keys.Empty, false);
-        emit Labeled(allowanceId, bytes32(0), "allowance");
+        (, descriptor) = command("allowance", Keys.Empty, Keys.Allowance, Keys.Empty, 0, false, true);
     }
 
     /// @notice Apply each ALLOWANCE block in the admin request.
-    /// @param c Admin command context; `c.request` must contain ALLOWANCE blocks.
+    /// @param c Admin command context; `c.input` must contain ALLOWANCE blocks.
     /// @return Empty output state.
     function allowance(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, ) = Cursors.init(c.request, 1);
+        (Cur memory input, ) = openInput(c.input, descriptor);
 
-        while (request.i < request.len) {
-            (uint peer, bytes32 asset, uint amount) = request.unpackAllowance();
+        while (input.i < input.len) {
+            (uint peer, bytes32 asset, uint amount) = input.unpackAllowance();
             allowance(peer, asset, amount);
         }
-
-        request.complete();
         return "";
     }
 }

package/commands/admin/Appoint.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.33;
 
 import { AdminBase, CommandContext, Keys } from "./Base.sol";
-import { Cursors, Cur, Schemas } from "../../Cursors.sol";
+import { Cursors, Cur } from "../../Cursors.sol";
 using Cursors for Cur;
 
 /// @title Appoint
@@ -10,27 +10,24 @@ using Cursors for Cur;
 /// Each ACCOUNT block in the request is enabled as a guardian on the host.
 /// Only callable by the admin account.
 abstract contract Appoint is AdminBase {
-    uint internal immutable appointId = commandId(this.appoint.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Admin(host, appointId, "1:0:0", Schemas.Account, Keys.Empty, Keys.Empty, false);
-        emit Labeled(appointId, bytes32(0), "appoint");
+        (, descriptor) = command("appoint", Keys.Empty, Keys.Account, Keys.Empty, 0, false, true);
     }
 
     /// @notice Appoint each ACCOUNT block in the admin request as a guardian.
-    /// @param c Admin command context; `c.request` must contain ACCOUNT blocks.
+    /// @param c Admin command context; `c.input` must contain ACCOUNT blocks.
     /// @return Empty output state.
     function appoint(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, ) = Cursors.init(c.request, 1);
+        (Cur memory input, ) = openInput(c.input, descriptor);
 
-        while (request.i < request.len) {
-            bytes32 account = request.unpackAccount();
+        while (input.i < input.len) {
+            bytes32 account = input.unpackAccount();
             setGuardian(account, true);
         }
-
-        request.complete();
         return "";
     }
 }

package/commands/admin/Authorize.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import { AdminBase, CommandContext, Keys } from "./Base.sol";
-import { Cursors, Cur, Schemas } from "../../Cursors.sol";
+import {AdminBase, CommandContext, Keys} from "./Base.sol";
+import {Cursors, Cur} from "../../Cursors.sol";
 using Cursors for Cur;
 
 /// @title Authorize
@@ -10,32 +10,23 @@ using Cursors for Cur;
 /// Each NODE block in the request is authorized on the host.
 /// Only callable by the admin account.
 abstract contract Authorize is AdminBase {
-    uint internal immutable authorizeId = commandId(this.authorize.selector);
+    bytes32 private immutable descriptor;
+    uint internal immutable authorizeId;
 
     constructor() {
-        emit Admin(host, authorizeId, "1:0:0", Schemas.Node, Keys.Empty, Keys.Empty, false);
-        emit Labeled(authorizeId, bytes32(0), "authorize");
+        (authorizeId, descriptor) = command("authorize", Keys.Empty, Keys.Node, Keys.Empty, 0, false, true);
     }
 
     /// @notice Authorize each NODE block in the admin request.
-    /// @param c Admin command context; `c.request` must contain NODE blocks.
+    /// @param c Admin command context; `c.input` must contain NODE blocks.
     /// @return Empty output state.
-    function authorize(
-        CommandContext calldata c
-    ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, ) = Cursors.init(c.request, 1);
+    function authorize(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory) {
+        (Cur memory input, ) = openInput(c.input, descriptor);
 
-        while (request.i < request.len) {
-            uint node = request.unpackNode();
+        while (input.i < input.len) {
+            uint node = input.unpackNode();
             setNode(node, true);
         }
-
-        request.complete();
         return "";
     }
 }
-
-
-
-
-

package/commands/admin/Base.sol

@@ -2,8 +2,7 @@
 pragma solidity ^0.8.33;
 
 import {CommandBase, CommandContext, Keys} from "../Base.sol";
-import {AdminEvent} from "../../events/Admin.sol";
 
 /// @title AdminBase
 /// @notice Shared base for admin commands.
-abstract contract AdminBase is CommandBase, AdminEvent {}
+abstract contract AdminBase is CommandBase {}

package/commands/admin/DenyAssets.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.33;
 
 import { AdminBase, CommandContext, Keys } from "./Base.sol";
-import { Cursors, Cur, Schemas } from "../../Cursors.sol";
+import { Cursors, Cur } from "../../Cursors.sol";
 using Cursors for Cur;
 
 abstract contract DenyAssetsHook {
@@ -16,27 +16,24 @@ abstract contract DenyAssetsHook {
 /// @notice Admin command that blocks a list of assets via a virtual hook.
 /// Each ASSET block in the request calls `denyAsset`. Only callable by the admin account.
 abstract contract DenyAssets is AdminBase, DenyAssetsHook {
-    uint internal immutable denyAssetsId = commandId(this.denyAssets.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Admin(host, denyAssetsId, "1:0:0", Schemas.Asset, Keys.Empty, Keys.Empty, false);
-        emit Labeled(denyAssetsId, bytes32(0), "denyAssets");
+        (, descriptor) = command("denyAssets", Keys.Empty, Keys.Asset, Keys.Empty, 0, false, true);
     }
 
     /// @notice Deny each ASSET block in the admin request.
-    /// @param c Admin command context; `c.request` must contain ASSET blocks.
+    /// @param c Admin command context; `c.input` must contain ASSET blocks.
     /// @return Empty output state.
     function denyAssets(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, ) = Cursors.init(c.request, 1);
+        (Cur memory input, ) = openInput(c.input, descriptor);
 
-        while (request.i < request.len) {
-            bytes32 asset = request.unpackAsset();
+        while (input.i < input.len) {
+            bytes32 asset = input.unpackAsset();
             denyAsset(asset);
         }
-
-        request.complete();
         return "";
     }
 }

package/commands/admin/Dismiss.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.33;
 
 import { AdminBase, CommandContext, Keys } from "./Base.sol";
-import { Cursors, Cur, Schemas } from "../../Cursors.sol";
+import { Cursors, Cur } from "../../Cursors.sol";
 using Cursors for Cur;
 
 /// @title Dismiss
@@ -10,27 +10,24 @@ using Cursors for Cur;
 /// Each ACCOUNT block in the request is disabled as a guardian on the host.
 /// Only callable by the admin account.
 abstract contract Dismiss is AdminBase {
-    uint internal immutable dismissId = commandId(this.dismiss.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Admin(host, dismissId, "1:0:0", Schemas.Account, Keys.Empty, Keys.Empty, false);
-        emit Labeled(dismissId, bytes32(0), "dismiss");
+        (, descriptor) = command("dismiss", Keys.Empty, Keys.Account, Keys.Empty, 0, false, true);
     }
 
     /// @notice Dismiss each ACCOUNT block in the admin request from guardian status.
-    /// @param c Admin command context; `c.request` must contain ACCOUNT blocks.
+    /// @param c Admin command context; `c.input` must contain ACCOUNT blocks.
     /// @return Empty output state.
     function dismiss(
         CommandContext calldata c
     ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, ) = Cursors.init(c.request, 1);
+        (Cur memory input, ) = openInput(c.input, descriptor);
 
-        while (request.i < request.len) {
-            bytes32 account = request.unpackAccount();
+        while (input.i < input.len) {
+            bytes32 account = input.unpackAccount();
             setGuardian(account, false);
         }
-
-        request.complete();
         return "";
     }
 }

package/commands/admin/Execute.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import {AdminBase, CommandContext, Keys} from "./Base.sol";
 import {Payable} from "../../core/Payable.sol";
-import {Cursors, Cur, Schemas} from "../../Cursors.sol";
+import {Cursors, Cur} from "../../Cursors.sol";
 import {Budget} from "../../utils/Value.sol";
 
 using Cursors for Cur;
@@ -14,26 +14,23 @@ using Cursors for Cur;
 /// Only callable by the admin account.
 /// Unspent top-level `msg.value` remains on this host.
 abstract contract ExecutePayable is AdminBase, Payable {
-    uint internal immutable executePayableId = commandId(this.executePayable.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Admin(host, executePayableId, "1:0:0", Schemas.Call, Keys.Empty, Keys.Empty, true);
-        emit Labeled(executePayableId, bytes32(0), "executePayable");
+        (, descriptor) = command("executePayable", Keys.Empty, Keys.Call, Keys.Empty, 0, true, true);
     }
 
     /// @notice Execute each CALL block in the admin request.
-    /// @param c Admin command context; `c.request` must contain CALL blocks.
+    /// @param c Admin command context; `c.input` must contain CALL blocks.
     /// @return Empty output state.
     function executePayable(CommandContext calldata c) external payable onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, ) = Cursors.init(c.request, 1);
+        (Cur memory input, ) = openInput(c.input, descriptor);
         Budget memory budget = openValue();
 
-        while (request.i < request.len) {
-            (uint target, uint resources, bytes calldata data) = request.unpackCall();
+        while (input.i < input.len) {
+            (uint target, uint resources, bytes calldata data) = input.unpackCall();
             rawCall(target, useValue(budget, resources), data);
         }
-
-        request.complete();
         return "";
     }
 }

package/commands/admin/Label.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.33;
 
 import {AdminBase, CommandContext, Keys} from "./Base.sol";
-import {Cursors, Cur, Schemas} from "../../Cursors.sol";
+import {Cursors, Cur} from "../../Cursors.sol";
 using Cursors for Cur;
 
 /// @title Label
@@ -10,25 +10,22 @@ using Cursors for Cur;
 /// Each LABEL block in the request emits one `Labeled` event. Only callable by
 /// the admin account.
 abstract contract Label is AdminBase {
-    uint internal immutable labelId = commandId(this.label.selector);
+    bytes32 private immutable descriptor;
 
     constructor() {
-        emit Admin(host, labelId, "1:0:0", Schemas.Label, Keys.Empty, Keys.Empty, false);
-        emit Labeled(labelId, bytes32(0), "label");
+        (, descriptor) = command("label", Keys.Empty, Keys.Label, Keys.Empty, 0, false, true);
     }
 
     /// @notice Publish each LABEL block in the admin request.
-    /// @param c Admin command context; `c.request` must contain LABEL blocks.
+    /// @param c Admin command context; `c.input` must contain LABEL blocks.
     /// @return Empty output state.
     function label(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, ) = Cursors.init(c.request, 1);
+        (Cur memory input, ) = openInput(c.input, descriptor);
 
-        while (request.i < request.len) {
-            (uint id, bytes32 namespace, string memory name) = request.unpackLabel();
-            emit Labeled(id, namespace, name);
+        while (input.i < input.len) {
+            (uint node, bytes32 namespace, string memory name) = input.unpackLabel();
+            emit Labeled(node, namespace, name);
         }
-
-        request.complete();
         return "";
     }
 }

package/commands/admin/Schemas.sol

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import {AdminBase, CommandContext, Keys} from "./Base.sol";
+import {Cursors, Cur} from "../../Cursors.sol";
+using Cursors for Cur;
+
+/// @title PublishSchema
+/// @notice Admin command that publishes block schemas for keys.
+/// Each SCHEMA block in the request emits one `Schema` event. Only callable by
+/// the admin account.
+abstract contract PublishSchema is AdminBase {
+    bytes32 private immutable descriptor;
+
+    constructor() {
+        (, descriptor) = command("publishSchema", Keys.Empty, Keys.Schema, Keys.Empty, 0, false, true);
+    }
+
+    /// @notice Publish each SCHEMA block in the admin request.
+    /// @param c Admin command context; `c.input` must contain SCHEMA blocks.
+    /// @return Empty output state.
+    function publishSchema(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory) {
+        (Cur memory input, ) = openInput(c.input, descriptor);
+
+        while (input.i < input.len) {
+            (bytes4 key, string memory body, bytes32 name) = input.unpackSchema();
+            emit Schema(host, key, body, name);
+        }
+        return "";
+    }
+}

package/commands/admin/Unauthorize.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import { AdminBase, CommandContext, Keys } from "./Base.sol";
-import { Cursors, Cur, Schemas } from "../../Cursors.sol";
+import {AdminBase, CommandContext, Keys} from "./Base.sol";
+import {Cursors, Cur} from "../../Cursors.sol";
 using Cursors for Cur;
 
 /// @title Unauthorize
@@ -10,32 +10,23 @@ using Cursors for Cur;
 /// Each NODE block in the request is deauthorized on the host.
 /// Only callable by the admin account.
 abstract contract Unauthorize is AdminBase {
-    uint internal immutable unauthorizeId = commandId(this.unauthorize.selector);
+    bytes32 private immutable descriptor;
+    uint internal immutable unauthorizeId;
 
     constructor() {
-        emit Admin(host, unauthorizeId, "1:0:0", Schemas.Node, Keys.Empty, Keys.Empty, false);
-        emit Labeled(unauthorizeId, bytes32(0), "unauthorize");
+        (unauthorizeId, descriptor) = command("unauthorize", Keys.Empty, Keys.Node, Keys.Empty, 0, false, true);
     }
 
     /// @notice Unauthorize each NODE block in the admin request.
-    /// @param c Admin command context; `c.request` must contain NODE blocks.
+    /// @param c Admin command context; `c.input` must contain NODE blocks.
     /// @return Empty output state.
-    function unauthorize(
-        CommandContext calldata c
-    ) external onlyAdmin(c.account) returns (bytes memory) {
-        (Cur memory request, ) = Cursors.init(c.request, 1);
+    function unauthorize(CommandContext calldata c) external onlyAdmin(c.account) returns (bytes memory) {
+        (Cur memory input, ) = openInput(c.input, descriptor);
 
-        while (request.i < request.len) {
-            uint node = request.unpackNode();
+        while (input.i < input.len) {
+            uint node = input.unpackNode();
             setNode(node, false);
         }
-
-        request.complete();
         return "";
     }
 }
-
-
-
-
-