@rootzero/contracts 1.25.0 → 1.27.0

package/commands/Provision.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {Execution, Executions, CommandBase, Flags, HostAmount, Lanes, Specs} from "./Base.sol";
+import {Execution, Executions, CommandBase, Flags, HostAmount, Specs} from "./Base.sol";
 using Executions for Execution;
 
 /// @notice Shared provision hook used by `Provision`.
@@ -32,25 +32,25 @@ abstract contract Provision is CommandBase, ProvisionHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("provision", Specs.Empty, Specs.Allocation, Specs.Custody, 0, 0);
+        (, descriptor) = command("provision", Specs.Empty, Specs.Allocation, Specs.Custody, 0);
     }
 
     /// @notice Provision ALLOCATION input blocks and output matching CUSTODY state blocks.
     /// @param context Command context carrying the ALLOCATION input stream.
     /// @return CUSTODY block stream matching the provisioned allocations.
-    /// @return Empty transaction stream.
+    /// @return Zero native budget credit.
     function provision(
         bytes calldata context
-    ) external onlyCommand returns (bytes memory, bytes memory) {
-        Execution memory exec = openCommand(context, descriptor, 0);
+    ) external onlyCommand returns (bytes memory, uint) {
+        Execution memory exec = openCommand(context, descriptor);
 
         while (exec.more()) {
-            HostAmount memory allocation = exec.unpackAllocationValue(Lanes.Input);
+            HostAmount memory allocation = exec.unpackAllocationValue();
             provision(exec.account, allocation);
             exec.outputCustody(allocation);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }
 
@@ -62,25 +62,25 @@ abstract contract ProvisionPayable is CommandBase, ProvisionPayableHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("provisionPayable", Specs.Empty, Specs.Allocation, Specs.Custody, 0, Flags.Funded);
+        (, descriptor) = command("provisionPayable", Specs.Empty, Specs.Allocation, Specs.Custody, Flags.Funded);
     }
 
     /// @notice Provision ALLOCATION input blocks with access to a mutable native-value budget.
     /// @param context Command context carrying the ALLOCATION input stream.
     /// @return CUSTODY block stream matching the provisioned allocations.
-    /// @return Remaining native value as a refund transaction stream.
+    /// @return Native value to add to the caller's budget.
     function provisionPayable(
         bytes calldata context
-    ) external payable onlyCommand returns (bytes memory, bytes memory) {
-        Execution memory exec = openCommand(context, descriptor, 0);
+    ) external payable onlyCommand returns (bytes memory, uint) {
+        Execution memory exec = openCommand(context, descriptor);
 
         while (exec.more()) {
-            HostAmount memory allocation = exec.unpackAllocationValue(Lanes.Input);
+            HostAmount memory allocation = exec.unpackAllocationValue();
             provision(exec.account, allocation, exec);
             exec.outputCustody(allocation);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }
 

package/commands/Recover.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {Execution, Executions, CommandBase, Flags, Lanes, Specs} from "./Base.sol";
+import {Execution, Executions, CommandBase, Flags, Specs} from "./Base.sol";
 
 using Executions for Execution;
 
@@ -31,23 +31,23 @@ abstract contract RecoverPayable is CommandBase, RecoverPayableHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("recoverPayable", Specs.Empty, Specs.Recover, Specs.Empty, 0, Flags.Funded);
+        (, descriptor) = command("recoverPayable", Specs.Empty, Specs.Recover, Specs.Empty, Flags.Funded);
     }
 
     /// @notice Recover each recover block in the command input.
     /// @param context Command context carrying the RECOVER 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 recoverPayable(
         bytes calldata context
