Merge remote-tracking branch 'origin/main' into danlaine/contiguous-2

Author: danlaine

.github/actions/disk/action.yml

@@ -59,6 +59,39 @@ runs:
         echo "TMP=D:\Temp" >> $env:GITHUB_ENV
         New-Item -ItemType Directory -Path "D:\Temp" -Force | Out-Null
 
+    - name: Configure swap (Linux)
+      shell: bash
+      if: runner.os == 'Linux'
+      run: |
+        sudo swapoff -a
+        sudo fallocate -l 8G /swapfile
+        sudo chmod 600 /swapfile
+        sudo mkswap /swapfile
+        sudo swapon /swapfile
+        sudo swapon --show
+
+    # macOS manages swap dynamically via dynamic_pager; ensure it is running and report state.
+    - name: Configure swap (macOS)
+      shell: bash
+      if: runner.os == 'macOS'
+      run: |
+        set -euxo pipefail
+        sudo mkdir -p /private/var/vm
+        if ! pgrep -x dynamic_pager >/dev/null; then
+          sudo launchctl load -w /System/Library/LaunchDaemons/com.apple.dynamic_pager.plist || true
+        fi
+        sysctl vm.swapusage || true
+
+    # Windows manages the pagefile dynamically by default, and changing its size requires a
+    # reboot to take effect (not practical within a single job). Log the current state only.
+    - name: Log pagefile (Windows)
+      shell: pwsh
+      if: runner.os == 'Windows'
+      run: |
+        $ErrorActionPreference = 'Continue'
+        Get-CimInstance -ClassName Win32_PageFileUsage   | Format-List Name, AllocatedBaseSize, CurrentUsage, PeakUsage
+        Get-CimInstance -ClassName Win32_PageFileSetting | Format-List Name, InitialSize, MaximumSize
+
     - name: Show disk free (after)
       shell: bash
       run: df -h || true

.github/workflows/publish.yml

@@ -65,6 +65,11 @@ jobs:
       continue-on-error: true
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+    - name: Publish runtime-macros
+      run: cargo publish --manifest-path runtime/macros/Cargo.toml
+      continue-on-error: true
+      env:
+        CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
     - name: Publish runtime
       run: cargo publish --manifest-path runtime/Cargo.toml
       continue-on-error: true

Cargo.lock

@@ -16,6 +16,7 @@ members = [
     "parallel",
     "resolver",
     "runtime",
+    "runtime/macros",
     "storage",
     "stream",
     "invariants",
@@ -104,6 +105,7 @@ commonware-p2p = { version = "2026.4.0", path = "p2p" }
 commonware-parallel = { version = "2026.4.0", path = "parallel", default-features = false }
 commonware-resolver = { version = "2026.4.0", path = "resolver" }
 commonware-runtime = { version = "2026.4.0", path = "runtime" }
+commonware-runtime-macros = { version = "2026.4.0", path = "runtime/macros" }
 commonware-storage = { version = "2026.4.0", path = "storage", default-features = false }
 commonware-stream = { version = "2026.4.0", path = "stream" }
 commonware-utils = { version = "2026.4.0", path = "utils", default-features = false }
@@ -114,8 +116,9 @@ criterion = "0.7.0"
 crossbeam-queue = "0.3.12"
 crossterm = "0.29.0"
 ctutils = "0.3.1"
+curve25519-dalek = "4.1.3"
 ecdsa = { version = "0.16.9", default-features = false }
-ed25519-consensus = { version = "2.1.0", default-features = false }
+ed25519-consensus = "2.1.0"
 ed25519-zebra = "4.1.0"
 either = "1.13.0"
 futures = "0.3.31"
@@ -194,3 +197,69 @@ debug = true
 # Although overflow checks are enabled by default in "test", we explicitly
 # enable them here for clarity.
 overflow-checks = true
+
+[profile.test.package.curve25519-dalek]
+opt-level = 3
+
+[profile.test.package.aws-lc-rs]
+opt-level = 3
+
+[profile.test.package.aws-lc-sys]
+opt-level = 3
+
+[profile.test.package.blake3]
+opt-level = 3
+
+[profile.test.package.blst]
+opt-level = 3
+
+[profile.test.package.chacha20poly1305]
+opt-level = 3
+
+[profile.test.package.crc]
+opt-level = 3
+
+[profile.test.package.crc-fast]
+opt-level = 3
+
+[profile.test.package.ctutils]
+opt-level = 3
+
+[profile.test.package.crypto-bigint]
+opt-level = 3
+
+[profile.test.package.ecdsa]
+opt-level = 3
+
+[profile.test.package.elliptic-curve]
+opt-level = 3
+
+[profile.test.package.num-bigint]
+opt-level = 3
+
+[profile.test.package.num-integer]
+opt-level = 3
+
+[profile.test.package.num-rational]
+opt-level = 3
+
+[profile.test.package.num-traits]
+opt-level = 3
+
+[profile.test.package.p256]
+opt-level = 3
+
+[profile.test.package.primeorder]
+opt-level = 3
+
+[profile.test.package.rand_chacha]
+opt-level = 3
+
+[profile.test.package.reed-solomon-simd]
+opt-level = 3
+
+[profile.test.package.sha2]
+opt-level = 3
+
+[profile.test.package.x25519-dalek]
+opt-level = 3

Cargo.toml

@@ -20,7 +20,6 @@ commonware-macros = { workspace = true, features = ["std"] }
 commonware-p2p.workspace = true
 commonware-runtime = { workspace = true, features = ["test-utils"] }
 commonware-utils.workspace = true
-prometheus-client.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
 

broadcast/Cargo.toml

@@ -1,5 +1,4 @@
 use super::{metrics, Config, Mailbox, Message};
-use crate::buffered::metrics::SequencerLabel;
 use commonware_codec::Codec;
 use commonware_cryptography::{Digestible, PublicKey};
 use commonware_macros::select_loop;
@@ -9,7 +8,7 @@ use commonware_p2p::{
 };
 use commonware_runtime::{
     spawn_cell,
-    telemetry::metrics::status::{CounterExt, GaugeExt, Status},
+    telemetry::metrics::{status::Status, GaugeExt},
     BufferPooler, Clock, ContextCell, Handle, Metrics, Spawner,
 };
 use commonware_utils::{
@@ -104,7 +103,7 @@ where
     // Metrics
     ////////////////////////////////////////
     /// Metrics
-    metrics: metrics::Metrics,
+    metrics: metrics::Metrics<P>,
 }
 
 impl<E, P, M, D> Engine<E, P, M, D>
@@ -223,10 +222,7 @@ where
                 };
 
                 trace!(?peer, "network");
-                self.metrics
-                    .peer
-                    .get_or_create(&SequencerLabel::from(&peer))
-                    .inc();
+                self.metrics.peer.get_or_create_by(&peer).inc();
                 self.handle_network(peer, msg);
             },
         }