@rootzero/contracts 0.7.0 → 0.7.2

package/core/Operation.sol

@@ -15,7 +15,7 @@ error FailedCall(address addr, bytes4 selector, bytes err);
 /// @notice Shared base for command and peer contracts.
 /// Provides convenience wrappers for cursor construction, quotient validation,
 /// and trusted inter-node calls. Inherits access control from `AccessControl`.
-abstract contract OperationBase is AccessControl, CursorBase {
+abstract contract OperationBase is CursorBase, AccessControl {
     /// @notice Return the host node ID corresponding to the current caller.
     /// @dev Encodes `msg.sender` as a host ID using the local-chain host layout.
     /// @return Host node ID for `msg.sender`.

package/package.json

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

package/peer/AssetPull.sol

@@ -9,33 +9,34 @@ string constant NAME = "peerAssetPull";
 using Cursors for Cur;
 
 /// @title PeerAssetPull
-/// @notice Peer that pulls assets identified by `(asset, meta)` from a remote host into this one.
-/// Each ASSET block in the request calls `peerAssetPull(peer, asset, meta)`, where `peer`
-/// is derived from `msg.sender`. Restricted to trusted peers.
-abstract contract PeerAssetPull is PeerBase {
-    uint internal immutable peerAssetPullId = peerId(NAME);
-
-    constructor() {
-        emit Peer(host, NAME, Schemas.Asset, peerAssetPullId, false);
-    }
-
-    /// @notice Override to process one incoming asset pull request from a remote host.
-    /// @param peer Host node ID derived from the caller address.
-    /// @param asset Requested asset identifier.
-    /// @param meta Requested asset metadata slot.
-    function peerAssetPull(uint peer, bytes32 asset, bytes32 meta) internal virtual;
-
-    /// @notice Execute the asset-pull peer call.
-    function peerAssetPull(bytes calldata request) external onlyPeer returns (bytes memory) {
-        (Cur memory assets, , ) = cursor(request, 1);
-        uint peer = caller();
-
-        while (assets.i < assets.bound) {
-            (bytes32 asset, bytes32 meta) = assets.unpackAsset();
-            peerAssetPull(peer, asset, meta);
-        }
-
-        assets.complete();
-        return "";
-    }
-}
+/// @notice Peer that pulls requested asset amounts from a remote host into this one.
+/// Each AMOUNT block in the request calls `peerAssetPull(peer, asset, meta, amount)`, where `peer`
+/// is derived from `msg.sender`. Restricted to trusted peers.
+abstract contract PeerAssetPull is PeerBase {
+    uint internal immutable peerAssetPullId = peerId(NAME);
+
+    constructor() {
+        emit Peer(host, NAME, Schemas.Amount, peerAssetPullId, false);
+    }
+
+    /// @notice Override to process one incoming amount-based asset pull request from a remote host.
+    /// @param peer Host node ID derived from the caller address.
+    /// @param asset Requested asset identifier.
+    /// @param meta Requested asset metadata slot.
+    /// @param amount Requested amount in the asset's native units.
+    function peerAssetPull(uint peer, bytes32 asset, bytes32 meta, uint amount) internal virtual;
+
+    /// @notice Execute the asset-pull peer call.
+    function peerAssetPull(bytes calldata request) external onlyPeer returns (bytes memory) {
+        (Cur memory assets, , ) = cursor(request, 1);
+        uint peer = caller();
+
+        while (assets.i < assets.bound) {
+            (bytes32 asset, bytes32 meta, uint amount) = assets.unpackAmount();
+            peerAssetPull(peer, asset, meta, amount);
+        }
+
+        assets.complete();
+        return "";
+    }
+}

package/queries/Base.sol

@@ -21,7 +21,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 HostBound, CursorBase, QueryEvent {
+abstract contract QueryBase is CursorBase, HostBound, 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)`,