@rootzero/contracts 1.25.0 → 1.27.0

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, Flags, Lanes, Specs} from "./Base.sol";
+import {AdminBase, Execution, Executions, Flags, Specs} from "./Base.sol";
 using Executions for Execution;
 
 /// @title Annotate
@@ -12,23 +12,23 @@ abstract contract Annotate is AdminBase {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("annotate", Specs.Empty, Specs.Annotation, Specs.Empty, 0, Flags.Admin);
+        (, descriptor) = command("annotate", Specs.Empty, Specs.Annotation, Specs.Empty, Flags.Admin);
     }
 
     /// @notice Publish each ANNOTATION block in the admin input.
     /// @param context Admin command context carrying the ANNOTATION input stream.
     /// @return Empty output state.
-    /// @return Empty transaction stream.
+    /// @return Zero native budget credit.
     function annotate(
         bytes calldata context
-    ) external returns (bytes memory, bytes memory) {
-        Execution memory exec = openAdminCommand(context, descriptor, 0);
+    ) external returns (bytes memory, uint) {
+        Execution memory exec = openAdminCommand(context, descriptor);
 
         while (exec.more()) {
-            (uint entity, bytes calldata data) = exec.unpackAnnotation(Lanes.Input);
+            (uint entity, bytes calldata data) = exec.unpackAnnotation();
             emit Annotation(entity, data);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }

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, Flags, Lanes, Specs } from "./Base.sol";
+import { AdminBase, Execution, Executions, Flags, Specs } from "./Base.sol";
 import { GuardianAccess } from "../../core/Access.sol";
 using Executions for Execution;
 
@@ -13,23 +13,23 @@ abstract contract Appoint is GuardianAccess, AdminBase {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("appoint", Specs.Empty, Specs.Account, Specs.Empty, 0, Flags.Admin);
+        (, descriptor) = command("appoint", Specs.Empty, Specs.Account, Specs.Empty, Flags.Admin);
     }
 
     /// @notice Appoint each user ACCOUNT block in the admin input as a guardian.
     /// @param context Admin command context carrying the ACCOUNT input stream.
     /// @return Empty output state.
-    /// @return Empty transaction stream.
+    /// @return Zero native budget credit.
     function appoint(
         bytes calldata context
-    ) external returns (bytes memory, bytes memory) {
-        Execution memory exec = openAdminCommand(context, descriptor, 0);
+    ) external returns (bytes memory, uint) {
+        Execution memory exec = openAdminCommand(context, descriptor);
 
         while (exec.more()) {
-            bytes32 guardian = exec.unpackAccount(Lanes.Input);
+            bytes32 guardian = exec.unpackAccount();
             setGuardian(guardian, true);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }

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, Flags, Lanes, Specs} from "./Base.sol";
+import {AdminBase, Execution, Executions, Flags, 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, Flags.Admin);
+        (id, descriptor) = command("authorize", Specs.Empty, Specs.Node, Specs.Empty, Flags.Admin);
     }
 
     /// @notice Return the registered AUTHORIZE command ID.
