@rootzero/contracts 0.9.5 → 0.9.7

package/utils/Ids.sol

@@ -26,6 +26,8 @@ library Ids {
     uint32 constant Peer = (uint32(Layout.Evm32) << 16) | (uint32(Layout.Node) << 8) | uint32(Layout.Peer);
     /// @dev Full 4-byte type prefix for query nodes.
     uint32 constant Query = (uint32(Layout.Evm32) << 16) | (uint32(Layout.Node) << 8) | uint32(Layout.Query);
+    /// @dev Full 4-byte type prefix for guard action nodes.
+    uint32 constant Guard = (uint32(Layout.Evm32) << 16) | (uint32(Layout.Node) << 8) | uint32(Layout.Guard);
 
     /// @notice Return true if `id` is a host node ID.
     function isHost(uint id) internal pure returns (bool) {
@@ -47,6 +49,11 @@ library Ids {
         return uint32(id >> 224) == Query;
     }
 
+    /// @notice Return true if `id` is a guard action node ID.
+    function isGuard(uint id) internal pure returns (bool) {
+        return uint32(id >> 224) == Guard;
+    }
+
     /// @notice Return true if `id` is a local node ID for this contract.
     function isLocalNode(uint id) internal view returns (bool) {
         return isLocalFamily(id, Node) && address(uint160(id)) == address(this);
@@ -60,14 +67,6 @@ library Ids {
         return id;
     }
 
-    /// @notice Assert that `id` is a command ID and return its embedded ABI selector.
-    /// @param id Node ID to validate.
-    /// @return selector 4-byte command selector stored in bits [191:160].
-    function commandSelector(uint id) internal pure returns (bytes4 selector) {
-        if (!isCommand(id)) revert InvalidId();
-        return bytes4(uint32(id >> 160));
-    }
-
     /// @notice Assert that `id` is a peer ID and return it unchanged.
     /// @param id Node ID to validate.
     /// @return pid The same `id` value if it is a peer.
@@ -76,14 +75,6 @@ library Ids {
         return id;
     }
 
-    /// @notice Assert that `id` is a peer ID and return its embedded ABI selector.
-    /// @param id Node ID to validate.
-    /// @return selector 4-byte peer selector stored in bits [191:160].
-    function peerSelector(uint id) internal pure returns (bytes4 selector) {
-        if (!isPeer(id)) revert InvalidId();
-        return bytes4(uint32(id >> 160));
-    }
-
     /// @notice Assert that `id` is a query ID and return it unchanged.
     /// @param id Node ID to validate.
     /// @return queryId The same `id` value if it is a query.
@@ -92,12 +83,40 @@ library Ids {
         return id;
     }
 
+    /// @notice Assert that `id` is a guard action ID and return it unchanged.
+    /// @param id Node ID to validate.
+    /// @return guardId The same `id` value if it is a guard action.
+    function guard(uint id) internal pure returns (uint guardId) {
+        if (!isGuard(id)) revert InvalidId();
+        return id;
+    }
+
+    /// @notice Assert that `id` is a command ID and return its embedded ABI selector.
+    /// @param id Node ID to validate.
+    /// @return selector 4-byte command selector stored in bits [191:160].
+    function commandSelector(uint id) internal pure returns (bytes4 selector) {
+        return bytes4(uint32(command(id) >> 160));
+    }
+
+    /// @notice Assert that `id` is a peer ID and return its embedded ABI selector.
+    /// @param id Node ID to validate.
+    /// @return selector 4-byte peer selector stored in bits [191:160].
+    function peerSelector(uint id) internal pure returns (bytes4 selector) {
+        return bytes4(uint32(peer(id) >> 160));
+    }
+
     /// @notice Assert that `id` is a query ID and return its embedded ABI selector.
     /// @param id Node ID to validate.
     /// @return selector 4-byte query selector stored in bits [191:160].
     function querySelector(uint id) internal pure returns (bytes4 selector) {
-        if (!isQuery(id)) revert InvalidId();
-        return bytes4(uint32(id >> 160));
+        return bytes4(uint32(query(id) >> 160));
+    }
+
+    /// @notice Assert that `id` is a guard action ID and return its embedded ABI selector.
+    /// @param id Node ID to validate.
+    /// @return selector 4-byte guard selector stored in bits [191:160].
+    function guardSelector(uint id) internal pure returns (bytes4 selector) {
+        return bytes4(uint32(guard(id) >> 160));
     }
 
     /// @notice Assert that `id` is the host ID of `addr` on the current chain.
@@ -146,6 +165,16 @@ library Ids {
         return id;
     }
 
+    /// @notice Build a chain-local guard action ID for the given selector and contract.
+    /// @param selector 4-byte ABI selector of the guard action entry point.
+    /// @param target Guard action contract address.
+    /// @return Guard action node ID embedding both the selector and address.
+    function toGuard(bytes4 selector, address target) internal view returns (uint) {
+        uint id = toLocalBase(Guard) | uint(uint160(target));
+        id |= uint(uint32(selector)) << 160;
+        return id;
+    }
+
     /// @notice Extract the contract address from any local node ID.
     /// Reverts if `id` does not belong to the local node family.
     /// @param id Node ID (host, command, or peer).
@@ -174,6 +203,8 @@ library Selectors {
     string constant PeerArgs = "(bytes)";
     /// @dev ABI argument encoding for query entry points: `(bytes)`.
     string constant QueryArgs = "(bytes)";
+    /// @dev ABI argument encoding for guard action entry points: `(bytes)`.
+    string constant GuardArgs = "(bytes)";
 
     /// @notice Derive the 4-byte ABI selector for a named command.
     /// The selector is `keccak256(name ++ CommandArgs)[0:4]`.
@@ -198,4 +229,12 @@ library Selectors {
     function query(string memory name) internal pure returns (bytes4) {
         return bytes4(keccak256(bytes.concat(bytes(name), bytes(QueryArgs))));
     }
+
+    /// @notice Derive the 4-byte ABI selector for a named guard action.
+    /// The selector is `keccak256(name ++ GuardArgs)[0:4]`.
+    /// @param name Guard action function name (without arguments).
+    /// @return 4-byte selector.
+    function guard(string memory name) internal pure returns (bytes4) {
+        return bytes4(keccak256(bytes.concat(bytes(name), bytes(GuardArgs))));
+    }
 }

package/utils/Layout.sol

@@ -37,10 +37,12 @@ library Layout {
 
     /// @dev Admin account — chain-local, backed by an EVM address.
     uint8 constant Admin = 0x01;
+    /// @dev Guardian account — chain-local, backed by an EVM address.
+    uint8 constant Guardian = 0x02;
     /// @dev User account — chain-agnostic, backed by an EVM address.
-    uint8 constant User = 0x02;
+    uint8 constant User = 0x03;
     /// @dev Keccak account — opaque 28-byte keccak commitment.
-    uint8 constant Keccak = 0x03;
+    uint8 constant Keccak = 0x04;
 
     // -------------------------------------------------------------------------
     // Node subtype tags (uint8, fourth byte of the ID type field)
@@ -54,6 +56,8 @@ library Layout {
     uint8 constant Peer = 0x03;
     /// @dev Node is a query contract.
     uint8 constant Query = 0x04;
+    /// @dev Node is a guardian-only direct action.
+    uint8 constant Guard = 0x05;
 
     // -------------------------------------------------------------------------
     // Asset subtype tags (uint8, fourth byte of the ID type field)

package/Queries.sol

@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-// Aggregator: re-exports query abstractions and reusable query bases.
-// Import this file to build rootzero query contracts without managing individual paths.
-
-import { IsAllowedAsset, IsAllowedAssetHook } from "./queries/Assets.sol";
-import { GetPosition, GetPositionHook } from "./queries/Positions.sol";
-import { GetBalances, GetBalancesHook } from "./queries/Balances.sol";
-import { QueryBase, encodeQueryCall } from "./queries/Base.sol";

package/events/Access.sol

@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import { EventEmitter } from "./Emitter.sol";
-
-string constant ABI = "event Access(uint indexed host, uint node, bool trusted)";
-
-/// @notice Emitted when a node's authorization status changes on a host.
-abstract contract AccessEvent is EventEmitter {
-    /// @param host Host node ID where the authorization change occurred.
-    /// @param node Node ID that was authorized or deauthorized.
-    /// @param trusted True if the node was authorized, false if deauthorized.
-    event Access(uint indexed host, uint node, bool trusted);
-
-    constructor() {
-        emit EventAbi(ABI);
-    }
-}
-
-
-

package/events/Deposit.sol

@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import { EventEmitter } from "./Emitter.sol";
-
-string constant ABI = "event Deposit(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount)";
-
-/// @notice Emitted when assets are deposited into an account.
-abstract contract DepositEvent is EventEmitter {
-    /// @param account Destination account identifier.
-    /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
-    /// @param amount Amount deposited.
-    event Deposit(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount);
-
-    constructor() {
-        emit EventAbi(ABI);
-    }
-}
-
-
-

package/events/Listing.sol

@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import { EventEmitter } from "./Emitter.sol";
-
-string constant ABI = "event Listing(uint indexed host, bytes32 asset, bytes32 meta, bool active)";
-
-/// @notice Emitted when an asset listing is updated on a host.
-abstract contract ListingEvent is EventEmitter {
-    /// @param host Host node ID that manages this listing.
-    /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
-    /// @param active True if the listing is currently active.
-    event Listing(uint indexed host, bytes32 asset, bytes32 meta, bool active);
-
-    constructor() {
-        emit EventAbi(ABI);
-    }
-}
-
-
-

package/events/Swap.sol

@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import { EventEmitter } from "./Emitter.sol";
-
-string constant ABI = "event Swap(bytes32 indexed account, bytes32 assetIn, uint amountIn, bytes32 assetOut, uint amountOut)";
-
-/// @notice Emitted when an account swaps one asset for another.
-abstract contract SwapEvent is EventEmitter {
-    /// @param account Account identifier performing the swap.
-    /// @param assetIn Input asset identifier.
-    /// @param amountIn Input amount spent.
-    /// @param assetOut Output asset identifier.
-    /// @param amountOut Output amount received.
-    event Swap(bytes32 indexed account, bytes32 assetIn, uint amountIn, bytes32 assetOut, uint amountOut);
-
-    constructor() {
-        emit EventAbi(ABI);
-    }
-}

package/events/Withdraw.sol

@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-pragma solidity ^0.8.33;
-
-import { EventEmitter } from "./Emitter.sol";
-
-string constant ABI = "event Withdrawal(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount)";
-
-/// @notice Emitted when assets are withdrawn from an account.
-abstract contract WithdrawalEvent is EventEmitter {
-    /// @param account Source account identifier.
-    /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
-    /// @param amount Amount withdrawn.
-    event Withdrawal(bytes32 indexed account, bytes32 asset, bytes32 meta, uint amount);
-
-    constructor() {
-        emit EventAbi(ABI);
-    }
-}
-
-
-