@rootzero/contracts 0.8.0 → 0.9.0

package/Commands.sol

@@ -5,34 +5,29 @@ pragma solidity ^0.8.33;
 // Import this file to inherit from the full rootzero command surface without managing individual paths.
 
 import { CommandBase, CommandContext, CommandPayable, encodeCommandCall } from "./commands/Base.sol";
-import { State } from "./utils/State.sol";
+import { Keys } from "./blocks/Keys.sol";
 import { Burn, BurnHook } from "./commands/Burn.sol";
-import { Create, CreateHook } from "./commands/Create.sol";
 import { CreditAccount, CreditAccountHook } from "./commands/Credit.sol";
 import { DebitAccount, DebitAccountHook } from "./commands/Debit.sol";
 import { Deposit, DepositHook, DepositPayable, DepositPayableHook } from "./commands/Deposit.sol";
-import { Remove, RemoveHook } from "./commands/Remove.sol";
 import { PipePayable, PipePayableHook } from "./commands/Pipe.sol";
-import { Provision, ProvisionHook, ProvisionPayable, ProvisionPayableHook, ProvisionFromBalance } from "./commands/Provision.sol";
-import { Settle } from "./commands/Settle.sol";
-import { StakeCustodyToPosition, StakeCustodyToPositionHook } from "./commands/Stake.sol";
-import { Supply, SupplyHook } from "./commands/Supply.sol";
+import { Provision, ProvisionHook, ProvisionPayable, ProvisionPayableHook } from "./commands/Provision.sol";
 import { Transfer, TransferHook } from "./commands/Transfer.sol";
 import { Withdraw, WithdrawHook } from "./commands/Withdraw.sol";
 import { AllowAssets, AllowAssetsHook } from "./commands/admin/AllowAssets.sol";
 import { Destroy, DestroyHook } from "./commands/admin/Destroy.sol";
+import { ExecutePayable } from "./commands/admin/Execute.sol";
 import { Authorize } from "./commands/admin/Authorize.sol";
 import { DenyAssets, DenyAssetsHook } from "./commands/admin/DenyAssets.sol";
 import { Init, InitHook } from "./commands/admin/Init.sol";
 import { RelocatePayable } from "./commands/admin/Relocate.sol";
-import { Allocate, AllocateHook } from "./commands/admin/Allocate.sol";
+import { Allowance, AllowanceHook } from "./commands/admin/Allowance.sol";
 import { Unauthorize } from "./commands/admin/Unauthorize.sol";
 import { PeerBase, encodePeerCall } from "./peer/Base.sol";
+import { PeerAllowance } from "./peer/Allowance.sol";
 import { PeerAssetPull, PeerAssetPullHook } from "./peer/AssetPull.sol";
 import { PeerAllowAssets } from "./peer/AllowAssets.sol";
 import { PeerDenyAssets } from "./peer/DenyAssets.sol";
-import { PeerPull, PeerPullHook } from "./peer/Pull.sol";
-import { PeerPush, PeerPushHook } from "./peer/Push.sol";
 import { PeerSettle } from "./peer/Settle.sol";
 
 

package/Core.sol

@@ -1,15 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-// Aggregator: re-exports the core host, access, cursor, and validation layer.
+// Aggregator: re-exports the core host, context, access, node-call, and validation layer.
 // Import this file to bring the full rootzero host base layer into scope.
 
 import { AccessControl } from "./core/Access.sol";
 import { Balances } from "./core/Balances.sol";
-import { CursorBase } from "./core/CursorBase.sol";
+import { RootZeroContext } from "./core/Context.sol";
 import { Host } from "./core/Host.sol";
-import { HostBound } from "./core/HostBound.sol";
-import { FailedCall, OperationBase } from "./core/Operation.sol";
+import { FailedCall, NodeCalls } from "./core/Calls.sol";
 import { Validator } from "./core/Validator.sol";
 import { HostDiscovery } from "./core/Host.sol";
 import { IHostDiscovery } from "./interfaces/IHostDiscovery.sol";

package/Cursors.sol

@@ -4,14 +4,12 @@ pragma solidity ^0.8.33;
 // Aggregator: re-exports all block stream primitives (Cursors, Writers, Schema, Keys, Sizes).
 // Import this file to get access to the full block encoding/decoding surface in one import.
 