@@ -24,17 +24,17 @@ abstract contract Authorize is AdminBase {
     /// @notice Authorize each NODE block in the admin input.
     /// @param context Admin command context carrying the NODE input stream.
     /// @return Empty output state.
-    /// @return Empty transaction stream.
+    /// @return Zero native budget credit.
     function authorize(
         bytes calldata context
-    ) external returns (bytes memory, bytes memory) {
-        Execution memory exec = openAdminCommand(context, descriptor, 0);
+    ) external returns (bytes memory, uint) {
+        Execution memory exec = openAdminCommand(context, descriptor);
 
         while (exec.more()) {
-            uint node = exec.unpackNode(Lanes.Input);
+            uint node = exec.unpackNode();
             setNode(node, true);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }

package/commands/admin/Base.sol

@@ -1,21 +1,18 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {CommandBase, Execution, Executions, Flags, Lanes, Specs} from "../Base.sol";
+import {CommandBase, Execution, Executions, Flags, Specs} from "../Base.sol";
 import {NodeAccess} from "../../core/Access.sol";
 
 /// @title AdminBase
 /// @notice Shared base for admin commands.
 abstract contract AdminBase is NodeAccess, CommandBase {
-    /// @notice Decode, authorize, and open one admin command context.
+    /// @notice Open and authorize one admin command context.
     function openAdminCommand(
         bytes calldata context,
-        uint descriptor,
-        uint batches
+        uint descriptor
     ) internal view returns (Execution memory exec) {
-        (bytes32 account, bytes calldata state, bytes calldata input) = unpackCommandContext(context);
-        enforceAdmin(account, msg.sender);
-        exec = Executions.open(state, input, descriptor, batches);
-        exec.account = account;
+        exec = openCommand(context, descriptor);
+        enforceAdmin(exec.account, msg.sender);
     }
 }

package/commands/admin/DenyAssets.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {AdminBase, Execution, Executions, Flags, Lanes, Specs} from "./Base.sol";
+import {AdminBase, Execution, Executions, Flags, Specs} from "./Base.sol";
 using Executions for Execution;
 
 /// @notice Hook implemented by hosts that deny assets.
@@ -19,23 +19,23 @@ abstract contract DenyAssets is AdminBase, DenyAssetsHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("denyAssets", Specs.Empty, Specs.Asset, Specs.Empty, 0, Flags.Admin);
+        (, descriptor) = command("denyAssets", Specs.Empty, Specs.Asset, Specs.Empty, Flags.Admin);
     }
 
     /// @notice Deny each ASSET block in the admin input.
     /// @param context Admin command context carrying the ASSET input stream.
     /// @return Empty output state.
-    /// @return Empty transaction stream.
+    /// @return Zero native budget credit.
     function denyAssets(
         bytes calldata context
-    ) external returns (bytes memory, bytes memory) {
-        Execution memory exec = openAdminCommand(context, descriptor, 0);
+    ) external returns (bytes memory, uint) {
+        Execution memory exec = openAdminCommand(context, descriptor);
 
         while (exec.more()) {
-            bytes32 asset = exec.unpackAsset(Lanes.Input);
+            bytes32 asset = exec.unpackAsset();
             denyAsset(asset);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }

package/commands/admin/Dismiss.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import { AdminBase, Execution, Executions, Flags, Lanes, Specs } from "./Base.sol";
+import { AdminBase, Execution, Executions, Flags, Specs } from "./Base.sol";
 import { GuardianAccess } from "../../core/Access.sol";
 using Executions for Execution;
 
@@ -13,23 +13,23 @@ abstract contract Dismiss is GuardianAccess, AdminBase {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("dismiss", Specs.Empty, Specs.Account, Specs.Empty, 0, Flags.Admin);
+        (, descriptor) = command("dismiss", Specs.Empty, Specs.Account, Specs.Empty, Flags.Admin);
     }
 
     /// @notice Dismiss each user ACCOUNT block in the admin input from guardian status.
     /// @param context Admin command context carrying the ACCOUNT input stream.
     /// @return Empty output state.
-    /// @return Empty transaction stream.
+    /// @return Zero native budget credit.
     function dismiss(
         bytes calldata context
-    ) external returns (bytes memory, bytes memory) {
-        Execution memory exec = openAdminCommand(context, descriptor, 0);
+    ) external returns (bytes memory, uint) {
+        Execution memory exec = openAdminCommand(context, descriptor);
 
         while (exec.more()) {
-            bytes32 guardian = exec.unpackAccount(Lanes.Input);
+            bytes32 guardian = exec.unpackAccount();
             setGuardian(guardian, false);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }

package/commands/admin/Execute.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {AdminBase, Execution, Executions, Flags, Lanes, Specs} from "./Base.sol";
+import {AdminBase, Execution, Executions, Flags, Specs} from "./Base.sol";
 import {RawNodeCalls} from "../../core/Calls.sol";
 
 using Executions for Execution;
@@ -10,28 +10,28 @@ using Executions for Execution;
 /// @notice Admin command that forwards raw calldata to one or more target nodes.
 /// Each CALL block specifies a target node ID, packed resources, and raw calldata payload.
 /// Only callable by the admin account.
-/// Unspent top-level `msg.value` is returned as a refund transaction.
+/// Unspent top-level `msg.value` is returned as native budget credit.
 abstract contract ExecutePayable is RawNodeCalls, AdminBase {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("executePayable", Specs.Empty, Specs.Call, Specs.Empty, 0, Flags.AdminFunded);
+        (, descriptor) = command("executePayable", Specs.Empty, Specs.Call, Specs.Empty, Flags.AdminFunded);
     }
 
     /// @notice Execute each CALL block in the admin input.
     /// @param context Admin command context carrying the CALL input stream.
     /// @return Empty output state.
-    /// @return Remaining native value as a refund transaction stream.
+    /// @return Native value to add to the caller's budget.
     function executePayable(
         bytes calldata context
-    ) external payable returns (bytes memory, bytes memory) {
-        Execution memory exec = openAdminCommand(context, descriptor, 0);
+    ) external payable returns (bytes memory, uint) {
+        Execution memory exec = openAdminCommand(context, descriptor);
 
         while (exec.more()) {
-            (uint target, uint resources, bytes calldata data) = exec.unpackCall(Lanes.Input);
+            (uint target, uint resources, bytes calldata data) = exec.unpackCall();
             rawCall(target, exec.useResourceValue(resources), data);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }

package/commands/admin/Unauthorize.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {AdminBase, Execution, Executions, Flags, Lanes, Specs} from "./Base.sol";
+import {AdminBase, Execution, Executions, Flags, Specs} from "./Base.sol";
 using Executions for Execution;
 
 /// @title Unauthorize
@@ -13,7 +13,7 @@ abstract contract Unauthorize is AdminBase {
     uint private immutable id;
 
     constructor() {
-        (id, descriptor) = command("unauthorize", Specs.Empty, Specs.Node, Specs.Empty, 0, Flags.Admin);
+        (id, descriptor) = command("unauthorize", Specs.Empty, Specs.Node, Specs.Empty, Flags.Admin);
     }
 
     /// @notice Return the registered UNAUTHORIZE command ID.
@@ -24,17 +24,17 @@ abstract contract Unauthorize is AdminBase {
     /// @notice Unauthorize each NODE block in the admin input.
     /// @param context Admin command context carrying the NODE input stream.
     /// @return Empty output state.
-    /// @return Empty transaction stream.
+    /// @return Zero native budget credit.
     function unauthorize(
         bytes calldata context
-    ) external returns (bytes memory, bytes memory) {
-        Execution memory exec = openAdminCommand(context, descriptor, 0);
+    ) external returns (bytes memory, uint) {
+        Execution memory exec = openAdminCommand(context, descriptor);
 
         while (exec.more()) {
-            uint node = exec.unpackNode(Lanes.Input);
+            uint node = exec.unpackNode();
             setNode(node, false);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }

package/core/Access.sol

@@ -89,6 +89,7 @@ abstract contract NodeAccess is AdminAccess, TrustAccess, NodeEvent {
     /// @param node Node ID to update.
     /// @param active True to authorize the node, false to revoke it.
     function setNode(uint node, bool active) internal {
+        node = Nodes.local(node);
         nodes[node] = active;
         emit Node(host, node, active);
     }

package/core/Calls.sol

@@ -135,17 +135,17 @@ abstract contract CommandCalls is NodeCalls {
     /// @param state Current command state block stream.
     /// @param input Command input block stream.
     /// @return nextState Decoded command output state block stream.
-    /// @return transactions Decoded command transaction block stream.
+    /// @return credit Trusted native value to add to the caller's execution budget.
     function callCommand(
         uint command,
         uint128 value,
         bytes32 account,
         bytes memory state,
         bytes calldata input
-    ) internal returns (bytes memory nextState, bytes memory transactions) {
+    ) internal returns (bytes memory nextState, uint credit) {
         bytes4 selector = Nodes.commandSelector(command);
         bytes memory data = encodeCommandCall(selector, account, state, input);
-        return abi.decode(trustedCall(command, value, data), (bytes, bytes));
+        return abi.decode(trustedCall(command, value, data), (bytes, uint));
     }
 }
 

package/core/Endpoint.sol

@@ -7,6 +7,8 @@ import {Label} from "../annotations/Label.sol";
 import {Schema} from "../annotations/Schema.sol";
 import {Descriptors} from "../codec/Descriptors.sol";
 
+using Descriptors for uint;
+
 /// @title EndpointBase
 /// @notice Shared endpoint metadata helpers.
 abstract contract EndpointBase is EndpointEvent, Label, Schema {
@@ -16,7 +18,6 @@ abstract contract EndpointBase is EndpointEvent, Label, Schema {
     /// @param state State block specification.
     /// @param input Input block specification.
     /// @param output Output block specification.
-    /// @param transactions Number of transaction blocks produced per batch, or zero for none.
     /// @param flags Packed endpoint behavior flags.
     /// @return descriptor Packed endpoint lane metadata and flags.
     function endpoint(
@@ -25,10 +26,9 @@ abstract contract EndpointBase is EndpointEvent, Label, Schema {
         uint state,
         uint input,
         uint output,
-        uint8 transactions,
         uint8 flags
     ) internal returns (uint descriptor) {
-        descriptor = Descriptors.create(state, input, output, transactions, flags);
+        descriptor = Descriptors.create(state, input, output, flags);
         return endpoint(id, name, descriptor);
     }
 
@@ -56,12 +56,12 @@ abstract contract EndpointBase is EndpointEvent, Label, Schema {
 /// Commands intentionally do not inherit this base because they must open state
 /// and input together through `openCommand`.
 abstract contract InputEndpointBase is EndpointBase {
-    /// @notice Open an endpoint input stream with an expected batch count.
+    /// @notice Open a bounded endpoint input stream.
     function openInput(
         bytes calldata input,
-        uint descriptor,
-        uint batches
+        uint descriptor
     ) internal view returns (Execution memory exec) {
-        return Executions.openInput(input, descriptor, batches);
+        exec.budget = msg.value;
+        (exec.decoders, exec.writer) = descriptor.openInput(input);
     }
 }

package/core/Pipeline.sol

@@ -1,12 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {Decoders, Cur, Readers, Reader} from "../Codec.sol";
-import {PostHook} from "./Settlement.sol";
-import {Budgets} from "../execution/Budget.sol";
-
-using Decoders for Cur;
-using Readers for Reader;
+import {Blocks} from "../codec/Blocks.sol";
+import {Cursors} from "../utils/Cursors.sol";
+import {InsufficientValue, OutOfBounds, UnexpectedState} from "../utils/Errors.sol";
 
 /// @notice Hook implemented by hosts that execute encoded step streams.
 abstract contract PipeHook {
@@ -21,28 +18,25 @@ abstract contract PipeHook {
 
 /// @title Pipeline
 /// @notice Core pipeline functionality shared by higher-level surfaces.
-abstract contract Pipeline is PipeHook, PostHook {
-    /// @dev Thrown when the pipeline finishes with non-empty threaded state.
-    error UnexpectedState();
-
+abstract contract Pipeline is PipeHook {
     /// @notice Override to dispatch one piped step.
     /// Called once per STEP block. The returned state becomes the state passed to
     /// the next step, and the final returned state must be empty. Returned
-    /// transactions are decoded and passed individually to `post` before the next step runs.
+    /// credit is added to the shared native-value budget before the next step runs.
     /// @param cmd Command node ID to invoke or handle.
     /// @param account Account identifier for the piped context.
     /// @param state Current threaded state block stream.
     /// @param input Step input block stream.
     /// @param value Native EVM value assigned to this step.
     /// @return output Updated state block stream for the next step.
-    /// @return transactions Transaction block stream produced by the command.
+    /// @return credit Trusted native value to add to the pipeline budget.
     function dispatch(
         uint cmd,
         bytes32 account,
         bytes memory state,
         bytes calldata input,
         uint128 value
-    ) internal virtual returns (bytes memory output, bytes memory transactions);
+    ) internal virtual returns (bytes memory output, uint credit);
 
     /// @notice Execute a STEP block stream through the pipeline.
     /// @dev Reverts with `UnexpectedState` if the final threaded state is non-empty.
@@ -58,19 +52,21 @@ abstract contract Pipeline is PipeHook, PostHook {
         bytes calldata steps,
         uint budget
     ) internal virtual override returns (uint remaining) {
-        Cur memory cur = Decoders.open(steps);
+        (uint abs, uint end) = Cursors.bounds(steps);
 
-        while (cur.more()) {
-            (uint cmd, uint resources, bytes calldata input) = cur.unpackStep();
+        while (abs < end) {
+            uint cmd;
             uint128 value;
-            (budget, value) = Budgets.useResourceValue(budget, resources);
-            Reader memory txs;
-            (state, txs.source) = dispatch(cmd, account, state, input, value);
-
-            while (txs.more()) {
-                (bytes32 from, bytes32 to, bytes32 asset, uint amount) = txs.unpackTransaction();
-                post(from, to, asset, amount);
+            bytes calldata input;
+            (cmd, value, input, abs) = Blocks.unpackStep(abs);
+            if (abs > end) revert OutOfBounds();
+            if (value > budget) revert InsufficientValue();
+            unchecked {
+                budget -= value;
             }
+            uint credit;
+            (state, credit) = dispatch(cmd, account, state, input, value);
+            budget += credit;
         }
 
         if (state.length != 0) revert UnexpectedState();

package/core/Settlement.sol

@@ -61,7 +61,8 @@ abstract contract Settlement is PostHook, SettleHook, RepayHook, DebitAccountHoo
     }
 
     /// @notice Settle one position by crediting its asset and debiting its liability.
-    /// Skips either operation when its corresponding amount is zero.
+    /// Skips either operation when its corresponding amount is zero, including
+    /// position sides encoded as absent with a zero identifier and quantity.
     function settle(
         bytes32 account,
         bytes32 asset,

package/core/Types.sol

@@ -76,6 +76,7 @@ struct Debt {
 }
 
 /// @notice Asset and liability pair threaded as live pipeline state.
+/// Either side may be absent by setting both its identifier and quantity to zero.
 struct Position {
     /// @dev Identifier for the asset side.
     bytes32 asset;

package/execution/Budget.sol

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
+import {InsufficientValue} from "../utils/Errors.sol";
+
 /// @notice Mutable native-value budget shared across internal calls.
 struct Budget {
     /// @dev Remaining unspent native value in wei.
@@ -10,9 +12,6 @@ struct Budget {
 /// @title Budgets
 /// @notice Opening and mutation helpers for standalone native-value budgets.
 library Budgets {
-    /// @dev Thrown when an operation attempts to spend more value than remains.
-    error InsufficientValue();
-
     /// @notice Open a standalone budget containing the current call value.
     /// @return budget Budget initialized with `msg.value`.
     function open() internal view returns (Budget memory budget) {