@rootzero/contracts 0.9.7 → 0.9.8

package/Core.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-// Aggregator: re-exports the core host, context, access, node-call, and validation layer.
+// Aggregator: re-exports the core host, runtime, 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 { RootZeroContext } from "./core/Context.sol";
+import { Runtime } from "./core/Runtime.sol";
 import { Host, IHostIntroduction } from "./core/Host.sol";
 import { FailedCall, NodeCalls } from "./core/Calls.sol";
 import { Payable } from "./core/Payable.sol";

package/Events.sol

@@ -6,22 +6,22 @@ pragma solidity ^0.8.33;
 
 import { AdminEvent } from "./events/Admin.sol";
 import { AssetStatusEvent } from "./events/Asset.sol";
+import { Actions } from "./utils/Actions.sol";
 import { BalanceEvent } from "./events/Balance.sol";
-import { CollateralEvent } from "./events/Collateral.sol";
 import { CommandEvent } from "./events/Command.sol";
-import { Contexts } from "./events/Contexts.sol";
-import { DebtEvent } from "./events/Debt.sol";
 import { PositionEvent } from "./events/Position.sol";
 import { ReceivedEvent } from "./events/Received.sol";
 import { EventEmitter } from "./events/Emitter.sol";
 import { GuardEvent } from "./events/Guard.sol";
 import { GuardianEvent } from "./events/Guardian.sol";
 import { IntroductionEvent } from "./events/Introduction.sol";
+import { LockedEvent } from "./events/Locked.sol";
 import { NodeEvent } from "./events/Node.sol";
 import { PeerEvent } from "./events/Peer.sol";
 import { QueryEvent } from "./events/Query.sol";
 import { RootedEvent } from "./events/Rooted.sol";
 import { SpentEvent } from "./events/Spent.sol";
+import { UnlockedEvent } from "./events/Unlocked.sol";
 
 
 

package/Utils.sol

@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-// Aggregator: re-exports all utility libraries (Keys, Accounts, Assets, ECDSA, Ids, Layout, Utils, Value).
+// Aggregator: re-exports all utility libraries (Keys, Accounts, Actions, Assets, ECDSA, Ids, Layout, Utils, Value).
 // Import this file to access the full utility surface without managing individual paths.
 
 import { Keys } from "./blocks/Keys.sol";
 import { Accounts } from "./utils/Accounts.sol";
+import { Actions } from "./utils/Actions.sol";
 import { Amounts, Assets } from "./utils/Assets.sol";
 import { ECDSA } from "./utils/ECDSA.sol";
 import { Ids, Selectors } from "./utils/Ids.sol";

package/core/Access.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.33;
 
 import {NodeEvent} from "../events/Node.sol";
 import {GuardianEvent} from "../events/Guardian.sol";
-import {RootZeroContext} from "./Context.sol";
+import {Runtime} from "./Runtime.sol";
 import {Accounts} from "../utils/Accounts.sol";
 import {Ids} from "../utils/Ids.sol";
 import {addrOr} from "../utils/Utils.sol";
@@ -14,7 +14,7 @@ import {addrOr} from "../utils/Utils.sol";
 /// mapping of externally trusted node IDs. Inbound trust is host-based:
 /// trusted hosts, the commander, and this contract itself may interact
 /// with the host through the guarded command and peer entrypoints.