-import { HostAmount, UserAmount, HostAsset, Tx, AssetAmount, Sizes } from "./blocks/Schema.sol";
+import { AssetAmount, AccountAsset, AccountAmount, HostAmount, HostAccountAsset, HostAccountAmount, Tx } from "./core/Types.sol";
+import { Forms, Sizes } from "./blocks/Schema.sol";
 import { Keys } from "./blocks/Keys.sol";
 import { Schemas } from "./blocks/Schema.sol";
-import { Cursors, Cur } from "./blocks/cursors/Core.sol";
-import { Erc20Cursors } from "./blocks/cursors/Erc20.sol";
-import { Erc1155Cursors } from "./blocks/cursors/Erc1155.sol";
-import { Erc721Cursors } from "./blocks/cursors/Erc721.sol";
-import { Writer, Writers } from "./blocks/Writers.sol";
+import { Cursors, Cur } from "./blocks/Cursors.sol";
+import { ALLOC_SCALE, Writer, Writers } from "./blocks/Writers.sol";
 
 
 

package/Events.sol

@@ -11,7 +11,7 @@ import { CollateralEvent } from "./events/Collateral.sol";
 import { CommandEvent } from "./events/Command.sol";
 import { DebtEvent } from "./events/Debt.sol";
 import { DepositEvent } from "./events/Deposit.sol";
-import { Erc721PositionEvent } from "./events/Erc721.sol";
+import { AssetPositionEvent } from "./events/Position.sol";
 import { EventEmitter } from "./events/Emitter.sol";
 import { GovernedEvent } from "./events/Governed.sol";
 import { HostAnnouncedEvent } from "./events/Host.sol";

package/Queries.sol

@@ -5,6 +5,6 @@ pragma solidity ^0.8.33;
 // Import this file to build rootzero query contracts without managing individual paths.
 
 import { IsAllowedAsset, IsAllowedAssetHook } from "./queries/Assets.sol";
-import { AssetPosition, AssetPositionHook } from "./queries/Positions.sol";
+import { GetPosition, GetPositionHook } from "./queries/Positions.sol";
 import { GetBalances, GetBalancesHook } from "./queries/Balances.sol";
 import { QueryBase, encodeQueryCall } from "./queries/Base.sol";

package/README.md

@@ -10,8 +10,9 @@ Most consumers should start from the package root entry points:
 
 - `@rootzero/contracts/Core.sol` — host, access control, balances, and validator building blocks
 - `@rootzero/contracts/Commands.sol` — command and peer base contracts plus all standard command mixins
-- `@rootzero/contracts/Cursors.sol` — cursor reader (`Cur`), block schemas, key constants, memory refs, and writers
-- `@rootzero/contracts/Utils.sol` — IDs, assets, accounts, state discriminants, layout, and value helpers
+- `@rootzero/contracts/Queries.sol` — query base contracts plus standard query mixins
+- `@rootzero/contracts/Cursors.sol` — cursor reader (`Cur`), block schemas, key constants, typed block helpers, and writers
+- `@rootzero/contracts/Utils.sol` — IDs, assets, accounts, layout, and value helpers
 - `@rootzero/contracts/Events.sol` — reusable event emitters and event contracts
 
 ## Start Here
