@rootzero/contracts 0.9.8 → 0.9.9

package/events/Query.sol

@@ -10,10 +10,8 @@ abstract contract QueryEvent is EventEmitter {
     /// @param host Host node ID that owns this query.
     /// @param id Query node ID.
     /// @param name Human-readable query name.
-    /// @param shape Per-operation prime block counts encoded as `request:response`.
-    /// Blocks outside the prime runs are global batch blocks and are excluded
-    /// from the counts.
-    /// @param request Schema DSL string describing the query request shape.
+    /// @param shape Per-operation block counts encoded as `request:response`.
+    /// @param request Schema DSL string describing the input request run, or empty if none.
     /// @param response Schema DSL string describing the query response shape.
     event Query(uint indexed host, uint id, string name, bytes32 shape, string request, string response);
 

package/events/Transfer.sol

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import { EventEmitter } from "./Emitter.sol";
+
+/// @notice Emitted when an asset moves from one account to another.
+abstract contract TransferEvent is EventEmitter {
+    string private constant ABI = "event Transfer(bytes32 indexed from, bytes32 to, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context)";
+
+    /// @param account Source account identifier.
+    /// @param to Destination account identifier.
+    /// @param asset Asset identifier.
+    /// @param meta Asset metadata slot.
+    /// @param amount Amount transferred.
+    /// @param action Primary operation hint from `Actions`.
+    /// @param context Reserved context value for future use.
+    event Transfer(bytes32 indexed account, bytes32 to, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context);
+
+    constructor() {
+        emit EventAbi(ABI);
+    }
+}

package/guards/Revoke.sol

@@ -19,13 +19,13 @@ abstract contract Revoke is GuardBase {
     }
 
     function revoke(bytes calldata request) external onlyGuardian {
-        (Cur memory input, ) = cursor(request, 1);
+        (Cur memory input, ) = Cursors.first(request, 1);
 
-        while (input.i < input.bound) {
+        while (input.i < input.len) {
             uint node = input.unpackNode();
             setNode(node, false);
         }
 
-        input.close();
+        input.complete();
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rootzero/contracts",
-  "version": "0.9.8",
+  "version": "0.9.9",
   "description": "Solidity contracts and protocol building blocks for rootzero hosts and commands.",
   "private": false,
   "license": "GPL-3.0-only",

package/peer/AllowAssets.sol

@@ -20,14 +20,14 @@ abstract contract PeerAllowAssets is PeerBase, AllowAssetsHook {
 
     /// @notice Execute the allow-assets peer call.
     function peerAllowAssets(bytes calldata request) external onlyPeer returns (bytes memory) {
-        (Cur memory assets, ) = cursor(request, 1);
+        (Cur memory assets, ) = Cursors.first(request, 1);
 
-        while (assets.i < assets.bound) {
+        while (assets.i < assets.len) {
             (bytes32 asset, bytes32 meta) = assets.unpackAsset();
             allowAsset(asset, meta);
         }
 
-        assets.close();
+        assets.complete();
         return "";
     }
 }

package/peer/Allowance.sol

@@ -21,15 +21,15 @@ abstract contract PeerAllowance is PeerBase, AllowanceHook {
 
     /// @notice Execute the allowance peer call.
     function peerAllowance(bytes calldata request) external onlyPeer returns (bytes memory) {
-        (Cur memory amounts, ) = cursor(request, 1);
+        (Cur memory amounts, ) = Cursors.first(request, 1);
         uint peer = caller();
 
-        while (amounts.i < amounts.bound) {
+        while (amounts.i < amounts.len) {
             (bytes32 asset, bytes32 meta, uint amount) = amounts.unpackAmount();
             allowance(peer, asset, meta, amount);
         }
 
-        amounts.close();
+        amounts.complete();
         return "";
     }
 }

package/peer/BalancePull.sol

@@ -29,15 +29,15 @@ abstract contract PeerBalancePull is PeerBase, BalancePullHook {
 
     /// @notice Execute the balance-pull peer call.
     function peerBalancePull(bytes calldata request) external onlyPeer returns (bytes memory) {
-        (Cur memory input, ) = cursor(request, 1);
+        (Cur memory input, ) = Cursors.first(request, 1);
         uint peer = caller();
 
-        while (input.i < input.bound) {
+        while (input.i < input.len) {
             (bytes32 asset, bytes32 meta, uint amount) = input.unpackBalance();
             balancePull(peer, asset, meta, amount);
         }
 
-        input.close();
+        input.complete();
         return "";
     }
 }

package/peer/DenyAssets.sol

@@ -20,14 +20,14 @@ abstract contract PeerDenyAssets is PeerBase, DenyAssetsHook {
 
     /// @notice Execute the deny-assets peer call.
     function peerDenyAssets(bytes calldata request) external onlyPeer returns (bytes memory) {
-        (Cur memory assets, ) = cursor(request, 1);
+        (Cur memory assets, ) = Cursors.first(request, 1);
 
-        while (assets.i < assets.bound) {
+        while (assets.i < assets.len) {
             (bytes32 asset, bytes32 meta) = assets.unpackAsset();
             denyAsset(asset, meta);
         }
 
-        assets.close();
+        assets.complete();
         return "";
     }
 }

package/peer/Pipe.sol

@@ -24,15 +24,15 @@ abstract contract PeerPipePayable is PeerBase, Pipeline {
     /// @dev Each pipe receives its own explicit value sub-budget. Any top-level
     ///      `msg.value` not assigned to a pipe remains on this host.
     function peerPipePayable(bytes calldata request) external payable onlyPeer returns (bytes memory) {
-        (Cur memory input, ) = cursor(request, 1);
+        (Cur memory input, ) = Cursors.first(request, 1);
         Budget memory budget = valueBudget();
 
-        while (input.i < input.bound) {
+        while (input.i < input.len) {
             (uint value, bytes32 account, bytes calldata state, bytes calldata steps) = input.unpackPipe();
             pipe(account, state, steps, allocateValue(budget, value));
         }
 
-        input.close();
+        input.complete();
         return "";
     }
 }

package/peer/Settle.sol

@@ -2,15 +2,16 @@
 pragma solidity ^0.8.33;
 
 import { PeerBase } from "./Base.sol";
-import { TransferHook } from "../commands/Transfer.sol";
+import { CreditAccountHook } from "../commands/Credit.sol";
+import { DebitAccountHook } from "../commands/Debit.sol";
 import { Cursors, Cur, Schemas } from "../Cursors.sol";
 
 using Cursors for Cur;
 
 /// @title PeerSettle
-/// @notice Peer that consumes peer-supplied TRANSACTION blocks through the shared transfer hook.
-/// Each TRANSACTION block in the request calls `transfer(value)`. Restricted to trusted peers.
-abstract contract PeerSettle is PeerBase, TransferHook {
+/// @notice Peer that consumes peer-supplied TRANSACTION blocks through debit and credit hooks.
+/// Each TRANSACTION block calls `debitAccount` for `from` and `creditAccount` for `to`.
+abstract contract PeerSettle is PeerBase, DebitAccountHook, CreditAccountHook {
     string private constant NAME = "peerSettle";
     uint internal immutable peerSettleId = peerId(NAME);
 
@@ -20,13 +21,15 @@ abstract contract PeerSettle is PeerBase, TransferHook {
 
     /// @notice Execute the peer-settle call.
     function peerSettle(bytes calldata request) external onlyPeer returns (bytes memory) {
-        (Cur memory state, ) = cursor(request, 1);
+        (Cur memory state, ) = Cursors.first(request, 1);
 
-        while (state.i < state.bound) {
-            transfer(state.unpackTxValue());
+        while (state.i < state.len) {
+            (bytes32 from, bytes32 to, bytes32 asset, bytes32 meta, uint amount) = state.unpackTransaction();
+            if (from != 0) debitAccount(from, asset, meta, amount);
+            if (to != 0) creditAccount(to, asset, meta, amount);
         }
 
-        state.close();
+        state.complete();
         return "";
     }
 }

package/queries/Assets.sol

@@ -33,16 +33,16 @@ abstract contract AssetStatus is QueryBase, AssetStatusHook {
     /// @param request Block-stream request consisting of `#asset { bytes32 asset, bytes32 meta }` blocks.
     /// @return Block-stream response containing one `#status { uint code }` per asset block.
     function assetStatus(bytes calldata request) external view returns (bytes memory) {
-        (Cur memory query, uint groups) = cursor(request, 1);
+        (Cur memory query, uint groups) = Cursors.first(request, 1);
         Writer memory response = Writers.allocStatuses(groups);
 
-        while (query.i < query.bound) {
+        while (query.i < query.len) {
             (bytes32 asset, bytes32 meta) = query.unpackAsset();
             uint status = assetStatus(asset, meta);
             response.appendStatus(status);
         }
 
-        query.close();
+        query.complete();
         return response.finish();
     }
 }

package/queries/Balances.sol

@@ -33,16 +33,16 @@ abstract contract GetBalances is QueryBase, GetBalancesHook {
     /// @param request Block-stream request consisting of `accountAsset(account, asset, meta)*`.
     /// @return Block-stream response containing one `accountAmount(account, asset, meta, amount)` block per request block.
     function getBalances(bytes calldata request) external view returns (bytes memory) {
-        (Cur memory query, uint groups) = cursor(request, 1);
+        (Cur memory query, uint groups) = Cursors.first(request, 1);
         Writer memory response = Writers.allocAccountAmounts(groups);
 
-        while (query.i < query.bound) {
+        while (query.i < query.len) {
             (bytes32 account, bytes32 asset, bytes32 meta) = query.unpackAccountAsset();
             uint amount = getBalance(account, asset, meta);
             response.appendAccountAmount(account, asset, meta, amount);
         }
 
-        query.close();
+        query.complete();
         return response.finish();
     }
 }

package/queries/Positions.sol

@@ -42,15 +42,15 @@ abstract contract GetPosition is QueryBase, GetPositionHook {
     /// @param request Block-stream request consisting of `accountAsset(account, asset, meta)*`.
     /// @return Block-stream response containing one output-schema block per position block.
     function getPosition(bytes calldata request) external view returns (bytes memory) {
-        (Cur memory query, uint groups) = cursor(request, 1);
+        (Cur memory query, uint groups) = Cursors.first(request, 1);
         Writer memory response = Writers.allocAny(groups);
 
-        while (query.i < query.bound) {
+        while (query.i < query.len) {
             (bytes32 account, bytes32 asset, bytes32 meta) = query.unpackAccountAsset();
             appendPosition(account, asset, meta, response);
         }
 
-        query.close();
+        query.complete();
         return response.finish();
     }
 }

package/utils/Accounts.sol

@@ -57,6 +57,14 @@ library Accounts {
         return prefix(account) == Keccak;
     }
 
+    /// @notice Assert that `input` is an account and return it unchanged.
+    /// @param input Account identifier to validate.
+    /// @return account The same `input` if it is an account.
+    function any(bytes32 input) internal pure returns (bytes32 account) {
+        if (!isAccount(input)) revert InvalidAccount();
+        return input;
+    }
+
     /// @notice Assert that `input` is an admin account and return it unchanged.
     /// @param input Account identifier to validate.
     /// @return account The same `input` if it is an admin account.

package/utils/Actions.sol

@@ -4,13 +4,15 @@ pragma solidity ^0.8.33;
 library Actions {
     uint32 constant None = 0;
     uint32 constant Transfer = 1;
-    uint32 constant Deposit = 2;
-    uint32 constant Withdraw = 3;
-    uint32 constant Fee = 4;
-    uint32 constant Mint = 5;
-    uint32 constant Burn = 6;
-    uint32 constant Swap = 7;
-    uint32 constant Borrow = 8;
-    uint32 constant Repay = 9;
-    uint32 constant Liquidate = 10;
+    uint32 constant Payout = 2;
+    uint32 constant Settle = 3;
+    uint32 constant Deposit = 4;
+    uint32 constant Withdraw = 5;
+    uint32 constant Fee = 6;
+    uint32 constant Mint = 7;
+    uint32 constant Burn = 8;
+    uint32 constant Swap = 9;
+    uint32 constant Borrow = 10;
+    uint32 constant Repay = 11;
+    uint32 constant Liquidate = 12;
 }

package/commands/Transfer.sol

@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import { CommandContext, CommandBase, Keys } from "./Base.sol";
-import { Cursors, Cur, Schemas, Tx } from "../Cursors.sol";
-import { Accounts } from "../utils/Accounts.sol";
-using Cursors for Cur;
-
-abstract contract TransferHook {
-    /// @notice Override to execute a single transfer record from the request pipeline.
-    /// Called once per PAYOUT block in the request.
-    /// @param value Decoded transfer record (from, to, asset, meta, amount).
-    function transfer(Tx memory value) internal virtual;
-}
-
-/// @title Transfer
-/// @notice Command that transfers assets from a caller to recipients specified in
-/// PAYOUT request blocks. Produces no state output.
-/// The virtual `transfer(value)` hook is called once per entry.
-abstract contract Transfer is CommandBase, TransferHook {
-    string private constant NAME = "transfer";
-
-    uint internal immutable transferId = commandId(NAME);
-
-    constructor() {
-        emit Command(host, transferId, NAME, "1:0:0", Schemas.Payout, Keys.Empty, Keys.Empty, false);
-    }
-
-    /// @notice Override to customize request parsing or batching for transfers.
-    /// The default implementation iterates entry blocks and calls `transfer(value)` for each.
-    /// @param from Source account identifier.
-    /// @param request Full request bytes.
-    /// @return Empty bytes (transfers produce no state output).
-    function transfer(bytes32 from, bytes calldata request) internal virtual returns (bytes memory) {
-        (Cur memory input, ) = cursor(request, 1);
-        Tx memory value;
-        value.from = from;
-
-        while (input.i < input.bound) {
-            (value.to, value.asset, value.meta, value.amount) = input.unpackPayout();
-            Accounts.ensure(value.to);
-            transfer(value);
-        }
-
-        input.close();
-        return "";
-    }
-
-    function transfer(
-        CommandContext calldata c
-    ) external onlyCommand returns (bytes memory) {
-        return transfer(c.account, c.request);
-    }
-}