-    ) external payable onlyCommand returns (bytes memory, bytes memory) {
-        Execution memory exec = openCommand(context, descriptor, 0);
+    ) external payable onlyCommand returns (bytes memory, uint) {
+        Execution memory exec = openCommand(context, descriptor);
 
         while (exec.more()) {
-            (uint handler, uint resources, bytes32 key, bytes calldata witness) = exec.unpackRecover(Lanes.Input);
+            (uint handler, uint resources, bytes32 key, bytes calldata witness) = exec.unpackRecover();
             recover(handler, resources, key, witness, exec);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }

package/commands/Relay.sol

@@ -1,27 +1,32 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {Execution, Executions, CommandBase, Flags, Lanes, Specs} from "./Base.sol";
+import {Execution, Executions, CommandBase, Flags, 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`.
+    /// @dev Relay hooks may forward only EMPTY or BALANCE state. They must not
+    /// relay DEBT, POSITION, or other state whose destination handling can fail:
+    /// the source state is consumed before destination success is known.
     /// @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.
+    /// @param state Complete state forwarded into the destination context.
     /// @param input Input forwarded into the destination context.
-    /// @param exec Execution carrying the source state and value available for
-    /// transport fees and destination resource funding.
+    /// @param funds Execution carrying value available for transport fees and
+    /// destination resource funding.
     function relay(
         uint portal,
         uint resources,
         bytes32 account,
+        bytes calldata state,
         bytes calldata input,
-        Execution memory exec
+        Execution memory funds
     ) internal virtual;
 }
 
@@ -31,18 +36,15 @@ abstract contract RelayPayable is CommandBase, RelayPayableHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("relayPayable", Specs.Empty, Specs.Relay, Specs.Empty, 0, Flags.Funded);
+        (, descriptor) = command("relayPayable", Specs.Empty, Specs.Relay, Specs.Empty, Flags.Funded);
     }
 
     /// @notice Relay one RELAY input block with the command account and empty state.
-    function relayPayable(
-        bytes calldata context
-    ) external payable onlyCommand returns (bytes memory, bytes memory) {
-        Execution memory exec = openCommand(context, descriptor, 1);
-        (uint portal, uint resources, bytes calldata input) = exec.unpackRelay(Lanes.Input);
-        relay(portal, resources, exec.account, input, exec);
-
-        return closeCommand(exec);
+    function relayPayable(bytes calldata context) external payable onlyCommand returns (bytes memory, uint) {
+        Execution memory exec = openCommand(context, descriptor);
+        (uint portal, uint resources, bytes calldata input) = exec.oninput().unpackRelay();
+        relay(portal, resources, exec.account, context[0:0], input, exec);
+        return exec.close();
     }
 }
 
@@ -55,20 +57,17 @@ abstract contract RelayBalancePayable is CommandBase, RelayPayableHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("relayBalancePayable", Specs.Balance, Specs.Relay, Specs.Empty, 0, Flags.Funded);
+        (, descriptor) = command("relayBalancePayable", Specs.Balance, Specs.Relay, Specs.Empty, Flags.Funded);
     }
 
     /// @notice Relay one RELAY input block with the command account and current state.
     /// @param context Command context carrying state and exactly one RELAY input block.
     /// @return Empty output state.
-    /// @return Remaining native value as a refund transaction stream.
-    function relayBalancePayable(
-        bytes calldata context
-    ) external payable onlyCommand returns (bytes memory, bytes memory) {
-        Execution memory exec = openCommand(context, descriptor, 1);
-        (uint portal, uint resources, bytes calldata input) = exec.unpackRelay(Lanes.Input);
-        relay(portal, resources, exec.account, input, exec);
-
-        return closeCommand(exec);
+    /// @return Native value to add to the caller's budget.
+    function relayBalancePayable(bytes calldata context) external payable onlyCommand returns (bytes memory, uint) {
+        Execution memory exec = openCommand(context, descriptor);
+        (uint portal, uint resources, bytes calldata input) = exec.oninput().unpackRelay();
+        relay(portal, resources, exec.account, exec.takeRawState(), input, exec);
+        return exec.close();
     }
 }

package/commands/Repay.sol

@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {Execution, Executions, CommandBase, Flags, Lanes, Specs} from "./Base.sol";
+import {Execution, Executions, CommandBase, Flags, Specs} from "./Base.sol";
 import {RepayHook} from "../core/Settlement.sol";
 import {Action} from "../annotations/Action.sol";
 import {Actions} from "../utils/Actions.sol";
-import {Blocks} from "../codec/Blocks.sol";
-import {Reader, Readers} from "../codec/Readers.sol";
+import {Blocks, Memory} from "../codec/Blocks.sol";
+import {Sizes} from "../codec/Specs.sol";
+import {UnexpectedInput} from "../utils/Errors.sol";
 
 using Executions for Execution;
-using Readers for Reader;
 
 /// @notice Hook implemented by hosts that repay liabilities using native value.
 abstract contract RepayPayableHook {
@@ -28,7 +28,7 @@ abstract contract Repay is CommandBase, RepayHook, Action {
     uint private immutable id;
 
     constructor() {
-        (id, descriptor) = command("repay", Specs.Debt, Specs.Empty, Specs.Empty, 0, 0);
+        (id, descriptor) = command("repay", Specs.Debt, Specs.Empty, Specs.Empty, 0);
         action(id, Actions.Repay);
     }
 
@@ -40,18 +40,18 @@ abstract contract Repay is CommandBase, RepayHook, Action {
     /// @notice Repay each liability in the DEBT state stream.
     /// @param context Command context carrying the DEBT state stream.
     /// @return Empty output state.
-    /// @return Empty transaction stream.
+    /// @return Zero native budget credit.
     function repay(
         bytes calldata context
-    ) external onlyCommand returns (bytes memory, bytes memory) {
-        Execution memory exec = openCommand(context, descriptor, 0);
+    ) external onlyCommand returns (bytes memory, uint) {
+        Execution memory exec = openCommand(context, descriptor);
 
         while (exec.more()) {
-            (bytes32 liability, uint debt) = exec.unpackDebt(Lanes.State);
+            (bytes32 liability, uint debt) = exec.unpackDebt();
             repay(exec.account, liability, debt);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }
 
@@ -62,25 +62,25 @@ abstract contract RepayPayable is CommandBase, RepayPayableHook, Action {
 
     constructor() {
         uint id;
-        (id, descriptor) = command("repayPayable", Specs.Debt, Specs.Empty, Specs.Empty, 0, Flags.Funded);
+        (id, descriptor) = command("repayPayable", Specs.Debt, Specs.Empty, Specs.Empty, Flags.Funded);
         action(id, Actions.Repay);
     }
 
     /// @notice Repay each liability in the DEBT state stream.
     /// @param context Command context carrying the DEBT state 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 repayPayable(
         bytes calldata context
-    ) external payable onlyCommand returns (bytes memory, bytes memory) {
-        Execution memory exec = openCommand(context, descriptor, 0);
+    ) external payable onlyCommand returns (bytes memory, uint) {
+        Execution memory exec = openCommand(context, descriptor);
 
         while (exec.more()) {
-            (bytes32 liability, uint debt) = exec.unpackDebt(Lanes.State);
+            (bytes32 liability, uint debt) = exec.unpackDebt();
             repay(exec.account, liability, debt, exec);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }
 
@@ -91,26 +91,26 @@ abstract contract RepayPosition is CommandBase, RepayHook, Action {
 
     constructor() {
         uint id;
-        (id, descriptor) = command("repayPosition", Specs.Position, Specs.Empty, Specs.Balance, 0, 0);
+        (id, descriptor) = command("repayPosition", Specs.Position, Specs.Empty, Specs.Balance, 0);
         action(id, Actions.Repay);
     }
 
     /// @notice Repay each POSITION liability and return its asset as BALANCE state.
     /// @param context Command context carrying the POSITION state stream.
     /// @return BALANCE output state containing each released asset side.
-    /// @return Empty transaction stream.
+    /// @return Zero native budget credit.
     function repayPosition(
         bytes calldata context
-    ) external onlyCommand returns (bytes memory, bytes memory) {
-        Execution memory exec = openCommand(context, descriptor, 0);
+    ) external onlyCommand returns (bytes memory, uint) {
+        Execution memory exec = openCommand(context, descriptor);
 
         while (exec.more()) {
-            (bytes32 asset, uint amount, bytes32 liability, uint debt) = exec.unpackPosition(Lanes.State);
+            (bytes32 asset, uint amount, bytes32 liability, uint debt) = exec.unpackPosition();
             repay(exec.account, liability, debt);
             exec.outputBalance(asset, amount);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }
 
@@ -122,7 +122,7 @@ abstract contract RepayPositionPayable is CommandBase, RepayPayableHook, Action
     constructor() {
         uint id;
         (id, descriptor) = command(
-            "repayPositionPayable", Specs.Position, Specs.Empty, Specs.Balance, 0, Flags.Funded
+            "repayPositionPayable", Specs.Position, Specs.Empty, Specs.Balance, Flags.Funded
         );
         action(id, Actions.Repay);
     }
@@ -130,19 +130,19 @@ abstract contract RepayPositionPayable is CommandBase, RepayPayableHook, Action
     /// @notice Repay each POSITION liability and return its asset as BALANCE state.
     /// @param context Command context carrying the POSITION state stream.
     /// @return BALANCE output state containing each released asset side.
-    /// @return Remaining native value as a refund transaction stream.
+    /// @return Native value to add to the caller's budget.
     function repayPositionPayable(
         bytes calldata context
-    ) external payable onlyCommand returns (bytes memory, bytes memory) {
-        Execution memory exec = openCommand(context, descriptor, 0);
+    ) external payable onlyCommand returns (bytes memory, uint) {
+        Execution memory exec = openCommand(context, descriptor);
 
         while (exec.more()) {
-            (bytes32 asset, uint amount, bytes32 liability, uint debt) = exec.unpackPosition(Lanes.State);
+            (bytes32 asset, uint amount, bytes32 liability, uint debt) = exec.unpackPosition();
             repay(exec.account, liability, debt, exec);
             exec.outputBalance(asset, amount);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }
 
@@ -157,23 +157,26 @@ abstract contract RepayInternal is Repay {
     /// @param input Empty input required by the command schema.
     /// @param value Native value assigned to the command; must be zero.
     /// @return output Empty output state.
-    /// @return transactions Empty transaction stream.
+    /// @return credit Zero native budget credit.
     function executeRepay(
         bytes32 account,
         bytes memory state,
         bytes calldata input,
         uint128 value
-    ) internal returns (bytes memory, bytes memory) {
+    ) internal returns (bytes memory, uint) {
         if (value != 0) revert ValueNotAllowed();
-        if (input.length != 0) revert Executions.ZeroStride();
+        if (input.length != 0) revert UnexpectedInput();
         if (state.length == 0) revert Blocks.EmptyRun();
 
-        Reader memory reader = Readers.open(state);
-        while (reader.more()) {
-            (bytes32 liability, uint debt) = reader.unpackDebt();
+        (uint abs, uint end) = Memory.bounds(state, Sizes.Debt);
+        while (abs < end) {
+            (bytes32 liability, uint debt) = Memory.unpackDebt(abs);
             repay(account, liability, debt);
+            unchecked {
+                abs += Sizes.Debt;
+            }
         }
 
-        return ("", "");
+        return ("", 0);
     }
 }

package/commands/Settle.sol

@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import {Execution, Executions, CommandBase, Flags, Lanes, Specs} from "./Base.sol";
+import {Execution, Executions, CommandBase, Flags, Specs} from "./Base.sol";
 import {SettleHook} from "../core/Settlement.sol";
 import {Action} from "../annotations/Action.sol";
 import {Actions} from "../utils/Actions.sol";
-import {Blocks} from "../codec/Blocks.sol";
-import {Reader, Readers} from "../codec/Readers.sol";
+import {Blocks, Memory} from "../codec/Blocks.sol";
+import {Sizes} from "../codec/Specs.sol";
+import {UnexpectedInput} from "../utils/Errors.sol";
 
 using Executions for Execution;
-using Readers for Reader;
 
 /// @notice Hook implemented by hosts that settle positions using native value.
 abstract contract SettlePayableHook {
@@ -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, 0);
+        (id, descriptor) = command("settle", Specs.Position, Specs.Empty, Specs.Empty, 0);
         action(id, Actions.Settle);
     }
 
@@ -49,18 +49,18 @@ abstract contract Settle is CommandBase, SettleHook, Action {
     /// @notice Settle each POSITION block from the command state.
     /// @param context Command context carrying the POSITION state stream.
     /// @return Empty output state.
-    /// @return Empty transaction stream.
+    /// @return Zero native budget credit.
     function settle(
         bytes calldata context
-    ) external onlyCommand returns (bytes memory, bytes memory) {
-        Execution memory exec = openCommand(context, descriptor, 0);
+    ) external onlyCommand returns (bytes memory, uint) {
+        Execution memory exec = openCommand(context, descriptor);
 
         while (exec.more()) {
-            (bytes32 asset, uint amount, bytes32 liability, uint debt) = exec.unpackPosition(Lanes.State);
+            (bytes32 asset, uint amount, bytes32 liability, uint debt) = exec.unpackPosition();
             settle(exec.account, asset, amount, liability, debt);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }
 
@@ -71,25 +71,25 @@ abstract contract SettlePayable is CommandBase, SettlePayableHook, Action {
 
     constructor() {
         uint id;
-        (id, descriptor) = command("settlePayable", Specs.Position, Specs.Empty, Specs.Empty, 0, Flags.Funded);
+        (id, descriptor) = command("settlePayable", Specs.Position, Specs.Empty, Specs.Empty, Flags.Funded);
         action(id, Actions.Settle);
     }
 
     /// @notice Settle each POSITION block with access to a shared native-value budget.
     /// @param context Command context carrying the POSITION state 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 settlePayable(
         bytes calldata context
-    ) external payable onlyCommand returns (bytes memory, bytes memory) {
-        Execution memory exec = openCommand(context, descriptor, 0);
+    ) external payable onlyCommand returns (bytes memory, uint) {
+        Execution memory exec = openCommand(context, descriptor);
 
         while (exec.more()) {
-            (bytes32 asset, uint amount, bytes32 liability, uint debt) = exec.unpackPosition(Lanes.State);
+            (bytes32 asset, uint amount, bytes32 liability, uint debt) = exec.unpackPosition();
             settle(exec.account, asset, amount, liability, debt, exec);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }
 
@@ -104,23 +104,26 @@ abstract contract SettleInternal is Settle {
     /// @param input Empty input required by the command schema.
     /// @param value Native value assigned to the command; must be zero.
     /// @return output Empty output state.
-    /// @return transactions Empty transaction stream.
+    /// @return credit Zero native budget credit.
     function executeSettle(
         bytes32 account,
         bytes memory state,
         bytes calldata input,
         uint128 value
-    ) internal returns (bytes memory, bytes memory) {
+    ) internal returns (bytes memory, uint) {
         if (value != 0) revert ValueNotAllowed();
-        if (input.length != 0) revert Executions.ZeroStride();
+        if (input.length != 0) revert UnexpectedInput();
         if (state.length == 0) revert Blocks.EmptyRun();
 
-        Reader memory reader = Readers.open(state);
-        while (reader.more()) {
-            (bytes32 asset, uint amount, bytes32 liability, uint debt) = reader.unpackPosition();
+        (uint abs, uint end) = Memory.bounds(state, Sizes.Position);
+        while (abs < end) {
+            (bytes32 asset, uint amount, bytes32 liability, uint debt) = Memory.unpackPosition(abs);
             settle(account, asset, amount, liability, debt);
+            unchecked {
+                abs += Sizes.Position;
+            }
         }
 
-        return ("", "");
+        return ("", 0);
     }
 }

package/commands/Withdraw.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, Specs} from "./Base.sol";
 import {Action} from "../annotations/Action.sol";
 import {Actions} from "../utils/Actions.sol";
 using Executions for Execution;
@@ -25,24 +25,24 @@ abstract contract Withdraw is CommandBase, WithdrawHook, Action {
 
     constructor() {
         uint id;
-        (id, descriptor) = command("withdraw", Specs.Balance, Specs.Empty, Specs.Empty, 0, 0);
+        (id, descriptor) = command("withdraw", Specs.Balance, Specs.Empty, Specs.Empty, 0);
         action(id, Actions.Withdraw);
     }
 
     /// @notice Withdraw each BALANCE block from the command state to the command account.
     /// @param context Command context carrying the BALANCE state stream.
     /// @return Empty output state.
-    /// @return Empty transaction stream.
+    /// @return Zero native budget credit.
     function withdraw(
         bytes calldata context
-    ) external onlyCommand returns (bytes memory, bytes memory) {
-        Execution memory exec = openCommand(context, descriptor, 0);
+    ) external onlyCommand returns (bytes memory, uint) {
+        Execution memory exec = openCommand(context, descriptor);
 
         while (exec.more()) {
-            (bytes32 asset, uint amount) = exec.unpackBalance(Lanes.State);
+            (bytes32 asset, uint amount) = exec.unpackBalance();
             withdraw(exec.account, asset, amount);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }

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, 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 allow assets.
@@ -19,24 +19,24 @@ abstract contract AllowAssets is AdminBase, AllowAssetsHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("allowAssets", Specs.Empty, Specs.Asset, Specs.Empty, 0, Flags.Admin);
+        (, descriptor) = command("allowAssets", Specs.Empty, Specs.Asset, Specs.Empty, Flags.Admin);
     }
 
     /// @notice Allow 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 allowAssets(
         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();
             allowAsset(asset);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }
 

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, 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 configure peer asset allowances.
@@ -23,23 +23,23 @@ abstract contract Allowance is AdminBase, AllowanceHook {
     uint private immutable descriptor;
 
     constructor() {
-        (, descriptor) = command("allowance", Specs.Empty, Specs.Allowance, Specs.Empty, 0, Flags.Admin);
+        (, descriptor) = command("allowance", Specs.Empty, Specs.Allowance, Specs.Empty, Flags.Admin);
     }
 
     /// @notice Apply each ALLOWANCE block in the admin input.
     /// @param context Admin command context carrying the ALLOWANCE input stream.
     /// @return Empty output state.
-    /// @return Empty transaction stream.
+    /// @return Zero native budget credit.
     function allowance(
         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 peer, bytes32 asset, uint amount) = exec.unpackAllowance(Lanes.Input);
+            (uint peer, bytes32 asset, uint amount) = exec.unpackAllowance();
             allowance(peer, asset, amount);
         }
 
-        return closeCommand(exec);
+        return exec.close();
     }
 }