@@ -35,20 +36,19 @@ All request and response data is encoded as a binary block stream. Each block is
 [bytes4 key][bytes4 payloadLen][payload]
 ```
 
-`key` is `bytes4(keccak256(schemaString))` — see `Keys` for the full set. `Cursors` parses calldata streams zero-copy via the `Cur` struct; `Writers` builds response streams into pre-allocated memory; `Mem` parses in-memory streams for composed responses.
+`key` is `bytes4(keccak256(schemaString))` — see `Keys` for the full set. `Cursors` parses calldata streams zero-copy via the `Cur` struct; `Writers` builds response streams into pre-allocated memory.
 
-## State Discriminants
+## Schemas, Forms, And State
 
-Every command declares its input and output state shape using constants from the `State` library:
+Protocol blocks use schema strings and four-byte keys:
 
-| Constant             | Meaning                           |
-|----------------------|-----------------------------------|
-| `State.Empty`        | No state (empty stream)           |
-| `State.Steps`        | STEP blocks (sub-command pipeline)|
-| `State.Balances`     | BALANCE blocks                    |
-| `State.Transactions` | TRANSACTION blocks                |
-| `State.Custodies`    | CUSTODY blocks                    |
-| `State.Claims`       | Claim records                     |
+- `Schemas` describes semantic protocol blocks such as `amount(...)`, `balance(...)`, `custody(...)`, and `payout(...)`.
+- `Forms` describes reusable structural blocks such as `accountAsset(...)` and `accountAmount(...)`, mostly used by queries.
+- `Keys` contains the runtime `bytes4` keys derived from those schema/form strings.
+
+Every command declares its input and output pipeline state with block keys in the `Command` event. Use `Keys.Empty` when a command expects or returns no state.
+
+The active command pipeline state is intentionally narrow: `BALANCE` and `CUSTODY` blocks are live value owned by the active account while execution is in-flight. `TRANSACTION` remains a block type for settlement messages, but it is not command pipeline state.
 
 ## Typical Usage
 
@@ -79,9 +79,8 @@ Extend `CommandBase` to define a command mixin that runs inside the protocol's t
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import { CommandBase, CommandContext } from "@rootzero/contracts/Commands.sol";
+import { CommandBase, CommandContext, Keys } from "@rootzero/contracts/Commands.sol";
 import { Cursors, Cur, Schemas } from "@rootzero/contracts/Cursors.sol";
-import { State } from "@rootzero/contracts/Utils.sol";
 
 using Cursors for Cur;
 
@@ -91,12 +90,12 @@ abstract contract ExampleCommand is CommandBase {
     uint internal immutable myCommandId = commandId(NAME);
 
     constructor() {
-        emit Command(host, NAME, Schemas.Amount, myCommandId, State.Empty, State.Balances);
+        emit Command(host, myCommandId, NAME, Schemas.Amount, Keys.Empty, Keys.Balance, false);
     }
 
     function myCommand(
         CommandContext calldata c
-    ) external payable onlyCommand(myCommandId, c.target) returns (bytes memory) {
+    ) external onlyCommand(c.account) returns (bytes memory) {
         (Cur memory input, , ) = cursor(c.request, 1);
         (bytes32 asset, bytes32 meta, uint amount) = input.unpackAmount();
         input.complete();
@@ -110,8 +109,8 @@ abstract contract ExampleCommand is CommandBase {
 - `contracts/core` — host, access control, balances, operation base, and signature validation
 - `contracts/commands` — standard command building blocks and admin commands
 - `contracts/peer` — peer protocol surfaces for inter-host asset flows and asset allow/deny
-- `contracts/blocks` — block stream schema (`Schema`), cursor parsing (`Cursors`), memory refs (`Mem`), and writers (`Writers`)
-- `contracts/utils` — shared encoding helpers: IDs, assets, accounts, state discriminants, layout, ECDSA
+- `contracts/blocks` — block stream schema (`Schema`), cursor parsing (`Cursors`), and writers (`Writers`)
+- `contracts/utils` — shared encoding helpers: IDs, assets, accounts, layout, ECDSA
 - `contracts/events` — protocol event contracts and emitters
 - `contracts/interfaces` — discovery interfaces and shared external protocol surfaces
 - `docs` — introductory documentation

package/Utils.sol

@@ -1,17 +1,17 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-// Aggregator: re-exports all utility libraries (State, Accounts, Assets, ECDSA, Ids, Layout, Utils, Value).
+// Aggregator: re-exports all utility libraries (Keys, Accounts, Assets, ECDSA, Ids, Layout, Utils, Value).
 // Import this file to access the full utility surface without managing individual paths.
 
-import { State } from "./utils/State.sol";
+import { Keys } from "./blocks/Keys.sol";
 import { Accounts } from "./utils/Accounts.sol";
 import { Amounts, Assets } from "./utils/Assets.sol";
 import { ECDSA } from "./utils/ECDSA.sol";
 import { Ids, Selectors } from "./utils/Ids.sol";
 import { Layout } from "./utils/Layout.sol";
 import { Schemas } from "./blocks/Schema.sol";
-import { addrOr, applyBps, beforeBps, bytes32ToString, divisible, isFamily, isLocal, isLocalFamily, matchesBase, MAX_BPS, max8, max16, max24, max32, max40, max64, max96, max128, max160, NotDivisible, retryTicket, toLocalBase, toLocalFamily, toUnspecifiedBase, ValueOverflow } from "./utils/Utils.sol";
+import { addrOr, applyBps, beforeBps, bytes32ToInt, bytes32ToString, divisible, hash32, intToBytes32, isFamily, isLocal, isLocalFamily, matchesBase, MAX_BPS, max8, max16, max24, max32, max40, max64, max96, max128, max160, NotDivisible, retryTicket, toLocalBase, toLocalFamily, toUnspecifiedBase, ValueOverflow } from "./utils/Utils.sol";
 import { Budget, Values } from "./utils/Value.sol";