-abstract contract AccessControl is RootZeroContext, NodeEvent, GuardianEvent {
+abstract contract AccessControl is Runtime, NodeEvent, GuardianEvent {
     /// @dev Trusted commander address. All calls from this address are implicitly trusted.
     /// Defaults to `address(this)` when no external commander is provided.
     address internal immutable commander;

package/core/Host.sol

@@ -7,6 +7,7 @@ import {Authorize} from "../commands/admin/Authorize.sol";
 import {Dismiss} from "../commands/admin/Dismiss.sol";
 import {Unauthorize} from "../commands/admin/Unauthorize.sol";
 import {ExecutePayable} from "../commands/admin/Execute.sol";
+import {Revoke} from "../guards/Revoke.sol";
 import {IntroductionEvent} from "../events/Introduction.sol";
 import {Ids} from "../utils/Ids.sol";
 
@@ -23,10 +24,11 @@ interface IHostIntroduction {
 
 /// @title Host
 /// @notice Abstract base contract for rootzero host implementations.
-/// Inherits admin command support (authorize, unauthorize, executePayable) and
+/// Inherits admin command support (authorize, unauthorize, executePayable),
+/// guardian management, the default guardian revoke action, and
 /// optionally introduces itself to a commander host at deployment.
 /// Accepts native ETH payments via the `receive` function.
-abstract contract Host is Authorize, Unauthorize, Appoint, Dismiss, ExecutePayable, IntroductionEvent, IHostIntroduction {
+abstract contract Host is Authorize, Unauthorize, Revoke, Appoint, Dismiss, ExecutePayable, IntroductionEvent, IHostIntroduction {
     /// @param cmdr Commander address; passed to `AccessControl`.
     ///        If `cmdr` is a deployed contract, the host calls `introduce`
     ///        on it during construction.

package/core/{Context.sol → Runtime.sol}

@@ -7,9 +7,9 @@ import {Ids} from "../utils/Ids.sol";
 
 using Cursors for Cur;
 
-/// @title RootZeroContext
-/// @notice Shared rootzero contract context for host identity, native value identity, and block-stream cursors.
-abstract contract RootZeroContext {
+/// @title Runtime
+/// @notice Shared runtime for host identity, native value identity, and block-stream cursors.
+abstract contract Runtime {
     /// @dev This contract's host node ID, set to `Ids.toHost(address(this))` at construction.
     uint public immutable host = Ids.toHost(address(this));
     /// @dev Asset ID for the native chain value (ETH), bound to the current chain at deployment.

package/events/Locked.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import { EventEmitter } from "./Emitter.sol";
+
+/// @notice Emitted when an account locks an asset in a protocol operation.
+abstract contract LockedEvent is EventEmitter {
+    string private constant ABI = "event Locked(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context)";
+
+    /// @param account Account identifier that locked the asset.
+    /// @param asset Asset identifier.
+    /// @param meta Asset metadata slot.
+    /// @param amount Amount locked.
+    /// @param action Primary operation hint from `Actions`.
+    /// @param context Reserved context value for future use.
+    event Locked(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context);
+
+    constructor() {
+        emit EventAbi(ABI);
+    }
+}

package/events/Position.sol

@@ -6,14 +6,16 @@ import {EventEmitter} from "./Emitter.sol";
 /// @notice Emitted when the reported value of an asset-backed position changes or is observed.
 /// A value of 0 should be interpreted as a closed position.
 abstract contract PositionEvent is EventEmitter {
-    string private constant ABI = "event Position(bytes32 indexed account, bytes32 asset, bytes32 meta, uint value, uint queryId)";
+    string private constant ABI = "event Position(bytes32 indexed account, bytes32 asset, bytes32 meta, uint value, uint32 action, uint context, uint queryId)";
 
     /// @param account Account identifier that owns or is associated with the position.
     /// @param asset Asset identifier for the asset class.
     /// @param meta Asset metadata slot carrying the position context.
     /// @param value Context-specific position value; 0 indicates a closed position.
+    /// @param action Primary operation hint from `Actions`.
+    /// @param context Reserved context value for future use.
     /// @param queryId Query ID associated with the position lookup or reporting context.
-    event Position(bytes32 indexed account, bytes32 asset, bytes32 meta, uint value, uint queryId);
+    event Position(bytes32 indexed account, bytes32 asset, bytes32 meta, uint value, uint32 action, uint context, uint queryId);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Received.sol

@@ -5,14 +5,15 @@ import { EventEmitter } from "./Emitter.sol";
 
 /// @notice Emitted when an account receives an asset in a protocol operation.
 abstract contract ReceivedEvent is EventEmitter {
-    string private constant ABI = "event Received(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint context)";
+    string private constant ABI = "event Received(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context)";
 
     /// @param account Account identifier that received the asset.
     /// @param asset Asset identifier.
     /// @param meta Asset metadata slot.
     /// @param amount Amount received.
-    /// @param context Operation context identifier associated with this receipt.
-    event Received(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint context);
+    /// @param action Primary operation hint from `Actions`.
+    /// @param context Reserved context value for future use.
+    event Received(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Spent.sol

@@ -5,14 +5,15 @@ import { EventEmitter } from "./Emitter.sol";
 
 /// @notice Emitted when an account spends an asset in a protocol operation.
 abstract contract SpentEvent is EventEmitter {
-    string private constant ABI = "event Spent(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint context)";
+    string private constant ABI = "event Spent(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context)";
 
     /// @param account Account identifier that spent the asset.
     /// @param asset Asset identifier.
     /// @param meta Asset metadata slot.
     /// @param amount Amount spent.
-    /// @param context Operation context identifier associated with this spend.
-    event Spent(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint context);
+    /// @param action Primary operation hint from `Actions`.
+    /// @param context Reserved context value for future use.
+    event Spent(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context);
 
     constructor() {
         emit EventAbi(ABI);

package/events/Unlocked.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.33;
+
+import { EventEmitter } from "./Emitter.sol";
+
+/// @notice Emitted when an account unlocks an asset in a protocol operation.
+abstract contract UnlockedEvent is EventEmitter {
+    string private constant ABI = "event Unlocked(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context)";
+
+    /// @param account Account identifier that unlocked the asset.
+    /// @param asset Asset identifier.
+    /// @param meta Asset metadata slot.
+    /// @param amount Amount unlocked.
+    /// @param action Primary operation hint from `Actions`.
+    /// @param context Reserved context value for future use.
+    event Unlocked(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint32 action, uint context);
+
+    constructor() {
+        emit EventAbi(ABI);
+    }
+}

package/package.json

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

package/queries/Base.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.33;
 
-import { RootZeroContext } from "../core/Context.sol";
+import { Runtime } from "../core/Runtime.sol";
 import { QueryEvent } from "../events/Query.sol";
 import { Ids, Selectors } from "../utils/Ids.sol";
 
@@ -20,7 +20,7 @@ function encodeQueryCall(uint target, bytes calldata request) pure returns (byte
 /// @notice Abstract base for rootzero query contracts.
 /// Queries are view-only entry points that consume a block-stream request and
 /// return a block-stream response.
-abstract contract QueryBase is RootZeroContext, QueryEvent {
+abstract contract QueryBase is Runtime, QueryEvent {
 
     /// @notice Derive the deterministic node ID for a named query on this contract.
     /// The ID encodes the ABI selector of `name(bytes)` and `address(this)`,

package/utils/Actions.sol

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-3.0-only
+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;
+}

package/events/Collateral.sol

@@ -1,24 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.33;
-
-import { EventEmitter } from "./Emitter.sol";
-
-/// @notice Emitted when an account's collateral position changes.
-/// Off-chain indexers should query the access command to retrieve the precise collateral details.
-abstract contract CollateralEvent is EventEmitter {
-    string private constant ABI = "event Collateral(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint access)";
-
-    /// @param account Account identifier that holds the collateral.
-    /// @param asset Asset identifier of the collateral.
-    /// @param meta Asset metadata slot.
-    /// @param amount Current collateral amount.
-    /// @param access Command ID or context identifier associated with this change.
-    event Collateral(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint access);
-
-    constructor() {
-        emit EventAbi(ABI);
-    }
-}
-
-
-

package/events/Contexts.sol

@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-/// @notice Standard context codes for generic asset activity events.
-library Contexts {
-    uint constant Deposit = 1;
-    uint constant Withdraw = 2;
-    uint constant Fee = 3;
-    uint constant Mint = 4;
-    uint constant Burn = 5;
-    uint constant Swap = 6;
-}

package/events/Debt.sol

@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.33;
-
-import { EventEmitter } from "./Emitter.sol";
-
-/// @notice Emitted when an account's debt position changes.
-/// Off-chain indexers should query the access command to retrieve precise debt details.
-abstract contract DebtEvent is EventEmitter {
-    string private constant ABI = "event Debt(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint mode, uint access)";
-
-    /// @param account Account identifier that holds the debt.
-    /// @param asset Asset identifier of the debt.
-    /// @param meta Asset metadata slot.
-    /// @param amount Current debt amount.
-    /// @param mode Debt mode or type discriminant (implementation-defined).
-    /// @param access Command ID or context identifier associated with this change.
-    event Debt(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount, uint mode, uint access);
-
-    constructor() {
-        emit EventAbi(ABI);
-    }
-}
-
-
-