diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index c7a4c6617..ad805ef71 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -44,6 +44,17 @@ runs:
     - name: Install Foundry
       uses: foundry-rs/foundry-toolchain@v1
 
+    - name: Checkout poa-middleware (bls branch) for BLS e2e tests
+      shell: bash
+      run: |
+        set -euo pipefail
+        POA_DIR="${{ runner.workspace }}/contracts/poa-middleware"
+        rm -rf "$POA_DIR"
+        mkdir -p "$(dirname "$POA_DIR")"
+        git clone --depth=1 --branch bls https://github.com/Lay3rLabs/poa-middleware.git "$POA_DIR"
+        # OpenZeppelin contracts ship via npm; foundry.toml remaps node_modules.
+        npm --prefix "$POA_DIR" ci --no-audit --no-fund
+
     - name: Create placeholder dist folder for macro expansion
       shell: bash
       run: mkdir -p app/dist
diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
index 4e28ff783..6a85c3ef5 100644
--- a/.github/workflows/basic.yml
+++ b/.github/workflows/basic.yml
@@ -17,25 +17,6 @@ env:
   WAVS_CLI_COSMOS_MNEMONIC: "reward index time stem expire cheap worth fence coil option treat ensure install entry zone mule benefit success remain rebuild inherit eyebrow cluster sheriff"
 
 jobs:
-  test-eigenlayer:
-    name: Test Suite (EigenLayer)
-    runs-on: blacksmith-4vcpu-ubuntu-2404
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup
-
-      - name: Configure EigenLayer middleware
-        run: |
-          sed -i 's/evm_middleware_type = ".*"/evm_middleware_type = "eigenlayer"/' packages/layer-tests/layer-tests.toml
-
-      - name: Build tests first
-        run: cargo test --workspace --no-run --locked
-
-      - name: Run tests
-        run: cargo test --workspace --locked --all-features -- --nocapture --test-threads=4
-        env:
-          RUST_LOG: info
-
   test-poa:
     name: Test Suite (POA)
     runs-on: blacksmith-4vcpu-ubuntu-2404
@@ -58,13 +39,13 @@ jobs:
   test-suite:
     name: Test Suite
     runs-on: ubuntu-latest
-    needs: [test-eigenlayer, test-poa]
+    needs: [test-poa]
     if: always()
     steps:
       - name: Check test results
         run: |
-          if [ "${{ needs.test-eigenlayer.result }}" != "success" ] || [ "${{ needs.test-poa.result }}" != "success" ]; then
-            echo "One or more test jobs failed"
+          if [ "${{ needs.test-poa.result }}" != "success" ]; then
+            echo "Test job failed"
             exit 1
           fi
           echo "All test jobs passed"
@@ -81,3 +62,6 @@ jobs:
 
       - name: Run clippy
         run: cargo clippy --all-targets --all-features -- -D warnings
+
+      - name: Check wavs-types standalone feature builds
+        run: cargo check -p wavs-types --no-default-features --features full --locked
diff --git a/.gitignore b/.gitignore
index e91be62d1..ae5cf83c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,6 @@ __pycache__
 
 # generated by prepack
 packages/wavs-mcp/skill/
+
+# claude
+.claude/worktrees/
diff --git a/CLAUDE.md b/CLAUDE.md
index 9b7c0f32d..e0dd570bd 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -79,7 +79,7 @@ just dev-tool send-triggers --count 1000
 
 The main WAVS node is a Tokio-based async server centered around a **dispatcher** (`packages/wavs/src/dispatcher.rs`) that orchestrates four subsystems via Crossbeam channels:
 
-1. **Trigger Manager** (`subsystems/trigger/`) — Monitors EVM and Cosmos blockchain events; routes events to registered services via cron, timer, or on-chain triggers. Uses libp2p for P2P trigger distribution.
+1. **Trigger Manager** (`subsystems/trigger/`) — Monitors EVM and Cosmos blockchain events; routes events to registered services via cron, timer, or on-chain triggers. Uses commonware-p2p for P2P message broadcast between operators.
 
 2. **Engine** (`subsystems/engine/`) — Executes WASM components in isolated Wasmtime WASI runtimes. Each AVS service runs as a sandboxed component with restricted system access.
 
@@ -134,5 +134,307 @@ Detailed docs live in `docs/`:
 - `LOCAL_DEV.md` — Development workflow and telemetry
 - `API.md` — HTTP API reference
 - `ASYNC_NOTES.md` — Async design patterns used throughout
-- `P2P.md` — libp2p/Hyperswarm networking
+- `P2P.md` — commonware P2P networking
 - `WIT_AUTHORING_NOTES.md` — Writing WIT component interfaces
+
+<!-- GSD:project-start source:PROJECT.md -->
+## Project
+
+**WAVS**
+
+WAVS (WebAssembly-based Actively Validated Services) is a platform for running decentralized off-chain computation anchored to blockchains. Operators run sandboxed WASM components, reach multi-operator consensus via P2P (commonware), and submit verified results on-chain. Services declare their own trigger, signature scheme (secp256k1 or BLS12-381), and submission target.
+
+**Core Value:** Multi-operator signature aggregation over P2P must work reliably — operators broadcast signed submissions, reach quorum, and submit on-chain.
+
+### Constraints
+
+- **Coexistence**: secp256k1 and bls12381 work as per-service options — no breaking changes to existing services
+- **Runtime**: blst signing is sync/CPU-bound — runs on blocking thread pool (spawn_blocking)
+- **Hash-to-curve**: hash-to-curve matches `HashToCurve.sol` (RFC 9380, DST `BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_`)
+- **Pubkey sort**: aggregator sorts signerPubkeys by keccak256(pubkey) ascending — contract enforces this
+- **Reference block**: referenceBlock < current block at submission, >= block when operators registered keys
+<!-- GSD:project-end -->
+
+<!-- GSD:stack-start source:codebase/STACK.md -->
+## Technology Stack
+
+## Languages
+- Rust 1.91.0 - Core WAVS node, subsystems (trigger, engine, aggregator, submission), CLI, backend services
+- TypeScript 5.8.3 - Desktop app frontend (Tauri React app)
+- JavaScript/JSX - Frontend React components
+- Solidity - Example EVM contracts in `examples/contracts/solidity/`
+- Rust (WASI components) - Example AVS components in `examples/components/`
+- Rust (CosmWasm) - Example Cosmos contracts in `examples/contracts/cosmwasm/`
+## Runtime
+- Tokio 1.47.1 - Async runtime for the WAVS node server
+- Node.js (for frontend build tooling) - Managed via pnpm
+- Cargo - Rust workspace with resolver version 2
+- pnpm 10.18.3 - Frontend package manager for Tauri app
+- Lockfiles: `Cargo.lock` (Rust), `pnpm-lock.yaml` (frontend)
+## Frameworks
+- Axum 0.8.6 - HTTP API server with macros
+- Tauri 2.10.2 - Desktop application framework (backend bridge)
+- Wasmtime 42.0.1 - WebAssembly runtime with component-model, cache, std features
+- OpenTelemetry 0.31.0 - Distributed tracing with Jaeger propagation and OTLP export
+- libp2p 0.56 - P2P networking (tcp, dns, noise, yamux, gossipsub, kad, mdns, autonat)
+- React 19.1.0 - UI framework
+- Vite 7.0.4 - Build tool and dev server
+- Tauri 2.10 (CLI) - Build and packaging for desktop
+- React Router DOM 7.1.0 - Client-side routing
+- Zustand 5.0.0 - State management
+- TailwindCSS 3.4.0 - CSS framework
+- CodeMirror 6 - Code editor component
+- Criterion 0.7.0 - Benchmarking framework (Rust)
+- Foundry (Forge) - Solidity contract building
+- Docker (implied for CosmWasm builds via justfile)
+- OpenAPI/Swagger - API documentation (utoipa 5.4.0, utoipa-swagger-ui 9.0.2)
+## Key Dependencies
+- alloy 1.0.42 (suite) - EVM interaction: alloy-contract, alloy-provider (with ws/pubsub), alloy-signer-local (mnemonic), alloy-sol-types, alloy-rpc-types-eth
+- cosmwasm-std 3.0.2 - Cosmos smart contract library
+- layer-climb 0.9.0 - Layer Labs proprietary EVM/Cosmos credential handling
+- hyperswarm (from git: datrs/hyperswarm-rs) - Hypercore/Hyperswarm protocol support
+- hypercore 0.14.0 - Distributed append-only logs with tokio and sparse features
+- hypercore-protocol 0.6.1 - Protocol implementation
+- tokio-stream 0.1 - Stream adapters for tokio
+- futures 0.3.31 - Async utilities
+- crossbeam 0.8.4 - Concurrent data structures (channels, epoch-based GC)
+- tokio-tungstenite 0.28.0 - WebSocket implementation
+- reqwest 0.12.23 - HTTP client with JSON support
+- tower-http 0.6.6 - HTTP middleware (CORS, tracing)
+- axum-tracing-opentelemetry 0.32.0 - OpenTelemetry integration for Axum
+- serde 1.0.228 - Serialization framework with derive
+- serde_json 1.0.145 - JSON handling
+- bincode 2.0.1 - Binary encoding (for trigger actions)
+- toml 0.9.7 - TOML parsing for config
+- bip39 2.2.0 - BIP39 mnemonic support with rand
+- alloy-signer-local - Local signing with mnemonic support
+- secp256k1 (via libp2p) - P2P identity derivation from signing mnemonic
+- chrono 0.4.42 - Date/time handling
+- cron 0.15.0 - Cron expression parsing
+- dashmap 6.1.0 - Concurrent hash map
+- lru 0.16.1 - LRU cache for compiled WASM modules
+- slotmap 1.0.7 - Sparse collections
+- bimap 0.6.3 - Bidirectional map
+- clap 4.5.48 - CLI argument parsing with derive and env support
+- dotenvy 0.15.7 - .env file loading
+- tracing 0.1.41 - Structured logging with filtering
+- thiserror 2.0.17 - Error type derivation
+- uuid 1.18.1 - UUID generation (v7, serde support)
+- zeroize 1.8.2 - Secure memory clearing
+- Viem 2.23.5 - Ethereum client (EVM interaction in browser)
+- @scure/bip39 1.4.0 - BIP39 mnemonic generation
+- clsx 2.1.0 - Conditional className utility
+- react-virtual 3.13.18 - Virtual scrolling
+## Configuration
+- Configuration via `.env` file with `dotenvy` loader
+- TOML config file at `./wavs.toml` (or `~/.wavs/wavs.toml`, platform-specific XDG paths)
+- Search order: CLI arg `--home` → `./wavs.toml` → `~/.wavs/wavs.toml` → platform XDG paths → `/etc/wavs/wavs.toml`
+- Key environment variables:
+- `Cargo.toml` - Rust workspace at root with members pointing to packages
+- `foundry.toml` - Forge config for Solidity contracts (via_ir=true, EigenLayer lib)
+- `wavs.toml` - Comprehensive WAVS server and CLI configuration
+- `wkg.toml` - WIT package management configuration
+- `app/package.json` - Frontend package configuration
+- `app/vite.config.ts` - Vite build config (implicit, standard Tauri React template)
+- `tsconfig.json` - TypeScript configuration (implied)
+- Jaeger OTLP endpoint: `http://localhost:4317` (optional, configured in wavs.toml)
+- Prometheus metrics push endpoint: `http://localhost:9090` (optional, 30-second default interval)
+- In-memory log buffer for `/dev/logs` endpoint (enabled when dev_endpoints_enabled=true)
+## Platform Requirements
+- Rust 1.91.0+ (workspace edition 2021)
+- Node.js + pnpm 10.18.3 (for frontend)
+- Docker (for cross-platform WASI and CosmWasm builds)
+- Foundry (forge) for Solidity compilation
+- Justfile support (build orchestration)
+- Deployment target: Linux/macOS/Windows (via Tauri)
+- EVM chain endpoints (WebSocket + HTTP for fallback): Ethereum, Sepolia, Holesky, or local Anvil (chain ID 31337)
+- Cosmos chain endpoints (RPC + gRPC): Neutron, Layer, or local testnet
+- IPFS gateway: `http://127.0.0.1:8080/ipfs/` (local) or `https://ipfs.io/ipfs/` (remote)
+- HTTP server binding: `127.0.0.1:8041` (default port 8041 from wavs.toml)
+- WASM LRU cache: 20 compiled modules (default)
+- Wasmtime fuel (compute metering): Unlimited (configurable)
+- Max execution time: Unlimited (configurable via max_execution_seconds)
+- Max HTTP body: 15 MB (configurable)
+- Max WASM response: 50 MB (configurable)
+<!-- GSD:stack-end -->
+
+<!-- GSD:conventions-start source:CONVENTIONS.md -->
+## Conventions
+
+## Naming Patterns
+- Rust: `snake_case` (e.g., `dispatcher.rs`, `service_registry.rs`, `mock_config.rs`)
+- TypeScript/TSX: `camelCase` or `PascalCase` for components (e.g., `App.tsx`, `appStore.ts`, `AddressDisplay.tsx`)
+- Test modules: inline in Rust files under `#[cfg(test)] mod tests { ... }`
+- Test files: separate files in `tests/` directory with `_tests.rs` suffix (e.g., `dispatcher_tests.rs`, `aggregator_tests.rs`)
+- Rust: `snake_case` for all functions (pub and private)
+- TypeScript: `camelCase` for functions and methods
+- Rust: `snake_case` for all variables (let bindings, struct fields, locals)
+- TypeScript: `camelCase` for variables and state
+- Rust: `PascalCase` for types, traits, structs, enums
+- TypeScript: `PascalCase` for interfaces, types, components
+- Rust: `SCREAMING_SNAKE_CASE` for compile-time constants and module-level statics
+- TypeScript: `SCREAMING_SNAKE_CASE` or `camelCase` depending on scope
+## Code Style
+- Rust: Enforced by `cargo fmt` (configured via workspace)
+- TypeScript: No explicit linter configured, but follows standard conventions
+- Rust: `cargo clippy --all-targets --all-features` with `-D warnings` (deny all warnings)
+- TypeScript: Strict compiler settings (tsconfig.json)
+## Import Organization
+- TypeScript: Not configured - uses relative paths throughout
+- Rust: Uses workspace dependencies via `Cargo.toml` references (e.g., `use wavs::...`, `use utils::...`)
+## Error Handling
+## Logging
+- Initialization: `init_tracing_tests()` in tests
+- Levels: `trace!()`, `debug!()`, `info!()`, `warn!()`, `error!()`
+- Structured logging: Named fields via macro arguments
+- Instrumentation: `#[instrument]` macro on functions to auto-trace entry/exit
+- Configuration: Via `RUST_LOG` environment variable (e.g., `RUST_LOG=debug,wavs=debug`)
+- Methods: `console.log()`, `console.warn()`, `console.error()`
+- Used for initialization and error reporting
+- Example: `console.warn('Failed to start WAVS:', err);`
+- No structured logging framework detected
+## Comments
+- Multi-line documentation comments for public APIs and complex functions
+- Explain the "why", not the "what" (code shows the "what")
+- Document runtime invariants and constraints
+- Three-slash doc comments (`///`) for public items
+- Doc comment blocks before items they document
+- Example from `/Users/jacobhartnell/Dev/WAVS/WAVS/packages/types/src/bytes.rs`:
+- Field documentation (inline docs):
+- Enum variant docs:
+- JSDoc-style blocks (/** ... */) for exported functions
+- Single-line comments for inline explanation
+- Example from `/Users/jacobhartnell/Dev/WAVS/WAVS/app/src/utils/error.ts`:
+- Explain complex logic or non-obvious decisions
+- Example from `/Users/jacobhartnell/Dev/WAVS/WAVS/packages/wavs/src/dispatcher.rs`:
+## Function Design
+- Rust: Functions are generally 10-50 lines, larger functions broken into smaller helpers
+- TypeScript: React components 30-100 lines, hooks/utils 5-30 lines
+- Rust: Use struct types for functions with many parameters
+- TypeScript: Object destructuring for multiple parameters in components
+- Rust: Explicit `Result<T, E>` types for fallible operations
+- TypeScript: Explicit return types on public functions, implicit on internal helpers
+## Module Design
+- Rust: Use `pub mod` for public modules, re-export important items at crate root
+- TypeScript: Named exports for all functions/types, use `export { }` at end of files
+- Rust: Minimal re-exports; subsystems define their own `mod.rs` or `lib.rs`
+- TypeScript: Component directories have `index.ts` that re-exports (rarely used)
+- Rust: Explicit `pub` on items meant for external use, private by default
+- TypeScript: All exports are public by convention; no `private` keyword on module level
+<!-- GSD:conventions-end -->
+
+<!-- GSD:architecture-start source:ARCHITECTURE.md -->
+## Architecture
+
+## Pattern Overview
+- Dispatcher orchestrates four independent subsystems via crossbeam channels
+- Each subsystem runs in its own thread with blocking channel recv loops
+- WASM-based sandboxed execution via Wasmtime WASI components
+- Separation between operator node logic and blockchain integration
+- HTTP API server for administration and monitoring
+## Layers
+- Purpose: Expose administrative endpoints for service management, monitoring, debugging
+- Location: `packages/wavs/src/http/`
+- Contains: Axum route handlers for services, chains, configuration, health checks, logs
+- Depends on: Dispatcher (synchronous direct calls), config, metrics
+- Used by: Desktop app frontend, CLI tools, external operators
+- Purpose: Central coordinator that receives trigger events and routes through subsystems
+- Location: `packages/wavs/src/dispatcher.rs`
+- Contains: Service registry, channel senders/receivers, subsystem lifecycle management
+- Depends on: All four subsystems, service storage, chain configs
+- Used by: HTTP server, subsystems (via channels), main.rs
+- Purpose: Listen to blockchain events, cron schedules, block intervals, and other triggers; fire events to dispatcher
+- Location: `packages/wavs/src/subsystems/trigger.rs` and `trigger/` subdirectories
+- Contains: EVM stream listeners, Cosmos stream listeners, cron scheduler, event multiplexer
+- Depends on: Chain configs, blockchain RPC providers, services registry
+- Used by: Dispatcher (receives TriggerCommand, sends TriggerAction)
+- Purpose: Execute operator and aggregator WASM components in sandboxed Wasmtime environments
+- Location: `packages/wavs/src/subsystems/engine.rs`, `packages/engine/`
+- Contains: WasmEngine wrapper, component lifecycle, WIT bindings
+- Depends on: Services (for component lookup), WASI component binaries
+- Used by: Dispatcher (receives EngineCommand, sends EngineResponse)
+- Purpose: Sign operator results with derived keys and prepare signed Submission objects
+- Location: `packages/wavs/src/subsystems/submission.rs`
+- Contains: Signer management (HD wallet derivation), submission request routing
+- Depends on: Services (for service lookup), config (mnemonic)
+- Used by: Dispatcher (receives SubmissionCommand, sends to Aggregator)
+- Purpose: Collect signatures from peer operators via P2P, execute aggregator component, submit results to blockchain
+- Location: `packages/wavs/src/subsystems/aggregator.rs` and `aggregator/` subdirectories
+- Contains: P2P networking (libp2p GossipSub), quorum queue management, EVM/Cosmos signing clients, transaction submission
+- Depends on: Services, Engine (for aggregator execution), blockchain providers, optional P2P peers
+- Used by: Dispatcher (receives AggregatorCommand), SubmissionManager (broadcasts submissions)
+- Purpose: Persist services, signatures, quorum state, and submission history
+- Location: `utils/storage/` (trait-based abstraction), `packages/wavs/` uses FileStorage
+- Contains: Key-value store (services, chains), database (signatures, quorum queues), IPFS gateway integration
+- Depends on: Tokio async runtime, file system or database backends
+- Used by: Dispatcher, Services, Aggregator, all subsystems
+- Purpose: Track registered services, workflows, and service-to-component mappings
+- Location: `packages/wavs/src/service_registry.rs`
+- Contains: Service storage, restore/load logic from persistent store
+- Depends on: Storage layer, service definitions
+- Used by: Dispatcher, subsystems for service lookup
+## Data Flow
+- If workflow's `submit` field is `None`, execution stops after step 3
+- Operator component runs but no signing/submission occurs
+- Useful for side-effect-only operations (e.g., posting to external APIs)
+- Services state: Persistent in storage (KeyValue store)
+- Submission state: Quorum queues held in memory, periodically flushed to database
+- Signer state: Derived on-demand from mnemonic + HD index, cached in SubmissionManager
+- Component state: Stateless (read from storage on each execution)
+## Key Abstractions
+- Purpose: Represents a concrete trigger event (block interval, contract event, cron tick)
+- Examples: `packages/wavs/src/subsystems/trigger.rs`
+- Pattern: Enum wrapping event-specific data and metadata
+- Purpose: Communication protocol between Dispatcher and Engine subsystem
+- Examples: `packages/wavs/src/subsystems/engine.rs`
+- Pattern: Command/Response pair across channel boundaries
+- Purpose: Signed operator response ready for blockchain submission
+- Examples: `packages/types/` (shared types)
+- Pattern: Contains operator response + signature + event proof
+- Purpose: Define AVS operator logic, triggers, and submission config
+- Examples: Loaded from storage via ServiceRegistry
+- Pattern: Tree of Service -> Workflows -> Components, each with triggers and target contract
+- Purpose: Abstract storage backend (File, Database, etc.)
+- Examples: `packages/wavs/` uses `FileStorage`
+- Pattern: Generic trait allowing Dispatcher to work with any storage implementation
+## Entry Points
+- Location: `packages/wavs/src/main.rs`
+- Triggers: Process start (`cargo run`)
+- Responsibilities: Parse args, initialize config, setup telemetry (Jaeger/Prometheus), spawn HTTP server thread, spawn Dispatcher thread, wait for threads to finish
+- Location: `packages/wavs/src/http/server.rs`
+- Triggers: HTTP requests to `{host}:{port}`
+- Responsibilities: Route requests to handlers (service management, health checks, logs), validate auth, serialize responses
+- Location: `packages/wavs/src/http/handlers/service/add.rs`
+- Triggers: POST `/service`
+- Responsibilities: Validate service definition, add to registry, start listening for triggers
+- Location: `packages/wavs/src/dispatcher.rs` (impl block at line 231)
+- Triggers: Called from main thread after config setup
+- Responsibilities: Spawn all four subsystem threads, listen for kill signal, coordinate graceful shutdown
+## Error Handling
+- Subsystem channels: Errors logged when channel send fails (peer dropped); subsystem continues
+- WASM execution: Errors from component returned as part of response; logged at info level
+- Blockchain RPC: Connection errors trigger retry logic with exponential backoff (handled by Alloy provider)
+- Signing: Missing keys or invalid configs return SubmissionError to dispatcher, submitted as failed submission
+- Storage: DBError propagated up; non-critical reads return Ok(None) if key not found
+## Cross-Cutting Concerns
+<!-- GSD:architecture-end -->
+
+<!-- GSD:workflow-start source:GSD defaults -->
+## GSD Workflow Enforcement
+
+Before using Edit, Write, or other file-changing tools, start work through a GSD command so planning artifacts and execution context stay in sync.
+
+Use these entry points:
+- `/gsd:quick` for small fixes, doc updates, and ad-hoc tasks
+- `/gsd:debug` for investigation and bug fixing
+- `/gsd:execute-phase` for planned phase work
+
+Do not make direct repo edits outside a GSD workflow unless the user explicitly asks to bypass it.
+<!-- GSD:workflow-end -->
+
+<!-- GSD:profile-start -->
+## Developer Profile
+
+> Profile not yet configured. Run `/gsd:profile-user` to generate your developer profile.
+> This section is managed by `generate-claude-profile` -- do not edit manually.
+<!-- GSD:profile-end -->
diff --git a/Cargo.lock b/Cargo.lock
index cf6ba7c30..184ffd850 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -436,7 +436,7 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror 2.0.18",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tracing",
  "url",
  "wasmtimer",
@@ -457,7 +457,7 @@ dependencies = [
  "parking_lot 0.12.5",
  "serde",
  "serde_json",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-stream",
  "tower",
  "tracing",
@@ -503,7 +503,7 @@ dependencies = [
  "reqwest 0.12.28",
  "serde",
  "serde_json",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-stream",
  "tower",
  "tracing",
@@ -689,7 +689,7 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror 2.0.18",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tower",
  "tracing",
  "url",
@@ -723,7 +723,7 @@ dependencies = [
  "http",
  "rustls 0.23.37",
  "serde_json",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-tungstenite 0.26.2",
  "tracing",
  "ws_stream_wasm",
@@ -1128,52 +1128,10 @@ name = "arrayvec"
 version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
-
-[[package]]
-name = "asn1-rs"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56624a96882bb8c26d61312ae18cb45868e5a9992ea73c58e45c3101e56a1e60"
-dependencies = [
- "asn1-rs-derive",
- "asn1-rs-impl",
- "displaydoc",
- "nom",
- "num-traits",
- "rusticata-macros",
- "thiserror 2.0.18",
- "time",
-]
-
-[[package]]
-name = "asn1-rs-derive"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
- "synstructure 0.13.2",
-]
-
-[[package]]
-name = "asn1-rs-impl"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "zeroize",
 ]
 
-[[package]]
-name = "asn1_der"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4858a9d740c5007a9069007c3b4e91152d0506f13c1b31dd49051fd537656156"
-
 [[package]]
 name = "async-broadcast"
 version = "0.7.2"
@@ -1219,7 +1177,7 @@ dependencies = [
  "futures-io",
  "once_cell",
  "pin-project-lite 0.2.17",
- "tokio 1.50.0",
+ "tokio 1.51.0",
 ]
 
 [[package]]
@@ -1415,19 +1373,6 @@ dependencies = [
  "rustc_version 0.4.1",
 ]
 
-[[package]]
-name = "asynchronous-codec"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233"
-dependencies = [
- "bytes 1.11.1",
- "futures-sink",
- "futures-util",
- "memchr",
- "pin-project-lite 0.2.17",
-]
-
 [[package]]
 name = "atk"
 version = "0.18.2"
@@ -1466,18 +1411,6 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
-[[package]]
-name = "attohttpc"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e2cdb6d5ed835199484bb92bb8b3edd526effe995c61732580439c1a67e2e9"
-dependencies = [
- "base64 0.22.1",
- "http",
- "log",
- "url",
-]
-
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -1527,6 +1460,29 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
+[[package]]
+name = "aws-lc-rs"
+version = "1.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94bffc006df10ac2a68c83692d734a465f8ee6c5b384d8545a636f81d858f4bf"
+dependencies = [
+ "aws-lc-sys",
+ "untrusted 0.7.1",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4321e568ed89bb5a7d291a7f37997c2c0df89809d7b6d12062c81ddb54aa782e"
+dependencies = [
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+]
+
 [[package]]
 name = "axum"
 version = "0.8.8"
@@ -1554,7 +1510,7 @@ dependencies = [
  "serde_path_to_error",
  "serde_urlencoded",
  "sync_wrapper",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tower",
  "tower-layer",
  "tower-service",
@@ -1865,7 +1821,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
 dependencies = [
  "arrayvec 0.4.12",
- "constant_time_eq",
+ "constant_time_eq 0.1.5",
+]
+
+[[package]]
+name = "blake3"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.7.6",
+ "cc",
+ "cfg-if 1.0.4",
+ "constant_time_eq 0.4.2",
+ "cpufeatures",
+ "zeroize",
 ]
 
 [[package]]
@@ -2334,7 +2305,7 @@ dependencies = [
  "core2",
  "multibase",
  "multihash",
- "unsigned-varint 0.8.0",
+ "unsigned-varint",
 ]
 
 [[package]]
@@ -2412,6 +2383,21 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 
+[[package]]
+name = "cmake"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "cmov"
+version = "0.5.0-pre.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5417da527aa9bf6a1e10a781231effd1edd3ee82f27d5f8529ac9b279babce96"
+
 [[package]]
 name = "cobs"
 version = "0.3.0"
@@ -2504,6 +2490,229 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "commonware-broadcast"
+version = "2026.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b67e4fed57f8d77c8d92b7bdd7512aee03d9d27ce4c0d3d8f93dd50358e9efc"
+dependencies = [
+ "commonware-codec",
+ "commonware-cryptography",
+ "commonware-macros",
+ "commonware-p2p",
+ "commonware-runtime",
+ "commonware-utils",
+ "prometheus-client",
+ "thiserror 2.0.18",
+ "tracing",
+]
+
+[[package]]
+name = "commonware-codec"
+version = "2026.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2af69c7b97ba7225a934e29fad444f35b5d365322efaaf724e1af66c99c8c6c3"
+dependencies = [
+ "bytes 1.11.1",
+ "cfg-if 1.0.4",
+ "commonware-macros",
+ "paste",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "thiserror 2.0.18",
+]
+
+[[package]]
+name = "commonware-cryptography"
+version = "2026.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf9bba8bf1ad51f54c57bee0824987bb397bedb60a09917d6a93509828a2dff"
+dependencies = [
+ "anyhow",
+ "aws-lc-rs",
+ "blake3",
+ "blst",
+ "bytes 1.11.1",
+ "cfg-if 1.0.4",
+ "chacha20poly1305",
+ "commonware-codec",
+ "commonware-macros",
+ "commonware-math",
+ "commonware-parallel",
+ "commonware-utils",
+ "crc-fast",
+ "ctutils",
+ "ecdsa",
+ "ed25519-consensus",
+ "getrandom 0.2.17",
+ "num-rational",
+ "num-traits",
+ "p256",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+ "sha2 0.10.9",
+ "thiserror 2.0.18",
+ "x25519-dalek",
+ "zeroize",
+]
+
+[[package]]
+name = "commonware-macros"
+version = "2026.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c8da60f9fe8357927327729fa7838b44555f4c578e4b07c12a2964664230a98"
+dependencies = [
+ "commonware-macros-impl",
+ "tokio 1.51.0",
+]
+
+[[package]]
+name = "commonware-macros-impl"
+version = "2026.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19c4e1e7a838cff536ffbe38f441c555eee99322d755aed3e06af9407c127fd3"
+dependencies = [
+ "proc-macro-crate 3.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+ "toml 0.9.12+spec-1.1.0",
+]
+
+[[package]]
+name = "commonware-math"
+version = "2026.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a44f73b02286843967888c7aa750a7a91a5cd3ac8b9bc48cd1d81331836bbb"
+dependencies = [
+ "bytes 1.11.1",
+ "commonware-codec",
+ "commonware-macros",
+ "commonware-parallel",
+ "commonware-utils",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "commonware-p2p"
+version = "2026.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b493b3ff98ef12a54162d9eae90175a6ff56e12df90f7b3381eff3cea84a8deb"
+dependencies = [
+ "commonware-codec",
+ "commonware-cryptography",
+ "commonware-macros",
+ "commonware-parallel",
+ "commonware-runtime",
+ "commonware-stream",
+ "commonware-utils",
+ "either",
+ "futures",
+ "num-bigint",
+ "num-integer",
+ "num-rational",
+ "num-traits",
+ "prometheus-client",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+ "rand_distr",
+ "thiserror 2.0.18",
+ "tracing",
+]
+
+[[package]]
+name = "commonware-parallel"
+version = "2026.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a590a49ee5d5389a2b966008b3367275772da7f336719fdb0f046ad257f6849"
+dependencies = [
+ "cfg-if 1.0.4",
+ "commonware-macros",
+ "rayon",
+]
+
+[[package]]
+name = "commonware-runtime"
+version = "2026.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06938675df074ca7749a6d531c4706bcc339e842105e73b03a76d45bd860b349"
+dependencies = [
+ "axum",
+ "bytes 1.11.1",
+ "cfg-if 1.0.4",
+ "commonware-codec",
+ "commonware-cryptography",
+ "commonware-macros",
+ "commonware-parallel",
+ "commonware-utils",
+ "criterion",
+ "crossbeam-queue",
+ "futures",
+ "getrandom 0.2.17",
+ "governor",
+ "libc",
+ "opentelemetry",
+ "opentelemetry-otlp",
+ "opentelemetry_sdk",
+ "prometheus-client",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+ "rayon",
+ "sha2 0.10.9",
+ "sysinfo",
+ "thiserror 2.0.18",
+ "tokio 1.51.0",
+ "tracing",
+ "tracing-opentelemetry",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "commonware-stream"
+version = "2026.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24852a37e87406ba53fc95a53574016362cc9f527faf68d298fb1a3f50159950"
+dependencies = [
+ "chacha20poly1305",
+ "commonware-codec",
+ "commonware-cryptography",
+ "commonware-macros",
+ "commonware-runtime",
+ "commonware-utils",
+ "futures",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+ "thiserror 2.0.18",
+ "x25519-dalek",
+ "zeroize",
+]
+
+[[package]]
+name = "commonware-utils"
+version = "2026.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "192eb390e3e0277770982e5e63de72f3c116c810873f3250318cae9ff0206560"
+dependencies = [
+ "bytes 1.11.1",
+ "cfg-if 1.0.4",
+ "commonware-codec",
+ "commonware-macros",
+ "futures",
+ "getrandom 0.2.17",
+ "hashbrown 0.16.1",
+ "num-bigint",
+ "num-integer",
+ "num-rational",
+ "num-traits",
+ "parking_lot 0.12.5",
+ "pin-project 1.1.11",
+ "rand 0.8.5",
+ "thiserror 2.0.18",
+ "tokio 1.51.0",
+ "zeroize",
+]
+
 [[package]]
 name = "compact-encoding"
 version = "1.1.0"
@@ -2621,6 +2830,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
+[[package]]
+name = "constant_time_eq"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b"
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -3003,6 +3218,16 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
+[[package]]
+name = "crc-fast"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e75b2483e97a5a7da73ac68a05b629f9c53cff58d8ed1c77866079e18b00dba5"
+dependencies = [
+ "digest 0.10.7",
+ "spin",
+]
+
 [[package]]
 name = "crc32fast"
 version = "1.5.0"
@@ -3032,7 +3257,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tinytemplate",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "walkdir",
 ]
 
@@ -3046,12 +3271,6 @@ dependencies = [
  "itertools 0.13.0",
 ]
 
-[[package]]
-name = "critical-section"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
-
 [[package]]
 name = "cron"
 version = "0.15.0"
@@ -3243,6 +3462,15 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "ctutils"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "758e5ed90be3c8abff7f9a6f37ab7f6d8c59c2210d448b81f3f508134aec84e4"
+dependencies = [
+ "cmov",
+]
+
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@@ -3564,7 +3792,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de"
 dependencies = [
  "data-encoding",
- "syn 2.0.117",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -3605,7 +3833,7 @@ dependencies = [
  "deadpool-runtime",
  "lazy_static 1.5.0",
  "num_cpus",
- "tokio 1.50.0",
+ "tokio 1.51.0",
 ]
 
 [[package]]
@@ -3635,24 +3863,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "der-parser"
-version = "10.0.0"
+name = "deranged"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6"
-dependencies = [
- "asn1-rs",
- "displaydoc",
- "nom",
- "num-bigint",
- "num-traits",
- "rusticata-macros",
-]
-
-[[package]]
-name = "deranged"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 dependencies = [
  "powerfmt",
  "serde_core",
@@ -3850,7 +4064,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users 0.5.2",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4059,6 +4273,7 @@ dependencies = [
  "hex",
  "rand_core 0.6.4",
  "sha2 0.9.9",
+ "thiserror 1.0.69",
  "zeroize",
 ]
 
@@ -4159,7 +4374,7 @@ dependencies = [
  "rustc_version 0.4.1",
  "toml 0.9.12+spec-1.1.0",
  "vswhom",
- "winreg 0.55.0",
+ "winreg",
 ]
 
 [[package]]
@@ -4213,18 +4428,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "enum-as-inner"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
 [[package]]
 name = "enum-ordinalize"
 version = "4.3.2"
@@ -4303,7 +4506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4645,6 +4848,12 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
 [[package]]
 name = "fuchsia-zircon"
 version = "0.3.3"
@@ -4692,16 +4901,6 @@ dependencies = [
  "futures-util",
 ]
 
-[[package]]
-name = "futures-bounded"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91f328e7fb845fc832912fb6a34f40cf6d1888c92f974d1893a54e97b5ff542e"
-dependencies = [
- "futures-timer",
- "futures-util",
-]
-
 [[package]]
 name = "futures-channel"
 version = "0.3.32"
@@ -4774,17 +4973,6 @@ dependencies = [
  "syn 2.0.117",
 ]
 
-[[package]]
-name = "futures-rustls"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
-dependencies = [
- "futures-io",
- "rustls 0.23.37",
- "rustls-pki-types",
-]
-
 [[package]]
 name = "futures-sink"
 version = "0.3.32"
@@ -5214,6 +5402,29 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "governor"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9efcab3c1958580ff1f25a2a41be1668f7603d849bb63af523b208a3cc1223b8"
+dependencies = [
+ "cfg-if 1.0.4",
+ "dashmap",
+ "futures-sink",
+ "futures-timer",
+ "futures-util",
+ "getrandom 0.3.4",
+ "hashbrown 0.16.1",
+ "nonzero_ext",
+ "parking_lot 0.12.5",
+ "portable-atomic",
+ "quanta",
+ "rand 0.9.2",
+ "smallvec",
+ "spinning_top",
+ "web-time",
+]
+
 [[package]]
 name = "group"
 version = "0.13.0"
@@ -5291,7 +5502,7 @@ dependencies = [
  "http",
  "indexmap 2.13.0",
  "slab",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-util",
  "tracing",
 ]
@@ -5367,24 +5578,6 @@ dependencies = [
  "hashbrown 0.14.5",
 ]
 
-[[package]]
-name = "hashlink"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
-dependencies = [
- "hashbrown 0.14.5",
-]
-
-[[package]]
-name = "hashlink"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
-dependencies = [
- "hashbrown 0.15.5",
-]
-
 [[package]]
 name = "headers"
 version = "0.4.1"
@@ -5460,59 +5653,6 @@ dependencies = [
  "arrayvec 0.7.6",
 ]
 
-[[package]]
-name = "hex_fmt"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f"
-
-[[package]]
-name = "hickory-proto"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502"
-dependencies = [
- "async-trait",
- "cfg-if 1.0.4",
- "data-encoding",
- "enum-as-inner 0.6.1",
- "futures-channel",
- "futures-io",
- "futures-util",
- "idna 1.1.0",
- "ipnet",
- "once_cell",
- "rand 0.9.2",
- "ring",
- "socket2 0.5.10",
- "thiserror 2.0.18",
- "tinyvec",
- "tokio 1.50.0",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "hickory-resolver"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc62a9a99b0bfb44d2ab95a7208ac952d31060efc16241c87eaf36406fecf87a"
-dependencies = [
- "cfg-if 1.0.4",
- "futures-util",
- "hickory-proto",
- "ipconfig",
- "moka",
- "once_cell",
- "parking_lot 0.12.5",
- "rand 0.9.2",
- "resolv-conf",
- "smallvec",
- "thiserror 2.0.18",
- "tokio 1.50.0",
- "tracing",
-]
-
 [[package]]
 name = "hkdf"
 version = "0.12.4"
@@ -5650,7 +5790,7 @@ dependencies = [
  "pin-project-lite 0.2.17",
  "pin-utils",
  "smallvec",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "want",
 ]
 
@@ -5665,7 +5805,7 @@ dependencies = [
  "hyper-util",
  "rustls 0.23.37",
  "rustls-pki-types",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-rustls 0.26.4",
  "tower-service",
  "webpki-roots 1.0.6",
@@ -5680,7 +5820,7 @@ dependencies = [
  "hyper",
  "hyper-util",
  "pin-project-lite 0.2.17",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tower-service",
 ]
 
@@ -5695,7 +5835,7 @@ dependencies = [
  "hyper",
  "hyper-util",
  "native-tls",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-native-tls",
  "tower-service",
 ]
@@ -5717,9 +5857,9 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite 0.2.17",
- "socket2 0.6.3",
+ "socket2 0.5.10",
  "system-configuration",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tower-service",
  "tracing",
  "windows-registry",
@@ -6014,60 +6154,6 @@ dependencies = [
  "icu_properties",
 ]
 
-[[package]]
-name = "if-addrs"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0a05c691e1fae256cf7013d99dad472dc52d5543322761f83ec8d47eab40d2b"
-dependencies = [
- "libc",
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "if-watch"
-version = "3.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71c02a5161c313f0cbdbadc511611893584a10a7b6153cb554bdf83ddce99ec2"
-dependencies = [
- "async-io",
- "core-foundation 0.9.4",
- "fnv",
- "futures",
- "if-addrs",
- "ipnet",
- "log",
- "netlink-packet-core",
- "netlink-packet-route",
- "netlink-proto",
- "netlink-sys",
- "rtnetlink",
- "system-configuration",
- "tokio 1.50.0",
- "windows 0.62.2",
-]
-
-[[package]]
-name = "igd-next"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "516893339c97f6011282d5825ac94fc1c7aad5cad26bdc2d0cee068c0bf97f97"
-dependencies = [
- "async-trait",
- "attohttpc",
- "bytes 1.11.1",
- "futures",
- "http",
- "http-body-util",
- "hyper",
- "hyper-util",
- "log",
- "rand 0.9.2",
- "tokio 1.50.0",
- "url",
- "xmltree",
-]
-
 [[package]]
 name = "im-rc"
 version = "15.1.0"
@@ -6200,18 +6286,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "ipconfig"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
-dependencies = [
- "socket2 0.5.10",
- "widestring",
- "windows-sys 0.48.0",
- "winreg 0.50.0",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.12.0"
@@ -6236,7 +6310,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
  "hermit-abi 0.5.2",
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6596,7 +6670,7 @@ dependencies = [
  "rand 0.9.2",
  "serde",
  "serde_json",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tracing-subscriber",
 ]
 
@@ -6646,7 +6720,7 @@ dependencies = [
  "tendermint",
  "tendermint-rpc",
  "thiserror 2.0.18",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "toml 0.8.23",
  "tonic 0.13.1",
  "tonic-web-wasm-client",
@@ -6736,7 +6810,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tempfile",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tracing",
  "tracing-subscriber",
  "utils",
@@ -6827,525 +6901,89 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
-name = "libp2p"
-version = "0.56.0"
+name = "libredox"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce71348bf5838e46449ae240631117b487073d5f347c06d434caddcb91dceb5a"
+checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a"
 dependencies = [
- "bytes 1.11.1",
- "either",
- "futures",
- "futures-timer",
- "getrandom 0.2.17",
- "libp2p-allow-block-list",
- "libp2p-autonat",
- "libp2p-connection-limits",
- "libp2p-core",
- "libp2p-dns",
- "libp2p-gossipsub",
- "libp2p-identify",
- "libp2p-identity",
- "libp2p-kad",
- "libp2p-mdns",
- "libp2p-metrics",
- "libp2p-noise",
- "libp2p-ping",
- "libp2p-quic",
- "libp2p-request-response",
- "libp2p-swarm",
- "libp2p-tcp",
- "libp2p-upnp",
- "libp2p-yamux",
- "multiaddr",
- "pin-project 1.1.11",
- "rw-stream-sink",
- "thiserror 2.0.18",
+ "libc",
 ]
 
 [[package]]
-name = "libp2p-allow-block-list"
-version = "0.6.0"
+name = "linux-keyutils"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16ccf824ee859ca83df301e1c0205270206223fd4b1f2e512a693e1912a8f4a"
+checksum = "761e49ec5fd8a5a463f9b84e877c373d888935b71c6be78f3767fe2ae6bed18e"
 dependencies = [
- "libp2p-core",
- "libp2p-identity",
- "libp2p-swarm",
+ "bitflags 2.11.0",
+ "libc",
 ]
 
 [[package]]
-name = "libp2p-autonat"
-version = "0.15.0"
+name = "linux-raw-sys"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+
+[[package]]
+name = "litemap"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fab5e25c49a7d48dac83d95d8f3bac0a290d8a5df717012f6e34ce9886396c0b"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "async-trait",
- "asynchronous-codec",
- "either",
- "futures",
- "futures-bounded",
- "futures-timer",
- "libp2p-core",
- "libp2p-identity",
- "libp2p-request-response",
- "libp2p-swarm",
- "quick-protobuf",
- "quick-protobuf-codec",
- "rand 0.8.5",
- "rand_core 0.6.4",
- "thiserror 2.0.18",
- "tracing",
- "web-time",
+ "scopeguard",
 ]
 
 [[package]]
-name = "libp2p-connection-limits"
-version = "0.6.0"
+name = "log"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18b8b607cf3bfa2f8c57db9c7d8569a315d5cc0a282e6bfd5ebfc0a9840b2a0"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 dependencies = [
- "libp2p-core",
- "libp2p-identity",
- "libp2p-swarm",
+ "value-bag",
 ]
 
 [[package]]
-name = "libp2p-core"
-version = "0.43.2"
+name = "logos"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "249128cd37a2199aff30a7675dffa51caf073b51aa612d2f544b19932b9aebca"
+checksum = "7251356ef8cb7aec833ddf598c6cb24d17b689d20b993f9d11a3d764e34e6458"
 dependencies = [
- "either",
- "fnv",
- "futures",
- "futures-timer",
- "libp2p-identity",
- "multiaddr",
- "multihash",
- "multistream-select",
- "parking_lot 0.12.5",
- "pin-project 1.1.11",
- "quick-protobuf",
- "rand 0.8.5",
- "rw-stream-sink",
- "thiserror 2.0.18",
- "tracing",
- "unsigned-varint 0.8.0",
- "web-time",
+ "logos-derive",
 ]
 
 [[package]]
-name = "libp2p-dns"
-version = "0.44.0"
+name = "logos-codegen"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b770c1c8476736ca98c578cba4b505104ff8e842c2876b528925f9766379f9a"
+checksum = "59f80069600c0d66734f5ff52cc42f2dabd6b29d205f333d61fd7832e9e9963f"
 dependencies = [
- "async-trait",
- "futures",
- "hickory-resolver",
- "libp2p-core",
- "libp2p-identity",
- "parking_lot 0.12.5",
- "smallvec",
- "tracing",
+ "beef",
+ "fnv",
+ "lazy_static 1.5.0",
+ "proc-macro2",
+ "quote",
+ "regex-syntax",
+ "syn 2.0.117",
 ]
 
 [[package]]
-name = "libp2p-gossipsub"
-version = "0.49.3"
+name = "logos-derive"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cef64c3bdfaee9561319a289d778e9f8c56bd8e10f5d1059289ebb085ef09d7"
-dependencies = [
- "async-channel 2.5.0",
- "asynchronous-codec",
- "base64 0.22.1",
- "byteorder",
- "bytes 1.11.1",
- "either",
- "fnv",
- "futures",
- "futures-timer",
- "getrandom 0.2.17",
- "hashlink 0.9.1",
- "hex_fmt",
- "libp2p-core",
- "libp2p-identity",
- "libp2p-swarm",
- "quick-protobuf",
- "quick-protobuf-codec",
- "rand 0.8.5",
- "regex",
- "sha2 0.10.9",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "libp2p-identify"
-version = "0.47.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ab792a8b68fdef443a62155b01970c81c3aadab5e659621b063ef252a8e65e8"
-dependencies = [
- "asynchronous-codec",
- "either",
- "futures",
- "futures-bounded",
- "futures-timer",
- "libp2p-core",
- "libp2p-identity",
- "libp2p-swarm",
- "quick-protobuf",
- "quick-protobuf-codec",
- "smallvec",
- "thiserror 2.0.18",
- "tracing",
-]
-
-[[package]]
-name = "libp2p-identity"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c7892c221730ba55f7196e98b0b8ba5e04b4155651736036628e9f73ed6fc3"
-dependencies = [
- "asn1_der",
- "bs58",
- "ed25519-dalek 2.2.0",
- "hkdf",
- "k256",
- "multihash",
- "quick-protobuf",
- "rand 0.8.5",
- "sha2 0.10.9",
- "thiserror 2.0.18",
- "tracing",
- "zeroize",
-]
-
-[[package]]
-name = "libp2p-kad"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13d3fd632a5872ec804d37e7413ceea20588f69d027a0fa3c46f82574f4dee60"
-dependencies = [
- "asynchronous-codec",
- "bytes 1.11.1",
- "either",
- "fnv",
- "futures",
- "futures-bounded",
- "futures-timer",
- "libp2p-core",
- "libp2p-identity",
- "libp2p-swarm",
- "quick-protobuf",
- "quick-protobuf-codec",
- "rand 0.8.5",
- "sha2 0.10.9",
- "smallvec",
- "thiserror 2.0.18",
- "tracing",
- "uint 0.10.0",
- "web-time",
-]
-
-[[package]]
-name = "libp2p-mdns"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66872d0f1ffcded2788683f76931be1c52e27f343edb93bc6d0bcd8887be443"
-dependencies = [
- "futures",
- "hickory-proto",
- "if-watch",
- "libp2p-core",
- "libp2p-identity",
- "libp2p-swarm",
- "rand 0.8.5",
- "smallvec",
- "socket2 0.5.10",
- "tokio 1.50.0",
- "tracing",
-]
-
-[[package]]
-name = "libp2p-metrics"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "805a555148522cb3414493a5153451910cb1a146c53ffbf4385708349baf62b7"
-dependencies = [
- "futures",
- "libp2p-core",
- "libp2p-gossipsub",
- "libp2p-identify",
- "libp2p-identity",
- "libp2p-kad",
- "libp2p-ping",
- "libp2p-swarm",
- "pin-project 1.1.11",
- "prometheus-client",
- "web-time",
-]
-
-[[package]]
-name = "libp2p-noise"
-version = "0.46.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc73eacbe6462a0eb92a6527cac6e63f02026e5407f8831bde8293f19217bfbf"
-dependencies = [
- "asynchronous-codec",
- "bytes 1.11.1",
- "futures",
- "libp2p-core",
- "libp2p-identity",
- "multiaddr",
- "multihash",
- "quick-protobuf",
- "rand 0.8.5",
- "snow",
- "static_assertions",
- "thiserror 2.0.18",
- "tracing",
- "x25519-dalek",
- "zeroize",
-]
-
-[[package]]
-name = "libp2p-ping"
-version = "0.47.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74bb7fcdfd9fead4144a3859da0b49576f171a8c8c7c0bfc7c541921d25e60d3"
-dependencies = [
- "futures",
- "futures-timer",
- "libp2p-core",
- "libp2p-identity",
- "libp2p-swarm",
- "rand 0.8.5",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "libp2p-quic"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dc448b2de9f4745784e3751fe8bc6c473d01b8317edd5ababcb0dec803d843f"
-dependencies = [
- "futures",
- "futures-timer",
- "if-watch",
- "libp2p-core",
- "libp2p-identity",
- "libp2p-tls",
- "quinn",
- "rand 0.8.5",
- "ring",
- "rustls 0.23.37",
- "socket2 0.5.10",
- "thiserror 2.0.18",
- "tokio 1.50.0",
- "tracing",
-]
-
-[[package]]
-name = "libp2p-request-response"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9f1cca83488b90102abac7b67d5c36fc65bc02ed47620228af7ed002e6a1478"
-dependencies = [
- "async-trait",
- "futures",
- "futures-bounded",
- "libp2p-core",
- "libp2p-identity",
- "libp2p-swarm",
- "rand 0.8.5",
- "smallvec",
- "tracing",
-]
-
-[[package]]
-name = "libp2p-swarm"
-version = "0.47.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce88c6c4bf746c8482480345ea3edfd08301f49e026889d1cbccfa1808a9ed9e"
-dependencies = [
- "either",
- "fnv",
- "futures",
- "futures-timer",
- "hashlink 0.10.0",
- "libp2p-core",
- "libp2p-identity",
- "libp2p-swarm-derive",
- "multistream-select",
- "rand 0.8.5",
- "smallvec",
- "tokio 1.50.0",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "libp2p-swarm-derive"
-version = "0.35.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd297cf53f0cb3dee4d2620bb319ae47ef27c702684309f682bdb7e55a18ae9c"
-dependencies = [
- "heck 0.5.0",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "libp2p-tcp"
-version = "0.44.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb6585b9309699f58704ec9ab0bb102eca7a3777170fa91a8678d73ca9cafa93"
-dependencies = [
- "futures",
- "futures-timer",
- "if-watch",
- "libc",
- "libp2p-core",
- "socket2 0.6.3",
- "tokio 1.50.0",
- "tracing",
-]
-
-[[package]]
-name = "libp2p-tls"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96ff65a82e35375cbc31ebb99cacbbf28cb6c4fefe26bf13756ddcf708d40080"
-dependencies = [
- "futures",
- "futures-rustls",
- "libp2p-core",
- "libp2p-identity",
- "rcgen",
- "ring",
- "rustls 0.23.37",
- "rustls-webpki 0.103.9",
- "thiserror 2.0.18",
- "x509-parser",
- "yasna",
-]
-
-[[package]]
-name = "libp2p-upnp"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4757e65fe69399c1a243bbb90ec1ae5a2114b907467bf09f3575e899815bb8d3"
-dependencies = [
- "futures",
- "futures-timer",
- "igd-next",
- "libp2p-core",
- "libp2p-swarm",
- "tokio 1.50.0",
- "tracing",
-]
-
-[[package]]
-name = "libp2p-yamux"
-version = "0.47.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f15df094914eb4af272acf9adaa9e287baa269943f32ea348ba29cfb9bfc60d8"
-dependencies = [
- "either",
- "futures",
- "libp2p-core",
- "thiserror 2.0.18",
- "tracing",
- "yamux 0.12.1",
- "yamux 0.13.10",
-]
-
-[[package]]
-name = "libredox"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "linux-keyutils"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "761e49ec5fd8a5a463f9b84e877c373d888935b71c6be78f3767fe2ae6bed18e"
-dependencies = [
- "bitflags 2.11.0",
- "libc",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
-
-[[package]]
-name = "litemap"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
-
-[[package]]
-name = "lock_api"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
-dependencies = [
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
-dependencies = [
- "value-bag",
-]
-
-[[package]]
-name = "logos"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7251356ef8cb7aec833ddf598c6cb24d17b689d20b993f9d11a3d764e34e6458"
-dependencies = [
- "logos-derive",
-]
-
-[[package]]
-name = "logos-codegen"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f80069600c0d66734f5ff52cc42f2dabd6b29d205f333d61fd7832e9e9963f"
-dependencies = [
- "beef",
- "fnv",
- "lazy_static 1.5.0",
- "proc-macro2",
- "quote",
- "regex-syntax",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "logos-derive"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24fb722b06a9dc12adb0963ed585f19fc61dc5413e6a9be9422ef92c091e731d"
+checksum = "24fb722b06a9dc12adb0963ed585f19fc61dc5413e6a9be9422ef92c091e731d"
 dependencies = [
  "logos-codegen",
 ]
@@ -7591,9 +7229,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
+checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
 dependencies = [
  "libc",
  "wasi 0.11.1+wasi-snapshot-preview1",
@@ -7618,23 +7256,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "864e1de64c29b386d2dc7822aea156a7e4d45d4393ac748878dc21c9c41037f0"
 
-[[package]]
-name = "moka"
-version = "0.12.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85f8024e1c8e71c778968af91d43700ce1d11b219d127d79fb2934153b82b42b"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-epoch",
- "crossbeam-utils",
- "equivalent",
- "parking_lot 0.12.5",
- "portable-atomic",
- "smallvec",
- "tagptr",
- "uuid",
-]
-
 [[package]]
 name = "muda"
 version = "0.17.1"
@@ -7656,25 +7277,6 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
-[[package]]
-name = "multiaddr"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6351f60b488e04c1d21bc69e56b89cb3f5e8f5d22557d6e8031bdfd79b6961"
-dependencies = [
- "arrayref",
- "byteorder",
- "data-encoding",
- "libp2p-identity",
- "multibase",
- "multihash",
- "percent-encoding",
- "serde",
- "static_assertions",
- "unsigned-varint 0.8.0",
- "url",
-]
-
 [[package]]
 name = "multibase"
 version = "0.9.2"
@@ -7707,7 +7309,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b430e7953c29dd6a09afc29ff0bb69c6e306329ee6794700aee27b76a1aea8d"
 dependencies = [
  "core2",
- "unsigned-varint 0.8.0",
+ "unsigned-varint",
 ]
 
 [[package]]
@@ -7722,20 +7324,6 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
 
-[[package]]
-name = "multistream-select"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0df8e5eec2298a62b326ee4f0d7fe1a6b90a09dfcf9df37b38f947a8c42f19"
-dependencies = [
- "bytes 1.11.1",
- "futures",
- "log",
- "pin-project 1.1.11",
- "smallvec",
- "unsigned-varint 0.7.2",
-]
-
 [[package]]
 name = "native-tls"
 version = "0.2.18"
@@ -7794,54 +7382,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "netlink-packet-core"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3463cbb78394cb0141e2c926b93fc2197e473394b761986eca3b9da2c63ae0f4"
-dependencies = [
- "paste",
-]
-
-[[package]]
-name = "netlink-packet-route"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ce3636fa715e988114552619582b530481fd5ef176a1e5c1bf024077c2c9445"
-dependencies = [
- "bitflags 2.11.0",
- "libc",
- "log",
- "netlink-packet-core",
-]
-
-[[package]]
-name = "netlink-proto"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65d130ee111430e47eed7896ea43ca693c387f097dd97376bffafbf25812128"
-dependencies = [
- "bytes 1.11.1",
- "futures",
- "log",
- "netlink-packet-core",
- "netlink-sys",
- "thiserror 2.0.18",
-]
-
-[[package]]
-name = "netlink-sys"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd6c30ed10fa69cc491d491b85cc971f6bdeb8e7367b7cde2ee6cc878d583fae"
-dependencies = [
- "bytes 1.11.1",
- "futures-util",
- "libc",
- "log",
- "tokio 1.50.0",
-]
-
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
@@ -7873,18 +7413,6 @@ dependencies = [
  "memoffset",
 ]
 
-[[package]]
-name = "nix"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
-dependencies = [
- "bitflags 2.11.0",
- "cfg-if 1.0.4",
- "cfg_aliases",
- "libc",
-]
-
 [[package]]
 name = "nix"
 version = "0.31.2"
@@ -7903,12 +7431,6 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 
-[[package]]
-name = "nohash-hasher"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -7919,6 +7441,12 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nonzero_ext"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
+
 [[package]]
 name = "normpath"
 version = "1.5.0"
@@ -7928,13 +7456,22 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae"
+dependencies = [
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -8137,6 +7674,16 @@ dependencies = [
  "objc2-core-foundation",
 ]
 
+[[package]]
+name = "objc2-io-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
+dependencies = [
+ "libc",
+ "objc2-core-foundation",
+]
+
 [[package]]
 name = "objc2-io-surface"
 version = "0.3.2"
@@ -8219,7 +7766,7 @@ dependencies = [
  "serde_json",
  "sha2 0.10.9",
  "thiserror 2.0.18",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tracing",
  "unicase",
 ]
@@ -8253,20 +7800,11 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.9",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "wit-component 0.230.0",
  "wit-parser 0.230.0",
 ]
 
-[[package]]
-name = "oid-registry"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f40cff3dde1b6087cc5d5f5d4d65712f34016a03ed60e9c08dcc392736b5b7"
-dependencies = [
- "asn1-rs",
-]
-
 [[package]]
 name = "olpc-cjson"
 version = "0.1.4"
@@ -8283,10 +7821,6 @@ name = "once_cell"
 version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
-dependencies = [
- "critical-section",
- "portable-atomic",
-]
 
 [[package]]
 name = "once_cell_polyfill"
@@ -8400,8 +7934,9 @@ dependencies = [
  "prost 0.14.3",
  "reqwest 0.12.28",
  "thiserror 2.0.18",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tonic 0.14.5",
+ "tracing",
 ]
 
 [[package]]
@@ -8436,7 +7971,7 @@ dependencies = [
  "percent-encoding",
  "rand 0.9.2",
  "thiserror 2.0.18",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-stream",
 ]
 
@@ -8728,16 +8263,6 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "132dca9b868d927b35b5dd728167b2dee150eb1ad686008fc71ccb298b776fca"
 
-[[package]]
-name = "pem"
-version = "3.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
-dependencies = [
- "base64 0.22.1",
- "serde_core",
-]
-
 [[package]]
 name = "pem-rfc7468"
 version = "0.7.0"
@@ -9403,9 +8928,9 @@ dependencies = [
 
 [[package]]
 name = "prometheus-client"
-version = "0.23.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf41c1a7c32ed72abe5082fb19505b969095c12da9f5732a4bc9878757fd087c"
+checksum = "e4500adecd7af8e0e9f4dbce15cfee07ce913fbf6ad605cc468b83f2d531ee94"
 dependencies = [
  "dtoa",
  "itoa",
@@ -9415,9 +8940,9 @@ dependencies = [
 
 [[package]]
 name = "prometheus-client-derive-encode"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
+checksum = "9adf1691c04c0a5ff46ff8f262b58beb07b0dbb61f96f9f54f6cbd82106ed87f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9664,41 +9189,34 @@ dependencies = [
 name = "pulley-macros"
 version = "42.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3f210c61b6ecfaebbba806b6d9113a222519d4e5cc4ab2d5ecca047bb7927ae"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
-[[package]]
-name = "quick-protobuf"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f"
+checksum = "c3f210c61b6ecfaebbba806b6d9113a222519d4e5cc4ab2d5ecca047bb7927ae"
 dependencies = [
- "byteorder",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
 ]
 
 [[package]]
-name = "quick-protobuf-codec"
-version = "0.3.1"
+name = "quanta"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15a0580ab32b169745d7a39db2ba969226ca16738931be152a3209b409de2474"
+checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7"
 dependencies = [
- "asynchronous-codec",
- "bytes 1.11.1",
- "quick-protobuf",
- "thiserror 1.0.69",
- "unsigned-varint 0.8.0",
+ "crossbeam-utils",
+ "libc",
+ "once_cell",
+ "raw-cpuid",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "web-sys",
+ "winapi 0.3.9",
 ]
 
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
 [[package]]
 name = "quick-xml"
 version = "0.38.4"
@@ -9716,15 +9234,14 @@ checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
 dependencies = [
  "bytes 1.11.1",
  "cfg_aliases",
- "futures-io",
  "pin-project-lite 0.2.17",
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
  "rustls 0.23.37",
- "socket2 0.6.3",
+ "socket2 0.5.10",
  "thiserror 2.0.18",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tracing",
  "web-time",
 ]
@@ -9759,9 +9276,9 @@ dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.6.3",
+ "socket2 0.5.10",
  "tracing",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -9886,6 +9403,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "rand_distr"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
+dependencies = [
+ "num-traits",
+ "rand 0.8.5",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -9932,7 +9459,7 @@ dependencies = [
  "libc",
  "mkdirp",
  "random-access-storage",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "winapi 0.3.9",
 ]
 
@@ -9966,6 +9493,15 @@ dependencies = [
  "rustversion",
 ]
 
+[[package]]
+name = "raw-cpuid"
+version = "11.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"
+dependencies = [
+ "bitflags 2.11.0",
+]
+
 [[package]]
 name = "raw-window-handle"
 version = "0.6.2"
@@ -9992,19 +9528,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "rcgen"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
-dependencies = [
- "pem",
- "ring",
- "rustls-pki-types",
- "time",
- "yasna",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -10142,7 +9665,7 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-native-tls",
  "tokio-rustls 0.26.4",
  "tokio-util",
@@ -10179,7 +9702,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sync_wrapper",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-util",
  "tower",
  "tower-http",
@@ -10191,12 +9714,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "resolv-conf"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7"
-
 [[package]]
 name = "rfc6979"
 version = "0.4.0"
@@ -10241,7 +9758,7 @@ dependencies = [
  "cfg-if 1.0.4",
  "getrandom 0.2.17",
  "libc",
- "untrusted",
+ "untrusted 0.9.0",
  "windows-sys 0.52.0",
 ]
 
@@ -10280,7 +9797,7 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror 2.0.18",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-util",
  "tracing",
 ]
@@ -10327,24 +9844,6 @@ dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "rtnetlink"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b960d5d873a75b5be9761b1e73b146f52dddcd27bac75263f40fba686d4d7b5"
-dependencies = [
- "futures-channel",
- "futures-util",
- "log",
- "netlink-packet-core",
- "netlink-packet-route",
- "netlink-proto",
- "netlink-sys",
- "nix 0.30.1",
- "thiserror 1.0.69",
- "tokio 1.50.0",
-]
-
 [[package]]
 name = "ruint"
 version = "1.17.2"
@@ -10459,15 +9958,6 @@ dependencies = [
  "semver 1.0.27",
 ]
 
-[[package]]
-name = "rusticata-macros"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
-dependencies = [
- "nom",
-]
-
 [[package]]
 name = "rustix"
 version = "0.38.44"
@@ -10491,7 +9981,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -10563,7 +10053,7 @@ checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
- "untrusted",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -10574,7 +10064,7 @@ checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
 dependencies = [
  "ring",
  "rustls-pki-types",
- "untrusted",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -10595,17 +10085,6 @@ dependencies = [
  "wait-timeout",
 ]
 
-[[package]]
-name = "rw-stream-sink"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8c9026ff5d2f23da5e45bbc283f156383001bfb09c4e44256d02c1a685fe9a1"
-dependencies = [
- "futures",
- "pin-project 1.1.11",
- "static_assertions",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.23"
@@ -11174,7 +10653,7 @@ dependencies = [
  "bytes 1.11.1",
  "hex",
  "sha2 0.10.9",
- "tokio 1.50.0",
+ "tokio 1.51.0",
 ]
 
 [[package]]
@@ -11332,7 +10811,6 @@ dependencies = [
  "chacha20poly1305",
  "curve25519-dalek 4.1.3",
  "rand_core 0.6.4",
- "ring",
  "rustc_version 0.4.1",
  "sha2 0.10.9",
  "subtle",
@@ -11426,6 +10904,21 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "spin"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
+
+[[package]]
+name = "spinning_top"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
+dependencies = [
+ "lock_api",
+]
+
 [[package]]
 name = "spki"
 version = "0.7.3"
@@ -11665,6 +11158,20 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "sysinfo"
+version = "0.37.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16607d5caffd1c07ce073528f9ed972d88db15dd44023fa57142963be3feb11f"
+dependencies = [
+ "libc",
+ "memchr",
+ "ntapi",
+ "objc2-core-foundation",
+ "objc2-io-kit",
+ "windows",
+]
+
 [[package]]
 name = "system-configuration"
 version = "0.7.0"
@@ -11715,12 +11222,6 @@ dependencies = [
  "winx",
 ]
 
-[[package]]
-name = "tagptr"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
-
 [[package]]
 name = "tao"
 version = "0.34.6"
@@ -11753,7 +11254,7 @@ dependencies = [
  "tao-macros",
  "unicode-segmentation",
  "url",
- "windows 0.61.3",
+ "windows",
  "windows-core 0.61.2",
  "windows-version",
  "x11-dl",
@@ -11831,13 +11332,13 @@ dependencies = [
  "tauri-runtime-wry",
  "tauri-utils",
  "thiserror 2.0.18",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tray-icon",
  "url",
  "webkit2gtk",
  "webview2-com",
  "window-vibrancy",
- "windows 0.61.3",
+ "windows",
 ]
 
 [[package]]
@@ -11982,7 +11483,7 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows 0.61.3",
+ "windows",
 ]
 
 [[package]]
@@ -12007,7 +11508,7 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows 0.61.3",
+ "windows",
  "wry",
 ]
 
@@ -12080,7 +11581,7 @@ dependencies = [
  "getrandom 0.4.2",
  "once_cell",
  "rustix 1.1.4",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12370,13 +11871,13 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.50.0"
+version = "1.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
+checksum = "2bd1c4c0fc4a7ab90fc15ef6daaa3ec3b893f004f915f2392557ed23237820cd"
 dependencies = [
  "bytes 1.11.1",
  "libc",
- "mio 1.1.1",
+ "mio 1.2.0",
  "parking_lot 0.12.5",
  "pin-project-lite 0.2.17",
  "signal-hook-registry",
@@ -12387,9 +11888,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.6.1"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c"
+checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12403,7 +11904,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
 dependencies = [
  "native-tls",
- "tokio 1.50.0",
+ "tokio 1.51.0",
 ]
 
 [[package]]
@@ -12414,7 +11915,7 @@ checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
 dependencies = [
  "rustls 0.22.4",
  "rustls-pki-types",
- "tokio 1.50.0",
+ "tokio 1.51.0",
 ]
 
 [[package]]
@@ -12424,7 +11925,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
  "rustls 0.23.37",
- "tokio 1.50.0",
+ "tokio 1.51.0",
 ]
 
 [[package]]
@@ -12435,7 +11936,7 @@ checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70"
 dependencies = [
  "futures-core",
  "pin-project-lite 0.2.17",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-util",
 ]
 
@@ -12449,7 +11950,7 @@ dependencies = [
  "log",
  "rustls 0.23.37",
  "rustls-pki-types",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-rustls 0.26.4",
  "tungstenite 0.26.2",
  "webpki-roots 0.26.11",
@@ -12466,7 +11967,7 @@ dependencies = [
  "rustls 0.23.37",
  "rustls-native-certs",
  "rustls-pki-types",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-rustls 0.26.4",
  "tungstenite 0.28.0",
 ]
@@ -12482,7 +11983,7 @@ dependencies = [
  "futures-io",
  "futures-sink",
  "pin-project-lite 0.2.17",
- "tokio 1.50.0",
+ "tokio 1.51.0",
 ]
 
 [[package]]
@@ -12629,7 +12130,7 @@ dependencies = [
  "prost 0.13.5",
  "rustls-native-certs",
  "socket2 0.5.10",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-rustls 0.26.4",
  "tokio-stream",
  "tower",
@@ -12657,7 +12158,7 @@ dependencies = [
  "percent-encoding",
  "pin-project 1.1.11",
  "sync_wrapper",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-stream",
  "tower",
  "tower-layer",
@@ -12719,7 +12220,7 @@ dependencies = [
  "pin-project-lite 0.2.17",
  "slab",
  "sync_wrapper",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-util",
  "tower-layer",
  "tower-service",
@@ -12830,6 +12331,16 @@ dependencies = [
  "tracing-opentelemetry",
 ]
 
+[[package]]
+name = "tracing-serde"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1"
+dependencies = [
+ "serde",
+ "tracing-core",
+]
+
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.23"
@@ -12840,12 +12351,15 @@ dependencies = [
  "nu-ansi-term",
  "once_cell",
  "regex-automata",
+ "serde",
+ "serde_json",
  "sharded-slab",
  "smallvec",
  "thread_local",
  "tracing",
  "tracing-core",
  "tracing-log",
+ "tracing-serde",
 ]
 
 [[package]]
@@ -12878,7 +12392,7 @@ checksum = "1cad71a0c0d68ab9941d2fb6e82f8fb2e86d9945b94e1661dd0aaea2b88215a9"
 dependencies = [
  "async-trait",
  "cfg-if 1.0.4",
- "enum-as-inner 0.3.4",
+ "enum-as-inner",
  "futures",
  "idna 0.2.3",
  "lazy_static 1.5.0",
@@ -13009,18 +12523,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "uint"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909988d098b2f738727b161a106cfc7cab00c539c2687a8836f8e565976fb53e"
-dependencies = [
- "byteorder",
- "crunchy",
- "hex",
- "static_assertions",
-]
-
 [[package]]
 name = "unarray"
 version = "0.1.4"
@@ -13146,15 +12648,15 @@ checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "unsigned-varint"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105"
+checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06"
 
 [[package]]
-name = "unsigned-varint"
-version = "0.8.0"
+name = "untrusted"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "untrusted"
@@ -13230,7 +12732,11 @@ dependencies = [
  "axum",
  "axum-extra",
  "bip39",
+ "blst",
  "cid",
+ "commonware-codec",
+ "commonware-cryptography",
+ "commonware-math",
  "const-hex",
  "cw-wavs-mock-api",
  "dashmap",
@@ -13239,6 +12745,7 @@ dependencies = [
  "dotenvy",
  "figment",
  "futures",
+ "hkdf",
  "iri-string",
  "layer-climb",
  "layer-climb-cli",
@@ -13247,15 +12754,18 @@ dependencies = [
  "opentelemetry-otlp",
  "opentelemetry_sdk",
  "rand 0.9.2",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
  "reqwest 0.12.28",
  "serde",
  "serde_json",
+ "sha2 0.10.9",
  "shellexpand",
  "subtle",
  "temp-env",
  "tempfile",
  "thiserror 2.0.18",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "toml 0.9.12+spec-1.1.0",
  "tower",
  "tracing",
@@ -13486,7 +12996,7 @@ dependencies = [
  "sha256",
  "tempfile",
  "thiserror 1.0.69",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-util",
  "tracing",
  "url",
@@ -13836,7 +13346,7 @@ dependencies = [
  "serde_json",
  "sha2 0.10.9",
  "thiserror 1.0.69",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-util",
  "toml 0.8.23",
  "tracing",
@@ -13866,7 +13376,7 @@ dependencies = [
  "serde_json",
  "sha2 0.10.9",
  "thiserror 1.0.69",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "toml 0.8.23",
 ]
 
@@ -14266,7 +13776,7 @@ dependencies = [
  "rustix 1.1.4",
  "system-interface",
  "thiserror 2.0.18",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tracing",
  "url",
  "wasmtime",
@@ -14289,7 +13799,7 @@ dependencies = [
  "http-body-util",
  "hyper",
  "rustls 0.22.4",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-rustls 0.25.0",
  "tracing",
  "wasmtime",
@@ -14319,7 +13829,7 @@ checksum = "f1014ca35f2f36909766d1f09bb00811b994dd83d5cb90be7ddb295150072120"
 dependencies = [
  "bytes 1.11.1",
  "rustls 0.22.4",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-rustls 0.25.0",
  "wasmtime",
  "wasmtime-wasi",
@@ -14390,8 +13900,16 @@ dependencies = [
  "base64 0.22.1",
  "bimap",
  "bincode",
+ "bip39",
  "chrono",
  "clap 4.6.0",
+ "commonware-broadcast",
+ "commonware-codec",
+ "commonware-cryptography",
+ "commonware-math",
+ "commonware-p2p",
+ "commonware-runtime",
+ "commonware-utils",
  "const-hex",
  "cosmwasm-std",
  "criterion",
@@ -14408,9 +13926,10 @@ dependencies = [
  "hyperswarm",
  "iri-string",
  "layer-climb",
- "libp2p",
  "opentelemetry",
  "rand 0.9.2",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
  "reqwest 0.12.28",
  "serde",
  "serde_json",
@@ -14418,10 +13937,11 @@ dependencies = [
  "tauri",
  "tempfile",
  "thiserror 2.0.18",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tokio-stream",
  "tokio-tungstenite 0.28.0",
  "tokio-util",
+ "toml 0.9.12+spec-1.1.0",
  "tower",
  "tower-http",
  "tracing",
@@ -14456,7 +13976,7 @@ dependencies = [
  "tauri-build",
  "tauri-plugin-dialog",
  "tauri-plugin-fs",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "toml 0.9.12+spec-1.1.0",
  "tracing",
  "tracing-subscriber",
@@ -14499,7 +14019,7 @@ dependencies = [
  "serde_json",
  "shellexpand",
  "tempfile",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tracing",
  "tracing-subscriber",
  "utils",
@@ -14517,7 +14037,7 @@ dependencies = [
  "alloy-signer-local",
  "clap 4.6.0",
  "reqwest 0.12.28",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tracing-subscriber",
  "utils",
  "wavs-cli",
@@ -14543,7 +14063,7 @@ dependencies = [
  "serde_json",
  "tempfile",
  "thiserror 2.0.18",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "tracing",
  "utils",
  "wasm-pkg-client",
@@ -14584,7 +14104,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tempfile",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "toml 0.9.12+spec-1.1.0",
  "tracing",
  "tracing-subscriber",
@@ -14607,14 +14127,19 @@ dependencies = [
  "anyhow",
  "async-trait",
  "bincode",
+ "blst",
  "cfg-if 1.0.4",
  "chrono",
+ "commonware-codec",
+ "commonware-cryptography",
+ "commonware-math",
  "const-hex",
  "cosmwasm-schema",
  "cosmwasm-std",
  "iri-string",
  "layer-climb-address",
  "layer-climb-config",
+ "rand_chacha 0.3.1",
  "regex",
  "ripemd",
  "semver 1.0.27",
@@ -14622,7 +14147,7 @@ dependencies = [
  "serde_json",
  "sha2 0.10.9",
  "thiserror 2.0.18",
- "tokio 1.50.0",
+ "tokio 1.51.0",
  "ts-rs",
  "utoipa",
  "wasm-pkg-common",
@@ -14752,7 +14277,7 @@ checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
- "windows 0.61.3",
+ "windows",
  "windows-core 0.61.2",
  "windows-implement",
  "windows-interface",
@@ -14776,7 +14301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"
 dependencies = [
  "thiserror 2.0.18",
- "windows 0.61.3",
+ "windows",
  "windows-core 0.61.2",
 ]
 
@@ -14789,12 +14314,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "widestring"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471"
-
 [[package]]
 name = "wiggle"
 version = "42.0.1"
@@ -14875,7 +14394,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -14924,23 +14443,11 @@ version = "0.61.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
 dependencies = [
- "windows-collections 0.2.0",
+ "windows-collections",
  "windows-core 0.61.2",
- "windows-future 0.2.1",
+ "windows-future",
  "windows-link 0.1.3",
- "windows-numerics 0.2.0",
-]
-
-[[package]]
-name = "windows"
-version = "0.62.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
-dependencies = [
- "windows-collections 0.3.2",
- "windows-core 0.62.2",
- "windows-future 0.3.2",
- "windows-numerics 0.3.1",
+ "windows-numerics",
 ]
 
 [[package]]
@@ -14952,15 +14459,6 @@ dependencies = [
  "windows-core 0.61.2",
 ]
 
-[[package]]
-name = "windows-collections"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
-dependencies = [
- "windows-core 0.62.2",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.61.2"
@@ -14995,18 +14493,7 @@ checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
  "windows-core 0.61.2",
  "windows-link 0.1.3",
- "windows-threading 0.1.0",
-]
-
-[[package]]
-name = "windows-future"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
-dependencies = [
- "windows-core 0.62.2",
- "windows-link 0.2.1",
- "windows-threading 0.2.1",
+ "windows-threading",
 ]
 
 [[package]]
@@ -15053,16 +14540,6 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
-[[package]]
-name = "windows-numerics"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
-dependencies = [
- "windows-core 0.62.2",
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "windows-registry"
 version = "0.6.1"
@@ -15236,15 +14713,6 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
-[[package]]
-name = "windows-threading"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
-dependencies = [
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "windows-version"
 version = "0.1.7"
@@ -15461,16 +14929,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if 1.0.4",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "winreg"
 version = "0.55.0"
@@ -15800,7 +15258,7 @@ dependencies = [
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",
- "windows 0.61.3",
+ "windows",
  "windows-core 0.61.2",
  "windows-version",
  "x11-dl",
@@ -15909,23 +15367,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "x509-parser"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569f339c0c402346d4a75a9e39cf8dad310e287eef1ff56d4c68e5067f53460"
-dependencies = [
- "asn1-rs",
- "data-encoding",
- "der-parser",
- "lazy_static 1.5.0",
- "nom",
- "oid-registry",
- "rusticata-macros",
- "thiserror 2.0.18",
- "time",
-]
-
 [[package]]
 name = "xdg-home"
 version = "1.3.0"
@@ -15936,21 +15377,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "xml-rs"
-version = "0.8.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f"
-
-[[package]]
-name = "xmltree"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7d8a75eaf6557bb84a65ace8609883db44a29951042ada9b393151532e41fcb"
-dependencies = [
- "xml-rs",
-]
-
 [[package]]
 name = "yaml-rust2"
 version = "0.8.1"
@@ -15959,38 +15385,7 @@ checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8"
 dependencies = [
  "arraydeque",
  "encoding_rs",
- "hashlink 0.8.4",
-]
-
-[[package]]
-name = "yamux"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed0164ae619f2dc144909a9f082187ebb5893693d8c0196e8085283ccd4b776"
-dependencies = [
- "futures",
- "log",
- "nohash-hasher",
- "parking_lot 0.12.5",
- "pin-project 1.1.11",
- "rand 0.8.5",
- "static_assertions",
-]
-
-[[package]]
-name = "yamux"
-version = "0.13.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1991f6690292030e31b0144d73f5e8368936c58e45e7068254f7138b23b00672"
-dependencies = [
- "futures",
- "log",
- "nohash-hasher",
- "parking_lot 0.12.5",
- "pin-project 1.1.11",
- "rand 0.9.2",
- "static_assertions",
- "web-time",
+ "hashlink",
 ]
 
 [[package]]
@@ -15999,15 +15394,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
-[[package]]
-name = "yasna"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
-dependencies = [
- "time",
-]
-
 [[package]]
 name = "yoke"
 version = "0.8.1"
diff --git a/Cargo.toml b/Cargo.toml
index 3fa1183c6..8f757e689 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -128,12 +128,12 @@ wildmatch = "2.5.0"
 alloy-node-bindings = "=1.0.42"
 alloy-json-abi = "1.4.1"
 alloy-primitives = { version = "1.4.1", features = ["serde"] }
-alloy-provider = { version = "=1.0.42", features = ["ws", "pubsub"] }
+alloy-provider = { version = "=1.0.42", default-features = false }
 alloy-sol-types = "1.4.1"
 alloy-sol-macro = { version = "1.4.1", features = ["json"] }
 alloy-transport = "=1.0.42"
 alloy-transport-http = "=1.0.42"
-alloy-rpc-client = "=1.0.42"
+alloy-rpc-client = { version = "=1.0.42", default-features = false }
 alloy-contract = "=1.0.42"
 alloy-signer = "=1.0.42"
 alloy-signer-local = { version = "=1.0.42", features = ["mnemonic"] }
@@ -233,24 +233,6 @@ crossbeam = "0.8.4"
 # versioning
 semver = { version = "1.0.27", features = ["serde"] }
 
-# p2p
-# Cargo.toml
-libp2p = { version = "0.56", features = [
-    "tokio",            # tokio runtime
-    "tcp",
-    "dns",
-    "noise",
-    "yamux",
-    "identify",
-    "ping",
-    "gossipsub",
-    "request-response",
-    "kad",              # WAN discovery
-    "mdns",             # local dev discovery
-    "autonat",          # NAT detection for external address discovery
-    "macros",
-    "secp256k1",        # secp256k1 identity for P2P (derived from signing_mnemonic)
-] }
 
 # Tauri - backend
 tauri = { version = "2.10.2", features = ["protocol-asset"] }
@@ -279,11 +261,14 @@ mime_guess = "2.0.5"
 awsm_web = {version = "0.45.0", default-features = false, features = ["dom", "file"]}
 
 
+# P2P / crypto
+commonware-cryptography = "2026.3.0"
+
 # local
 utils = { path = "packages/utils" }
 wavs = { path = "packages/wavs" }
 wavs-engine = { path = "packages/engine" }
-wavs-types = { path = "packages/types" }
+wavs-types = { path = "packages/types", default-features = false }
 wavs-cli = { path = "packages/cli" }
 wavs-benchmark-common = { path = "packages/wavs/benches/common" }
 example-helpers = { path = "examples/components/_helpers" }
diff --git a/DEMO.md b/DEMO.md
new file mode 100644
index 000000000..6e29bee11
--- /dev/null
+++ b/DEMO.md
@@ -0,0 +1,266 @@
+# P2P Demo & Testing Guide
+
+How to verify the commonware P2P migration works, from quick unit tests through
+full multi-operator end-to-end.
+
+---
+
+## Quick Start
+
+```bash
+# Run all P2P unit and integration tests (no live stack needed, ~30s)
+cargo test -p wavs -- p2p --test-threads=1
+
+# Run the full E2E suite with multi-operator P2P
+just test-wavs-e2e
+```
+
+---
+
+## Test Layers
+
+### 1. Unit Tests — Identity & Message Types
+
+Tests in `packages/wavs/src/subsystems/aggregator/p2p.rs` (inline `#[cfg(test)]` module).
+No network, no async runtime. Fast.
+
+```bash
+cargo test -p wavs -- p2p_broadcast_tests --test-threads=1
+```
+
+**What they cover:**
+
+| Test | What it checks |
+|------|----------------|
+| `test_p2p_message_from_submission` | `P2pMessage::from_submission()` encodes service ID + payload correctly |
+| `test_p2p_message_codec_roundtrip` | Encode → decode produces identical fields (Codec trait) |
+| `test_p2p_message_digest_determinism` | Identical messages → same SHA-256 digest; different messages → different digest |
+| `test_p2p_message_to_submission_roundtrip` | Full serialize/deserialize round-trip through `P2pMessage` |
+| `test_service_router_empty_rejects_all` | Empty `ServiceRouter` rejects all messages |
+| `test_service_router_subscribe_accept` | After `subscribe(A)`, accepts messages for A, rejects B |
+| `test_service_router_unsubscribe` | After `unsubscribe(A)`, rejects messages for A again |
+| `test_service_router_subscribed_services` | `subscribed_services()` returns correct list |
+| `test_retry_queue_empty` | Empty queue returns empty drain |
+| `test_retry_queue_push_drain_fifo` | Messages drained in FIFO order |
+| `test_retry_queue_overflow_drops_oldest` | Queue at capacity drops oldest on push (bounded at 64) |
+| `test_retry_queue_drain_empty` | Second drain of empty queue returns empty |
+
+---
+
+### 2. Integration Tests — Identity (no network)
+
+Tests in `packages/wavs/tests/p2p_identity_tests.rs`.
+
+```bash
+cargo test -p wavs --test p2p_identity_tests -- --nocapture
+```
+
+**What they cover:**
+
+| Test | What it checks |
+|------|----------------|
+| `test_deterministic_derivation` | Same mnemonic always produces the same Ed25519 keypair |
+| `test_consistent_across_restarts` | `ed25519_signer_from_mnemonic()` is stable across calls |
+| `test_different_mnemonics_produce_different_keys` | Different mnemonics → different peer IDs |
+| `test_invalid_mnemonic_returns_error` | Bad mnemonic returns an error, does not panic |
+| `test_p2p_config_default_is_disabled` | `P2pConfig::default()` is `Disabled` |
+| `test_p2p_config_local_deserialization` | `[wavs.p2p.local]` TOML deserializes correctly |
+| `test_p2p_config_remote_deserialization` | `[wavs.p2p.remote]` TOML deserializes correctly |
+| `test_p2p_config_disabled_has_no_port` | `P2pConfig::Disabled` has no listen port |
+
+---
+
+### 3. Integration Tests — Connectivity (real sockets, localhost)
+
+Tests in `packages/wavs/tests/p2p_connectivity_tests.rs`.
+Spin up real commonware runtimes on localhost. Ports start at `19000`.
+
+```bash
+cargo test -p wavs --test p2p_connectivity_tests -- --test-threads=1 --nocapture
+```
+
+> `--test-threads=1` is required — tests bind to localhost ports and conflict if run in parallel.
+
+**What they cover:**
+
+| Test | What it checks |
+|------|----------------|
+| `test_lookup_mode_two_nodes_connect` | Two nodes in Local mode connect to each other via known addresses |
+| `test_unauthorized_peer_rejected` | Node with pubkey not in `authorized_peers` cannot connect |
+| `test_discovery_mode_two_nodes` | Two nodes in Remote mode discover each other via bootstrapper |
+| `test_block_peer` | `block_peer()` disconnects a peer and prevents reconnection |
+| `test_auto_reconnect` | Node survives bootstrapper unavailability; `dial_frequency` retries automatically |
+
+---
+
+### 4. Integration Tests — Broadcast (real P2P, real messages)
+
+Tests in `packages/wavs/tests/p2p_broadcast_tests.rs`.
+Spin up 2–3 real commonware nodes and exchange actual `Submission` payloads.
+
+```bash
+cargo test -p wavs --test p2p_broadcast_tests -- --test-threads=1 --nocapture
+```
+
+**What they cover:**
+
+| Test | What it checks |
+|------|----------------|
+| `test_broadcast_to_all_peers` | Published submission arrives at all connected peers |
+| `test_service_filtering` | Operator subscribed to service A does not receive service B messages |
+| `test_p2p_handle_api_preserved` | `publish`, `subscribe`, `unsubscribe`, `get_status` all work; Aggregator interface unchanged |
+| `test_retry_queue_on_no_peers` | Messages queued when no peers; delivered after peer connects |
+| `test_deduplication_by_digest` | Same message broadcast twice arrives exactly once |
+| `test_catchup_after_reconnect` | Node that reconnects receives messages broadcast while it was away |
+| `test_cache_bounded_deque_size` | Catch-up buffer respects `deque_size` limit |
+| `test_status_connected_peers_after_broadcast` | `/p2p/status` returns correct `connected_peers` count and hex peer IDs after broadcast |
+
+---
+
+### 5. E2E Tests — Full Multi-Operator Stack
+
+Requires all services running. Starts real WAVS nodes, Anvil chain, and middleware.
+
+```bash
+just test-wavs-e2e
+```
+
+The test suite uses `p2p = "remote"` (discovery mode) by default. To isolate the
+multi-operator test:
+
+```toml
+# packages/layer-tests/layer-tests.toml
+mode = { "isolated" = [{ evm = "multi_operator" }] }
+```
+
+Then:
+
+```bash
+just test-wavs-e2e
+```
+
+To switch to Local (lookup) mode:
+
+```toml
+# packages/layer-tests/layer-tests.toml
+p2p = "local"
+```
+
+---
+
+## Manual Two-Node Demo
+
+Verify the P2P layer works with two live WAVS nodes on localhost.
+
+### Step 1 — Get peer IDs
+
+```bash
+# Node 1 (use any BIP-39 mnemonic)
+wavs-cli p2p identity --mnemonic "test test test test test test test test test test test junk"
+# → e.g. a1b2c3d4e5f6...  (64 hex chars)
+
+# Node 2 (different mnemonic)
+wavs-cli p2p identity --mnemonic "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
+# → e.g. b2c3d4e5f6a1...
+```
+
+### Step 2 — Write configs
+
+**`/tmp/wavs-node-1.toml`:**
+```toml
+[wavs]
+port = 8041
+signing_mnemonic = "test test test test test test test test test test test junk"
+
+[wavs.p2p.local]
+listen_port = 9000
+peer_addresses = ["<NODE2_PUBKEY>@127.0.0.1:9001"]
+authorized_peers = ["<NODE2_PUBKEY>"]
+```
+
+**`/tmp/wavs-node-2.toml`:**
+```toml
+[wavs]
+port = 8042
+signing_mnemonic = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
+
+[wavs.p2p.local]
+listen_port = 9001
+peer_addresses = ["<NODE1_PUBKEY>@127.0.0.1:9000"]
+authorized_peers = ["<NODE1_PUBKEY>"]
+```
+
+Replace `<NODE1_PUBKEY>` and `<NODE2_PUBKEY>` with the hex strings from Step 1.
+
+### Step 3 — Start nodes
+
+```bash
+# Terminal 1
+WAVS_SIGNING_MNEMONIC="test test test test test test test test test test test junk" \
+  wavs --home /tmp/wavs-node-1.toml
+
+# Terminal 2
+WAVS_SIGNING_MNEMONIC="abandon abandon abandon..." \
+  wavs --home /tmp/wavs-node-2.toml
+```
+
+### Step 4 — Verify connectivity
+
+```bash
+# Node 1 status
+curl -s http://127.0.0.1:8041/p2p/status | jq .
+
+# Node 2 status
+curl -s http://127.0.0.1:8042/p2p/status | jq .
+```
+
+Expected on each node once connected:
+```json
+{
+  "enabled": true,
+  "local_peer_id": "<hex>",
+  "listen_addresses": ["0.0.0.0:900X"],
+  "connected_peers": 1,
+  "peer_ids": ["<other_node_hex>"],
+  "subscribed_services": []
+}
+```
+
+`connected_peers` starts at `0` and increments to `1` after the first broadcast.
+
+---
+
+## What to Look For in Logs
+
+```
+INFO wavs::p2p: P2P lookup network: listening on 0.0.0.0:9000, 1 peers, 1 authorized
+INFO wavs::p2p: Broadcast delivered to 1 peers
+INFO wavs::p2p: Inbound P2P message for service <id>, forwarding to aggregator
+```
+
+With `RUST_LOG=info,wavs=debug`:
+```
+DEBUG wavs::p2p: Subscribed to service: <service_id>
+DEBUG wavs::p2p: Filtered message for unsubscribed service
+DEBUG wavs::p2p: Duplicate message filtered by digest
+```
+
+---
+
+## Troubleshooting
+
+**`connected_peers` stays at 0**
+- Check that `authorized_peers` in each node's config lists the *other* node's pubkey
+- Check that `peer_addresses` uses the correct port
+- Connectivity only updates after the first successful broadcast (the tracker is populated from ack recipients and inbound senders)
+
+**`parse_bootstrapper` error in logs**
+- Remote mode bootstrapper addresses must be `<hex_pubkey>@<host>:<port>`, not bare `host:port`
+- Use `wavs-cli p2p identity` to get the hex pubkey, then compose the address
+
+**Port conflicts in tests**
+- Run P2P integration tests with `--test-threads=1`; parallel runs collide on localhost ports
+- Tests use ports starting at `19000` + offset
+
+**Runtime drop panic after tests**
+- Cosmetic. The commonware runtime's internal Tokio runtime is dropped on thread exit after the test framework tears down. All assertions pass before the panic.
diff --git a/app/src/stores/appStore.ts b/app/src/stores/appStore.ts
index 503bf89b1..e84dec745 100644
--- a/app/src/stores/appStore.ts
+++ b/app/src/stores/appStore.ts
@@ -38,7 +38,7 @@ interface AppState {
 
 export const useAppStore = create<AppState>((set, get) => ({
   // Initial state
-  settings: { wavs_home: null, saved_registries: [], saved_service_managers: [], saved_services: [], mcp_enabled: false, mcp_auto_start: false, mcp_token: null, env_vars: {} },
+  settings: { wavs_home: null, saved_registries: [], saved_service_managers: [] },
   logList: [],
   activityList: [],
   services: new Map(),
diff --git a/checksums.txt b/checksums.txt
index 70bb79844..ceb7046bd 100644
--- a/checksums.txt
+++ b/checksums.txt
@@ -1,10 +1,10 @@
-5306b31c131cbbfc07a49f0ab43774c13ef5da1ff584c1af549bb7dff16d2223  ./examples/build/components/chain_trigger_lookup.wasm
-4c828e793e771289e820ea4227712ea51eb5fe8ce050ac6ceb7c35a04a7e3a72  ./examples/build/components/cosmos_query.wasm
-ae5956a15e43f9f0f1e33b457829fa72d6343a4dd20e6049d209b0849f941cb1  ./examples/build/components/echo_block_interval.wasm
-1bc1fa1af778d535a00ce2174ae3fa24ddd2ef961abe859832959155efb08636  ./examples/build/components/echo_cron_interval.wasm
-8e1ec1471fe0845a2d8d158f6610f6f6134d4f090569b7b1911fcc7258f8eb01  ./examples/build/components/echo_data.wasm
-3ccd4f8b6817dcb2c28e688effea2597590228ff7060d180205240db0765a333  ./examples/build/components/kv_store.wasm
-88f28f046e2e379032a93d6a98abb70b6fa7a037e23ddd4382a14dfe25c48d37  ./examples/build/components/permissions.wasm
-f9e1c1144bbfbfe7139d9a0be6890452058c1a700ce96bb5b6fc8f50535109f1  ./examples/build/components/simple_aggregator.wasm
-c2d31fe21f971a71983354c32127852af5cff011dd4686abf98c956d3361b682  ./examples/build/components/square.wasm
-1fc8363742b207eb7ddb32caa629e1e8ac7a953e755afb85c67fa0d729923f66  ./examples/build/components/timer_aggregator.wasm
+bf30f06de033a700a2f3e4f8072fa56ec246711539fdbce24b6b6370e576568a  ./examples/build/components/chain_trigger_lookup.wasm
+dce2fb77fe6ef64fb770e9c631cbb7fa2f76a4487de4507d6d50bd8d0d718936  ./examples/build/components/cosmos_query.wasm
+387344beec4d2917c4ee81a78e3889e3b212e90319f7c68bf5af22a7a9de5ec5  ./examples/build/components/echo_block_interval.wasm
+9bebeae57feb1a21257270f6c5cd8489fb4f8a6973ee83906a9cb7ddf908e3d8  ./examples/build/components/echo_cron_interval.wasm
+d87c393e1f58c2955ef23c7240a4d38ea37176f11cbdda69bef1b2b5bdb0df84  ./examples/build/components/echo_data.wasm
+fbf2324e16b3ec02f9f72b5ab14a3b1853beab187debc37d4c5d6f096f50d00d  ./examples/build/components/kv_store.wasm
+defbd231bce9d2b7e2e64bd3aabd8147b5c24ace75f7b3352bd53497e60bb73c  ./examples/build/components/permissions.wasm
+c232b120ee19d23823908f0917d6233470d5e9204d2dd71d19ff5fde5cf887d0  ./examples/build/components/simple_aggregator.wasm
+08fc7a66001624a3ade417351da677d3ccfb1c08899b3622442fb02d2fd0a5bd  ./examples/build/components/square.wasm
+4a2c49a7421c127eb2b8d92620f2f4c360e356907f1c0e1b1dd202b466f684d4  ./examples/build/components/timer_aggregator.wasm
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 11c522d7a..c7ca29158 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -77,4 +77,4 @@ Burned (submitted) queues are retained for a configurable TTL (default 48 hours)
 
 ## P2P Networking
 
-The Aggregator subsystem includes optional P2P networking for multi-operator deployments. Each registered service gets its own GossipSub topic; operators subscribe on service registration and unsubscribe on removal. Peer discovery uses either mDNS (local/dev) or Kademlia DHT (production). See [P2P.md](P2P.md) for configuration details.
+The Aggregator subsystem includes optional P2P networking for multi-operator deployments. Operators broadcast signed submissions via a commonware broadcast channel with application-level service filtering. Peer connectivity uses either lookup mode (local/dev, known addresses) or discovery mode (production, bootstrapper-based). Identities are Ed25519 keypairs derived from the signing mnemonic. See [P2P.md](P2P.md) for configuration details.
diff --git a/docs/OPERATOR_MIGRATION.md b/docs/OPERATOR_MIGRATION.md
new file mode 100644
index 000000000..6f422ca78
--- /dev/null
+++ b/docs/OPERATOR_MIGRATION.md
@@ -0,0 +1,231 @@
+# Operator Migration Guide: libp2p to commonware
+
+This guide covers migrating a WAVS operator node from the libp2p P2P backend
+to the new commonware backend.
+
+## Prerequisites
+
+- Current WAVS node running with libp2p P2P (or planning an upgrade from a version that used it)
+- Coordination with all operators in your deployment
+- Access to your `WAVS_SIGNING_MNEMONIC` (same mnemonic used for on-chain signing)
+
+## Breaking Changes
+
+### 1. Identity Format Change
+
+- **Old:** secp256k1 keypair, peer IDs like `12D3KooW...` (base58-encoded multihash)
+- **New:** Ed25519 keypair derived from `WAVS_SIGNING_MNEMONIC` via ChaCha20Rng (BIP-39 seed)
+- Peer IDs are now hex-encoded Ed25519 public keys (64 lowercase hex characters)
+- The same mnemonic produces a **different** peer ID from before (different key algorithm and derivation)
+- To view your new peer ID:
+
+```bash
+wavs-cli p2p identity --mnemonic "your signing mnemonic words here"
+# Output: a1b2c3d4e5f6... (64 hex characters)
+```
+
+### 2. Address Format Change
+
+- **Old:** multiaddr format — `/ip4/1.2.3.4/tcp/9000/p2p/12D3KooW...`
+- **New:** socket format — `<hex_ed25519_pubkey>@<host>:<port>`
+- Example: `a1b2c3d4e5f6789012345678901234567890123456789012345678901234abcd@192.168.1.10:9000`
+
+### 3. Configuration Format Change
+
+**Old wavs.toml (libp2p):**
+
+```toml
+# Local mode (mDNS):
+[wavs.p2p]
+local = { listen_port = 9000 }
+
+# Remote mode (Kademlia DHT):
+[wavs.p2p]
+remote = { listen_port = 9000, bootstrap_nodes = ["/ip4/1.2.3.4/tcp/9000/p2p/12D3Koo..."] }
+```
+
+**New wavs.toml (commonware):**
+
+```toml
+# Local mode (lookup, known peer addresses):
+[wavs.p2p.local]
+listen_port = 9000
+peer_addresses = ["<hex_ed25519_pubkey>@127.0.0.1:9001"]
+authorized_peers = ["<hex_ed25519_pubkey>"]
+max_message_size = 65536    # optional, default 64 KB
+deque_size = 128            # optional, default 128 messages
+
+# Remote mode (discovery, bootstrapper-based):
+[wavs.p2p.remote]
+listen_port = 9000
+bootstrappers = ["<hex_ed25519_pubkey>@1.2.3.4:9000"]
+authorized_peers = ["<hex_ed25519_pubkey>"]
+max_message_size = 65536    # optional
+deque_size = 128            # optional
+```
+
+New fields added:
+- `authorized_peers`: Required. List of Ed25519 public keys allowed to connect. Replaces the implicit "known peers" concept from libp2p.
+- `peer_addresses` (Local mode only): Explicit peer addresses replacing mDNS automatic discovery.
+- `bootstrappers` (Remote mode only): Replaces `bootstrap_nodes` with the new address format.
+- `max_message_size`: Optional. Maximum P2P message size in bytes (default: 65536).
+- `deque_size`: Optional. Broadcast message cache size per peer for catch-up on reconnection (default: 128).
+
+### 4. Discovery Mechanism Change
+
+- **Old:** mDNS for automatic LAN peer discovery (local mode), Kademlia DHT for production
+- **New:** Lookup mode requires explicit `peer_addresses` (no automatic LAN discovery), Discovery mode uses bootstrapper-based peer resolution
+- There is no automatic peer discovery in the new system. Peers must be explicitly listed (Local mode) or reachable via bootstrappers (Remote mode).
+
+## Coordinated Upgrade Requirement
+
+**All operators in a deployment MUST upgrade simultaneously.**
+
+The old (libp2p) and new (commonware) backends use incompatible wire protocols, identity
+schemes, and address formats. A libp2p node and a commonware node cannot communicate.
+
+Plan a maintenance window with all operators. The window requires:
+1. Stopping all nodes
+2. Upgrading all binaries
+3. Updating all configurations with new Ed25519 peer IDs
+4. Starting all nodes together
+
+Rolling upgrades are not possible for the P2P networking layer.
+
+## Step-by-Step Migration
+
+### 1. Coordinate with Other Operators
+
+Schedule a maintenance window with all operators in your deployment. Agree on:
+- Upgrade time (all nodes must be stopped and upgraded together)
+- How to exchange new Ed25519 public keys (email, shared doc, secure channel)
+- Rollback plan if issues arise
+
+### 2. Generate Your New Ed25519 Identity
+
+Before the maintenance window, generate your new peer ID:
+
+```bash
+wavs-cli p2p identity --mnemonic "your signing mnemonic words here"
+```
+
+Share the output (64-character hex string) with all other operators in your deployment.
+Collect their hex public keys in return. You will need these for `authorized_peers`
+and `peer_addresses`/`bootstrappers` in the new config.
+
+### 3. Stop All Operator Nodes
+
+During the maintenance window, stop all WAVS operator nodes in your deployment.
+Verify all nodes are stopped before proceeding.
+
+### 4. Update WAVS Binary
+
+Download and install the new WAVS release that includes the commonware P2P backend.
+Verify the version:
+
+```bash
+wavs-node --version
+```
+
+### 5. Update wavs.toml Configuration
+
+Edit your `wavs.toml` to use the new P2P configuration format.
+
+**For Local (development/testing) deployments:**
+
+```toml
+[wavs.p2p.local]
+listen_port = 9000
+peer_addresses = ["<other_operator_pubkey>@<host>:<port>"]
+authorized_peers = ["<other_operator_pubkey>"]
+```
+
+**For Remote (production) deployments — bootstrapper node:**
+
+```toml
+[wavs.p2p.remote]
+listen_port = 9000
+bootstrappers = []              # Empty: this node is the bootstrapper
+authorized_peers = [
+    "<operator2_pubkey>",
+    "<operator3_pubkey>",
+]
+```
+
+**For Remote (production) deployments — other nodes:**
+
+```toml
+[wavs.p2p.remote]
+listen_port = 9000
+bootstrappers = ["<bootstrapper_pubkey>@<bootstrapper_host>:9000"]
+authorized_peers = [
+    "<operator1_pubkey>",       # bootstrapper
+    "<operator3_pubkey>",
+]
+```
+
+Replace `<*_pubkey>` placeholders with the actual 64-character hex Ed25519 public keys
+collected from each operator in step 2.
+
+### 6. Update authorized_peers on All Nodes
+
+Every operator must add all other operators' Ed25519 public keys to their
+`authorized_peers` list. Only peers listed in `authorized_peers` can connect.
+A node that is not in another node's `authorized_peers` will be rejected.
+
+### 7. Start All Operator Nodes
+
+Start all nodes simultaneously (or within a few seconds of each other). For Remote
+mode, start the bootstrapper node first, wait a moment, then start the other nodes.
+
+### 8. Verify Connectivity
+
+Use the P2P status endpoint to confirm all nodes are connected:
+
+```bash
+curl http://localhost:8041/p2p/status | jq .
+```
+
+Expected response:
+
+```json
+{
+  "enabled": true,
+  "local_peer_id": "<your_64_char_hex_pubkey>",
+  "listen_addresses": ["0.0.0.0:9000"],
+  "connected_peers": 2,
+  "peer_ids": ["<operator2_pubkey>", "<operator3_pubkey>"],
+  "subscribed_services": ["my-avs-service"]
+}
+```
+
+- `connected_peers` should match the number of other operators (N - 1 for an N-operator deployment)
+- `peer_ids` should list all other operators' Ed25519 public keys
+- `subscribed_services` should show all registered AVS services
+
+## Verification Checklist
+
+- [ ] `GET /p2p/status` returns `"enabled": true` on all nodes
+- [ ] `connected_peers` equals the expected number (total operators minus 1)
+- [ ] `peer_ids` lists all other operators' hex public keys
+- [ ] `subscribed_services` shows all registered services
+- [ ] Trigger processing resumes: check logs for `Aggregator: quorum reached` messages
+- [ ] On-chain submissions resume: verify transactions are being posted
+
+## Rollback
+
+If the upgrade fails, rolling back requires ALL operators to revert simultaneously
+to the old binary. The old libp2p and new commonware backends are incompatible —
+a partial rollback leaves the deployment non-functional.
+
+To rollback:
+1. Stop all nodes
+2. Restore old WAVS binary on all nodes
+3. Restore old `wavs.toml` on all nodes (keep the old libp2p config)
+4. Start all nodes simultaneously
+
+## Reference
+
+- [P2P.md](P2P.md) — Full P2P configuration reference for the commonware backend
+- [ARCHITECTURE.md](ARCHITECTURE.md) — System architecture overview
+- `wavs.toml` — Config template with all P2P options documented
diff --git a/docs/P2P.md b/docs/P2P.md
index a09b4cf04..3d9d82dd1 100644
--- a/docs/P2P.md
+++ b/docs/P2P.md
@@ -1,3 +1,6 @@
+# P2P Networking
+
+```
 ┌─────────────────────────────────────────────────────────────────────┐
 │                        WAVS Operator Node                           │
 ├─────────────────────────────────────────────────────────────────────┤
@@ -17,8 +20,8 @@
 │                                          │           │           │  │
 │                                          │  ┌────────▼────────┐  │  │
 │  ┌──────────────────────────────────┐    │  │   P2P Network   │  │  │
-│  │      Other WAVS Nodes            │◀───┼──│  mDNS/Kademlia  │  │  │
-│  │  (receive/send signatures)       │───▶│  │   + GossipSub   │  │  │
+│  │      Other WAVS Nodes            │◀───┼──│  commonware-p2p │  │  │
+│  │  (receive/send signatures)       │───▶│  │ Broadcast Engine│  │  │
 │  └──────────────────────────────────┘    │  └────────┬────────┘  │  │
 │                                          │           │           │  │
 │                                          │  ┌────────▼────────┐  │  │
@@ -33,61 +36,173 @@
                                               ┌────────────────┐
                                               │   Blockchain   │
                                               └────────────────┘
+```
 
 ---
 
 ## Overview
 
-P2P networking is an optional feature of the Aggregator subsystem. When enabled, operators broadcast their signed submissions to peers, and the Aggregator collects signatures from those peers to reach the quorum threshold before posting on-chain.
+P2P networking is an optional feature of the Aggregator subsystem. When enabled,
+operators broadcast signed submissions to peers via a commonware broadcast channel,
+and the Aggregator collects signatures to reach quorum before posting on-chain.
 
-Each registered service gets its own GossipSub topic. Operators subscribe to a service's topic on registration and unsubscribe when the service is removed. This keeps message routing scoped to relevant operators.
+Uses commonware-p2p for authenticated peer networking with Ed25519 identities.
+A single broadcast channel handles all services, with application-level filtering
+by service ID (ServiceRouter).
+
+---
+
+## Architecture
+
+- **Identity**: Ed25519 keypair derived from `WAVS_SIGNING_MNEMONIC` via ChaCha20Rng (BIP-39 seed). Deterministic: same mnemonic always produces the same peer ID.
+- **Two modes**: Local (lookup with known peer addresses) and Remote (discovery with bootstrappers).
+- **Broadcast**: Single commonware broadcast channel with ServiceRouter filtering by service ID. Two channels are registered per network — Channel 0 for the Broadcast Engine (caching/catch-up), Channel 1 for real-time forwarding to the Aggregator.
+- **Catch-up**: Buffered Broadcast Engine caches messages per peer. On reconnection, the Engine replays cached messages to the reconnecting peer.
+- **Security**: Oracle-based peer authorization — only peers whose Ed25519 public keys appear in `authorized_peers` can connect. Built-in per-peer rate limiting via commonware's default `Config::local()` settings.
 
 ---
 
 ## Configuration
 
-P2P is disabled by default. To enable it, add a `[wavs.p2p]` block to `wavs.toml`.
+P2P is disabled by default. Add a `[wavs.p2p]` block to `wavs.toml` to enable.
 
 ### Disabled (default)
 
-Omit the `[wavs.p2p]` block entirely. The node operates in single-operator mode: no P2P networking, no gossip, no bootstrap.
+Omit the `[wavs.p2p]` block entirely, or explicitly set:
+
+```toml
+# p2p = "disabled"
+```
+
+The node operates in single-operator mode: no P2P networking, no broadcast, no bootstrapping.
 
-### Local — mDNS (development / testing)
+### Local — Lookup Mode (development / testing)
 
 ```toml
-[wavs.p2p]
-local = { listen_port = 9000 }
+[wavs.p2p.local]
+listen_port = 9000
+peer_addresses = ["<hex_ed25519_pubkey>@127.0.0.1:9001"]
+authorized_peers = ["<hex_ed25519_pubkey>"]
+max_message_size = 65536    # Max P2P message size in bytes (default: 64 KB)
+deque_size = 128            # Broadcast cache per peer for catch-up (default: 128 messages)
 ```
 
-Uses multicast DNS for automatic peer discovery on the local network. Suitable for multi-operator dev/test setups on the same LAN.
+Lookup mode uses explicit peer addresses — no automatic LAN discovery. Suitable for
+multi-operator dev/test setups where all peer addresses are known in advance.
+
+`peer_addresses` lists the socket addresses of other operators in `<pubkey>@<host>:<port>` format.
+`authorized_peers` lists the Ed25519 public keys of peers allowed to connect.
 
-### Remote — Kademlia DHT (production)
+### Remote — Discovery Mode (production)
 
 ```toml
-[wavs.p2p]
-remote = { listen_port = 9000, bootstrap_nodes = [
-    "/ip4/1.2.3.4/tcp/9000/p2p/12D3Koo...",
-] }
+[wavs.p2p.remote]
+listen_port = 9000
+bootstrappers = []          # Empty = this node is a bootstrapper
+authorized_peers = ["<hex_ed25519_pubkey>"]
+max_message_size = 65536
+deque_size = 128
 ```
 
-Uses Kademlia DHT for peer discovery and GossipSub for message dissemination. Suitable for multi-operator production deployments across the internet.
+Discovery mode uses bootstrapper nodes for initial peer discovery. Suitable for
+multi-operator production deployments across the internet.
 
-If `bootstrap_nodes` is an empty list, this node acts as the bootstrap server for other peers to connect to.
+If `bootstrappers` is an empty list, this node acts as a bootstrapper for other peers.
+Other nodes list its address in their `bootstrappers` field.
 
 ---
 
 ## Multi-Node Setup
 
-For step-by-step instructions on configuring multiple nodes with P2P, see the [V2 migration guide](https://github.com/Lay3rLabs/Layer-Wiki/wiki/V2-migration-guide) (the "setup p2p" section).
+### Local Development (2 operators on localhost)
+
+Each operator needs their own `wavs.toml`. First, get each operator's Ed25519 public key
+from their signing mnemonic:
+
+```bash
+wavs-cli p2p identity --mnemonic "your signing mnemonic words here"
+# Output: <64-character hex Ed25519 public key>
+```
+
+**Node 1 (`wavs-node-1.toml`):**
+
+```toml
+[wavs]
+port = 8041
+signing_mnemonic = "<mnemonic_1>"
+
+[wavs.p2p.local]
+listen_port = 9000
+peer_addresses = ["<node2_ed25519_pubkey>@127.0.0.1:9001"]
+authorized_peers = ["<node2_ed25519_pubkey>"]
+```
+
+**Node 2 (`wavs-node-2.toml`):**
+
+```toml
+[wavs]
+port = 8042
+signing_mnemonic = "<mnemonic_2>"
+
+[wavs.p2p.local]
+listen_port = 9001
+peer_addresses = ["<node1_ed25519_pubkey>@127.0.0.1:9000"]
+authorized_peers = ["<node1_ed25519_pubkey>"]
+```
+
+Start both nodes. Use `GET /p2p/status` on each to confirm connectivity.
+
+### Production Deployment
+
+1. Designate one node as the initial bootstrapper (set `bootstrappers = []`).
+2. All other nodes list the bootstrapper's address: `bootstrappers = ["<bootstrapper_pubkey>@<host>:9000"]`.
+3. Exchange Ed25519 public keys out-of-band with all other operators.
+4. Add all operators' public keys to `authorized_peers` in every node's config.
 
 ---
 
 ## Status Endpoint
 
-`GET /p2p/status` returns the current P2P state of the node, including:
+`GET /p2p/status` returns the current P2P state of the node as JSON.
+
+| Field | Type | Description |
+|---|---|---|
+| `enabled` | bool | Whether P2P networking is active |
+| `local_peer_id` | string | Hex-encoded Ed25519 public key of this node |
+| `listen_addresses` | string[] | Socket addresses this node listens on (e.g. `"0.0.0.0:9000"`) |
+| `connected_peers` | number | Count of currently connected peers |
+| `peer_ids` | string[] | Hex Ed25519 public keys of all connected peers |
+| `subscribed_services` | string[] | Service names currently subscribed for P2P broadcast |
+
+Example response:
+
+```json
+{
+  "enabled": true,
+  "local_peer_id": "a1b2c3d4e5f6...",
+  "listen_addresses": ["0.0.0.0:9000"],
+  "connected_peers": 2,
+  "peer_ids": ["b2c3d4e5f6a1...", "c3d4e5f6a1b2..."],
+  "subscribed_services": ["my-avs-service"]
+}
+```
+
+---
+
+## Identity
+
+Ed25519 keypairs are derived deterministically from `WAVS_SIGNING_MNEMONIC` via ChaCha20Rng
+seeded with the BIP-39 mnemonic seed bytes. The same mnemonic always produces the same
+Ed25519 keypair and therefore the same peer ID.
+
+**Peer ID format:** 64-character lowercase hex string (32-byte Ed25519 public key, hex-encoded).
 
-- Whether P2P is enabled
-- The local peer ID
-- Listen addresses and discovered external addresses (useful for NAT traversal)
-- Connected peer IDs and count
-- Subscribed GossipSub topics and peer counts per topic
+**Address format:** `<peer_id>@<host>:<port>` — for example:
+```
+a1b2c3d4e5f6789012345678901234567890123456789012345678901234abcd@192.168.1.10:9000
+```
+
+To get your node's Ed25519 public key:
+```bash
+wavs-cli p2p identity --mnemonic "your signing mnemonic words here"
+```
diff --git a/docs/blog/commonware-p2p-migration.md b/docs/blog/commonware-p2p-migration.md
new file mode 100644
index 000000000..4645541d6
--- /dev/null
+++ b/docs/blog/commonware-p2p-migration.md
@@ -0,0 +1,79 @@
+# WAVS Migrates to commonware for P2P Networking
+
+**Date:** 2026-03
+
+## Summary
+
+WAVS has replaced its libp2p-based P2P networking layer with commonware primitives.
+This migration delivers simpler architecture, better performance, and tighter security
+for multi-operator deployments.
+
+## Why commonware?
+
+The libp2p integration served WAVS well during early development, but its feature
+surface far exceeded what WAVS actually needed. The configuration required 13 feature
+flags (tcp, dns, noise, yamux, identify, ping, gossipsub, request-response, kad, mdns,
+autonat, macros, secp256k1) to support a relatively narrow use case: broadcast
+signed submissions between a known set of operators. GossipSub mesh tuning,
+per-service topic management, and secp256k1 peer identity all added operational
+complexity without matching benefits.
+
+commonware takes a focused approach. Its broadcast Engine is purpose-built for
+disseminating messages to a known set of peers with reliable catch-up on reconnection.
+Peer authorization uses an Oracle — a deterministic set of allowed public keys —
+rather than open-mesh peer discovery. This maps directly to WAVS's trust model:
+only registered operators should communicate.
+
+The identity model is another strong fit. WAVS operators already hold a signing
+mnemonic (`WAVS_SIGNING_MNEMONIC`). commonware's Ed25519 identity is derived
+deterministically from that mnemonic via ChaCha20Rng, so no separate key management
+is required. The same mnemonic that signs on-chain submissions also identifies the
+operator in the P2P network.
+
+## What Changed
+
+- **Identity:** secp256k1 keypair (libp2p PeerID like `12D3Koo...`) replaced by Ed25519 keypair derived from signing mnemonic. Peer IDs are now 64-character hex strings.
+- **Address format:** multiaddr (`/ip4/1.2.3.4/tcp/9000/p2p/12D3Koo...`) replaced by socket format (`<hex_ed25519_pubkey>@<host>:<port>`).
+- **Discovery:** mDNS (local LAN) and Kademlia DHT (production) replaced by Lookup mode (explicit peer list, local/dev) and Discovery mode (bootstrapper-based, production).
+- **Message routing:** Per-service GossipSub topics replaced by a single commonware broadcast channel with application-level service filtering (ServiceRouter).
+- **Catch-up:** Custom request/response protocol replaced by Broadcast Engine with per-peer message caching. On reconnection, the Engine replays cached messages to the reconnecting peer automatically.
+- **Security:** Connection-level TLS encryption replaced by Oracle-based peer authorization. Only peers whose Ed25519 public keys appear in `authorized_peers` can connect. Built-in per-peer rate limiting is provided by commonware's default configuration.
+
+## Impact on Operators
+
+This is a breaking change. The commonware and libp2p backends are fundamentally
+incompatible — they use different wire protocols, different identity schemes, and
+different address formats. Operators running multi-node deployments must coordinate
+a simultaneous upgrade across all nodes.
+
+Peer IDs will change. All operators need to regenerate their peer IDs from their
+signing mnemonic, exchange the new IDs out-of-band, and update their `wavs.toml`
+configuration before restarting. Single-operator deployments (no P2P enabled) are
+unaffected beyond the config format change if they migrate to the new `wavs.toml`
+format.
+
+See the [Operator Migration Guide](../OPERATOR_MIGRATION.md) for step-by-step
+instructions covering identity regeneration, config format changes, and coordinated
+upgrade sequencing.
+
+## Technical Details
+
+The migration was implemented in four phases. Phase 1 replaced the identity system,
+establishing Ed25519 keypair derivation from the signing mnemonic via ChaCha20Rng.
+Phase 2 replaced the network layer, implementing lookup and discovery modes on
+top of commonware-p2p with Oracle-based authorization. Phase 3 added the broadcast
+architecture — a two-channel design where Channel 0 feeds the Broadcast Engine for
+message caching and catch-up, and Channel 1 provides real-time forwarding to the
+Aggregator.
+
+Zero libp2p code remains in the codebase. The networking stack uses
+commonware-p2p for transport and peer management, commonware-broadcast for message
+dissemination and catch-up, and commonware-cryptography for Ed25519 key operations.
+
+## What's Next
+
+Future improvements in the P2P layer include on-chain operator registry integration
+(automatically deriving `authorized_peers` from registered operators rather than
+manual configuration), simulated networking tests for deterministic multi-operator
+testing, and improved NAT traversal guidance for production deployments. The current
+architecture provides a stable foundation for these enhancements.
diff --git a/examples/build/components/chain_trigger_lookup.wasm b/examples/build/components/chain_trigger_lookup.wasm
index 44f504831..88dd96447 100644
Binary files a/examples/build/components/chain_trigger_lookup.wasm and b/examples/build/components/chain_trigger_lookup.wasm differ
diff --git a/examples/build/components/cosmos_query.wasm b/examples/build/components/cosmos_query.wasm
index 1d4c938d7..f28838071 100644
Binary files a/examples/build/components/cosmos_query.wasm and b/examples/build/components/cosmos_query.wasm differ
diff --git a/examples/build/components/echo_block_interval.wasm b/examples/build/components/echo_block_interval.wasm
index 980d3817a..5a79d11f7 100644
Binary files a/examples/build/components/echo_block_interval.wasm and b/examples/build/components/echo_block_interval.wasm differ
diff --git a/examples/build/components/echo_cron_interval.wasm b/examples/build/components/echo_cron_interval.wasm
index 5307a77a5..5d8a298b8 100644
Binary files a/examples/build/components/echo_cron_interval.wasm and b/examples/build/components/echo_cron_interval.wasm differ
diff --git a/examples/build/components/echo_data.wasm b/examples/build/components/echo_data.wasm
index 6a21aadec..264183249 100644
Binary files a/examples/build/components/echo_data.wasm and b/examples/build/components/echo_data.wasm differ
diff --git a/examples/build/components/kv_store.wasm b/examples/build/components/kv_store.wasm
index 14c38f300..51ba84b1e 100644
Binary files a/examples/build/components/kv_store.wasm and b/examples/build/components/kv_store.wasm differ
diff --git a/examples/build/components/permissions.wasm b/examples/build/components/permissions.wasm
index 8c3559483..8b7e58ea5 100644
Binary files a/examples/build/components/permissions.wasm and b/examples/build/components/permissions.wasm differ
diff --git a/examples/build/components/simple_aggregator.wasm b/examples/build/components/simple_aggregator.wasm
index c4f526e3c..7423ef627 100644
Binary files a/examples/build/components/simple_aggregator.wasm and b/examples/build/components/simple_aggregator.wasm differ
diff --git a/examples/build/components/square.wasm b/examples/build/components/square.wasm
index ae24a14d9..4a09a12c4 100644
Binary files a/examples/build/components/square.wasm and b/examples/build/components/square.wasm differ
diff --git a/examples/build/components/timer_aggregator.wasm b/examples/build/components/timer_aggregator.wasm
index 50b672d7e..2c7f63c3c 100644
Binary files a/examples/build/components/timer_aggregator.wasm and b/examples/build/components/timer_aggregator.wasm differ
diff --git a/examples/components/_helpers/Cargo.toml b/examples/components/_helpers/Cargo.toml
index 7e8881d97..bb8670367 100644
--- a/examples/components/_helpers/Cargo.toml
+++ b/examples/components/_helpers/Cargo.toml
@@ -9,7 +9,7 @@ repository.workspace = true
 [dependencies]
 wavs-wasi-utils = { workspace = true }
 alloy-primitives = { workspace = true }
-alloy-provider = { workspace = true }
+alloy-provider = { workspace = true, default-features = false }
 alloy-contract = { workspace = true }
 alloy-sol-macro = { workspace = true }
 alloy-sol-types = { workspace = true }
diff --git a/examples/components/chain-trigger-lookup/Cargo.toml b/examples/components/chain-trigger-lookup/Cargo.toml
index f93503e40..79231ec0a 100644
--- a/examples/components/chain-trigger-lookup/Cargo.toml
+++ b/examples/components/chain-trigger-lookup/Cargo.toml
@@ -13,7 +13,7 @@ example-helpers = { workspace = true }
 anyhow = { workspace = true }
 layer-climb = { workspace = true }
 alloy-network = { workspace = true }
-alloy-provider = { workspace = true }
+alloy-provider = { workspace = true, default-features = false }
 alloy-primitives = { workspace = true }
 
 [lib]
diff --git a/examples/components/timer-aggregator/Cargo.toml b/examples/components/timer-aggregator/Cargo.toml
index bf4d9ebae..cafa3ec69 100644
--- a/examples/components/timer-aggregator/Cargo.toml
+++ b/examples/components/timer-aggregator/Cargo.toml
@@ -12,7 +12,7 @@ wit-bindgen = { workspace = true }
 alloy-primitives = { workspace = true }
 wavs-wasi-utils = { workspace = true }
 alloy-network = { workspace = true }
-alloy-provider = { workspace = true }
+alloy-provider = { workspace = true, default-features = false }
 wasip2 = { workspace = true }
 example-helpers = { workspace = true }
 example-types = { workspace = true }
diff --git a/examples/contracts/cosmwasm/mock/api/Cargo.toml b/examples/contracts/cosmwasm/mock/api/Cargo.toml
index 340265ca7..48adddb0e 100644
--- a/examples/contracts/cosmwasm/mock/api/Cargo.toml
+++ b/examples/contracts/cosmwasm/mock/api/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-wavs-types = { workspace = true }
+wavs-types = { workspace = true, features = ["cosmwasm"] }
 cosmwasm-std = {workspace = true}
 anyhow = {workspace = true}
 cosmwasm-schema = {workspace = true}
diff --git a/examples/contracts/cosmwasm/mock/service-handler/Cargo.toml b/examples/contracts/cosmwasm/mock/service-handler/Cargo.toml
index 759bac1e7..3961069aa 100644
--- a/examples/contracts/cosmwasm/mock/service-handler/Cargo.toml
+++ b/examples/contracts/cosmwasm/mock/service-handler/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 cw-wavs-mock-api = { workspace = true }
-wavs-types = { workspace = true }
+wavs-types = { workspace = true, features = ["cosmwasm"] }
 cosmwasm-std = { workspace = true }
 anyhow = { workspace = true }
 cw-storage-plus = { workspace = true }
diff --git a/examples/contracts/cosmwasm/trigger/api/Cargo.toml b/examples/contracts/cosmwasm/trigger/api/Cargo.toml
index 0c29cb5d1..c80d0c183 100644
--- a/examples/contracts/cosmwasm/trigger/api/Cargo.toml
+++ b/examples/contracts/cosmwasm/trigger/api/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-wavs-types = { workspace = true }
+wavs-types = { workspace = true, features = ["cosmwasm"] }
 cosmwasm-std = {workspace = true}
 anyhow = {workspace = true}
 cosmwasm-schema = {workspace = true}
diff --git a/examples/contracts/cosmwasm/trigger/simple/Cargo.toml b/examples/contracts/cosmwasm/trigger/simple/Cargo.toml
index 63399da6c..493174264 100644
--- a/examples/contracts/cosmwasm/trigger/simple/Cargo.toml
+++ b/examples/contracts/cosmwasm/trigger/simple/Cargo.toml
@@ -10,8 +10,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 cw-wavs-mock-api = { workspace = true }
 cw-wavs-trigger-api = { workspace = true }
-# The workspace `wavs-types` has features, we need to disable them, overriding with `worksace = true` doesn't work
-wavs-types = { workspace = true }
+wavs-types = { workspace = true, features = ["cosmwasm"] }
 layer-climb-address = { workspace = true }
 cosmwasm-std = { workspace = true }
 anyhow = { workspace = true }
diff --git a/examples/contracts/solidity/abi/ISimpleSubmit.sol/ISimpleSubmit.json b/examples/contracts/solidity/abi/ISimpleSubmit.sol/ISimpleSubmit.json
index 2a143666f..9267f1364 100644
--- a/examples/contracts/solidity/abi/ISimpleSubmit.sol/ISimpleSubmit.json
+++ b/examples/contracts/solidity/abi/ISimpleSubmit.sol/ISimpleSubmit.json
@@ -1 +1 @@
-{"abi":[{"type":"function","name":"getDataWithId","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"","type":"tuple","internalType":"struct ISimpleSubmit.DataWithId","components":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"},{"name":"data","type":"bytes","internalType":"bytes"}]}],"stateMutability":"view"},{"type":"function","name":"getSignedData","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"","type":"tuple","internalType":"struct ISimpleSubmit.SignedData","components":[{"name":"data","type":"bytes","internalType":"bytes"},{"name":"signatureData","type":"tuple","internalType":"struct IWavsServiceHandler.SignatureData","components":[{"name":"signers","type":"address[]","internalType":"address[]"},{"name":"signatures","type":"bytes[]","internalType":"bytes[]"},{"name":"referenceBlock","type":"uint32","internalType":"uint32"}]},{"name":"envelope","type":"tuple","internalType":"struct IWavsServiceHandler.Envelope","components":[{"name":"eventId","type":"bytes20","internalType":"bytes20"},{"name":"ordering","type":"bytes12","internalType":"bytes12"},{"name":"payload","type":"bytes","internalType":"bytes"}]}]}],"stateMutability":"view"}],"bytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"deployedBytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"methodIdentifiers":{"getDataWithId(uint64)":"c053045e","getSignedData(uint64)":"78ecfb47"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.28+commit.7893614a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"getDataWithId\",\"outputs\":[{\"components\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"internalType\":\"struct ISimpleSubmit.DataWithId\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"getSignedData\",\"outputs\":[{\"components\":[{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"internalType\":\"bytes[]\",\"name\":\"signatures\",\"type\":\"bytes[]\"},{\"internalType\":\"uint32\",\"name\":\"referenceBlock\",\"type\":\"uint32\"}],\"internalType\":\"struct IWavsServiceHandler.SignatureData\",\"name\":\"signatureData\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"bytes20\",\"name\":\"eventId\",\"type\":\"bytes20\"},{\"internalType\":\"bytes12\",\"name\":\"ordering\",\"type\":\"bytes12\"},{\"internalType\":\"bytes\",\"name\":\"payload\",\"type\":\"bytes\"}],\"internalType\":\"struct IWavsServiceHandler.Envelope\",\"name\":\"envelope\",\"type\":\"tuple\"}],\"internalType\":\"struct ISimpleSubmit.SignedData\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"Lay3r Labs\",\"details\":\"This interface defines the functions and events for the simple submit contract\",\"kind\":\"dev\",\"methods\":{\"getDataWithId(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID\"},\"returns\":{\"_0\":\"dataWithId The data with ID\"}},\"getSignedData(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID\"},\"returns\":{\"_0\":\"signedData The signed data\"}}},\"title\":\"ISimpleSubmit\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"getDataWithId(uint64)\":{\"notice\":\"Returns the data with ID for a given trigger ID\"},\"getSignedData(uint64)\":{\"notice\":\"Returns the signed data for a given trigger ID\"}},\"notice\":\"Interface for the simple submit contract\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"examples/contracts/solidity/mocks/ISimpleSubmit.sol\":\"ISimpleSubmit\"},\"evmVersion\":\"prague\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[],\"viaIR\":true},\"sources\":{\"examples/contracts/solidity/interfaces/IWavsServiceHandler.sol\":{\"keccak256\":\"0x427e63f26320f27f53975554ff530953d81fb51b681fca950754b576ce83a267\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://d39520e0561d2f65a04b76c265f7ede71feab34fc0e1bd9f21b868353b9c2b0a\",\"dweb:/ipfs/QmWgvBY8pim9hNLNFDRZyob4PvRmuxEoRSyqABkUNpDcef\"]},\"examples/contracts/solidity/mocks/ISimpleSubmit.sol\":{\"keccak256\":\"0xda7573fb96ece8207cef432837be49e268803b477a3e05dd44c02b49152aa392\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://e4a5a489f203064ae9f529969a859482ed9a3809a33bda62f9a5d0d22372ae89\",\"dweb:/ipfs/QmXQxvFodWcdndsfyJGv7K4BWMs5QbTZeKepfdyxWwAZKZ\"]},\"examples/contracts/solidity/mocks/ISimpleTrigger.sol\":{\"keccak256\":\"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1\",\"dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.28+commit.7893614a"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"getDataWithId","outputs":[{"internalType":"struct ISimpleSubmit.DataWithId","name":"","type":"tuple","components":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"},{"internalType":"bytes","name":"data","type":"bytes"}]}]},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"getSignedData","outputs":[{"internalType":"struct ISimpleSubmit.SignedData","name":"","type":"tuple","components":[{"internalType":"bytes","name":"data","type":"bytes"},{"internalType":"struct IWavsServiceHandler.SignatureData","name":"signatureData","type":"tuple","components":[{"internalType":"address[]","name":"signers","type":"address[]"},{"internalType":"bytes[]","name":"signatures","type":"bytes[]"},{"internalType":"uint32","name":"referenceBlock","type":"uint32"}]},{"internalType":"struct IWavsServiceHandler.Envelope","name":"envelope","type":"tuple","components":[{"internalType":"bytes20","name":"eventId","type":"bytes20"},{"internalType":"bytes12","name":"ordering","type":"bytes12"},{"internalType":"bytes","name":"payload","type":"bytes"}]}]}]}],"devdoc":{"kind":"dev","methods":{"getDataWithId(uint64)":{"params":{"triggerId":"The trigger ID"},"returns":{"_0":"dataWithId The data with ID"}},"getSignedData(uint64)":{"params":{"triggerId":"The trigger ID"},"returns":{"_0":"signedData The signed data"}}},"version":1},"userdoc":{"kind":"user","methods":{"getDataWithId(uint64)":{"notice":"Returns the data with ID for a given trigger ID"},"getSignedData(uint64)":{"notice":"Returns the signed data for a given trigger ID"}},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":false,"runs":200},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"examples/contracts/solidity/mocks/ISimpleSubmit.sol":"ISimpleSubmit"},"evmVersion":"prague","libraries":{},"viaIR":true},"sources":{"examples/contracts/solidity/interfaces/IWavsServiceHandler.sol":{"keccak256":"0x427e63f26320f27f53975554ff530953d81fb51b681fca950754b576ce83a267","urls":["bzz-raw://d39520e0561d2f65a04b76c265f7ede71feab34fc0e1bd9f21b868353b9c2b0a","dweb:/ipfs/QmWgvBY8pim9hNLNFDRZyob4PvRmuxEoRSyqABkUNpDcef"],"license":"MIT"},"examples/contracts/solidity/mocks/ISimpleSubmit.sol":{"keccak256":"0xda7573fb96ece8207cef432837be49e268803b477a3e05dd44c02b49152aa392","urls":["bzz-raw://e4a5a489f203064ae9f529969a859482ed9a3809a33bda62f9a5d0d22372ae89","dweb:/ipfs/QmXQxvFodWcdndsfyJGv7K4BWMs5QbTZeKepfdyxWwAZKZ"],"license":"MIT"},"examples/contracts/solidity/mocks/ISimpleTrigger.sol":{"keccak256":"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814","urls":["bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1","dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG"],"license":"MIT"}},"version":1},"id":5}
\ No newline at end of file
+{"abi":[{"type":"function","name":"getDataWithId","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"","type":"tuple","internalType":"struct ISimpleSubmit.DataWithId","components":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"},{"name":"data","type":"bytes","internalType":"bytes"}]}],"stateMutability":"view"},{"type":"function","name":"getSignedData","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"","type":"tuple","internalType":"struct ISimpleSubmit.SignedData","components":[{"name":"data","type":"bytes","internalType":"bytes"},{"name":"signatureData","type":"tuple","internalType":"struct IWavsServiceHandler.SignatureData","components":[{"name":"signers","type":"address[]","internalType":"address[]"},{"name":"signatures","type":"bytes[]","internalType":"bytes[]"},{"name":"referenceBlock","type":"uint32","internalType":"uint32"}]},{"name":"envelope","type":"tuple","internalType":"struct IWavsServiceHandler.Envelope","components":[{"name":"eventId","type":"bytes20","internalType":"bytes20"},{"name":"ordering","type":"bytes12","internalType":"bytes12"},{"name":"payload","type":"bytes","internalType":"bytes"}]}]}],"stateMutability":"view"}],"bytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"deployedBytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"methodIdentifiers":{"getDataWithId(uint64)":"c053045e","getSignedData(uint64)":"78ecfb47"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.28+commit.7893614a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"getDataWithId\",\"outputs\":[{\"components\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"internalType\":\"struct ISimpleSubmit.DataWithId\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"getSignedData\",\"outputs\":[{\"components\":[{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"internalType\":\"bytes[]\",\"name\":\"signatures\",\"type\":\"bytes[]\"},{\"internalType\":\"uint32\",\"name\":\"referenceBlock\",\"type\":\"uint32\"}],\"internalType\":\"struct IWavsServiceHandler.SignatureData\",\"name\":\"signatureData\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"bytes20\",\"name\":\"eventId\",\"type\":\"bytes20\"},{\"internalType\":\"bytes12\",\"name\":\"ordering\",\"type\":\"bytes12\"},{\"internalType\":\"bytes\",\"name\":\"payload\",\"type\":\"bytes\"}],\"internalType\":\"struct IWavsServiceHandler.Envelope\",\"name\":\"envelope\",\"type\":\"tuple\"}],\"internalType\":\"struct ISimpleSubmit.SignedData\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"Lay3r Labs\",\"details\":\"This interface defines the functions and events for the simple submit contract\",\"kind\":\"dev\",\"methods\":{\"getDataWithId(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID\"},\"returns\":{\"_0\":\"dataWithId The data with ID\"}},\"getSignedData(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID\"},\"returns\":{\"_0\":\"signedData The signed data\"}}},\"title\":\"ISimpleSubmit\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"getDataWithId(uint64)\":{\"notice\":\"Returns the data with ID for a given trigger ID\"},\"getSignedData(uint64)\":{\"notice\":\"Returns the signed data for a given trigger ID\"}},\"notice\":\"Interface for the simple submit contract\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"examples/contracts/solidity/mocks/ISimpleSubmit.sol\":\"ISimpleSubmit\"},\"evmVersion\":\"prague\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[],\"viaIR\":true},\"sources\":{\"examples/contracts/solidity/interfaces/IWavsServiceHandler.sol\":{\"keccak256\":\"0x427e63f26320f27f53975554ff530953d81fb51b681fca950754b576ce83a267\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://d39520e0561d2f65a04b76c265f7ede71feab34fc0e1bd9f21b868353b9c2b0a\",\"dweb:/ipfs/QmWgvBY8pim9hNLNFDRZyob4PvRmuxEoRSyqABkUNpDcef\"]},\"examples/contracts/solidity/mocks/ISimpleSubmit.sol\":{\"keccak256\":\"0xda7573fb96ece8207cef432837be49e268803b477a3e05dd44c02b49152aa392\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://e4a5a489f203064ae9f529969a859482ed9a3809a33bda62f9a5d0d22372ae89\",\"dweb:/ipfs/QmXQxvFodWcdndsfyJGv7K4BWMs5QbTZeKepfdyxWwAZKZ\"]},\"examples/contracts/solidity/mocks/ISimpleTrigger.sol\":{\"keccak256\":\"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1\",\"dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.28+commit.7893614a"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"getDataWithId","outputs":[{"internalType":"struct ISimpleSubmit.DataWithId","name":"","type":"tuple","components":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"},{"internalType":"bytes","name":"data","type":"bytes"}]}]},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"getSignedData","outputs":[{"internalType":"struct ISimpleSubmit.SignedData","name":"","type":"tuple","components":[{"internalType":"bytes","name":"data","type":"bytes"},{"internalType":"struct IWavsServiceHandler.SignatureData","name":"signatureData","type":"tuple","components":[{"internalType":"address[]","name":"signers","type":"address[]"},{"internalType":"bytes[]","name":"signatures","type":"bytes[]"},{"internalType":"uint32","name":"referenceBlock","type":"uint32"}]},{"internalType":"struct IWavsServiceHandler.Envelope","name":"envelope","type":"tuple","components":[{"internalType":"bytes20","name":"eventId","type":"bytes20"},{"internalType":"bytes12","name":"ordering","type":"bytes12"},{"internalType":"bytes","name":"payload","type":"bytes"}]}]}]}],"devdoc":{"kind":"dev","methods":{"getDataWithId(uint64)":{"params":{"triggerId":"The trigger ID"},"returns":{"_0":"dataWithId The data with ID"}},"getSignedData(uint64)":{"params":{"triggerId":"The trigger ID"},"returns":{"_0":"signedData The signed data"}}},"version":1},"userdoc":{"kind":"user","methods":{"getDataWithId(uint64)":{"notice":"Returns the data with ID for a given trigger ID"},"getSignedData(uint64)":{"notice":"Returns the signed data for a given trigger ID"}},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":false,"runs":200},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"examples/contracts/solidity/mocks/ISimpleSubmit.sol":"ISimpleSubmit"},"evmVersion":"prague","libraries":{},"viaIR":true},"sources":{"examples/contracts/solidity/interfaces/IWavsServiceHandler.sol":{"keccak256":"0x427e63f26320f27f53975554ff530953d81fb51b681fca950754b576ce83a267","urls":["bzz-raw://d39520e0561d2f65a04b76c265f7ede71feab34fc0e1bd9f21b868353b9c2b0a","dweb:/ipfs/QmWgvBY8pim9hNLNFDRZyob4PvRmuxEoRSyqABkUNpDcef"],"license":"MIT"},"examples/contracts/solidity/mocks/ISimpleSubmit.sol":{"keccak256":"0xda7573fb96ece8207cef432837be49e268803b477a3e05dd44c02b49152aa392","urls":["bzz-raw://e4a5a489f203064ae9f529969a859482ed9a3809a33bda62f9a5d0d22372ae89","dweb:/ipfs/QmXQxvFodWcdndsfyJGv7K4BWMs5QbTZeKepfdyxWwAZKZ"],"license":"MIT"},"examples/contracts/solidity/mocks/ISimpleTrigger.sol":{"keccak256":"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814","urls":["bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1","dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG"],"license":"MIT"}},"version":1},"id":7}
\ No newline at end of file
diff --git a/examples/contracts/solidity/abi/ISimpleTrigger.sol/ISimpleTrigger.json b/examples/contracts/solidity/abi/ISimpleTrigger.sol/ISimpleTrigger.json
index 33ed8ab41..ae2539ed3 100644
--- a/examples/contracts/solidity/abi/ISimpleTrigger.sol/ISimpleTrigger.json
+++ b/examples/contracts/solidity/abi/ISimpleTrigger.sol/ISimpleTrigger.json
@@ -1 +1 @@
-{"abi":[{"type":"function","name":"getTrigger","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"","type":"tuple","internalType":"struct ISimpleTrigger.TriggerInfo","components":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"},{"name":"creator","type":"address","internalType":"address"},{"name":"data","type":"bytes","internalType":"bytes"}]}],"stateMutability":"view"}],"bytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"deployedBytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"methodIdentifiers":{"getTrigger(uint64)":"e328ed77"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.28+commit.7893614a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"getTrigger\",\"outputs\":[{\"components\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"creator\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"internalType\":\"struct ISimpleTrigger.TriggerInfo\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"Lay3r Labs\",\"details\":\"This interface defines the functions and events for the simple trigger contract\",\"kind\":\"dev\",\"methods\":{\"getTrigger(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID\"},\"returns\":{\"_0\":\"triggerInfo The trigger info\"}}},\"title\":\"ISimpleTrigger\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"getTrigger(uint64)\":{\"notice\":\"Returns the trigger info for a given trigger ID\"}},\"notice\":\"Interface for the simple trigger contract\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"examples/contracts/solidity/mocks/ISimpleTrigger.sol\":\"ISimpleTrigger\"},\"evmVersion\":\"prague\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[],\"viaIR\":true},\"sources\":{\"examples/contracts/solidity/mocks/ISimpleTrigger.sol\":{\"keccak256\":\"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1\",\"dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.28+commit.7893614a"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"getTrigger","outputs":[{"internalType":"struct ISimpleTrigger.TriggerInfo","name":"","type":"tuple","components":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"},{"internalType":"address","name":"creator","type":"address"},{"internalType":"bytes","name":"data","type":"bytes"}]}]}],"devdoc":{"kind":"dev","methods":{"getTrigger(uint64)":{"params":{"triggerId":"The trigger ID"},"returns":{"_0":"triggerInfo The trigger info"}}},"version":1},"userdoc":{"kind":"user","methods":{"getTrigger(uint64)":{"notice":"Returns the trigger info for a given trigger ID"}},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":false,"runs":200},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"examples/contracts/solidity/mocks/ISimpleTrigger.sol":"ISimpleTrigger"},"evmVersion":"prague","libraries":{},"viaIR":true},"sources":{"examples/contracts/solidity/mocks/ISimpleTrigger.sol":{"keccak256":"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814","urls":["bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1","dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG"],"license":"MIT"}},"version":1},"id":6}
\ No newline at end of file
+{"abi":[{"type":"function","name":"getTrigger","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"","type":"tuple","internalType":"struct ISimpleTrigger.TriggerInfo","components":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"},{"name":"creator","type":"address","internalType":"address"},{"name":"data","type":"bytes","internalType":"bytes"}]}],"stateMutability":"view"}],"bytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"deployedBytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"methodIdentifiers":{"getTrigger(uint64)":"e328ed77"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.28+commit.7893614a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"getTrigger\",\"outputs\":[{\"components\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"creator\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"internalType\":\"struct ISimpleTrigger.TriggerInfo\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"Lay3r Labs\",\"details\":\"This interface defines the functions and events for the simple trigger contract\",\"kind\":\"dev\",\"methods\":{\"getTrigger(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID\"},\"returns\":{\"_0\":\"triggerInfo The trigger info\"}}},\"title\":\"ISimpleTrigger\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"getTrigger(uint64)\":{\"notice\":\"Returns the trigger info for a given trigger ID\"}},\"notice\":\"Interface for the simple trigger contract\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"examples/contracts/solidity/mocks/ISimpleTrigger.sol\":\"ISimpleTrigger\"},\"evmVersion\":\"prague\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[],\"viaIR\":true},\"sources\":{\"examples/contracts/solidity/mocks/ISimpleTrigger.sol\":{\"keccak256\":\"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1\",\"dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.28+commit.7893614a"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"getTrigger","outputs":[{"internalType":"struct ISimpleTrigger.TriggerInfo","name":"","type":"tuple","components":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"},{"internalType":"address","name":"creator","type":"address"},{"internalType":"bytes","name":"data","type":"bytes"}]}]}],"devdoc":{"kind":"dev","methods":{"getTrigger(uint64)":{"params":{"triggerId":"The trigger ID"},"returns":{"_0":"triggerInfo The trigger info"}}},"version":1},"userdoc":{"kind":"user","methods":{"getTrigger(uint64)":{"notice":"Returns the trigger info for a given trigger ID"}},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":false,"runs":200},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"examples/contracts/solidity/mocks/ISimpleTrigger.sol":"ISimpleTrigger"},"evmVersion":"prague","libraries":{},"viaIR":true},"sources":{"examples/contracts/solidity/mocks/ISimpleTrigger.sol":{"keccak256":"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814","urls":["bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1","dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG"],"license":"MIT"}},"version":1},"id":8}
\ No newline at end of file
diff --git a/examples/contracts/solidity/abi/SimpleBlsSubmit.sol/SimpleBlsSubmit.json b/examples/contracts/solidity/abi/SimpleBlsSubmit.sol/SimpleBlsSubmit.json
new file mode 100644
index 000000000..b0b65395a
--- /dev/null
+++ b/examples/contracts/solidity/abi/SimpleBlsSubmit.sol/SimpleBlsSubmit.json
@@ -0,0 +1 @@
+{"abi":[{"type":"constructor","inputs":[{"name":"serviceManager","type":"address","internalType":"contract IWavsServiceManager"}],"stateMutability":"nonpayable"},{"type":"function","name":"getServiceManager","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"handleSignedEnvelope","inputs":[{"name":"envelope","type":"tuple","internalType":"struct IWavsServiceHandler.Envelope","components":[{"name":"eventId","type":"bytes20","internalType":"bytes20"},{"name":"ordering","type":"bytes12","internalType":"bytes12"},{"name":"payload","type":"bytes","internalType":"bytes"}]},{"name":"signatureData","type":"tuple","internalType":"struct IWavsServiceHandler.SignatureData","components":[{"name":"signerPubkeys","type":"bytes[]","internalType":"bytes[]"},{"name":"aggregateSignature","type":"bytes","internalType":"bytes"},{"name":"referenceBlock","type":"uint32","internalType":"uint32"}]}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"isValidTriggerId","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"","type":"bool","internalType":"bool"}],"stateMutability":"view"},{"type":"function","name":"validTriggers","inputs":[{"name":"","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"","type":"bool","internalType":"bool"}],"stateMutability":"view"}],"bytecode":{"object":"0x60a06040523461003f57610019610014610110565b610131565b610021610044565b610a58610137823960805181818161035701526108fb0152610a5890f35b61004a565b60405190565b5f80fd5b601f801991011690565b634e487b7160e01b5f52604160045260245ffd5b906100769061004e565b810190811060018060401b0382111761008e57604052565b610058565b906100a661009f610044565b928361006c565b565b5f80fd5b60018060a01b031690565b6100c0906100ac565b90565b6100cc906100b7565b90565b6100d8816100c3565b036100df57565b5f80fd5b905051906100f0826100cf565b565b9060208282031261010b57610108915f016100e3565b90565b6100a8565b61012e610b8f8038038061012381610093565b9283398101906100f2565b90565b60805256fe60806040526004361015610013575b61030d565b61001d5f3561005c565b806326faf60c146100575780634dda0b43146100525780635939468e1461004d5763aa32d9f40361000e576102d8565b6102a4565b6101e3565b610166565b60e01c90565b60405190565b5f80fd5b5f80fd5b5f80fd5b67ffffffffffffffff1690565b61008a81610074565b0361009157565b5f80fd5b905035906100a282610081565b565b906020828203126100bd576100ba915f01610095565b90565b61006c565b90565b6100d96100d46100de92610074565b6100c2565b610074565b90565b906100eb906100c5565b5f5260205260405f2090565b1c90565b60ff1690565b61011190600861011693026100f7565b6100fb565b90565b906101249154610101565b90565b61013c906101375f915f926100e1565b610119565b90565b151590565b61014d9061013f565b9052565b9190610164905f60208501940190610144565b565b346101965761019261018161017c3660046100a4565b610127565b610189610062565b91829182610151565b0390f35b610068565b5f9103126101a557565b61006c565b60018060a01b031690565b6101be906101aa565b90565b6101ca906101b5565b9052565b91906101e1905f602085019401906101c1565b565b34610213576101f336600461019b565b61020f6101fe610349565b610206610062565b918291826101ce565b0390f35b610068565b5f80fd5b9081606091031261022a5790565b610218565b9081606091031261023d5790565b610218565b91909160408184031261029a575f81013567ffffffffffffffff8111610295578361026e91830161021c565b92602082013567ffffffffffffffff81116102905761028d920161022f565b90565b610070565b610070565b61006c565b5f0190565b346102d3576102bd6102b7366004610242565b906108f5565b6102c5610062565b806102cf8161029f565b0390f35b610068565b34610308576103046102f36102ee3660046100a4565b610a04565b6102fb610062565b91829182610151565b0390f35b610068565b5f80fd5b5f90565b61032961032461032e926101aa565b6100c2565b6101aa565b90565b61033a90610315565b90565b61034690610331565b90565b610351610311565b5061037b7f000000000000000000000000000000000000000000000000000000000000000061033d565b90565b5f80fd5b601f801991011690565b634e487b7160e01b5f52604160045260245ffd5b906103aa90610382565b810190811067ffffffffffffffff8211176103c457604052565b61038c565b60e01b90565b5f9103126103d957565b61006c565b6bffffffffffffffffffffffff191690565b6103f9816103de565b0361040057565b5f80fd5b90503590610411826103f0565b565b50610422906020810190610404565b90565b61042e906103de565b9052565b6bffffffffffffffffffffffff60a01b1690565b61044f81610432565b0361045657565b5f80fd5b9050359061046782610446565b565b5061047890602081019061045a565b90565b61048490610432565b9052565b5f80fd5b5f80fd5b5f80fd5b90356001602003823603038112156104d557016020813591019167ffffffffffffffff82116104d05760018202360383136104cb57565b61048c565b610488565b610490565b60209181520190565b90825f939282370152565b9190610508816105018161050d956104da565b80956104e3565b610382565b0190565b61056791610559606082019261053561052c5f830183610413565b5f850190610425565b61054f6105456020830183610469565b602085019061047b565b6040810190610494565b9160408185039101526104ee565b90565b90356001602003823603038112156105ab57016020813591019167ffffffffffffffff82116105a65760208202360383136105a157565b61048c565b610488565b610490565b60209181520190565b90565b906105c792916104ee565b90565b60200190565b91816105db916105b0565b90816105ec602083028401946105b9565b92835f925b8484106106015750505050505090565b909192939495602061062d61062783856001950388526106218b88610494565b906105bc565b986105ca565b9401940192949391906105f1565b63ffffffff1690565b61064d8161063b565b0361065457565b5f80fd5b9050359061066582610644565b565b50610676906020810190610658565b90565b6106829061063b565b9052565b906106e09060406106d86106ce6106b3606085016106a65f89018961056a565b908783035f8901526105d0565b6106c06020880188610494565b9086830360208801526104ee565b9482810190610667565b910190610679565b90565b90916106fd61070b9360408401908482035f860152610511565b916020818403910152610686565b90565b610716610062565b3d5f823e3d90fd5b5f80fd5b5f80fd5b5f80fd5b90359060016020038136030382121561076c570180359067ffffffffffffffff82116107675760200191600182023603831361076257565b610726565b610722565b61071e565b5f80fd5b90610788610781610062565b92836103a0565b565b5f80fd5b5f80fd5b5f80fd5b67ffffffffffffffff81116107b4576107b0602091610382565b0190565b61038c565b909291926107ce6107c982610796565b610775565b938185526020850190828401116107ea576107e8926104e3565b565b610792565b9080601f8301121561080d5781602061080a933591016107b9565b90565b61078e565b919091604081840312610864576108296040610775565b92610836815f8401610095565b5f850152602082013567ffffffffffffffff811161085f5761085892016107ef565b6020830152565b61078a565b610771565b90602082820312610899575f82013567ffffffffffffffff8111610894576108919201610812565b90565b610070565b61006c565b6108a89051610074565b90565b5f1b90565b906108bc60ff916108ab565b9181191691161790565b6108cf9061013f565b90565b90565b906108ea6108e56108f1926108c6565b6108d2565b82546108b0565b9055565b9061091f7f000000000000000000000000000000000000000000000000000000000000000061033d565b9063ace9966090839092803b156109d55761094c5f93610957610940610062565b968795869485946103c9565b8452600484016106e3565b03915afa80156109d0576109a2926109859261097d926109a4575b50604081019061072a565b810190610869565b61099d6001916109975f80920161089e565b906100e1565b6108d5565b565b6109c3905f3d81116109c9575b6109bb81836103a0565b8101906103cf565b5f610972565b503d6109b1565b61070e565b61037e565b5f90565b5f1c90565b6109ef6109f4916109de565b6100fb565b90565b610a0190546109e3565b90565b610a1a610a1f91610a136109da565b505f6100e1565b6109f7565b9056fea2646970667358221220534075a633a10c6a2e9e87e397961b2056590f33c64974d6498902a9e25c021664736f6c634300081c0033","sourceMap":"685:1584:9:-:0;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;:::i;:::-;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;:::o;1225:98::-;1283:33;;1225:98::o","linkReferences":{}},"deployedBytecode":{"object":"0x60806040526004361015610013575b61030d565b61001d5f3561005c565b806326faf60c146100575780634dda0b43146100525780635939468e1461004d5763aa32d9f40361000e576102d8565b6102a4565b6101e3565b610166565b60e01c90565b60405190565b5f80fd5b5f80fd5b5f80fd5b67ffffffffffffffff1690565b61008a81610074565b0361009157565b5f80fd5b905035906100a282610081565b565b906020828203126100bd576100ba915f01610095565b90565b61006c565b90565b6100d96100d46100de92610074565b6100c2565b610074565b90565b906100eb906100c5565b5f5260205260405f2090565b1c90565b60ff1690565b61011190600861011693026100f7565b6100fb565b90565b906101249154610101565b90565b61013c906101375f915f926100e1565b610119565b90565b151590565b61014d9061013f565b9052565b9190610164905f60208501940190610144565b565b346101965761019261018161017c3660046100a4565b610127565b610189610062565b91829182610151565b0390f35b610068565b5f9103126101a557565b61006c565b60018060a01b031690565b6101be906101aa565b90565b6101ca906101b5565b9052565b91906101e1905f602085019401906101c1565b565b34610213576101f336600461019b565b61020f6101fe610349565b610206610062565b918291826101ce565b0390f35b610068565b5f80fd5b9081606091031261022a5790565b610218565b9081606091031261023d5790565b610218565b91909160408184031261029a575f81013567ffffffffffffffff8111610295578361026e91830161021c565b92602082013567ffffffffffffffff81116102905761028d920161022f565b90565b610070565b610070565b61006c565b5f0190565b346102d3576102bd6102b7366004610242565b906108f5565b6102c5610062565b806102cf8161029f565b0390f35b610068565b34610308576103046102f36102ee3660046100a4565b610a04565b6102fb610062565b91829182610151565b0390f35b610068565b5f80fd5b5f90565b61032961032461032e926101aa565b6100c2565b6101aa565b90565b61033a90610315565b90565b61034690610331565b90565b610351610311565b5061037b7f000000000000000000000000000000000000000000000000000000000000000061033d565b90565b5f80fd5b601f801991011690565b634e487b7160e01b5f52604160045260245ffd5b906103aa90610382565b810190811067ffffffffffffffff8211176103c457604052565b61038c565b60e01b90565b5f9103126103d957565b61006c565b6bffffffffffffffffffffffff191690565b6103f9816103de565b0361040057565b5f80fd5b90503590610411826103f0565b565b50610422906020810190610404565b90565b61042e906103de565b9052565b6bffffffffffffffffffffffff60a01b1690565b61044f81610432565b0361045657565b5f80fd5b9050359061046782610446565b565b5061047890602081019061045a565b90565b61048490610432565b9052565b5f80fd5b5f80fd5b5f80fd5b90356001602003823603038112156104d557016020813591019167ffffffffffffffff82116104d05760018202360383136104cb57565b61048c565b610488565b610490565b60209181520190565b90825f939282370152565b9190610508816105018161050d956104da565b80956104e3565b610382565b0190565b61056791610559606082019261053561052c5f830183610413565b5f850190610425565b61054f6105456020830183610469565b602085019061047b565b6040810190610494565b9160408185039101526104ee565b90565b90356001602003823603038112156105ab57016020813591019167ffffffffffffffff82116105a65760208202360383136105a157565b61048c565b610488565b610490565b60209181520190565b90565b906105c792916104ee565b90565b60200190565b91816105db916105b0565b90816105ec602083028401946105b9565b92835f925b8484106106015750505050505090565b909192939495602061062d61062783856001950388526106218b88610494565b906105bc565b986105ca565b9401940192949391906105f1565b63ffffffff1690565b61064d8161063b565b0361065457565b5f80fd5b9050359061066582610644565b565b50610676906020810190610658565b90565b6106829061063b565b9052565b906106e09060406106d86106ce6106b3606085016106a65f89018961056a565b908783035f8901526105d0565b6106c06020880188610494565b9086830360208801526104ee565b9482810190610667565b910190610679565b90565b90916106fd61070b9360408401908482035f860152610511565b916020818403910152610686565b90565b610716610062565b3d5f823e3d90fd5b5f80fd5b5f80fd5b5f80fd5b90359060016020038136030382121561076c570180359067ffffffffffffffff82116107675760200191600182023603831361076257565b610726565b610722565b61071e565b5f80fd5b90610788610781610062565b92836103a0565b565b5f80fd5b5f80fd5b5f80fd5b67ffffffffffffffff81116107b4576107b0602091610382565b0190565b61038c565b909291926107ce6107c982610796565b610775565b938185526020850190828401116107ea576107e8926104e3565b565b610792565b9080601f8301121561080d5781602061080a933591016107b9565b90565b61078e565b919091604081840312610864576108296040610775565b92610836815f8401610095565b5f850152602082013567ffffffffffffffff811161085f5761085892016107ef565b6020830152565b61078a565b610771565b90602082820312610899575f82013567ffffffffffffffff8111610894576108919201610812565b90565b610070565b61006c565b6108a89051610074565b90565b5f1b90565b906108bc60ff916108ab565b9181191691161790565b6108cf9061013f565b90565b90565b906108ea6108e56108f1926108c6565b6108d2565b82546108b0565b9055565b9061091f7f000000000000000000000000000000000000000000000000000000000000000061033d565b9063ace9966090839092803b156109d55761094c5f93610957610940610062565b968795869485946103c9565b8452600484016106e3565b03915afa80156109d0576109a2926109859261097d926109a4575b50604081019061072a565b810190610869565b61099d6001916109975f80920161089e565b906100e1565b6108d5565b565b6109c3905f3d81116109c9575b6109bb81836103a0565b8101906103cf565b5f610972565b503d6109b1565b61070e565b61037e565b5f90565b5f1c90565b6109ef6109f4916109de565b6100fb565b90565b610a0190546109e3565b90565b610a1a610a1f91610a136109da565b505f6100e1565b6109f7565b9056fea2646970667358221220534075a633a10c6a2e9e87e397961b2056590f33c64974d6498902a9e25c021664736f6c634300081c0033","sourceMap":"685:1584:9:-:0;;;;;;;;;-1:-1:-1;685:1584:9;:::i;:::-;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;:::o;:::-;;;;:::o;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;:::o;:::-;;;;:::o;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::o;858:62::-;;;;;;;;;:::i;:::-;;:::i;:::-;;:::o;685:1584::-;;;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;:::o;:::-;;;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;2157:110::-;2209:7;;:::i;:::-;2243:16;2235:25;2243:16;2235:25;:::i;:::-;2228:32;:::o;685:1584::-;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;:::o;:::-;;;;;;;:::o;:::-;;:::i;:::-;;;;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;;;;:::o;:::-;;;;;;;;;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;;;;:::o;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;:::o;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;;;;;;:::i;:::-;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::o;:::-;;:::i;:::-;;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;;;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;1369:370::-;;1546:25;:16;:25;:::i;:::-;;;1572:8;;1582:13;1546:50;;;;;;;;;;;;:::i;:::-;;;;;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;;;;;1690:42;1546:50;1638:42;1546:50;1649:16;1546:50;;;1369:370;1649:8;:16;;;;;:::i;:::-;1638:42;;;;:::i;:::-;1690:35;1728:4;1690:13;1704:20;;1690:13;1704:10;:20;;:::i;:::-;1690:35;;:::i;:::-;:42;:::i;:::-;1369:370::o;1546:50::-;;;;;;;;;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;:::i;685:1584::-;;;:::o;:::-;;;;:::o;:::-;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;1958:153::-;2080:24;;1958:153;2057:4;;:::i;:::-;2080:13;;:24;:::i;:::-;;:::i;:::-;2073:31;:::o","linkReferences":{},"immutableReferences":{"413":[{"start":855,"length":32},{"start":2299,"length":32}]}},"methodIdentifiers":{"getServiceManager()":"4dda0b43","handleSignedEnvelope((bytes20,bytes12,bytes),(bytes[],bytes,uint32))":"5939468e","isValidTriggerId(uint64)":"aa32d9f4","validTriggers(uint64)":"26faf60c"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.28+commit.7893614a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"contract IWavsServiceManager\",\"name\":\"serviceManager\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"getServiceManager\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes20\",\"name\":\"eventId\",\"type\":\"bytes20\"},{\"internalType\":\"bytes12\",\"name\":\"ordering\",\"type\":\"bytes12\"},{\"internalType\":\"bytes\",\"name\":\"payload\",\"type\":\"bytes\"}],\"internalType\":\"struct IWavsServiceHandler.Envelope\",\"name\":\"envelope\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"bytes[]\",\"name\":\"signerPubkeys\",\"type\":\"bytes[]\"},{\"internalType\":\"bytes\",\"name\":\"aggregateSignature\",\"type\":\"bytes\"},{\"internalType\":\"uint32\",\"name\":\"referenceBlock\",\"type\":\"uint32\"}],\"internalType\":\"struct IWavsServiceHandler.SignatureData\",\"name\":\"signatureData\",\"type\":\"tuple\"}],\"name\":\"handleSignedEnvelope\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"isValidTriggerId\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"\",\"type\":\"uint64\"}],\"name\":\"validTriggers\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"Lay3r Labs\",\"details\":\"This contract implements the BLS variant of IWavsServiceHandler.      It does NOT implement ISimpleSubmit because that interface references      the ECDSA SignatureData type. BLS tests verify via isValidTriggerId()      after the BLS pairing check passes in _SERVICE_MANAGER.validate().\",\"kind\":\"dev\",\"methods\":{\"constructor\":{\"params\":{\"serviceManager\":\"The BLS service manager\"}},\"getServiceManager()\":{\"returns\":{\"_0\":\"The address of the service manager\"}},\"handleSignedEnvelope((bytes20,bytes12,bytes),(bytes[],bytes,uint32))\":{\"params\":{\"envelope\":\"The envelope containing the data.\",\"signatureData\":\"The signature data.\"}},\"isValidTriggerId(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID to check\"},\"returns\":{\"_0\":\"True if the trigger ID has been verified, false otherwise\"}}},\"title\":\"SimpleBlsSubmit\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"constructor\":{\"notice\":\"Constructor\"},\"getServiceManager()\":{\"notice\":\"Returns the address of the service manager\"},\"handleSignedEnvelope((bytes20,bytes12,bytes),(bytes[],bytes,uint32))\":{\"notice\":\"Handles a signed envelope\"},\"isValidTriggerId(uint64)\":{\"notice\":\"Checks if a trigger ID is valid (BLS signature was verified)\"},\"validTriggers(uint64)\":{\"notice\":\"Mapping from trigger ID to valid triggers\"}},\"notice\":\"Contract for BLS-signed submission handling\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"examples/contracts/solidity/mocks/SimpleBlsSubmit.sol\":\"SimpleBlsSubmit\"},\"evmVersion\":\"prague\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[],\"viaIR\":true},\"sources\":{\"examples/contracts/solidity/interfaces/bls/IWavsServiceHandler.sol\":{\"keccak256\":\"0xde638d3bcdec85b9be8c5fbf5914195fd10b3704a6ef4d9150570852310b2e3c\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://9f0c7ab2d9dff148aa83d555b225ef5242560f2a11c1380cfabb2a3dc61c5686\",\"dweb:/ipfs/QmQu8sJYF3SEFTRdqDAshy8F4SaNPR97zQN5NwoAdSgHcw\"]},\"examples/contracts/solidity/interfaces/bls/IWavsServiceManager.sol\":{\"keccak256\":\"0xfdfa0284ca08a3046f8aeaa7f42c17b3c6cf3327fd7a284a51c2ac495d9231b3\",\"license\":\"UNLICENSED\",\"urls\":[\"bzz-raw://a7e3871a2ce42c15376416ba8fb57cb2de0659af431b811bbd263be33b1ddb64\",\"dweb:/ipfs/QmYDg1EPkF9QSgrLaVgpmKyAjAPaVsyCuKnoPgMqMyyN7X\"]},\"examples/contracts/solidity/mocks/ISimpleTrigger.sol\":{\"keccak256\":\"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1\",\"dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG\"]},\"examples/contracts/solidity/mocks/SimpleBlsSubmit.sol\":{\"keccak256\":\"0x735d06d02a5a24b2190f858655b296a25d1a8ab98f427f493153c2f1fb2868be\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://83f944f6af4ee9e6ab0cbea9a00b57a2c78c2038653905486a63377cb54e51e7\",\"dweb:/ipfs/QmVR9dEuzgHWuj8rAtbWCmaTBQuoWDroQPCCivpjhojdTu\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.28+commit.7893614a"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"contract IWavsServiceManager","name":"serviceManager","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"stateMutability":"view","type":"function","name":"getServiceManager","outputs":[{"internalType":"address","name":"","type":"address"}]},{"inputs":[{"internalType":"struct IWavsServiceHandler.Envelope","name":"envelope","type":"tuple","components":[{"internalType":"bytes20","name":"eventId","type":"bytes20"},{"internalType":"bytes12","name":"ordering","type":"bytes12"},{"internalType":"bytes","name":"payload","type":"bytes"}]},{"internalType":"struct IWavsServiceHandler.SignatureData","name":"signatureData","type":"tuple","components":[{"internalType":"bytes[]","name":"signerPubkeys","type":"bytes[]"},{"internalType":"bytes","name":"aggregateSignature","type":"bytes"},{"internalType":"uint32","name":"referenceBlock","type":"uint32"}]}],"stateMutability":"nonpayable","type":"function","name":"handleSignedEnvelope"},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"isValidTriggerId","outputs":[{"internalType":"bool","name":"","type":"bool"}]},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"","type":"uint64"}],"stateMutability":"view","type":"function","name":"validTriggers","outputs":[{"internalType":"bool","name":"","type":"bool"}]}],"devdoc":{"kind":"dev","methods":{"constructor":{"params":{"serviceManager":"The BLS service manager"}},"getServiceManager()":{"returns":{"_0":"The address of the service manager"}},"handleSignedEnvelope((bytes20,bytes12,bytes),(bytes[],bytes,uint32))":{"params":{"envelope":"The envelope containing the data.","signatureData":"The signature data."}},"isValidTriggerId(uint64)":{"params":{"triggerId":"The trigger ID to check"},"returns":{"_0":"True if the trigger ID has been verified, false otherwise"}}},"version":1},"userdoc":{"kind":"user","methods":{"constructor":{"notice":"Constructor"},"getServiceManager()":{"notice":"Returns the address of the service manager"},"handleSignedEnvelope((bytes20,bytes12,bytes),(bytes[],bytes,uint32))":{"notice":"Handles a signed envelope"},"isValidTriggerId(uint64)":{"notice":"Checks if a trigger ID is valid (BLS signature was verified)"},"validTriggers(uint64)":{"notice":"Mapping from trigger ID to valid triggers"}},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":false,"runs":200},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"examples/contracts/solidity/mocks/SimpleBlsSubmit.sol":"SimpleBlsSubmit"},"evmVersion":"prague","libraries":{},"viaIR":true},"sources":{"examples/contracts/solidity/interfaces/bls/IWavsServiceHandler.sol":{"keccak256":"0xde638d3bcdec85b9be8c5fbf5914195fd10b3704a6ef4d9150570852310b2e3c","urls":["bzz-raw://9f0c7ab2d9dff148aa83d555b225ef5242560f2a11c1380cfabb2a3dc61c5686","dweb:/ipfs/QmQu8sJYF3SEFTRdqDAshy8F4SaNPR97zQN5NwoAdSgHcw"],"license":"MIT"},"examples/contracts/solidity/interfaces/bls/IWavsServiceManager.sol":{"keccak256":"0xfdfa0284ca08a3046f8aeaa7f42c17b3c6cf3327fd7a284a51c2ac495d9231b3","urls":["bzz-raw://a7e3871a2ce42c15376416ba8fb57cb2de0659af431b811bbd263be33b1ddb64","dweb:/ipfs/QmYDg1EPkF9QSgrLaVgpmKyAjAPaVsyCuKnoPgMqMyyN7X"],"license":"UNLICENSED"},"examples/contracts/solidity/mocks/ISimpleTrigger.sol":{"keccak256":"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814","urls":["bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1","dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG"],"license":"MIT"},"examples/contracts/solidity/mocks/SimpleBlsSubmit.sol":{"keccak256":"0x735d06d02a5a24b2190f858655b296a25d1a8ab98f427f493153c2f1fb2868be","urls":["bzz-raw://83f944f6af4ee9e6ab0cbea9a00b57a2c78c2038653905486a63377cb54e51e7","dweb:/ipfs/QmVR9dEuzgHWuj8rAtbWCmaTBQuoWDroQPCCivpjhojdTu"],"license":"MIT"}},"version":1},"id":9}
\ No newline at end of file
diff --git a/examples/contracts/solidity/abi/SimpleSubmit.sol/SimpleSubmit.json b/examples/contracts/solidity/abi/SimpleSubmit.sol/SimpleSubmit.json
index e733c220c..46b7deafa 100644
--- a/examples/contracts/solidity/abi/SimpleSubmit.sol/SimpleSubmit.json
+++ b/examples/contracts/solidity/abi/SimpleSubmit.sol/SimpleSubmit.json
@@ -1 +1 @@
-{"abi":[{"type":"constructor","inputs":[{"name":"serviceManager","type":"address","internalType":"contract IWavsServiceManager"}],"stateMutability":"nonpayable"},{"type":"function","name":"getDataWithId","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"dataWithId","type":"tuple","internalType":"struct ISimpleSubmit.DataWithId","components":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"},{"name":"data","type":"bytes","internalType":"bytes"}]}],"stateMutability":"view"},{"type":"function","name":"getServiceManager","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"getSignedData","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"signedData","type":"tuple","internalType":"struct ISimpleSubmit.SignedData","components":[{"name":"data","type":"bytes","internalType":"bytes"},{"name":"signatureData","type":"tuple","internalType":"struct IWavsServiceHandler.SignatureData","components":[{"name":"signers","type":"address[]","internalType":"address[]"},{"name":"signatures","type":"bytes[]","internalType":"bytes[]"},{"name":"referenceBlock","type":"uint32","internalType":"uint32"}]},{"name":"envelope","type":"tuple","internalType":"struct IWavsServiceHandler.Envelope","components":[{"name":"eventId","type":"bytes20","internalType":"bytes20"},{"name":"ordering","type":"bytes12","internalType":"bytes12"},{"name":"payload","type":"bytes","internalType":"bytes"}]}]}],"stateMutability":"view"},{"type":"function","name":"handleSignedEnvelope","inputs":[{"name":"envelope","type":"tuple","internalType":"struct IWavsServiceHandler.Envelope","components":[{"name":"eventId","type":"bytes20","internalType":"bytes20"},{"name":"ordering","type":"bytes12","internalType":"bytes12"},{"name":"payload","type":"bytes","internalType":"bytes"}]},{"name":"signatureData","type":"tuple","internalType":"struct IWavsServiceHandler.SignatureData","components":[{"name":"signers","type":"address[]","internalType":"address[]"},{"name":"signatures","type":"bytes[]","internalType":"bytes[]"},{"name":"referenceBlock","type":"uint32","internalType":"uint32"}]}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"isValidTriggerId","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"","type":"bool","internalType":"bool"}],"stateMutability":"view"},{"type":"function","name":"signedDatas","inputs":[{"name":"","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"data","type":"bytes","internalType":"bytes"},{"name":"signatureData","type":"tuple","internalType":"struct IWavsServiceHandler.SignatureData","components":[{"name":"signers","type":"address[]","internalType":"address[]"},{"name":"signatures","type":"bytes[]","internalType":"bytes[]"},{"name":"referenceBlock","type":"uint32","internalType":"uint32"}]},{"name":"envelope","type":"tuple","internalType":"struct IWavsServiceHandler.Envelope","components":[{"name":"eventId","type":"bytes20","internalType":"bytes20"},{"name":"ordering","type":"bytes12","internalType":"bytes12"},{"name":"payload","type":"bytes","internalType":"bytes"}]}],"stateMutability":"view"},{"type":"function","name":"validTriggers","inputs":[{"name":"","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"","type":"bool","internalType":"bool"}],"stateMutability":"view"}],"bytecode":{"object":"0x60a06040523461003f57610019610014610110565b610131565b610021610044565b6120866101378239608051818181610c970152611f10015261208690f35b61004a565b60405190565b5f80fd5b601f801991011690565b634e487b7160e01b5f52604160045260245ffd5b906100769061004e565b810190811060018060401b0382111761008e57604052565b610058565b906100a661009f610044565b928361006c565b565b5f80fd5b60018060a01b031690565b6100c0906100ac565b90565b6100cc906100b7565b90565b6100d8816100c3565b036100df57565b5f80fd5b905051906100f0826100cf565b565b9060208282031261010b57610108915f016100e3565b90565b6100a8565b61012e6121bd8038038061012381610093565b9283398101906100f2565b90565b60805256fe60806040526004361015610013575b610c4d565b61001d5f3561008c565b806326faf60c146100875780633d821004146100825780634dda0b431461007d57806378ecfb4714610078578063aa32d9f414610073578063c053045e1461006e5763f969ff330361000e57610c19565b610b58565b610ad0565b610a9b565b610986565b61091d565b610196565b60e01c90565b60405190565b5f80fd5b5f80fd5b5f80fd5b67ffffffffffffffff1690565b6100ba816100a4565b036100c157565b5f80fd5b905035906100d2826100b1565b565b906020828203126100ed576100ea915f016100c5565b90565b61009c565b90565b61010961010461010e926100a4565b6100f2565b6100a4565b90565b9061011b906100f5565b5f5260205260405f2090565b1c90565b60ff1690565b6101419060086101469302610127565b61012b565b90565b906101549154610131565b90565b61016c906101675f915f92610111565b610149565b90565b151590565b61017d9061016f565b9052565b9190610194905f60208501940190610174565b565b346101c6576101c26101b16101ac3660046100d4565b610157565b6101b9610092565b91829182610181565b0390f35b610098565b906101d5906100f5565b5f5260205260405f2090565b634e487b7160e01b5f52602260045260245ffd5b9060016002830492168015610215575b602083101461021057565b6101e1565b91607f1691610205565b60209181520190565b5f5260205f2090565b905f929180549061024b610244836101f5565b809461021f565b916001811690815f146102a25750600114610266575b505050565b6102739192939450610228565b915f925b81841061028a57505001905f8080610261565b60018160209295939554848601520191019290610277565b92949550505060ff19168252151560200201905f8080610261565b906102c791610231565b90565b601f801991011690565b634e487b7160e01b5f52604160045260245ffd5b906102f2906102ca565b810190811067ffffffffffffffff82111761030c57604052565b6102d4565b9061033161032a92610321610092565b938480926102bd565b03836102e8565b565b5490565b60209181520190565b5f5260205f2090565b60018060a01b031690565b61035d90610349565b90565b61036990610354565b9052565b9061037a81602093610360565b0190565b5f1c90565b60018060a01b031690565b61039a61039f9161037e565b610383565b90565b6103ac905461038e565b90565b60010190565b906103d26103cc6103c584610333565b8093610337565b92610340565b905f5b8181106103e25750505090565b9091926104026103fc6001926103f7876103a2565b61036d565b946103af565b91019190916103d5565b90610416916103b5565b90565b9061043961043292610429610092565b9384809261040c565b03836102e8565b565b52565b5490565b9061045561044e610092565b92836102e8565b565b67ffffffffffffffff811161046f5760208091020190565b6102d4565b9061048661048183610457565b610442565b918252565b5f5260205f2090565b61049d90610311565b90565b906104aa8261043e565b6104b381610474565b926104c1602085019161048b565b5f915b8383106104d15750505050565b6001602081926104e085610494565b8152019201920191906104c4565b52565b63ffffffff1690565b61050661050b9161037e565b6104f1565b90565b61051890546104fa565b90565b63ffffffff1690565b9061052e9061051b565b9052565b61053c6060610442565b90565b9061058e6105856002610550610532565b9461056761055f5f8301610419565b5f880161043b565b61057f610576600183016104a0565b602088016104ee565b0161050e565b60408401610524565b565b60601b90565b61059f90610590565b90565b6105ae6105b39161037e565b610596565b90565b6105c090546105a2565b90565b6bffffffffffffffffffffffff191690565b906105df906105c3565b9052565b60a01c90565b60a01b90565b6105f8906105e9565b90565b61060761060c916105e3565b6105ef565b90565b61061990546105fb565b90565b6bffffffffffffffffffffffff60a01b1690565b9061063a9061061c565b9052565b52565b61064b6060610442565b90565b9061069c610693600161065f610641565b9461067661066e5f83016105b6565b5f88016105d5565b61068d6106845f830161060f565b60208801610630565b01610311565b6040840161063e565b565b6106a99060016101cb565b6106b45f8201610311565b916106cd60046106c66001850161053f565b930161064e565b90565b5190565b60209181520190565b90825f9392825e0152565b610707610710602093610715936106fe816106d0565b938480936106d4565b958691016106dd565b6102ca565b0190565b5190565b60200190565b60200190565b9061074661074061073984610719565b8093610337565b9261071d565b905f5b8181106107565750505090565b90919261076f610769600192865161036d565b94610723565b9101919091610749565b5190565b60209181520190565b60200190565b6107ab6107b46020936107b9936107a2816106d0565b9384809361021f565b958691016106dd565b6102ca565b0190565b906107c79161078c565b90565b60200190565b906107e46107dd83610779565b809261077d565b90816107f560208302840194610786565b925f915b83831061080857505050505090565b9091929394602061082a610824838560019503875289516107bd565b976107ca565b93019301919392906107f9565b6108409061051b565b9052565b9061088390604080610878610866606085015f8801518682035f880152610729565b602087015185820360208701526107d0565b940151910190610837565b90565b61088f906105c3565b9052565b61089c9061061c565b9052565b6108dd91604060608201926108bb5f8201515f850190610886565b6108cd60208201516020850190610893565b015190604081840391015261078c565b90565b9161090c906108fe61091a959360608601908682035f8801526106e8565b908482036020860152610844565b9160408184039101526108a0565b90565b346109505761094c6109386109333660046100d4565b61069e565b610943939193610092565b938493846108e0565b0390f35b610098565b5f91031261095f57565b61009c565b61096d90610354565b9052565b9190610984905f60208501940190610964565b565b346109b657610996366004610955565b6109b26109a1610c89565b6109a9610092565b91829182610971565b0390f35b610098565b906109fa906040806109ef6109dd606085015f8801518682035f880152610729565b602087015185820360208701526107d0565b940151910190610837565b90565b610a3a9160406060820192610a185f8201515f850190610886565b610a2a60208201516020850190610893565b015190604081840391015261078c565b90565b610a80916040610a6f610a5d606084015f8601518582035f87015261078c565b602085015184820360208601526109bb565b9201519060408184039101526109fd565b90565b610a989160208201915f818403910152610a3d565b90565b34610acb57610ac7610ab6610ab13660046100d4565b610e00565b610abe610092565b91829182610a83565b0390f35b610098565b34610b0057610afc610aeb610ae63660046100d4565b610e44565b610af3610092565b91829182610181565b0390f35b610098565b610b0e906100f5565b9052565b610b3d9160206040820192610b2d5f8201515f850190610b05565b015190602081840391015261078c565b90565b610b559160208201915f818403910152610b12565b90565b34610b8857610b84610b73610b6e3660046100d4565b610ebf565b610b7b610092565b91829182610b40565b0390f35b610098565b5f80fd5b90816060910312610b9f5790565b610b8d565b90816060910312610bb25790565b610b8d565b919091604081840312610c0f575f81013567ffffffffffffffff8111610c0a5783610be3918301610b91565b92602082013567ffffffffffffffff8111610c0557610c029201610ba4565b90565b6100a0565b6100a0565b61009c565b5f0190565b34610c4857610c32610c2c366004610bb7565b90611f0b565b610c3a610092565b80610c4481610c14565b0390f35b610098565b5f80fd5b5f90565b610c69610c64610c6e92610349565b6100f2565b610349565b90565b610c7a90610c55565b90565b610c8690610c71565b90565b610c91610c51565b50610cbb7f0000000000000000000000000000000000000000000000000000000000000000610c7d565b90565b610cc86060610442565b90565b606090565b606090565b606090565b5f90565b610ce6610532565b906020808084610cf4610cd0565b815201610cff610cd5565b815201610d0a610cda565b81525050565b610d18610cde565b90565b5f90565b5f90565b610d2b610641565b906020808084610d39610d1b565b815201610d44610d1f565b815201610d4f610ccb565b81525050565b610d5d610d23565b90565b610d68610cbe565b906020808084610d76610ccb565b815201610d81610d10565b815201610d8c610d55565b81525050565b610d9a610d60565b90565b52565b52565b90610df2610de96004610db4610cbe565b94610dcb610dc35f8301610311565b5f880161063e565b610de3610dda6001830161053f565b60208801610d9d565b0161064e565b60408401610da0565b565b610dfd90610da3565b90565b610e17610e1c91610e0f610d92565b5060016101cb565b610df4565b90565b5f90565b610e2f610e349161037e565b61012b565b90565b610e419054610e23565b90565b610e5a610e5f91610e53610e1f565b505f610111565b610e37565b90565b610e6c6040610442565b90565b5f90565b610e7b610e62565b9060208083610e88610e6f565b815201610e93610ccb565b81525050565b610ea1610e73565b90565b610eae6040610442565b90565b90610ebb906100a4565b9052565b610ec7610e99565b50610eff5f610ee0610edb600185906101cb565b610df4565b0151610ef6610eed610ea4565b935f8501610eb1565b6020830161063e565b90565b5f80fd5b60e01b90565b5f910312610f1657565b61009c565b610f24816105c3565b03610f2b57565b5f80fd5b90503590610f3c82610f1b565b565b50610f4d906020810190610f2f565b90565b610f598161061c565b03610f6057565b5f80fd5b90503590610f7182610f50565b565b50610f82906020810190610f64565b90565b5f80fd5b5f80fd5b5f80fd5b9035600160200382360303811215610fd257016020813591019167ffffffffffffffff8211610fcd576001820236038313610fc857565b610f89565b610f85565b610f8d565b90825f939282370152565b9190610ffc81610ff5816110019561021f565b8095610fd7565b6102ca565b0190565b61105b9161104d60608201926110296110205f830183610f3e565b5f850190610886565b6110436110396020830183610f73565b6020850190610893565b6040810190610f91565b916040818503910152610fe2565b90565b903560016020038236030381121561109f57016020813591019167ffffffffffffffff821161109a57602082023603831361109557565b610f89565b610f85565b610f8d565b90565b6110b081610354565b036110b757565b5f80fd5b905035906110c8826110a7565b565b506110d99060208101906110bb565b90565b60200190565b916110f0826110f692610337565b926110a4565b90815f905b828210611109575050505090565b9091929361112b61112560019261112088866110ca565b61036d565b956110dc565b9201909291926110fb565b903560016020038236030381121561117757016020813591019167ffffffffffffffff821161117257602082023603831361116d57565b610f89565b610f85565b610f8d565b90565b9061118a9291610fe2565b90565b60200190565b918161119e9161077d565b90816111af6020830284019461117c565b92835f925b8484106111c45750505050505090565b90919293949560206111f06111ea83856001950388526111e48b88610f91565b9061117f565b9861118d565b9401940192949391906111b4565b6112078161051b565b0361120e57565b5f80fd5b9050359061121f826111fe565b565b50611230906020810190611212565b90565b9061128d90604061128561127b611260606085016112535f89018961105e565b908783035f8901526110e2565b61126d6020880188611136565b908683036020880152611193565b9482810190611221565b910190610837565b90565b90916112aa6112b89360408401908482035f860152611005565b916020818403910152611233565b90565b6112c3610092565b3d5f823e3d90fd5b5f80fd5b5f80fd5b5f80fd5b903590600160200381360303821215611319570180359067ffffffffffffffff82116113145760200191600182023603831361130f57565b6112d3565b6112cf565b6112cb565b5f80fd5b5f80fd5b5f80fd5b5f80fd5b67ffffffffffffffff811161134c576113486020916102ca565b0190565b6102d4565b909291926113666113618261132e565b610442565b938185526020850190828401116113825761138092610fd7565b565b61132a565b9080601f830112156113a5578160206113a293359101611351565b90565b611326565b9190916040818403126113fc576113c16040610442565b926113ce815f84016100c5565b5f850152602082013567ffffffffffffffff81116113f7576113f09201611387565b6020830152565b611322565b61131e565b90602082820312611431575f82013567ffffffffffffffff811161142c5761142992016113aa565b90565b6100a0565b61009c565b6114406060610442565b90565b67ffffffffffffffff811161145b5760208091020190565b6102d4565b5f80fd5b9092919261147961147482611443565b610442565b93818552602080860192028301928184116114b657915b83831061149d5750505050565b602080916114ab84866110bb565b815201920191611490565b611460565b9080601f830112156114d9578160206114d693359101611464565b90565b611326565b9291906114f26114ed82610457565b610442565b93818552602080860192028101918383116115495781905b838210611518575050505050565b813567ffffffffffffffff8111611544576020916115398784938701611387565b81520191019061150a565b611326565b611460565b9080601f8301121561156c57816020611569933591016114de565b90565b611326565b9190916060818403126115ee576115886060610442565b925f82013567ffffffffffffffff81116115e957816115a89184016114bb565b5f85015260208201359167ffffffffffffffff83116115e4576115d0826115dd94830161154e565b6020860152604001611212565b6040830152565b611322565b611322565b61131e565b6115fe903690611571565b90565b919091606081840312611665576116186060610442565b92611625815f8401610f2f565b5f8501526116368160208401610f64565b6020850152604082013567ffffffffffffffff8111611660576116599201611387565b6040830152565b611322565b61131e565b611675903690611601565b90565b61168290516100a4565b90565b634e487b7160e01b5f525f60045260245ffd5b5190565b601f602091010490565b1b90565b919060086116c59102916116bf5f19846116a6565b926116a6565b9181191691161790565b90565b6116e66116e16116eb926116cf565b6100f2565b6116cf565b90565b90565b919061170761170261170f936116d2565b6116ee565b9083546116aa565b9055565b5f90565b61172991611723611713565b916116f1565b565b5b818110611737575050565b806117445f600193611717565b0161172c565b9190601f811161175a575b505050565b61176661178b93610228565b9060206117728461169c565b83019310611793575b6117849061169c565b019061172b565b5f8080611755565b91506117848192905061177b565b906117b1905f1990600802610127565b191690565b816117c0916117a1565b906002021790565b906117d2816106d0565b9067ffffffffffffffff8211611892576117f6826117f085546101f5565b8561174a565b602090601f831160011461182a57918091611819935f9261181e575b50506117b6565b90555b565b90915001515f80611812565b601f1983169161183985610228565b925f5b81811061187a57509160029391856001969410611860575b5050500201905561181c565b611870910151601f8416906117a1565b90555f8080611854565b9193602060018192878701518155019501920161183c565b6102d4565b906118a1916117c8565b565b5190565b5190565b600190818003010490565b5b8181106118c2575050565b806118cf5f600193611717565b016118b7565b906118e8905f1990602003600802610127565b8154169055565b90918281106118fe575b505050565b61191c611916611910611927956118ab565b926118ab565b92610340565b9182019101906118b6565b5f80806118f9565b90680100000000000000008111611958578161194d61195693610333565b908281556118ef565b565b6102d4565b6119679051610354565b90565b90565b61197682610719565b9167ffffffffffffffff83116119d9576119a461199e600192611999868661192f565b61071d565b92610340565b9204915f5b8381106119b65750505050565b60019060206119cc6119c78661195d565b61196a565b94019381840155016119a9565b6102d4565b906119e89161196d565b565b5190565b600190818003010490565b905f91611a10611a0882610228565b9283546117b6565b905555565b919290602082105f14611a6e57601f8411600114611a3e57611a389293506117b6565b90555b5b565b5090611a64611a69936001611a5b611a5585610228565b9261169c565b8201910161172b565b6119f9565b611a3b565b50611aa58293611a7f600194610228565b611a9e611a8b8561169c565b820192601f861680611ab0575b5061169c565b019061172b565b600202179055611a3c565b611abc908886036118d5565b5f611a98565b929091680100000000000000008211611b22576020115f14611b1357602081105f14611af757611af1916117b6565b90555b5b565b60019160ff1916611b0784610228565b55600202019055611af4565b60019150600202019055611af5565b6102d4565b908154611b33816101f5565b90818311611b5c575b818310611b4a575b50505050565b611b5393611a15565b5f808080611b44565b611b6883838387611ac2565b611b3c565b5f611b7791611b27565b565b905f03611b8b57611b8990611b6d565b565b611685565b5b818110611b9c575050565b80611ba95f600193611b79565b01611b91565b9091828110611bbe575b505050565b611bdc611bd6611bd0611be7956119ee565b926119ee565b9261048b565b918201910190611b90565b5f8080611bb9565b90680100000000000000008111611c185781611c0d611c169361043e565b90828155611baf565b565b6102d4565b611c42611c3c611c2c84610779565b93611c378585611bef565b610786565b9161048b565b5f915b838310611c525750505050565b6001602082611c6a611c648495611698565b86611897565b01920192019190611c45565b90611c8091611c1d565b565b611c8c905161051b565b90565b5f1b90565b90611ca363ffffffff91611c8f565b9181191691161790565b611cc1611cbc611cc69261051b565b6100f2565b61051b565b90565b90565b90611ce1611cdc611ce892611cad565b611cc9565b8254611c94565b9055565b90611d3060406002611d3694611d0f5f8201611d095f88016118a7565b906119de565b611d2860018201611d22602088016119ea565b90611c76565b019201611c82565b90611ccc565b565b90611d4291611cec565b565b5190565b611d5290516105c3565b90565b90611d6660018060a01b0391611c8f565b9181191691161790565b611d79906105c3565b90565b60601c90565b611d8b90611d7c565b90565b90611da3611d9e611daa92611d70565b611d82565b8254611d55565b9055565b611db8905161061c565b90565b90611dd56bffffffffffffffffffffffff60a01b916105e9565b9181191691161790565b611de89061061c565b90565b611df4906105e3565b90565b90611e0c611e07611e1392611ddf565b611deb565b8254611dbb565b9055565b90611e5a60406001611e6094611e3a5f8201611e345f8801611d48565b90611d8e565b611e525f8201611e4c60208801611dae565b90611df7565b019201611698565b90611897565b565b90611e6c91611e17565b565b90611eb260406004611eb894611e915f8201611e8b5f8801611698565b90611897565b611eaa60018201611ea4602088016118a3565b90611d38565b019201611d44565b90611e62565b565b90611ec491611e6e565b565b90611ed260ff91611c8f565b9181191691161790565b611ee59061016f565b90565b90565b90611f00611efb611f0792611edc565b611ee8565b8254611ec6565b9055565b611f347f0000000000000000000000000000000000000000000000000000000000000000610c7d565b9163cd71589e828294803b1561204b57611f605f93611f6b611f54610092565b98899586948594610f06565b845260048401611290565b03915afa9081156120465761201893611ffb9261201a575b50611fe0611fd7611fa3611f9b8660408101906112d7565b810190611401565b94611fd2611fc9602088015195611fc4611fbb611436565b975f890161063e565b6115f3565b60208601610d9d565b61166a565b60408301610da0565b611ff66001611ff05f8601611678565b906101cb565b611eba565b61201360019161200d5f809201611678565b90610111565b611eeb565b565b612039905f3d811161203f575b61203181836102e8565b810190610f0c565b5f611f83565b503d612027565b6112bb565b610f0256fea2646970667358221220363e2a421137e3e35665e12fb0e060cf18eb7c1fea8a779a2c062c2a06a9931864736f6c634300081c0033","sourceMap":"503:2330:8:-:0;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;:::i;:::-;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;:::o;990:112::-;1062:33;;990:112::o","linkReferences":{}},"deployedBytecode":{"object":"0x60806040526004361015610013575b610c4d565b61001d5f3561008c565b806326faf60c146100875780633d821004146100825780634dda0b431461007d57806378ecfb4714610078578063aa32d9f414610073578063c053045e1461006e5763f969ff330361000e57610c19565b610b58565b610ad0565b610a9b565b610986565b61091d565b610196565b60e01c90565b60405190565b5f80fd5b5f80fd5b5f80fd5b67ffffffffffffffff1690565b6100ba816100a4565b036100c157565b5f80fd5b905035906100d2826100b1565b565b906020828203126100ed576100ea915f016100c5565b90565b61009c565b90565b61010961010461010e926100a4565b6100f2565b6100a4565b90565b9061011b906100f5565b5f5260205260405f2090565b1c90565b60ff1690565b6101419060086101469302610127565b61012b565b90565b906101549154610131565b90565b61016c906101675f915f92610111565b610149565b90565b151590565b61017d9061016f565b9052565b9190610194905f60208501940190610174565b565b346101c6576101c26101b16101ac3660046100d4565b610157565b6101b9610092565b91829182610181565b0390f35b610098565b906101d5906100f5565b5f5260205260405f2090565b634e487b7160e01b5f52602260045260245ffd5b9060016002830492168015610215575b602083101461021057565b6101e1565b91607f1691610205565b60209181520190565b5f5260205f2090565b905f929180549061024b610244836101f5565b809461021f565b916001811690815f146102a25750600114610266575b505050565b6102739192939450610228565b915f925b81841061028a57505001905f8080610261565b60018160209295939554848601520191019290610277565b92949550505060ff19168252151560200201905f8080610261565b906102c791610231565b90565b601f801991011690565b634e487b7160e01b5f52604160045260245ffd5b906102f2906102ca565b810190811067ffffffffffffffff82111761030c57604052565b6102d4565b9061033161032a92610321610092565b938480926102bd565b03836102e8565b565b5490565b60209181520190565b5f5260205f2090565b60018060a01b031690565b61035d90610349565b90565b61036990610354565b9052565b9061037a81602093610360565b0190565b5f1c90565b60018060a01b031690565b61039a61039f9161037e565b610383565b90565b6103ac905461038e565b90565b60010190565b906103d26103cc6103c584610333565b8093610337565b92610340565b905f5b8181106103e25750505090565b9091926104026103fc6001926103f7876103a2565b61036d565b946103af565b91019190916103d5565b90610416916103b5565b90565b9061043961043292610429610092565b9384809261040c565b03836102e8565b565b52565b5490565b9061045561044e610092565b92836102e8565b565b67ffffffffffffffff811161046f5760208091020190565b6102d4565b9061048661048183610457565b610442565b918252565b5f5260205f2090565b61049d90610311565b90565b906104aa8261043e565b6104b381610474565b926104c1602085019161048b565b5f915b8383106104d15750505050565b6001602081926104e085610494565b8152019201920191906104c4565b52565b63ffffffff1690565b61050661050b9161037e565b6104f1565b90565b61051890546104fa565b90565b63ffffffff1690565b9061052e9061051b565b9052565b61053c6060610442565b90565b9061058e6105856002610550610532565b9461056761055f5f8301610419565b5f880161043b565b61057f610576600183016104a0565b602088016104ee565b0161050e565b60408401610524565b565b60601b90565b61059f90610590565b90565b6105ae6105b39161037e565b610596565b90565b6105c090546105a2565b90565b6bffffffffffffffffffffffff191690565b906105df906105c3565b9052565b60a01c90565b60a01b90565b6105f8906105e9565b90565b61060761060c916105e3565b6105ef565b90565b61061990546105fb565b90565b6bffffffffffffffffffffffff60a01b1690565b9061063a9061061c565b9052565b52565b61064b6060610442565b90565b9061069c610693600161065f610641565b9461067661066e5f83016105b6565b5f88016105d5565b61068d6106845f830161060f565b60208801610630565b01610311565b6040840161063e565b565b6106a99060016101cb565b6106b45f8201610311565b916106cd60046106c66001850161053f565b930161064e565b90565b5190565b60209181520190565b90825f9392825e0152565b610707610710602093610715936106fe816106d0565b938480936106d4565b958691016106dd565b6102ca565b0190565b5190565b60200190565b60200190565b9061074661074061073984610719565b8093610337565b9261071d565b905f5b8181106107565750505090565b90919261076f610769600192865161036d565b94610723565b9101919091610749565b5190565b60209181520190565b60200190565b6107ab6107b46020936107b9936107a2816106d0565b9384809361021f565b958691016106dd565b6102ca565b0190565b906107c79161078c565b90565b60200190565b906107e46107dd83610779565b809261077d565b90816107f560208302840194610786565b925f915b83831061080857505050505090565b9091929394602061082a610824838560019503875289516107bd565b976107ca565b93019301919392906107f9565b6108409061051b565b9052565b9061088390604080610878610866606085015f8801518682035f880152610729565b602087015185820360208701526107d0565b940151910190610837565b90565b61088f906105c3565b9052565b61089c9061061c565b9052565b6108dd91604060608201926108bb5f8201515f850190610886565b6108cd60208201516020850190610893565b015190604081840391015261078c565b90565b9161090c906108fe61091a959360608601908682035f8801526106e8565b908482036020860152610844565b9160408184039101526108a0565b90565b346109505761094c6109386109333660046100d4565b61069e565b610943939193610092565b938493846108e0565b0390f35b610098565b5f91031261095f57565b61009c565b61096d90610354565b9052565b9190610984905f60208501940190610964565b565b346109b657610996366004610955565b6109b26109a1610c89565b6109a9610092565b91829182610971565b0390f35b610098565b906109fa906040806109ef6109dd606085015f8801518682035f880152610729565b602087015185820360208701526107d0565b940151910190610837565b90565b610a3a9160406060820192610a185f8201515f850190610886565b610a2a60208201516020850190610893565b015190604081840391015261078c565b90565b610a80916040610a6f610a5d606084015f8601518582035f87015261078c565b602085015184820360208601526109bb565b9201519060408184039101526109fd565b90565b610a989160208201915f818403910152610a3d565b90565b34610acb57610ac7610ab6610ab13660046100d4565b610e00565b610abe610092565b91829182610a83565b0390f35b610098565b34610b0057610afc610aeb610ae63660046100d4565b610e44565b610af3610092565b91829182610181565b0390f35b610098565b610b0e906100f5565b9052565b610b3d9160206040820192610b2d5f8201515f850190610b05565b015190602081840391015261078c565b90565b610b559160208201915f818403910152610b12565b90565b34610b8857610b84610b73610b6e3660046100d4565b610ebf565b610b7b610092565b91829182610b40565b0390f35b610098565b5f80fd5b90816060910312610b9f5790565b610b8d565b90816060910312610bb25790565b610b8d565b919091604081840312610c0f575f81013567ffffffffffffffff8111610c0a5783610be3918301610b91565b92602082013567ffffffffffffffff8111610c0557610c029201610ba4565b90565b6100a0565b6100a0565b61009c565b5f0190565b34610c4857610c32610c2c366004610bb7565b90611f0b565b610c3a610092565b80610c4481610c14565b0390f35b610098565b5f80fd5b5f90565b610c69610c64610c6e92610349565b6100f2565b610349565b90565b610c7a90610c55565b90565b610c8690610c71565b90565b610c91610c51565b50610cbb7f0000000000000000000000000000000000000000000000000000000000000000610c7d565b90565b610cc86060610442565b90565b606090565b606090565b606090565b5f90565b610ce6610532565b906020808084610cf4610cd0565b815201610cff610cd5565b815201610d0a610cda565b81525050565b610d18610cde565b90565b5f90565b5f90565b610d2b610641565b906020808084610d39610d1b565b815201610d44610d1f565b815201610d4f610ccb565b81525050565b610d5d610d23565b90565b610d68610cbe565b906020808084610d76610ccb565b815201610d81610d10565b815201610d8c610d55565b81525050565b610d9a610d60565b90565b52565b52565b90610df2610de96004610db4610cbe565b94610dcb610dc35f8301610311565b5f880161063e565b610de3610dda6001830161053f565b60208801610d9d565b0161064e565b60408401610da0565b565b610dfd90610da3565b90565b610e17610e1c91610e0f610d92565b5060016101cb565b610df4565b90565b5f90565b610e2f610e349161037e565b61012b565b90565b610e419054610e23565b90565b610e5a610e5f91610e53610e1f565b505f610111565b610e37565b90565b610e6c6040610442565b90565b5f90565b610e7b610e62565b9060208083610e88610e6f565b815201610e93610ccb565b81525050565b610ea1610e73565b90565b610eae6040610442565b90565b90610ebb906100a4565b9052565b610ec7610e99565b50610eff5f610ee0610edb600185906101cb565b610df4565b0151610ef6610eed610ea4565b935f8501610eb1565b6020830161063e565b90565b5f80fd5b60e01b90565b5f910312610f1657565b61009c565b610f24816105c3565b03610f2b57565b5f80fd5b90503590610f3c82610f1b565b565b50610f4d906020810190610f2f565b90565b610f598161061c565b03610f6057565b5f80fd5b90503590610f7182610f50565b565b50610f82906020810190610f64565b90565b5f80fd5b5f80fd5b5f80fd5b9035600160200382360303811215610fd257016020813591019167ffffffffffffffff8211610fcd576001820236038313610fc857565b610f89565b610f85565b610f8d565b90825f939282370152565b9190610ffc81610ff5816110019561021f565b8095610fd7565b6102ca565b0190565b61105b9161104d60608201926110296110205f830183610f3e565b5f850190610886565b6110436110396020830183610f73565b6020850190610893565b6040810190610f91565b916040818503910152610fe2565b90565b903560016020038236030381121561109f57016020813591019167ffffffffffffffff821161109a57602082023603831361109557565b610f89565b610f85565b610f8d565b90565b6110b081610354565b036110b757565b5f80fd5b905035906110c8826110a7565b565b506110d99060208101906110bb565b90565b60200190565b916110f0826110f692610337565b926110a4565b90815f905b828210611109575050505090565b9091929361112b61112560019261112088866110ca565b61036d565b956110dc565b9201909291926110fb565b903560016020038236030381121561117757016020813591019167ffffffffffffffff821161117257602082023603831361116d57565b610f89565b610f85565b610f8d565b90565b9061118a9291610fe2565b90565b60200190565b918161119e9161077d565b90816111af6020830284019461117c565b92835f925b8484106111c45750505050505090565b90919293949560206111f06111ea83856001950388526111e48b88610f91565b9061117f565b9861118d565b9401940192949391906111b4565b6112078161051b565b0361120e57565b5f80fd5b9050359061121f826111fe565b565b50611230906020810190611212565b90565b9061128d90604061128561127b611260606085016112535f89018961105e565b908783035f8901526110e2565b61126d6020880188611136565b908683036020880152611193565b9482810190611221565b910190610837565b90565b90916112aa6112b89360408401908482035f860152611005565b916020818403910152611233565b90565b6112c3610092565b3d5f823e3d90fd5b5f80fd5b5f80fd5b5f80fd5b903590600160200381360303821215611319570180359067ffffffffffffffff82116113145760200191600182023603831361130f57565b6112d3565b6112cf565b6112cb565b5f80fd5b5f80fd5b5f80fd5b5f80fd5b67ffffffffffffffff811161134c576113486020916102ca565b0190565b6102d4565b909291926113666113618261132e565b610442565b938185526020850190828401116113825761138092610fd7565b565b61132a565b9080601f830112156113a5578160206113a293359101611351565b90565b611326565b9190916040818403126113fc576113c16040610442565b926113ce815f84016100c5565b5f850152602082013567ffffffffffffffff81116113f7576113f09201611387565b6020830152565b611322565b61131e565b90602082820312611431575f82013567ffffffffffffffff811161142c5761142992016113aa565b90565b6100a0565b61009c565b6114406060610442565b90565b67ffffffffffffffff811161145b5760208091020190565b6102d4565b5f80fd5b9092919261147961147482611443565b610442565b93818552602080860192028301928184116114b657915b83831061149d5750505050565b602080916114ab84866110bb565b815201920191611490565b611460565b9080601f830112156114d9578160206114d693359101611464565b90565b611326565b9291906114f26114ed82610457565b610442565b93818552602080860192028101918383116115495781905b838210611518575050505050565b813567ffffffffffffffff8111611544576020916115398784938701611387565b81520191019061150a565b611326565b611460565b9080601f8301121561156c57816020611569933591016114de565b90565b611326565b9190916060818403126115ee576115886060610442565b925f82013567ffffffffffffffff81116115e957816115a89184016114bb565b5f85015260208201359167ffffffffffffffff83116115e4576115d0826115dd94830161154e565b6020860152604001611212565b6040830152565b611322565b611322565b61131e565b6115fe903690611571565b90565b919091606081840312611665576116186060610442565b92611625815f8401610f2f565b5f8501526116368160208401610f64565b6020850152604082013567ffffffffffffffff8111611660576116599201611387565b6040830152565b611322565b61131e565b611675903690611601565b90565b61168290516100a4565b90565b634e487b7160e01b5f525f60045260245ffd5b5190565b601f602091010490565b1b90565b919060086116c59102916116bf5f19846116a6565b926116a6565b9181191691161790565b90565b6116e66116e16116eb926116cf565b6100f2565b6116cf565b90565b90565b919061170761170261170f936116d2565b6116ee565b9083546116aa565b9055565b5f90565b61172991611723611713565b916116f1565b565b5b818110611737575050565b806117445f600193611717565b0161172c565b9190601f811161175a575b505050565b61176661178b93610228565b9060206117728461169c565b83019310611793575b6117849061169c565b019061172b565b5f8080611755565b91506117848192905061177b565b906117b1905f1990600802610127565b191690565b816117c0916117a1565b906002021790565b906117d2816106d0565b9067ffffffffffffffff8211611892576117f6826117f085546101f5565b8561174a565b602090601f831160011461182a57918091611819935f9261181e575b50506117b6565b90555b565b90915001515f80611812565b601f1983169161183985610228565b925f5b81811061187a57509160029391856001969410611860575b5050500201905561181c565b611870910151601f8416906117a1565b90555f8080611854565b9193602060018192878701518155019501920161183c565b6102d4565b906118a1916117c8565b565b5190565b5190565b600190818003010490565b5b8181106118c2575050565b806118cf5f600193611717565b016118b7565b906118e8905f1990602003600802610127565b8154169055565b90918281106118fe575b505050565b61191c611916611910611927956118ab565b926118ab565b92610340565b9182019101906118b6565b5f80806118f9565b90680100000000000000008111611958578161194d61195693610333565b908281556118ef565b565b6102d4565b6119679051610354565b90565b90565b61197682610719565b9167ffffffffffffffff83116119d9576119a461199e600192611999868661192f565b61071d565b92610340565b9204915f5b8381106119b65750505050565b60019060206119cc6119c78661195d565b61196a565b94019381840155016119a9565b6102d4565b906119e89161196d565b565b5190565b600190818003010490565b905f91611a10611a0882610228565b9283546117b6565b905555565b919290602082105f14611a6e57601f8411600114611a3e57611a389293506117b6565b90555b5b565b5090611a64611a69936001611a5b611a5585610228565b9261169c565b8201910161172b565b6119f9565b611a3b565b50611aa58293611a7f600194610228565b611a9e611a8b8561169c565b820192601f861680611ab0575b5061169c565b019061172b565b600202179055611a3c565b611abc908886036118d5565b5f611a98565b929091680100000000000000008211611b22576020115f14611b1357602081105f14611af757611af1916117b6565b90555b5b565b60019160ff1916611b0784610228565b55600202019055611af4565b60019150600202019055611af5565b6102d4565b908154611b33816101f5565b90818311611b5c575b818310611b4a575b50505050565b611b5393611a15565b5f808080611b44565b611b6883838387611ac2565b611b3c565b5f611b7791611b27565b565b905f03611b8b57611b8990611b6d565b565b611685565b5b818110611b9c575050565b80611ba95f600193611b79565b01611b91565b9091828110611bbe575b505050565b611bdc611bd6611bd0611be7956119ee565b926119ee565b9261048b565b918201910190611b90565b5f8080611bb9565b90680100000000000000008111611c185781611c0d611c169361043e565b90828155611baf565b565b6102d4565b611c42611c3c611c2c84610779565b93611c378585611bef565b610786565b9161048b565b5f915b838310611c525750505050565b6001602082611c6a611c648495611698565b86611897565b01920192019190611c45565b90611c8091611c1d565b565b611c8c905161051b565b90565b5f1b90565b90611ca363ffffffff91611c8f565b9181191691161790565b611cc1611cbc611cc69261051b565b6100f2565b61051b565b90565b90565b90611ce1611cdc611ce892611cad565b611cc9565b8254611c94565b9055565b90611d3060406002611d3694611d0f5f8201611d095f88016118a7565b906119de565b611d2860018201611d22602088016119ea565b90611c76565b019201611c82565b90611ccc565b565b90611d4291611cec565b565b5190565b611d5290516105c3565b90565b90611d6660018060a01b0391611c8f565b9181191691161790565b611d79906105c3565b90565b60601c90565b611d8b90611d7c565b90565b90611da3611d9e611daa92611d70565b611d82565b8254611d55565b9055565b611db8905161061c565b90565b90611dd56bffffffffffffffffffffffff60a01b916105e9565b9181191691161790565b611de89061061c565b90565b611df4906105e3565b90565b90611e0c611e07611e1392611ddf565b611deb565b8254611dbb565b9055565b90611e5a60406001611e6094611e3a5f8201611e345f8801611d48565b90611d8e565b611e525f8201611e4c60208801611dae565b90611df7565b019201611698565b90611897565b565b90611e6c91611e17565b565b90611eb260406004611eb894611e915f8201611e8b5f8801611698565b90611897565b611eaa60018201611ea4602088016118a3565b90611d38565b019201611d44565b90611e62565b565b90611ec491611e6e565b565b90611ed260ff91611c8f565b9181191691161790565b611ee59061016f565b90565b90565b90611f00611efb611f0792611edc565b611ee8565b8254611ec6565b9055565b611f347f0000000000000000000000000000000000000000000000000000000000000000610c7d565b9163cd71589e828294803b1561204b57611f605f93611f6b611f54610092565b98899586948594610f06565b845260048401611290565b03915afa9081156120465761201893611ffb9261201a575b50611fe0611fd7611fa3611f9b8660408101906112d7565b810190611401565b94611fd2611fc9602088015195611fc4611fbb611436565b975f890161063e565b6115f3565b60208601610d9d565b61166a565b60408301610da0565b611ff66001611ff05f8601611678565b906101cb565b611eba565b61201360019161200d5f809201611678565b90610111565b611eeb565b565b612039905f3d811161203f575b61203181836102e8565b810190610f0c565b5f611f83565b503d612027565b6112bb565b610f0256fea2646970667358221220363e2a421137e3e35665e12fb0e060cf18eb7c1fea8a779a2c062c2a06a9931864736f6c634300081c0033","sourceMap":"503:2330:8:-:0;;;;;;;;;-1:-1:-1;503:2330:8;:::i;:::-;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;:::o;:::-;;;;:::o;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;:::o;:::-;;;;:::o;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::o;688:62::-;;;;;;;;;:::i;:::-;;:::i;:::-;;:::o;503:2330::-;;;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;:::o;:::-;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;:::i;:::-;;;:::o;:::-;;;;:::o;:::-;;;;;;;;:::o;:::-;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;:::o;:::-;;:::o;:::-;;;:::o;:::-;;;;;:::i;:::-;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;;:::o;:::-;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;;;:::o;:::-;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;:::i;:::-;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;:::o;:::-;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;:::o;:::-;;;;;:::i;:::-;;;:::o;:::-;;;;:::o;:::-;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;:::o;:::-;;;;;:::i;:::-;;;:::o;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;:::o;811:80::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;:::i;:::-;;;;:::i;:::-;;:::o;503:2330::-;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;;;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;:::o;:::-;;;;:::o;:::-;;;;:::o;:::-;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;:::o;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;:::o;:::-;;;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;2721:110::-;2773:7;;:::i;:::-;2807:16;2799:25;2807:16;2799:25;:::i;:::-;2792:32;:::o;503:2330::-;;;;:::i;:::-;;:::o;:::-;;;:::o;:::-;;;:::o;:::-;;;:::o;:::-;;;:::o;:::-;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::o;:::-;;;:::i;:::-;;:::o;:::-;;;:::o;:::-;;;:::o;:::-;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::o;:::-;;;:::i;:::-;;:::o;:::-;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::o;:::-;;;:::i;:::-;;:::o;:::-;;:::o;:::-;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;:::o;:::-;;;;:::i;:::-;;:::o;2125:192::-;2288:22;2275:35;2125:192;2221:42;;:::i;:::-;2288:11;;:22;:::i;:::-;2275:35;:::i;:::-;2125:192;:::o;503:2330::-;;;:::o;:::-;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;1932:153::-;2054:24;;1932:153;2031:4;;:::i;:::-;2054:13;;:24;:::i;:::-;;:::i;:::-;2047:31;:::o;503:2330::-;;;;:::i;:::-;;:::o;:::-;;;:::o;:::-;;;:::i;:::-;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::o;:::-;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;:::o;2357:318::-;2453:42;;:::i;:::-;2552:11;2597:71;2651:15;2507:67;2552:22;:11;2564:9;2552:22;;:::i;:::-;2507:67;:::i;:::-;2651:15;;2597:71;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::i;:::-;2357:318;:::o;503:2330::-;;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;:::i;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;;;;;;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;:::o;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::o;:::-;;:::i;:::-;;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;:::o;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;;;:::o;:::-;;;:::o;:::-;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;:::i;:::-;;;;;;:::o;:::-;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;:::i;:::-;:::o;:::-;;;:::o;:::-;;;:::o;:::-;;;;;;;;;:::o;:::-;;;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;:::i;:::-;;;;;;:::o;:::-;;;;;;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;:::o;:::-;;:::i;:::-;;;;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;:::i;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;;;:::i;:::-;:::o;:::-;;;:::o;:::-;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;:::o;:::-;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;-1:-1:-1;503:2330:8;;;;;;;;;;;;;;:::i;:::-;;;;;:::o;:::-;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::o;:::-;;;;:::i;:::-;;;;;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;:::i;:::-;:::o;:::-;;:::i;:::-;;;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;:::o;:::-;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;:::o;:::-;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;;;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;;;;:::i;:::-;:::o;:::-;;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;;;;:::i;:::-;:::o;:::-;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;;;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;1148:603::-;1325:25;:16;:25;:::i;:::-;;;1351:8;1361:13;1325:50;;;;;;;;;;;;:::i;:::-;;;;;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;;;;;;1702:42;1325:50;1510:181;1325:50;;;1148:603;1454:8;1546:145;;1443:56;1454:16;:8;:16;;;;;:::i;:::-;1443:56;;;;:::i;:::-;1591:10;1546:145;;1591:15;:10;:15;;1635:13;1546:145;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;1510:33;:11;1522:20;;:10;:20;;:::i;:::-;1510:33;;:::i;:::-;:181;:::i;:::-;1702:35;1740:4;1702:13;1716:20;;1702:13;1716:10;:20;;:::i;:::-;1702:35;;:::i;:::-;:42;:::i;:::-;1148:603::o;1325:50::-;;;;;;;;;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;:::i","linkReferences":{},"immutableReferences":{"597":[{"start":3223,"length":32},{"start":7952,"length":32}]}},"methodIdentifiers":{"getDataWithId(uint64)":"c053045e","getServiceManager()":"4dda0b43","getSignedData(uint64)":"78ecfb47","handleSignedEnvelope((bytes20,bytes12,bytes),(address[],bytes[],uint32))":"f969ff33","isValidTriggerId(uint64)":"aa32d9f4","signedDatas(uint64)":"3d821004","validTriggers(uint64)":"26faf60c"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.28+commit.7893614a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"contract IWavsServiceManager\",\"name\":\"serviceManager\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"getDataWithId\",\"outputs\":[{\"components\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"internalType\":\"struct ISimpleSubmit.DataWithId\",\"name\":\"dataWithId\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getServiceManager\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"getSignedData\",\"outputs\":[{\"components\":[{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"internalType\":\"bytes[]\",\"name\":\"signatures\",\"type\":\"bytes[]\"},{\"internalType\":\"uint32\",\"name\":\"referenceBlock\",\"type\":\"uint32\"}],\"internalType\":\"struct IWavsServiceHandler.SignatureData\",\"name\":\"signatureData\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"bytes20\",\"name\":\"eventId\",\"type\":\"bytes20\"},{\"internalType\":\"bytes12\",\"name\":\"ordering\",\"type\":\"bytes12\"},{\"internalType\":\"bytes\",\"name\":\"payload\",\"type\":\"bytes\"}],\"internalType\":\"struct IWavsServiceHandler.Envelope\",\"name\":\"envelope\",\"type\":\"tuple\"}],\"internalType\":\"struct ISimpleSubmit.SignedData\",\"name\":\"signedData\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes20\",\"name\":\"eventId\",\"type\":\"bytes20\"},{\"internalType\":\"bytes12\",\"name\":\"ordering\",\"type\":\"bytes12\"},{\"internalType\":\"bytes\",\"name\":\"payload\",\"type\":\"bytes\"}],\"internalType\":\"struct IWavsServiceHandler.Envelope\",\"name\":\"envelope\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"internalType\":\"bytes[]\",\"name\":\"signatures\",\"type\":\"bytes[]\"},{\"internalType\":\"uint32\",\"name\":\"referenceBlock\",\"type\":\"uint32\"}],\"internalType\":\"struct IWavsServiceHandler.SignatureData\",\"name\":\"signatureData\",\"type\":\"tuple\"}],\"name\":\"handleSignedEnvelope\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"isValidTriggerId\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"\",\"type\":\"uint64\"}],\"name\":\"signedDatas\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"internalType\":\"bytes[]\",\"name\":\"signatures\",\"type\":\"bytes[]\"},{\"internalType\":\"uint32\",\"name\":\"referenceBlock\",\"type\":\"uint32\"}],\"internalType\":\"struct IWavsServiceHandler.SignatureData\",\"name\":\"signatureData\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"bytes20\",\"name\":\"eventId\",\"type\":\"bytes20\"},{\"internalType\":\"bytes12\",\"name\":\"ordering\",\"type\":\"bytes12\"},{\"internalType\":\"bytes\",\"name\":\"payload\",\"type\":\"bytes\"}],\"internalType\":\"struct IWavsServiceHandler.Envelope\",\"name\":\"envelope\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"\",\"type\":\"uint64\"}],\"name\":\"validTriggers\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"Lay3r Labs\",\"details\":\"This contract implements the IWavsServiceHandler and ISimpleSubmit interfaces\",\"kind\":\"dev\",\"methods\":{\"constructor\":{\"params\":{\"serviceManager\":\"The service manager\"}},\"getDataWithId(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID\"},\"returns\":{\"dataWithId\":\"The data with ID\"}},\"getServiceManager()\":{\"returns\":{\"_0\":\"The address of the service manager\"}},\"getSignedData(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID\"},\"returns\":{\"signedData\":\"The signed data\"}},\"handleSignedEnvelope((bytes20,bytes12,bytes),(address[],bytes[],uint32))\":{\"params\":{\"envelope\":\"The envelope containing the data.\",\"signatureData\":\"The signature data.\"}},\"isValidTriggerId(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID to check\"},\"returns\":{\"_0\":\"True if the trigger ID is valid, false otherwise\"}}},\"title\":\"SimpleSubmit\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"constructor\":{\"notice\":\"Constructor\"},\"getDataWithId(uint64)\":{\"notice\":\"Returns the data with ID for a given trigger ID\"},\"getServiceManager()\":{\"notice\":\"Returns the address of the service manager\"},\"getSignedData(uint64)\":{\"notice\":\"Returns the signed data for a given trigger ID\"},\"handleSignedEnvelope((bytes20,bytes12,bytes),(address[],bytes[],uint32))\":{\"notice\":\"Handles a signed envelope\"},\"isValidTriggerId(uint64)\":{\"notice\":\"Checks if a trigger ID is valid\"},\"signedDatas(uint64)\":{\"notice\":\"Mapping from trigger ID to signed data\"},\"validTriggers(uint64)\":{\"notice\":\"Mapping from trigger ID to valid triggers\"}},\"notice\":\"Contract for the simple submit contract\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"examples/contracts/solidity/mocks/SimpleSubmit.sol\":\"SimpleSubmit\"},\"evmVersion\":\"prague\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[],\"viaIR\":true},\"sources\":{\"examples/contracts/solidity/interfaces/IWavsServiceHandler.sol\":{\"keccak256\":\"0x427e63f26320f27f53975554ff530953d81fb51b681fca950754b576ce83a267\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://d39520e0561d2f65a04b76c265f7ede71feab34fc0e1bd9f21b868353b9c2b0a\",\"dweb:/ipfs/QmWgvBY8pim9hNLNFDRZyob4PvRmuxEoRSyqABkUNpDcef\"]},\"examples/contracts/solidity/interfaces/IWavsServiceManager.sol\":{\"keccak256\":\"0xc4abed1f1f462a601b8f855c6d16bcc97ac9e5eb081f82ca6bedb6420cd1c9b7\",\"license\":\"UNLICENSED\",\"urls\":[\"bzz-raw://27c6906e991bbbe4a589b97d3f883bfb66c6b86463f9e1ff0fb68ac9845ef3f1\",\"dweb:/ipfs/QmYh9y385CszJ4m8TSbqLkTwzFwYyUEBX8KNwvHCjEuXWn\"]},\"examples/contracts/solidity/mocks/ISimpleSubmit.sol\":{\"keccak256\":\"0xda7573fb96ece8207cef432837be49e268803b477a3e05dd44c02b49152aa392\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://e4a5a489f203064ae9f529969a859482ed9a3809a33bda62f9a5d0d22372ae89\",\"dweb:/ipfs/QmXQxvFodWcdndsfyJGv7K4BWMs5QbTZeKepfdyxWwAZKZ\"]},\"examples/contracts/solidity/mocks/ISimpleTrigger.sol\":{\"keccak256\":\"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1\",\"dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG\"]},\"examples/contracts/solidity/mocks/SimpleSubmit.sol\":{\"keccak256\":\"0x01f938f4d3c7a6218900578ebc473b9cde798246cfe098da19c145e3332f5674\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://4f635c94e02d29c2cb924975650914fdd6e4e8da0a800280f8685018bdf13352\",\"dweb:/ipfs/QmVELBUj2SkyW1whEY4MXckTCvURrkHyYi9BAxETSHEtKs\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.28+commit.7893614a"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"contract IWavsServiceManager","name":"serviceManager","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"getDataWithId","outputs":[{"internalType":"struct ISimpleSubmit.DataWithId","name":"dataWithId","type":"tuple","components":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"},{"internalType":"bytes","name":"data","type":"bytes"}]}]},{"inputs":[],"stateMutability":"view","type":"function","name":"getServiceManager","outputs":[{"internalType":"address","name":"","type":"address"}]},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"getSignedData","outputs":[{"internalType":"struct ISimpleSubmit.SignedData","name":"signedData","type":"tuple","components":[{"internalType":"bytes","name":"data","type":"bytes"},{"internalType":"struct IWavsServiceHandler.SignatureData","name":"signatureData","type":"tuple","components":[{"internalType":"address[]","name":"signers","type":"address[]"},{"internalType":"bytes[]","name":"signatures","type":"bytes[]"},{"internalType":"uint32","name":"referenceBlock","type":"uint32"}]},{"internalType":"struct IWavsServiceHandler.Envelope","name":"envelope","type":"tuple","components":[{"internalType":"bytes20","name":"eventId","type":"bytes20"},{"internalType":"bytes12","name":"ordering","type":"bytes12"},{"internalType":"bytes","name":"payload","type":"bytes"}]}]}]},{"inputs":[{"internalType":"struct IWavsServiceHandler.Envelope","name":"envelope","type":"tuple","components":[{"internalType":"bytes20","name":"eventId","type":"bytes20"},{"internalType":"bytes12","name":"ordering","type":"bytes12"},{"internalType":"bytes","name":"payload","type":"bytes"}]},{"internalType":"struct IWavsServiceHandler.SignatureData","name":"signatureData","type":"tuple","components":[{"internalType":"address[]","name":"signers","type":"address[]"},{"internalType":"bytes[]","name":"signatures","type":"bytes[]"},{"internalType":"uint32","name":"referenceBlock","type":"uint32"}]}],"stateMutability":"nonpayable","type":"function","name":"handleSignedEnvelope"},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"isValidTriggerId","outputs":[{"internalType":"bool","name":"","type":"bool"}]},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"","type":"uint64"}],"stateMutability":"view","type":"function","name":"signedDatas","outputs":[{"internalType":"bytes","name":"data","type":"bytes"},{"internalType":"struct IWavsServiceHandler.SignatureData","name":"signatureData","type":"tuple","components":[{"internalType":"address[]","name":"signers","type":"address[]"},{"internalType":"bytes[]","name":"signatures","type":"bytes[]"},{"internalType":"uint32","name":"referenceBlock","type":"uint32"}]},{"internalType":"struct IWavsServiceHandler.Envelope","name":"envelope","type":"tuple","components":[{"internalType":"bytes20","name":"eventId","type":"bytes20"},{"internalType":"bytes12","name":"ordering","type":"bytes12"},{"internalType":"bytes","name":"payload","type":"bytes"}]}]},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"","type":"uint64"}],"stateMutability":"view","type":"function","name":"validTriggers","outputs":[{"internalType":"bool","name":"","type":"bool"}]}],"devdoc":{"kind":"dev","methods":{"constructor":{"params":{"serviceManager":"The service manager"}},"getDataWithId(uint64)":{"params":{"triggerId":"The trigger ID"},"returns":{"dataWithId":"The data with ID"}},"getServiceManager()":{"returns":{"_0":"The address of the service manager"}},"getSignedData(uint64)":{"params":{"triggerId":"The trigger ID"},"returns":{"signedData":"The signed data"}},"handleSignedEnvelope((bytes20,bytes12,bytes),(address[],bytes[],uint32))":{"params":{"envelope":"The envelope containing the data.","signatureData":"The signature data."}},"isValidTriggerId(uint64)":{"params":{"triggerId":"The trigger ID to check"},"returns":{"_0":"True if the trigger ID is valid, false otherwise"}}},"version":1},"userdoc":{"kind":"user","methods":{"constructor":{"notice":"Constructor"},"getDataWithId(uint64)":{"notice":"Returns the data with ID for a given trigger ID"},"getServiceManager()":{"notice":"Returns the address of the service manager"},"getSignedData(uint64)":{"notice":"Returns the signed data for a given trigger ID"},"handleSignedEnvelope((bytes20,bytes12,bytes),(address[],bytes[],uint32))":{"notice":"Handles a signed envelope"},"isValidTriggerId(uint64)":{"notice":"Checks if a trigger ID is valid"},"signedDatas(uint64)":{"notice":"Mapping from trigger ID to signed data"},"validTriggers(uint64)":{"notice":"Mapping from trigger ID to valid triggers"}},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":false,"runs":200},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"examples/contracts/solidity/mocks/SimpleSubmit.sol":"SimpleSubmit"},"evmVersion":"prague","libraries":{},"viaIR":true},"sources":{"examples/contracts/solidity/interfaces/IWavsServiceHandler.sol":{"keccak256":"0x427e63f26320f27f53975554ff530953d81fb51b681fca950754b576ce83a267","urls":["bzz-raw://d39520e0561d2f65a04b76c265f7ede71feab34fc0e1bd9f21b868353b9c2b0a","dweb:/ipfs/QmWgvBY8pim9hNLNFDRZyob4PvRmuxEoRSyqABkUNpDcef"],"license":"MIT"},"examples/contracts/solidity/interfaces/IWavsServiceManager.sol":{"keccak256":"0xc4abed1f1f462a601b8f855c6d16bcc97ac9e5eb081f82ca6bedb6420cd1c9b7","urls":["bzz-raw://27c6906e991bbbe4a589b97d3f883bfb66c6b86463f9e1ff0fb68ac9845ef3f1","dweb:/ipfs/QmYh9y385CszJ4m8TSbqLkTwzFwYyUEBX8KNwvHCjEuXWn"],"license":"UNLICENSED"},"examples/contracts/solidity/mocks/ISimpleSubmit.sol":{"keccak256":"0xda7573fb96ece8207cef432837be49e268803b477a3e05dd44c02b49152aa392","urls":["bzz-raw://e4a5a489f203064ae9f529969a859482ed9a3809a33bda62f9a5d0d22372ae89","dweb:/ipfs/QmXQxvFodWcdndsfyJGv7K4BWMs5QbTZeKepfdyxWwAZKZ"],"license":"MIT"},"examples/contracts/solidity/mocks/ISimpleTrigger.sol":{"keccak256":"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814","urls":["bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1","dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG"],"license":"MIT"},"examples/contracts/solidity/mocks/SimpleSubmit.sol":{"keccak256":"0x01f938f4d3c7a6218900578ebc473b9cde798246cfe098da19c145e3332f5674","urls":["bzz-raw://4f635c94e02d29c2cb924975650914fdd6e4e8da0a800280f8685018bdf13352","dweb:/ipfs/QmVELBUj2SkyW1whEY4MXckTCvURrkHyYi9BAxETSHEtKs"],"license":"MIT"}},"version":1},"id":8}
\ No newline at end of file
+{"abi":[{"type":"constructor","inputs":[{"name":"serviceManager","type":"address","internalType":"contract IWavsServiceManager"}],"stateMutability":"nonpayable"},{"type":"function","name":"getDataWithId","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"dataWithId","type":"tuple","internalType":"struct ISimpleSubmit.DataWithId","components":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"},{"name":"data","type":"bytes","internalType":"bytes"}]}],"stateMutability":"view"},{"type":"function","name":"getServiceManager","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"getSignedData","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"signedData","type":"tuple","internalType":"struct ISimpleSubmit.SignedData","components":[{"name":"data","type":"bytes","internalType":"bytes"},{"name":"signatureData","type":"tuple","internalType":"struct IWavsServiceHandler.SignatureData","components":[{"name":"signers","type":"address[]","internalType":"address[]"},{"name":"signatures","type":"bytes[]","internalType":"bytes[]"},{"name":"referenceBlock","type":"uint32","internalType":"uint32"}]},{"name":"envelope","type":"tuple","internalType":"struct IWavsServiceHandler.Envelope","components":[{"name":"eventId","type":"bytes20","internalType":"bytes20"},{"name":"ordering","type":"bytes12","internalType":"bytes12"},{"name":"payload","type":"bytes","internalType":"bytes"}]}]}],"stateMutability":"view"},{"type":"function","name":"handleSignedEnvelope","inputs":[{"name":"envelope","type":"tuple","internalType":"struct IWavsServiceHandler.Envelope","components":[{"name":"eventId","type":"bytes20","internalType":"bytes20"},{"name":"ordering","type":"bytes12","internalType":"bytes12"},{"name":"payload","type":"bytes","internalType":"bytes"}]},{"name":"signatureData","type":"tuple","internalType":"struct IWavsServiceHandler.SignatureData","components":[{"name":"signers","type":"address[]","internalType":"address[]"},{"name":"signatures","type":"bytes[]","internalType":"bytes[]"},{"name":"referenceBlock","type":"uint32","internalType":"uint32"}]}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"isValidTriggerId","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"","type":"bool","internalType":"bool"}],"stateMutability":"view"},{"type":"function","name":"signedDatas","inputs":[{"name":"","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"data","type":"bytes","internalType":"bytes"},{"name":"signatureData","type":"tuple","internalType":"struct IWavsServiceHandler.SignatureData","components":[{"name":"signers","type":"address[]","internalType":"address[]"},{"name":"signatures","type":"bytes[]","internalType":"bytes[]"},{"name":"referenceBlock","type":"uint32","internalType":"uint32"}]},{"name":"envelope","type":"tuple","internalType":"struct IWavsServiceHandler.Envelope","components":[{"name":"eventId","type":"bytes20","internalType":"bytes20"},{"name":"ordering","type":"bytes12","internalType":"bytes12"},{"name":"payload","type":"bytes","internalType":"bytes"}]}],"stateMutability":"view"},{"type":"function","name":"validTriggers","inputs":[{"name":"","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"","type":"bool","internalType":"bool"}],"stateMutability":"view"}],"bytecode":{"object":"0x60a06040523461003f57610019610014610110565b610131565b610021610044565b6120866101378239608051818181610c970152611f10015261208690f35b61004a565b60405190565b5f80fd5b601f801991011690565b634e487b7160e01b5f52604160045260245ffd5b906100769061004e565b810190811060018060401b0382111761008e57604052565b610058565b906100a661009f610044565b928361006c565b565b5f80fd5b60018060a01b031690565b6100c0906100ac565b90565b6100cc906100b7565b90565b6100d8816100c3565b036100df57565b5f80fd5b905051906100f0826100cf565b565b9060208282031261010b57610108915f016100e3565b90565b6100a8565b61012e6121bd8038038061012381610093565b9283398101906100f2565b90565b60805256fe60806040526004361015610013575b610c4d565b61001d5f3561008c565b806326faf60c146100875780633d821004146100825780634dda0b431461007d57806378ecfb4714610078578063aa32d9f414610073578063c053045e1461006e5763f969ff330361000e57610c19565b610b58565b610ad0565b610a9b565b610986565b61091d565b610196565b60e01c90565b60405190565b5f80fd5b5f80fd5b5f80fd5b67ffffffffffffffff1690565b6100ba816100a4565b036100c157565b5f80fd5b905035906100d2826100b1565b565b906020828203126100ed576100ea915f016100c5565b90565b61009c565b90565b61010961010461010e926100a4565b6100f2565b6100a4565b90565b9061011b906100f5565b5f5260205260405f2090565b1c90565b60ff1690565b6101419060086101469302610127565b61012b565b90565b906101549154610131565b90565b61016c906101675f915f92610111565b610149565b90565b151590565b61017d9061016f565b9052565b9190610194905f60208501940190610174565b565b346101c6576101c26101b16101ac3660046100d4565b610157565b6101b9610092565b91829182610181565b0390f35b610098565b906101d5906100f5565b5f5260205260405f2090565b634e487b7160e01b5f52602260045260245ffd5b9060016002830492168015610215575b602083101461021057565b6101e1565b91607f1691610205565b60209181520190565b5f5260205f2090565b905f929180549061024b610244836101f5565b809461021f565b916001811690815f146102a25750600114610266575b505050565b6102739192939450610228565b915f925b81841061028a57505001905f8080610261565b60018160209295939554848601520191019290610277565b92949550505060ff19168252151560200201905f8080610261565b906102c791610231565b90565b601f801991011690565b634e487b7160e01b5f52604160045260245ffd5b906102f2906102ca565b810190811067ffffffffffffffff82111761030c57604052565b6102d4565b9061033161032a92610321610092565b938480926102bd565b03836102e8565b565b5490565b60209181520190565b5f5260205f2090565b60018060a01b031690565b61035d90610349565b90565b61036990610354565b9052565b9061037a81602093610360565b0190565b5f1c90565b60018060a01b031690565b61039a61039f9161037e565b610383565b90565b6103ac905461038e565b90565b60010190565b906103d26103cc6103c584610333565b8093610337565b92610340565b905f5b8181106103e25750505090565b9091926104026103fc6001926103f7876103a2565b61036d565b946103af565b91019190916103d5565b90610416916103b5565b90565b9061043961043292610429610092565b9384809261040c565b03836102e8565b565b52565b5490565b9061045561044e610092565b92836102e8565b565b67ffffffffffffffff811161046f5760208091020190565b6102d4565b9061048661048183610457565b610442565b918252565b5f5260205f2090565b61049d90610311565b90565b906104aa8261043e565b6104b381610474565b926104c1602085019161048b565b5f915b8383106104d15750505050565b6001602081926104e085610494565b8152019201920191906104c4565b52565b63ffffffff1690565b61050661050b9161037e565b6104f1565b90565b61051890546104fa565b90565b63ffffffff1690565b9061052e9061051b565b9052565b61053c6060610442565b90565b9061058e6105856002610550610532565b9461056761055f5f8301610419565b5f880161043b565b61057f610576600183016104a0565b602088016104ee565b0161050e565b60408401610524565b565b60601b90565b61059f90610590565b90565b6105ae6105b39161037e565b610596565b90565b6105c090546105a2565b90565b6bffffffffffffffffffffffff191690565b906105df906105c3565b9052565b60a01c90565b60a01b90565b6105f8906105e9565b90565b61060761060c916105e3565b6105ef565b90565b61061990546105fb565b90565b6bffffffffffffffffffffffff60a01b1690565b9061063a9061061c565b9052565b52565b61064b6060610442565b90565b9061069c610693600161065f610641565b9461067661066e5f83016105b6565b5f88016105d5565b61068d6106845f830161060f565b60208801610630565b01610311565b6040840161063e565b565b6106a99060016101cb565b6106b45f8201610311565b916106cd60046106c66001850161053f565b930161064e565b90565b5190565b60209181520190565b90825f9392825e0152565b610707610710602093610715936106fe816106d0565b938480936106d4565b958691016106dd565b6102ca565b0190565b5190565b60200190565b60200190565b9061074661074061073984610719565b8093610337565b9261071d565b905f5b8181106107565750505090565b90919261076f610769600192865161036d565b94610723565b9101919091610749565b5190565b60209181520190565b60200190565b6107ab6107b46020936107b9936107a2816106d0565b9384809361021f565b958691016106dd565b6102ca565b0190565b906107c79161078c565b90565b60200190565b906107e46107dd83610779565b809261077d565b90816107f560208302840194610786565b925f915b83831061080857505050505090565b9091929394602061082a610824838560019503875289516107bd565b976107ca565b93019301919392906107f9565b6108409061051b565b9052565b9061088390604080610878610866606085015f8801518682035f880152610729565b602087015185820360208701526107d0565b940151910190610837565b90565b61088f906105c3565b9052565b61089c9061061c565b9052565b6108dd91604060608201926108bb5f8201515f850190610886565b6108cd60208201516020850190610893565b015190604081840391015261078c565b90565b9161090c906108fe61091a959360608601908682035f8801526106e8565b908482036020860152610844565b9160408184039101526108a0565b90565b346109505761094c6109386109333660046100d4565b61069e565b610943939193610092565b938493846108e0565b0390f35b610098565b5f91031261095f57565b61009c565b61096d90610354565b9052565b9190610984905f60208501940190610964565b565b346109b657610996366004610955565b6109b26109a1610c89565b6109a9610092565b91829182610971565b0390f35b610098565b906109fa906040806109ef6109dd606085015f8801518682035f880152610729565b602087015185820360208701526107d0565b940151910190610837565b90565b610a3a9160406060820192610a185f8201515f850190610886565b610a2a60208201516020850190610893565b015190604081840391015261078c565b90565b610a80916040610a6f610a5d606084015f8601518582035f87015261078c565b602085015184820360208601526109bb565b9201519060408184039101526109fd565b90565b610a989160208201915f818403910152610a3d565b90565b34610acb57610ac7610ab6610ab13660046100d4565b610e00565b610abe610092565b91829182610a83565b0390f35b610098565b34610b0057610afc610aeb610ae63660046100d4565b610e44565b610af3610092565b91829182610181565b0390f35b610098565b610b0e906100f5565b9052565b610b3d9160206040820192610b2d5f8201515f850190610b05565b015190602081840391015261078c565b90565b610b559160208201915f818403910152610b12565b90565b34610b8857610b84610b73610b6e3660046100d4565b610ebf565b610b7b610092565b91829182610b40565b0390f35b610098565b5f80fd5b90816060910312610b9f5790565b610b8d565b90816060910312610bb25790565b610b8d565b919091604081840312610c0f575f81013567ffffffffffffffff8111610c0a5783610be3918301610b91565b92602082013567ffffffffffffffff8111610c0557610c029201610ba4565b90565b6100a0565b6100a0565b61009c565b5f0190565b34610c4857610c32610c2c366004610bb7565b90611f0b565b610c3a610092565b80610c4481610c14565b0390f35b610098565b5f80fd5b5f90565b610c69610c64610c6e92610349565b6100f2565b610349565b90565b610c7a90610c55565b90565b610c8690610c71565b90565b610c91610c51565b50610cbb7f0000000000000000000000000000000000000000000000000000000000000000610c7d565b90565b610cc86060610442565b90565b606090565b606090565b606090565b5f90565b610ce6610532565b906020808084610cf4610cd0565b815201610cff610cd5565b815201610d0a610cda565b81525050565b610d18610cde565b90565b5f90565b5f90565b610d2b610641565b906020808084610d39610d1b565b815201610d44610d1f565b815201610d4f610ccb565b81525050565b610d5d610d23565b90565b610d68610cbe565b906020808084610d76610ccb565b815201610d81610d10565b815201610d8c610d55565b81525050565b610d9a610d60565b90565b52565b52565b90610df2610de96004610db4610cbe565b94610dcb610dc35f8301610311565b5f880161063e565b610de3610dda6001830161053f565b60208801610d9d565b0161064e565b60408401610da0565b565b610dfd90610da3565b90565b610e17610e1c91610e0f610d92565b5060016101cb565b610df4565b90565b5f90565b610e2f610e349161037e565b61012b565b90565b610e419054610e23565b90565b610e5a610e5f91610e53610e1f565b505f610111565b610e37565b90565b610e6c6040610442565b90565b5f90565b610e7b610e62565b9060208083610e88610e6f565b815201610e93610ccb565b81525050565b610ea1610e73565b90565b610eae6040610442565b90565b90610ebb906100a4565b9052565b610ec7610e99565b50610eff5f610ee0610edb600185906101cb565b610df4565b0151610ef6610eed610ea4565b935f8501610eb1565b6020830161063e565b90565b5f80fd5b60e01b90565b5f910312610f1657565b61009c565b610f24816105c3565b03610f2b57565b5f80fd5b90503590610f3c82610f1b565b565b50610f4d906020810190610f2f565b90565b610f598161061c565b03610f6057565b5f80fd5b90503590610f7182610f50565b565b50610f82906020810190610f64565b90565b5f80fd5b5f80fd5b5f80fd5b9035600160200382360303811215610fd257016020813591019167ffffffffffffffff8211610fcd576001820236038313610fc857565b610f89565b610f85565b610f8d565b90825f939282370152565b9190610ffc81610ff5816110019561021f565b8095610fd7565b6102ca565b0190565b61105b9161104d60608201926110296110205f830183610f3e565b5f850190610886565b6110436110396020830183610f73565b6020850190610893565b6040810190610f91565b916040818503910152610fe2565b90565b903560016020038236030381121561109f57016020813591019167ffffffffffffffff821161109a57602082023603831361109557565b610f89565b610f85565b610f8d565b90565b6110b081610354565b036110b757565b5f80fd5b905035906110c8826110a7565b565b506110d99060208101906110bb565b90565b60200190565b916110f0826110f692610337565b926110a4565b90815f905b828210611109575050505090565b9091929361112b61112560019261112088866110ca565b61036d565b956110dc565b9201909291926110fb565b903560016020038236030381121561117757016020813591019167ffffffffffffffff821161117257602082023603831361116d57565b610f89565b610f85565b610f8d565b90565b9061118a9291610fe2565b90565b60200190565b918161119e9161077d565b90816111af6020830284019461117c565b92835f925b8484106111c45750505050505090565b90919293949560206111f06111ea83856001950388526111e48b88610f91565b9061117f565b9861118d565b9401940192949391906111b4565b6112078161051b565b0361120e57565b5f80fd5b9050359061121f826111fe565b565b50611230906020810190611212565b90565b9061128d90604061128561127b611260606085016112535f89018961105e565b908783035f8901526110e2565b61126d6020880188611136565b908683036020880152611193565b9482810190611221565b910190610837565b90565b90916112aa6112b89360408401908482035f860152611005565b916020818403910152611233565b90565b6112c3610092565b3d5f823e3d90fd5b5f80fd5b5f80fd5b5f80fd5b903590600160200381360303821215611319570180359067ffffffffffffffff82116113145760200191600182023603831361130f57565b6112d3565b6112cf565b6112cb565b5f80fd5b5f80fd5b5f80fd5b5f80fd5b67ffffffffffffffff811161134c576113486020916102ca565b0190565b6102d4565b909291926113666113618261132e565b610442565b938185526020850190828401116113825761138092610fd7565b565b61132a565b9080601f830112156113a5578160206113a293359101611351565b90565b611326565b9190916040818403126113fc576113c16040610442565b926113ce815f84016100c5565b5f850152602082013567ffffffffffffffff81116113f7576113f09201611387565b6020830152565b611322565b61131e565b90602082820312611431575f82013567ffffffffffffffff811161142c5761142992016113aa565b90565b6100a0565b61009c565b6114406060610442565b90565b67ffffffffffffffff811161145b5760208091020190565b6102d4565b5f80fd5b9092919261147961147482611443565b610442565b93818552602080860192028301928184116114b657915b83831061149d5750505050565b602080916114ab84866110bb565b815201920191611490565b611460565b9080601f830112156114d9578160206114d693359101611464565b90565b611326565b9291906114f26114ed82610457565b610442565b93818552602080860192028101918383116115495781905b838210611518575050505050565b813567ffffffffffffffff8111611544576020916115398784938701611387565b81520191019061150a565b611326565b611460565b9080601f8301121561156c57816020611569933591016114de565b90565b611326565b9190916060818403126115ee576115886060610442565b925f82013567ffffffffffffffff81116115e957816115a89184016114bb565b5f85015260208201359167ffffffffffffffff83116115e4576115d0826115dd94830161154e565b6020860152604001611212565b6040830152565b611322565b611322565b61131e565b6115fe903690611571565b90565b919091606081840312611665576116186060610442565b92611625815f8401610f2f565b5f8501526116368160208401610f64565b6020850152604082013567ffffffffffffffff8111611660576116599201611387565b6040830152565b611322565b61131e565b611675903690611601565b90565b61168290516100a4565b90565b634e487b7160e01b5f525f60045260245ffd5b5190565b601f602091010490565b1b90565b919060086116c59102916116bf5f19846116a6565b926116a6565b9181191691161790565b90565b6116e66116e16116eb926116cf565b6100f2565b6116cf565b90565b90565b919061170761170261170f936116d2565b6116ee565b9083546116aa565b9055565b5f90565b61172991611723611713565b916116f1565b565b5b818110611737575050565b806117445f600193611717565b0161172c565b9190601f811161175a575b505050565b61176661178b93610228565b9060206117728461169c565b83019310611793575b6117849061169c565b019061172b565b5f8080611755565b91506117848192905061177b565b906117b1905f1990600802610127565b191690565b816117c0916117a1565b906002021790565b906117d2816106d0565b9067ffffffffffffffff8211611892576117f6826117f085546101f5565b8561174a565b602090601f831160011461182a57918091611819935f9261181e575b50506117b6565b90555b565b90915001515f80611812565b601f1983169161183985610228565b925f5b81811061187a57509160029391856001969410611860575b5050500201905561181c565b611870910151601f8416906117a1565b90555f8080611854565b9193602060018192878701518155019501920161183c565b6102d4565b906118a1916117c8565b565b5190565b5190565b600190818003010490565b5b8181106118c2575050565b806118cf5f600193611717565b016118b7565b906118e8905f1990602003600802610127565b8154169055565b90918281106118fe575b505050565b61191c611916611910611927956118ab565b926118ab565b92610340565b9182019101906118b6565b5f80806118f9565b90680100000000000000008111611958578161194d61195693610333565b908281556118ef565b565b6102d4565b6119679051610354565b90565b90565b61197682610719565b9167ffffffffffffffff83116119d9576119a461199e600192611999868661192f565b61071d565b92610340565b9204915f5b8381106119b65750505050565b60019060206119cc6119c78661195d565b61196a565b94019381840155016119a9565b6102d4565b906119e89161196d565b565b5190565b600190818003010490565b905f91611a10611a0882610228565b9283546117b6565b905555565b919290602082105f14611a6e57601f8411600114611a3e57611a389293506117b6565b90555b5b565b5090611a64611a69936001611a5b611a5585610228565b9261169c565b8201910161172b565b6119f9565b611a3b565b50611aa58293611a7f600194610228565b611a9e611a8b8561169c565b820192601f861680611ab0575b5061169c565b019061172b565b600202179055611a3c565b611abc908886036118d5565b5f611a98565b929091680100000000000000008211611b22576020115f14611b1357602081105f14611af757611af1916117b6565b90555b5b565b60019160ff1916611b0784610228565b55600202019055611af4565b60019150600202019055611af5565b6102d4565b908154611b33816101f5565b90818311611b5c575b818310611b4a575b50505050565b611b5393611a15565b5f808080611b44565b611b6883838387611ac2565b611b3c565b5f611b7791611b27565b565b905f03611b8b57611b8990611b6d565b565b611685565b5b818110611b9c575050565b80611ba95f600193611b79565b01611b91565b9091828110611bbe575b505050565b611bdc611bd6611bd0611be7956119ee565b926119ee565b9261048b565b918201910190611b90565b5f8080611bb9565b90680100000000000000008111611c185781611c0d611c169361043e565b90828155611baf565b565b6102d4565b611c42611c3c611c2c84610779565b93611c378585611bef565b610786565b9161048b565b5f915b838310611c525750505050565b6001602082611c6a611c648495611698565b86611897565b01920192019190611c45565b90611c8091611c1d565b565b611c8c905161051b565b90565b5f1b90565b90611ca363ffffffff91611c8f565b9181191691161790565b611cc1611cbc611cc69261051b565b6100f2565b61051b565b90565b90565b90611ce1611cdc611ce892611cad565b611cc9565b8254611c94565b9055565b90611d3060406002611d3694611d0f5f8201611d095f88016118a7565b906119de565b611d2860018201611d22602088016119ea565b90611c76565b019201611c82565b90611ccc565b565b90611d4291611cec565b565b5190565b611d5290516105c3565b90565b90611d6660018060a01b0391611c8f565b9181191691161790565b611d79906105c3565b90565b60601c90565b611d8b90611d7c565b90565b90611da3611d9e611daa92611d70565b611d82565b8254611d55565b9055565b611db8905161061c565b90565b90611dd56bffffffffffffffffffffffff60a01b916105e9565b9181191691161790565b611de89061061c565b90565b611df4906105e3565b90565b90611e0c611e07611e1392611ddf565b611deb565b8254611dbb565b9055565b90611e5a60406001611e6094611e3a5f8201611e345f8801611d48565b90611d8e565b611e525f8201611e4c60208801611dae565b90611df7565b019201611698565b90611897565b565b90611e6c91611e17565b565b90611eb260406004611eb894611e915f8201611e8b5f8801611698565b90611897565b611eaa60018201611ea4602088016118a3565b90611d38565b019201611d44565b90611e62565b565b90611ec491611e6e565b565b90611ed260ff91611c8f565b9181191691161790565b611ee59061016f565b90565b90565b90611f00611efb611f0792611edc565b611ee8565b8254611ec6565b9055565b611f347f0000000000000000000000000000000000000000000000000000000000000000610c7d565b9163cd71589e828294803b1561204b57611f605f93611f6b611f54610092565b98899586948594610f06565b845260048401611290565b03915afa9081156120465761201893611ffb9261201a575b50611fe0611fd7611fa3611f9b8660408101906112d7565b810190611401565b94611fd2611fc9602088015195611fc4611fbb611436565b975f890161063e565b6115f3565b60208601610d9d565b61166a565b60408301610da0565b611ff66001611ff05f8601611678565b906101cb565b611eba565b61201360019161200d5f809201611678565b90610111565b611eeb565b565b612039905f3d811161203f575b61203181836102e8565b810190610f0c565b5f611f83565b503d612027565b6112bb565b610f0256fea2646970667358221220363e2a421137e3e35665e12fb0e060cf18eb7c1fea8a779a2c062c2a06a9931864736f6c634300081c0033","sourceMap":"503:2330:11:-:0;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;:::i;:::-;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;:::o;990:112::-;1062:33;;990:112::o","linkReferences":{}},"deployedBytecode":{"object":"0x60806040526004361015610013575b610c4d565b61001d5f3561008c565b806326faf60c146100875780633d821004146100825780634dda0b431461007d57806378ecfb4714610078578063aa32d9f414610073578063c053045e1461006e5763f969ff330361000e57610c19565b610b58565b610ad0565b610a9b565b610986565b61091d565b610196565b60e01c90565b60405190565b5f80fd5b5f80fd5b5f80fd5b67ffffffffffffffff1690565b6100ba816100a4565b036100c157565b5f80fd5b905035906100d2826100b1565b565b906020828203126100ed576100ea915f016100c5565b90565b61009c565b90565b61010961010461010e926100a4565b6100f2565b6100a4565b90565b9061011b906100f5565b5f5260205260405f2090565b1c90565b60ff1690565b6101419060086101469302610127565b61012b565b90565b906101549154610131565b90565b61016c906101675f915f92610111565b610149565b90565b151590565b61017d9061016f565b9052565b9190610194905f60208501940190610174565b565b346101c6576101c26101b16101ac3660046100d4565b610157565b6101b9610092565b91829182610181565b0390f35b610098565b906101d5906100f5565b5f5260205260405f2090565b634e487b7160e01b5f52602260045260245ffd5b9060016002830492168015610215575b602083101461021057565b6101e1565b91607f1691610205565b60209181520190565b5f5260205f2090565b905f929180549061024b610244836101f5565b809461021f565b916001811690815f146102a25750600114610266575b505050565b6102739192939450610228565b915f925b81841061028a57505001905f8080610261565b60018160209295939554848601520191019290610277565b92949550505060ff19168252151560200201905f8080610261565b906102c791610231565b90565b601f801991011690565b634e487b7160e01b5f52604160045260245ffd5b906102f2906102ca565b810190811067ffffffffffffffff82111761030c57604052565b6102d4565b9061033161032a92610321610092565b938480926102bd565b03836102e8565b565b5490565b60209181520190565b5f5260205f2090565b60018060a01b031690565b61035d90610349565b90565b61036990610354565b9052565b9061037a81602093610360565b0190565b5f1c90565b60018060a01b031690565b61039a61039f9161037e565b610383565b90565b6103ac905461038e565b90565b60010190565b906103d26103cc6103c584610333565b8093610337565b92610340565b905f5b8181106103e25750505090565b9091926104026103fc6001926103f7876103a2565b61036d565b946103af565b91019190916103d5565b90610416916103b5565b90565b9061043961043292610429610092565b9384809261040c565b03836102e8565b565b52565b5490565b9061045561044e610092565b92836102e8565b565b67ffffffffffffffff811161046f5760208091020190565b6102d4565b9061048661048183610457565b610442565b918252565b5f5260205f2090565b61049d90610311565b90565b906104aa8261043e565b6104b381610474565b926104c1602085019161048b565b5f915b8383106104d15750505050565b6001602081926104e085610494565b8152019201920191906104c4565b52565b63ffffffff1690565b61050661050b9161037e565b6104f1565b90565b61051890546104fa565b90565b63ffffffff1690565b9061052e9061051b565b9052565b61053c6060610442565b90565b9061058e6105856002610550610532565b9461056761055f5f8301610419565b5f880161043b565b61057f610576600183016104a0565b602088016104ee565b0161050e565b60408401610524565b565b60601b90565b61059f90610590565b90565b6105ae6105b39161037e565b610596565b90565b6105c090546105a2565b90565b6bffffffffffffffffffffffff191690565b906105df906105c3565b9052565b60a01c90565b60a01b90565b6105f8906105e9565b90565b61060761060c916105e3565b6105ef565b90565b61061990546105fb565b90565b6bffffffffffffffffffffffff60a01b1690565b9061063a9061061c565b9052565b52565b61064b6060610442565b90565b9061069c610693600161065f610641565b9461067661066e5f83016105b6565b5f88016105d5565b61068d6106845f830161060f565b60208801610630565b01610311565b6040840161063e565b565b6106a99060016101cb565b6106b45f8201610311565b916106cd60046106c66001850161053f565b930161064e565b90565b5190565b60209181520190565b90825f9392825e0152565b610707610710602093610715936106fe816106d0565b938480936106d4565b958691016106dd565b6102ca565b0190565b5190565b60200190565b60200190565b9061074661074061073984610719565b8093610337565b9261071d565b905f5b8181106107565750505090565b90919261076f610769600192865161036d565b94610723565b9101919091610749565b5190565b60209181520190565b60200190565b6107ab6107b46020936107b9936107a2816106d0565b9384809361021f565b958691016106dd565b6102ca565b0190565b906107c79161078c565b90565b60200190565b906107e46107dd83610779565b809261077d565b90816107f560208302840194610786565b925f915b83831061080857505050505090565b9091929394602061082a610824838560019503875289516107bd565b976107ca565b93019301919392906107f9565b6108409061051b565b9052565b9061088390604080610878610866606085015f8801518682035f880152610729565b602087015185820360208701526107d0565b940151910190610837565b90565b61088f906105c3565b9052565b61089c9061061c565b9052565b6108dd91604060608201926108bb5f8201515f850190610886565b6108cd60208201516020850190610893565b015190604081840391015261078c565b90565b9161090c906108fe61091a959360608601908682035f8801526106e8565b908482036020860152610844565b9160408184039101526108a0565b90565b346109505761094c6109386109333660046100d4565b61069e565b610943939193610092565b938493846108e0565b0390f35b610098565b5f91031261095f57565b61009c565b61096d90610354565b9052565b9190610984905f60208501940190610964565b565b346109b657610996366004610955565b6109b26109a1610c89565b6109a9610092565b91829182610971565b0390f35b610098565b906109fa906040806109ef6109dd606085015f8801518682035f880152610729565b602087015185820360208701526107d0565b940151910190610837565b90565b610a3a9160406060820192610a185f8201515f850190610886565b610a2a60208201516020850190610893565b015190604081840391015261078c565b90565b610a80916040610a6f610a5d606084015f8601518582035f87015261078c565b602085015184820360208601526109bb565b9201519060408184039101526109fd565b90565b610a989160208201915f818403910152610a3d565b90565b34610acb57610ac7610ab6610ab13660046100d4565b610e00565b610abe610092565b91829182610a83565b0390f35b610098565b34610b0057610afc610aeb610ae63660046100d4565b610e44565b610af3610092565b91829182610181565b0390f35b610098565b610b0e906100f5565b9052565b610b3d9160206040820192610b2d5f8201515f850190610b05565b015190602081840391015261078c565b90565b610b559160208201915f818403910152610b12565b90565b34610b8857610b84610b73610b6e3660046100d4565b610ebf565b610b7b610092565b91829182610b40565b0390f35b610098565b5f80fd5b90816060910312610b9f5790565b610b8d565b90816060910312610bb25790565b610b8d565b919091604081840312610c0f575f81013567ffffffffffffffff8111610c0a5783610be3918301610b91565b92602082013567ffffffffffffffff8111610c0557610c029201610ba4565b90565b6100a0565b6100a0565b61009c565b5f0190565b34610c4857610c32610c2c366004610bb7565b90611f0b565b610c3a610092565b80610c4481610c14565b0390f35b610098565b5f80fd5b5f90565b610c69610c64610c6e92610349565b6100f2565b610349565b90565b610c7a90610c55565b90565b610c8690610c71565b90565b610c91610c51565b50610cbb7f0000000000000000000000000000000000000000000000000000000000000000610c7d565b90565b610cc86060610442565b90565b606090565b606090565b606090565b5f90565b610ce6610532565b906020808084610cf4610cd0565b815201610cff610cd5565b815201610d0a610cda565b81525050565b610d18610cde565b90565b5f90565b5f90565b610d2b610641565b906020808084610d39610d1b565b815201610d44610d1f565b815201610d4f610ccb565b81525050565b610d5d610d23565b90565b610d68610cbe565b906020808084610d76610ccb565b815201610d81610d10565b815201610d8c610d55565b81525050565b610d9a610d60565b90565b52565b52565b90610df2610de96004610db4610cbe565b94610dcb610dc35f8301610311565b5f880161063e565b610de3610dda6001830161053f565b60208801610d9d565b0161064e565b60408401610da0565b565b610dfd90610da3565b90565b610e17610e1c91610e0f610d92565b5060016101cb565b610df4565b90565b5f90565b610e2f610e349161037e565b61012b565b90565b610e419054610e23565b90565b610e5a610e5f91610e53610e1f565b505f610111565b610e37565b90565b610e6c6040610442565b90565b5f90565b610e7b610e62565b9060208083610e88610e6f565b815201610e93610ccb565b81525050565b610ea1610e73565b90565b610eae6040610442565b90565b90610ebb906100a4565b9052565b610ec7610e99565b50610eff5f610ee0610edb600185906101cb565b610df4565b0151610ef6610eed610ea4565b935f8501610eb1565b6020830161063e565b90565b5f80fd5b60e01b90565b5f910312610f1657565b61009c565b610f24816105c3565b03610f2b57565b5f80fd5b90503590610f3c82610f1b565b565b50610f4d906020810190610f2f565b90565b610f598161061c565b03610f6057565b5f80fd5b90503590610f7182610f50565b565b50610f82906020810190610f64565b90565b5f80fd5b5f80fd5b5f80fd5b9035600160200382360303811215610fd257016020813591019167ffffffffffffffff8211610fcd576001820236038313610fc857565b610f89565b610f85565b610f8d565b90825f939282370152565b9190610ffc81610ff5816110019561021f565b8095610fd7565b6102ca565b0190565b61105b9161104d60608201926110296110205f830183610f3e565b5f850190610886565b6110436110396020830183610f73565b6020850190610893565b6040810190610f91565b916040818503910152610fe2565b90565b903560016020038236030381121561109f57016020813591019167ffffffffffffffff821161109a57602082023603831361109557565b610f89565b610f85565b610f8d565b90565b6110b081610354565b036110b757565b5f80fd5b905035906110c8826110a7565b565b506110d99060208101906110bb565b90565b60200190565b916110f0826110f692610337565b926110a4565b90815f905b828210611109575050505090565b9091929361112b61112560019261112088866110ca565b61036d565b956110dc565b9201909291926110fb565b903560016020038236030381121561117757016020813591019167ffffffffffffffff821161117257602082023603831361116d57565b610f89565b610f85565b610f8d565b90565b9061118a9291610fe2565b90565b60200190565b918161119e9161077d565b90816111af6020830284019461117c565b92835f925b8484106111c45750505050505090565b90919293949560206111f06111ea83856001950388526111e48b88610f91565b9061117f565b9861118d565b9401940192949391906111b4565b6112078161051b565b0361120e57565b5f80fd5b9050359061121f826111fe565b565b50611230906020810190611212565b90565b9061128d90604061128561127b611260606085016112535f89018961105e565b908783035f8901526110e2565b61126d6020880188611136565b908683036020880152611193565b9482810190611221565b910190610837565b90565b90916112aa6112b89360408401908482035f860152611005565b916020818403910152611233565b90565b6112c3610092565b3d5f823e3d90fd5b5f80fd5b5f80fd5b5f80fd5b903590600160200381360303821215611319570180359067ffffffffffffffff82116113145760200191600182023603831361130f57565b6112d3565b6112cf565b6112cb565b5f80fd5b5f80fd5b5f80fd5b5f80fd5b67ffffffffffffffff811161134c576113486020916102ca565b0190565b6102d4565b909291926113666113618261132e565b610442565b938185526020850190828401116113825761138092610fd7565b565b61132a565b9080601f830112156113a5578160206113a293359101611351565b90565b611326565b9190916040818403126113fc576113c16040610442565b926113ce815f84016100c5565b5f850152602082013567ffffffffffffffff81116113f7576113f09201611387565b6020830152565b611322565b61131e565b90602082820312611431575f82013567ffffffffffffffff811161142c5761142992016113aa565b90565b6100a0565b61009c565b6114406060610442565b90565b67ffffffffffffffff811161145b5760208091020190565b6102d4565b5f80fd5b9092919261147961147482611443565b610442565b93818552602080860192028301928184116114b657915b83831061149d5750505050565b602080916114ab84866110bb565b815201920191611490565b611460565b9080601f830112156114d9578160206114d693359101611464565b90565b611326565b9291906114f26114ed82610457565b610442565b93818552602080860192028101918383116115495781905b838210611518575050505050565b813567ffffffffffffffff8111611544576020916115398784938701611387565b81520191019061150a565b611326565b611460565b9080601f8301121561156c57816020611569933591016114de565b90565b611326565b9190916060818403126115ee576115886060610442565b925f82013567ffffffffffffffff81116115e957816115a89184016114bb565b5f85015260208201359167ffffffffffffffff83116115e4576115d0826115dd94830161154e565b6020860152604001611212565b6040830152565b611322565b611322565b61131e565b6115fe903690611571565b90565b919091606081840312611665576116186060610442565b92611625815f8401610f2f565b5f8501526116368160208401610f64565b6020850152604082013567ffffffffffffffff8111611660576116599201611387565b6040830152565b611322565b61131e565b611675903690611601565b90565b61168290516100a4565b90565b634e487b7160e01b5f525f60045260245ffd5b5190565b601f602091010490565b1b90565b919060086116c59102916116bf5f19846116a6565b926116a6565b9181191691161790565b90565b6116e66116e16116eb926116cf565b6100f2565b6116cf565b90565b90565b919061170761170261170f936116d2565b6116ee565b9083546116aa565b9055565b5f90565b61172991611723611713565b916116f1565b565b5b818110611737575050565b806117445f600193611717565b0161172c565b9190601f811161175a575b505050565b61176661178b93610228565b9060206117728461169c565b83019310611793575b6117849061169c565b019061172b565b5f8080611755565b91506117848192905061177b565b906117b1905f1990600802610127565b191690565b816117c0916117a1565b906002021790565b906117d2816106d0565b9067ffffffffffffffff8211611892576117f6826117f085546101f5565b8561174a565b602090601f831160011461182a57918091611819935f9261181e575b50506117b6565b90555b565b90915001515f80611812565b601f1983169161183985610228565b925f5b81811061187a57509160029391856001969410611860575b5050500201905561181c565b611870910151601f8416906117a1565b90555f8080611854565b9193602060018192878701518155019501920161183c565b6102d4565b906118a1916117c8565b565b5190565b5190565b600190818003010490565b5b8181106118c2575050565b806118cf5f600193611717565b016118b7565b906118e8905f1990602003600802610127565b8154169055565b90918281106118fe575b505050565b61191c611916611910611927956118ab565b926118ab565b92610340565b9182019101906118b6565b5f80806118f9565b90680100000000000000008111611958578161194d61195693610333565b908281556118ef565b565b6102d4565b6119679051610354565b90565b90565b61197682610719565b9167ffffffffffffffff83116119d9576119a461199e600192611999868661192f565b61071d565b92610340565b9204915f5b8381106119b65750505050565b60019060206119cc6119c78661195d565b61196a565b94019381840155016119a9565b6102d4565b906119e89161196d565b565b5190565b600190818003010490565b905f91611a10611a0882610228565b9283546117b6565b905555565b919290602082105f14611a6e57601f8411600114611a3e57611a389293506117b6565b90555b5b565b5090611a64611a69936001611a5b611a5585610228565b9261169c565b8201910161172b565b6119f9565b611a3b565b50611aa58293611a7f600194610228565b611a9e611a8b8561169c565b820192601f861680611ab0575b5061169c565b019061172b565b600202179055611a3c565b611abc908886036118d5565b5f611a98565b929091680100000000000000008211611b22576020115f14611b1357602081105f14611af757611af1916117b6565b90555b5b565b60019160ff1916611b0784610228565b55600202019055611af4565b60019150600202019055611af5565b6102d4565b908154611b33816101f5565b90818311611b5c575b818310611b4a575b50505050565b611b5393611a15565b5f808080611b44565b611b6883838387611ac2565b611b3c565b5f611b7791611b27565b565b905f03611b8b57611b8990611b6d565b565b611685565b5b818110611b9c575050565b80611ba95f600193611b79565b01611b91565b9091828110611bbe575b505050565b611bdc611bd6611bd0611be7956119ee565b926119ee565b9261048b565b918201910190611b90565b5f8080611bb9565b90680100000000000000008111611c185781611c0d611c169361043e565b90828155611baf565b565b6102d4565b611c42611c3c611c2c84610779565b93611c378585611bef565b610786565b9161048b565b5f915b838310611c525750505050565b6001602082611c6a611c648495611698565b86611897565b01920192019190611c45565b90611c8091611c1d565b565b611c8c905161051b565b90565b5f1b90565b90611ca363ffffffff91611c8f565b9181191691161790565b611cc1611cbc611cc69261051b565b6100f2565b61051b565b90565b90565b90611ce1611cdc611ce892611cad565b611cc9565b8254611c94565b9055565b90611d3060406002611d3694611d0f5f8201611d095f88016118a7565b906119de565b611d2860018201611d22602088016119ea565b90611c76565b019201611c82565b90611ccc565b565b90611d4291611cec565b565b5190565b611d5290516105c3565b90565b90611d6660018060a01b0391611c8f565b9181191691161790565b611d79906105c3565b90565b60601c90565b611d8b90611d7c565b90565b90611da3611d9e611daa92611d70565b611d82565b8254611d55565b9055565b611db8905161061c565b90565b90611dd56bffffffffffffffffffffffff60a01b916105e9565b9181191691161790565b611de89061061c565b90565b611df4906105e3565b90565b90611e0c611e07611e1392611ddf565b611deb565b8254611dbb565b9055565b90611e5a60406001611e6094611e3a5f8201611e345f8801611d48565b90611d8e565b611e525f8201611e4c60208801611dae565b90611df7565b019201611698565b90611897565b565b90611e6c91611e17565b565b90611eb260406004611eb894611e915f8201611e8b5f8801611698565b90611897565b611eaa60018201611ea4602088016118a3565b90611d38565b019201611d44565b90611e62565b565b90611ec491611e6e565b565b90611ed260ff91611c8f565b9181191691161790565b611ee59061016f565b90565b90565b90611f00611efb611f0792611edc565b611ee8565b8254611ec6565b9055565b611f347f0000000000000000000000000000000000000000000000000000000000000000610c7d565b9163cd71589e828294803b1561204b57611f605f93611f6b611f54610092565b98899586948594610f06565b845260048401611290565b03915afa9081156120465761201893611ffb9261201a575b50611fe0611fd7611fa3611f9b8660408101906112d7565b810190611401565b94611fd2611fc9602088015195611fc4611fbb611436565b975f890161063e565b6115f3565b60208601610d9d565b61166a565b60408301610da0565b611ff66001611ff05f8601611678565b906101cb565b611eba565b61201360019161200d5f809201611678565b90610111565b611eeb565b565b612039905f3d811161203f575b61203181836102e8565b810190610f0c565b5f611f83565b503d612027565b6112bb565b610f0256fea2646970667358221220363e2a421137e3e35665e12fb0e060cf18eb7c1fea8a779a2c062c2a06a9931864736f6c634300081c0033","sourceMap":"503:2330:11:-:0;;;;;;;;;-1:-1:-1;503:2330:11;:::i;:::-;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;:::o;:::-;;;;:::o;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;:::o;:::-;;;;:::o;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::o;688:62::-;;;;;;;;;:::i;:::-;;:::i;:::-;;:::o;503:2330::-;;;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;:::o;:::-;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;:::i;:::-;;;:::o;:::-;;;;:::o;:::-;;;;;;;;:::o;:::-;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;:::o;:::-;;:::o;:::-;;;:::o;:::-;;;;;:::i;:::-;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;;:::o;:::-;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;;;:::o;:::-;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;:::i;:::-;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;:::o;:::-;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;:::o;:::-;;;;;:::i;:::-;;;:::o;:::-;;;;:::o;:::-;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;:::o;:::-;;;;;:::i;:::-;;;:::o;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;:::o;811:80::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;:::i;:::-;;;;:::i;:::-;;:::o;503:2330::-;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;;;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;:::o;:::-;;;;:::o;:::-;;;;:::o;:::-;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;:::o;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;:::o;:::-;;;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;2721:110::-;2773:7;;:::i;:::-;2807:16;2799:25;2807:16;2799:25;:::i;:::-;2792:32;:::o;503:2330::-;;;;:::i;:::-;;:::o;:::-;;;:::o;:::-;;;:::o;:::-;;;:::o;:::-;;;:::o;:::-;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::o;:::-;;;:::i;:::-;;:::o;:::-;;;:::o;:::-;;;:::o;:::-;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::o;:::-;;;:::i;:::-;;:::o;:::-;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::o;:::-;;;:::i;:::-;;:::o;:::-;;:::o;:::-;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;:::o;:::-;;;;:::i;:::-;;:::o;2125:192::-;2288:22;2275:35;2125:192;2221:42;;:::i;:::-;2288:11;;:22;:::i;:::-;2275:35;:::i;:::-;2125:192;:::o;503:2330::-;;;:::o;:::-;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;1932:153::-;2054:24;;1932:153;2031:4;;:::i;:::-;2054:13;;:24;:::i;:::-;;:::i;:::-;2047:31;:::o;503:2330::-;;;;:::i;:::-;;:::o;:::-;;;:::o;:::-;;;:::i;:::-;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::o;:::-;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;:::o;2357:318::-;2453:42;;:::i;:::-;2552:11;2597:71;2651:15;2507:67;2552:22;:11;2564:9;2552:22;;:::i;:::-;2507:67;:::i;:::-;2651:15;;2597:71;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::i;:::-;2357:318;:::o;503:2330::-;;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;:::i;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;;;;;;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;:::o;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::o;:::-;;:::i;:::-;;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;:::o;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;;;:::o;:::-;;;:::o;:::-;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;:::i;:::-;;;;;;:::o;:::-;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;:::i;:::-;:::o;:::-;;;:::o;:::-;;;:::o;:::-;;;;;;;;;:::o;:::-;;;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;:::i;:::-;;;;;;:::o;:::-;;;;;;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;:::o;:::-;;:::i;:::-;;;;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;:::i;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;;;:::i;:::-;:::o;:::-;;;:::o;:::-;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;:::o;:::-;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;-1:-1:-1;503:2330:11;;;;;;;;;;;;;;:::i;:::-;;;;;:::o;:::-;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::o;:::-;;;;:::i;:::-;;;;;;;;;;;;;;:::i;:::-;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;:::i;:::-;:::o;:::-;;:::i;:::-;;;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;:::o;:::-;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;:::o;:::-;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;;;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;;;;:::i;:::-;:::o;:::-;;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;;;;:::i;:::-;:::o;:::-;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;;;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;1148:603::-;1325:25;:16;:25;:::i;:::-;;;1351:8;1361:13;1325:50;;;;;;;;;;;;:::i;:::-;;;;;;;;;:::i;:::-;;;;;;;:::i;:::-;;;;;;;;;;1702:42;1325:50;1510:181;1325:50;;;1148:603;1454:8;1546:145;;1443:56;1454:16;:8;:16;;;;;:::i;:::-;1443:56;;;;:::i;:::-;1591:10;1546:145;;1591:15;:10;:15;;1635:13;1546:145;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;1510:33;:11;1522:20;;:10;:20;;:::i;:::-;1510:33;;:::i;:::-;:181;:::i;:::-;1702:35;1740:4;1702:13;1716:20;;1702:13;1716:10;:20;;:::i;:::-;1702:35;;:::i;:::-;:42;:::i;:::-;1148:603::o;1325:50::-;;;;;;;;;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;:::i","linkReferences":{},"immutableReferences":{"837":[{"start":3223,"length":32},{"start":7952,"length":32}]}},"methodIdentifiers":{"getDataWithId(uint64)":"c053045e","getServiceManager()":"4dda0b43","getSignedData(uint64)":"78ecfb47","handleSignedEnvelope((bytes20,bytes12,bytes),(address[],bytes[],uint32))":"f969ff33","isValidTriggerId(uint64)":"aa32d9f4","signedDatas(uint64)":"3d821004","validTriggers(uint64)":"26faf60c"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.28+commit.7893614a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"contract IWavsServiceManager\",\"name\":\"serviceManager\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"getDataWithId\",\"outputs\":[{\"components\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"internalType\":\"struct ISimpleSubmit.DataWithId\",\"name\":\"dataWithId\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getServiceManager\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"getSignedData\",\"outputs\":[{\"components\":[{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"internalType\":\"bytes[]\",\"name\":\"signatures\",\"type\":\"bytes[]\"},{\"internalType\":\"uint32\",\"name\":\"referenceBlock\",\"type\":\"uint32\"}],\"internalType\":\"struct IWavsServiceHandler.SignatureData\",\"name\":\"signatureData\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"bytes20\",\"name\":\"eventId\",\"type\":\"bytes20\"},{\"internalType\":\"bytes12\",\"name\":\"ordering\",\"type\":\"bytes12\"},{\"internalType\":\"bytes\",\"name\":\"payload\",\"type\":\"bytes\"}],\"internalType\":\"struct IWavsServiceHandler.Envelope\",\"name\":\"envelope\",\"type\":\"tuple\"}],\"internalType\":\"struct ISimpleSubmit.SignedData\",\"name\":\"signedData\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes20\",\"name\":\"eventId\",\"type\":\"bytes20\"},{\"internalType\":\"bytes12\",\"name\":\"ordering\",\"type\":\"bytes12\"},{\"internalType\":\"bytes\",\"name\":\"payload\",\"type\":\"bytes\"}],\"internalType\":\"struct IWavsServiceHandler.Envelope\",\"name\":\"envelope\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"internalType\":\"bytes[]\",\"name\":\"signatures\",\"type\":\"bytes[]\"},{\"internalType\":\"uint32\",\"name\":\"referenceBlock\",\"type\":\"uint32\"}],\"internalType\":\"struct IWavsServiceHandler.SignatureData\",\"name\":\"signatureData\",\"type\":\"tuple\"}],\"name\":\"handleSignedEnvelope\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"isValidTriggerId\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"\",\"type\":\"uint64\"}],\"name\":\"signedDatas\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"internalType\":\"bytes[]\",\"name\":\"signatures\",\"type\":\"bytes[]\"},{\"internalType\":\"uint32\",\"name\":\"referenceBlock\",\"type\":\"uint32\"}],\"internalType\":\"struct IWavsServiceHandler.SignatureData\",\"name\":\"signatureData\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"bytes20\",\"name\":\"eventId\",\"type\":\"bytes20\"},{\"internalType\":\"bytes12\",\"name\":\"ordering\",\"type\":\"bytes12\"},{\"internalType\":\"bytes\",\"name\":\"payload\",\"type\":\"bytes\"}],\"internalType\":\"struct IWavsServiceHandler.Envelope\",\"name\":\"envelope\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"\",\"type\":\"uint64\"}],\"name\":\"validTriggers\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"Lay3r Labs\",\"details\":\"This contract implements the IWavsServiceHandler and ISimpleSubmit interfaces\",\"kind\":\"dev\",\"methods\":{\"constructor\":{\"params\":{\"serviceManager\":\"The service manager\"}},\"getDataWithId(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID\"},\"returns\":{\"dataWithId\":\"The data with ID\"}},\"getServiceManager()\":{\"returns\":{\"_0\":\"The address of the service manager\"}},\"getSignedData(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID\"},\"returns\":{\"signedData\":\"The signed data\"}},\"handleSignedEnvelope((bytes20,bytes12,bytes),(address[],bytes[],uint32))\":{\"params\":{\"envelope\":\"The envelope containing the data.\",\"signatureData\":\"The signature data.\"}},\"isValidTriggerId(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID to check\"},\"returns\":{\"_0\":\"True if the trigger ID is valid, false otherwise\"}}},\"title\":\"SimpleSubmit\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"constructor\":{\"notice\":\"Constructor\"},\"getDataWithId(uint64)\":{\"notice\":\"Returns the data with ID for a given trigger ID\"},\"getServiceManager()\":{\"notice\":\"Returns the address of the service manager\"},\"getSignedData(uint64)\":{\"notice\":\"Returns the signed data for a given trigger ID\"},\"handleSignedEnvelope((bytes20,bytes12,bytes),(address[],bytes[],uint32))\":{\"notice\":\"Handles a signed envelope\"},\"isValidTriggerId(uint64)\":{\"notice\":\"Checks if a trigger ID is valid\"},\"signedDatas(uint64)\":{\"notice\":\"Mapping from trigger ID to signed data\"},\"validTriggers(uint64)\":{\"notice\":\"Mapping from trigger ID to valid triggers\"}},\"notice\":\"Contract for the simple submit contract\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"examples/contracts/solidity/mocks/SimpleSubmit.sol\":\"SimpleSubmit\"},\"evmVersion\":\"prague\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[],\"viaIR\":true},\"sources\":{\"examples/contracts/solidity/interfaces/IWavsServiceHandler.sol\":{\"keccak256\":\"0x427e63f26320f27f53975554ff530953d81fb51b681fca950754b576ce83a267\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://d39520e0561d2f65a04b76c265f7ede71feab34fc0e1bd9f21b868353b9c2b0a\",\"dweb:/ipfs/QmWgvBY8pim9hNLNFDRZyob4PvRmuxEoRSyqABkUNpDcef\"]},\"examples/contracts/solidity/interfaces/IWavsServiceManager.sol\":{\"keccak256\":\"0xc4abed1f1f462a601b8f855c6d16bcc97ac9e5eb081f82ca6bedb6420cd1c9b7\",\"license\":\"UNLICENSED\",\"urls\":[\"bzz-raw://27c6906e991bbbe4a589b97d3f883bfb66c6b86463f9e1ff0fb68ac9845ef3f1\",\"dweb:/ipfs/QmYh9y385CszJ4m8TSbqLkTwzFwYyUEBX8KNwvHCjEuXWn\"]},\"examples/contracts/solidity/mocks/ISimpleSubmit.sol\":{\"keccak256\":\"0xda7573fb96ece8207cef432837be49e268803b477a3e05dd44c02b49152aa392\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://e4a5a489f203064ae9f529969a859482ed9a3809a33bda62f9a5d0d22372ae89\",\"dweb:/ipfs/QmXQxvFodWcdndsfyJGv7K4BWMs5QbTZeKepfdyxWwAZKZ\"]},\"examples/contracts/solidity/mocks/ISimpleTrigger.sol\":{\"keccak256\":\"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1\",\"dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG\"]},\"examples/contracts/solidity/mocks/SimpleSubmit.sol\":{\"keccak256\":\"0x01f938f4d3c7a6218900578ebc473b9cde798246cfe098da19c145e3332f5674\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://4f635c94e02d29c2cb924975650914fdd6e4e8da0a800280f8685018bdf13352\",\"dweb:/ipfs/QmVELBUj2SkyW1whEY4MXckTCvURrkHyYi9BAxETSHEtKs\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.28+commit.7893614a"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"contract IWavsServiceManager","name":"serviceManager","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"getDataWithId","outputs":[{"internalType":"struct ISimpleSubmit.DataWithId","name":"dataWithId","type":"tuple","components":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"},{"internalType":"bytes","name":"data","type":"bytes"}]}]},{"inputs":[],"stateMutability":"view","type":"function","name":"getServiceManager","outputs":[{"internalType":"address","name":"","type":"address"}]},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"getSignedData","outputs":[{"internalType":"struct ISimpleSubmit.SignedData","name":"signedData","type":"tuple","components":[{"internalType":"bytes","name":"data","type":"bytes"},{"internalType":"struct IWavsServiceHandler.SignatureData","name":"signatureData","type":"tuple","components":[{"internalType":"address[]","name":"signers","type":"address[]"},{"internalType":"bytes[]","name":"signatures","type":"bytes[]"},{"internalType":"uint32","name":"referenceBlock","type":"uint32"}]},{"internalType":"struct IWavsServiceHandler.Envelope","name":"envelope","type":"tuple","components":[{"internalType":"bytes20","name":"eventId","type":"bytes20"},{"internalType":"bytes12","name":"ordering","type":"bytes12"},{"internalType":"bytes","name":"payload","type":"bytes"}]}]}]},{"inputs":[{"internalType":"struct IWavsServiceHandler.Envelope","name":"envelope","type":"tuple","components":[{"internalType":"bytes20","name":"eventId","type":"bytes20"},{"internalType":"bytes12","name":"ordering","type":"bytes12"},{"internalType":"bytes","name":"payload","type":"bytes"}]},{"internalType":"struct IWavsServiceHandler.SignatureData","name":"signatureData","type":"tuple","components":[{"internalType":"address[]","name":"signers","type":"address[]"},{"internalType":"bytes[]","name":"signatures","type":"bytes[]"},{"internalType":"uint32","name":"referenceBlock","type":"uint32"}]}],"stateMutability":"nonpayable","type":"function","name":"handleSignedEnvelope"},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"isValidTriggerId","outputs":[{"internalType":"bool","name":"","type":"bool"}]},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"","type":"uint64"}],"stateMutability":"view","type":"function","name":"signedDatas","outputs":[{"internalType":"bytes","name":"data","type":"bytes"},{"internalType":"struct IWavsServiceHandler.SignatureData","name":"signatureData","type":"tuple","components":[{"internalType":"address[]","name":"signers","type":"address[]"},{"internalType":"bytes[]","name":"signatures","type":"bytes[]"},{"internalType":"uint32","name":"referenceBlock","type":"uint32"}]},{"internalType":"struct IWavsServiceHandler.Envelope","name":"envelope","type":"tuple","components":[{"internalType":"bytes20","name":"eventId","type":"bytes20"},{"internalType":"bytes12","name":"ordering","type":"bytes12"},{"internalType":"bytes","name":"payload","type":"bytes"}]}]},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"","type":"uint64"}],"stateMutability":"view","type":"function","name":"validTriggers","outputs":[{"internalType":"bool","name":"","type":"bool"}]}],"devdoc":{"kind":"dev","methods":{"constructor":{"params":{"serviceManager":"The service manager"}},"getDataWithId(uint64)":{"params":{"triggerId":"The trigger ID"},"returns":{"dataWithId":"The data with ID"}},"getServiceManager()":{"returns":{"_0":"The address of the service manager"}},"getSignedData(uint64)":{"params":{"triggerId":"The trigger ID"},"returns":{"signedData":"The signed data"}},"handleSignedEnvelope((bytes20,bytes12,bytes),(address[],bytes[],uint32))":{"params":{"envelope":"The envelope containing the data.","signatureData":"The signature data."}},"isValidTriggerId(uint64)":{"params":{"triggerId":"The trigger ID to check"},"returns":{"_0":"True if the trigger ID is valid, false otherwise"}}},"version":1},"userdoc":{"kind":"user","methods":{"constructor":{"notice":"Constructor"},"getDataWithId(uint64)":{"notice":"Returns the data with ID for a given trigger ID"},"getServiceManager()":{"notice":"Returns the address of the service manager"},"getSignedData(uint64)":{"notice":"Returns the signed data for a given trigger ID"},"handleSignedEnvelope((bytes20,bytes12,bytes),(address[],bytes[],uint32))":{"notice":"Handles a signed envelope"},"isValidTriggerId(uint64)":{"notice":"Checks if a trigger ID is valid"},"signedDatas(uint64)":{"notice":"Mapping from trigger ID to signed data"},"validTriggers(uint64)":{"notice":"Mapping from trigger ID to valid triggers"}},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":false,"runs":200},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"examples/contracts/solidity/mocks/SimpleSubmit.sol":"SimpleSubmit"},"evmVersion":"prague","libraries":{},"viaIR":true},"sources":{"examples/contracts/solidity/interfaces/IWavsServiceHandler.sol":{"keccak256":"0x427e63f26320f27f53975554ff530953d81fb51b681fca950754b576ce83a267","urls":["bzz-raw://d39520e0561d2f65a04b76c265f7ede71feab34fc0e1bd9f21b868353b9c2b0a","dweb:/ipfs/QmWgvBY8pim9hNLNFDRZyob4PvRmuxEoRSyqABkUNpDcef"],"license":"MIT"},"examples/contracts/solidity/interfaces/IWavsServiceManager.sol":{"keccak256":"0xc4abed1f1f462a601b8f855c6d16bcc97ac9e5eb081f82ca6bedb6420cd1c9b7","urls":["bzz-raw://27c6906e991bbbe4a589b97d3f883bfb66c6b86463f9e1ff0fb68ac9845ef3f1","dweb:/ipfs/QmYh9y385CszJ4m8TSbqLkTwzFwYyUEBX8KNwvHCjEuXWn"],"license":"UNLICENSED"},"examples/contracts/solidity/mocks/ISimpleSubmit.sol":{"keccak256":"0xda7573fb96ece8207cef432837be49e268803b477a3e05dd44c02b49152aa392","urls":["bzz-raw://e4a5a489f203064ae9f529969a859482ed9a3809a33bda62f9a5d0d22372ae89","dweb:/ipfs/QmXQxvFodWcdndsfyJGv7K4BWMs5QbTZeKepfdyxWwAZKZ"],"license":"MIT"},"examples/contracts/solidity/mocks/ISimpleTrigger.sol":{"keccak256":"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814","urls":["bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1","dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG"],"license":"MIT"},"examples/contracts/solidity/mocks/SimpleSubmit.sol":{"keccak256":"0x01f938f4d3c7a6218900578ebc473b9cde798246cfe098da19c145e3332f5674","urls":["bzz-raw://4f635c94e02d29c2cb924975650914fdd6e4e8da0a800280f8685018bdf13352","dweb:/ipfs/QmVELBUj2SkyW1whEY4MXckTCvURrkHyYi9BAxETSHEtKs"],"license":"MIT"}},"version":1},"id":11}
\ No newline at end of file
diff --git a/examples/contracts/solidity/abi/SimpleTrigger.sol/SimpleTrigger.json b/examples/contracts/solidity/abi/SimpleTrigger.sol/SimpleTrigger.json
index 2f941bed1..fd083211b 100644
--- a/examples/contracts/solidity/abi/SimpleTrigger.sol/SimpleTrigger.json
+++ b/examples/contracts/solidity/abi/SimpleTrigger.sol/SimpleTrigger.json
@@ -1 +1 @@
-{"abi":[{"type":"function","name":"addTrigger","inputs":[{"name":"data","type":"bytes","internalType":"bytes"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"getTrigger","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"","type":"tuple","internalType":"struct ISimpleTrigger.TriggerInfo","components":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"},{"name":"creator","type":"address","internalType":"address"},{"name":"data","type":"bytes","internalType":"bytes"}]}],"stateMutability":"view"},{"type":"function","name":"nextTriggerId","inputs":[],"outputs":[{"name":"","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"stateMutability":"view"},{"type":"function","name":"triggerIdsByCreator","inputs":[{"name":"","type":"address","internalType":"address"},{"name":"","type":"uint256","internalType":"uint256"}],"outputs":[{"name":"","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"stateMutability":"view"},{"type":"function","name":"triggersById","inputs":[{"name":"","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"creator","type":"address","internalType":"address"},{"name":"data","type":"bytes","internalType":"bytes"}],"stateMutability":"view"},{"type":"event","name":"NewTrigger","inputs":[{"name":"triggerData","type":"bytes","indexed":false,"internalType":"bytes"}],"anonymous":false}],"bytecode":{"object":"0x608060405234601c57600e6020565b610e2d61002b8239610e2d90f35b6026565b60405190565b5f80fdfe60806040526004361015610013575b610788565b61001d5f3561006c565b806342227fa414610067578063913b1fbf14610062578063ce2896121461005d578063e31e0788146100585763e328ed770361000e57610753565b61067d565b610569565b6102b8565b610123565b60e01c90565b60405190565b5f80fd5b5f80fd5b5f91031261008a57565b61007c565b1c90565b67ffffffffffffffff1690565b6100b09060086100b5930261008f565b610093565b90565b906100c391546100a0565b90565b6100d260025f906100b8565b90565b67ffffffffffffffff1690565b90565b6100f96100f46100fe926100d5565b6100e2565b6100d5565b90565b61010a906100e5565b9052565b9190610121905f60208501940190610101565b565b3461015357610133366004610080565b61014f61013e6100c6565b610146610072565b9182918261010e565b0390f35b610078565b5f80fd5b60018060a01b031690565b6101709061015c565b90565b61017c81610167565b0361018357565b5f80fd5b9050359061019482610173565b565b90565b6101a281610196565b036101a957565b5f80fd5b905035906101ba82610199565b565b91906040838203126101e457806101d86101e1925f8601610187565b936020016101ad565b90565b61007c565b6101fd6101f86102029261015c565b6100e2565b61015c565b90565b61020e906101e9565b90565b61021a90610205565b90565b9061022790610211565b5f5260205260405f2090565b634e487b7160e01b5f52603260045260245ffd5b5490565b5f5260205f2090565b91909161026081610247565b83101561027e57600461027460089261024b565b8185040193060290565b610233565b61028e90600161021d565b61029781610247565b8210156102b4576102b1916102ab91610254565b906100b8565b90565b5f80fd5b346102e9576102e56102d46102ce3660046101bc565b90610283565b6102dc610072565b9182918261010e565b0390f35b610078565b6102f7816100d5565b036102fe57565b5f80fd5b9050359061030f826102ee565b565b9060208282031261032a57610327915f01610302565b90565b61007c565b90610339906100e5565b5f5260205260405f2090565b5f1c90565b60018060a01b031690565b61036161036691610345565b61034a565b90565b6103739054610355565b90565b634e487b7160e01b5f52602260045260245ffd5b90600160028304921680156103aa575b60208310146103a557565b610376565b91607f169161039a565b60209181520190565b5f5260205f2090565b905f92918054906103e06103d98361038a565b80946103b4565b916001811690815f1461043757506001146103fb575b505050565b61040891929394506103bd565b915f925b81841061041f57505001905f80806103f6565b6001816020929593955484860152019101929061040c565b92949550505060ff19168252151560200201905f80806103f6565b9061045c916103c6565b90565b601f801991011690565b634e487b7160e01b5f52604160045260245ffd5b906104879061045f565b810190811067ffffffffffffffff8211176104a157604052565b610469565b906104c66104bf926104b6610072565b93848092610452565b038361047d565b565b6104d2905f61032f565b906104ea60016104e35f8501610369565b93016104a6565b90565b6104f690610167565b9052565b5190565b60209181520190565b90825f9392825e0152565b61053161053a60209361053f93610528816104fa565b938480936104fe565b95869101610507565b61045f565b0190565b916105669261055960408201935f8301906104ed565b6020818403910152610512565b90565b3461059a5761058161057c366004610311565b6104c8565b9061059661058d610072565b92839283610543565b0390f35b610078565b5f80fd5b5f80fd5b906105ba6105b3610072565b928361047d565b565b67ffffffffffffffff81116105da576105d660209161045f565b0190565b610469565b90825f939282370152565b909291926105ff6105fa826105bc565b6105a7565b9381855260208501908284011161061b57610619926105df565b565b6105a3565b9080601f8301121561063e5781602061063b933591016105ea565b90565b61059f565b90602082820312610673575f82013567ffffffffffffffff811161066e5761066b9201610620565b90565b610158565b61007c565b5f0190565b346106ab57610695610690366004610643565b610bf4565b61069d610072565b806106a781610678565b0390f35b610078565b6106b9906100e5565b9052565b6106c690610167565b9052565b6106e96106f26020936106f7936106e0816104fa565b938480936103b4565b95869101610507565b61045f565b0190565b61073891604060608201926107165f8201515f8501906106b0565b610728602082015160208501906106bd565b01519060408184039101526106ca565b90565b6107509160208201915f8184039101526106fb565b90565b346107835761077f61076e610769366004610311565b610d94565b610776610072565b9182918261073b565b0390f35b610078565b5f80fd5b61079861079d91610345565b610093565b90565b6107aa905461078c565b90565b90565b6107c46107bf6107c9926107ad565b6100e2565b6100d5565b90565b634e487b7160e01b5f52601160045260245ffd5b6107ec6107f2916100d5565b916100d5565b019067ffffffffffffffff821161080557565b6107cc565b5f1b90565b9061082267ffffffffffffffff9161080a565b9181191691161790565b90565b9061084461083f61084b926100e5565b61082c565b825461080f565b9055565b61085960406105a7565b90565b9061086690610167565b9052565b52565b6108779051610167565b90565b9061088b60018060a01b039161080a565b9181191691161790565b90565b906108ad6108a86108b492610211565b610895565b825461087a565b9055565b5190565b601f602091010490565b1b90565b919060086108e59102916108df5f19846108c6565b926108c6565b9181191691161790565b6109036108fe61090892610196565b6100e2565b610196565b90565b90565b919061092461091f61092c936108ef565b61090b565b9083546108ca565b9055565b5f90565b61094691610940610930565b9161090e565b565b5b818110610954575050565b806109615f600193610934565b01610949565b9190601f8111610977575b505050565b6109836109a8936103bd565b90602061098f846108bc565b830193106109b0575b6109a1906108bc565b0190610948565b5f8080610972565b91506109a181929050610998565b906109ce905f199060080261008f565b191690565b816109dd916109be565b906002021790565b906109ef816104fa565b9067ffffffffffffffff8211610aaf57610a1382610a0d855461038a565b85610967565b602090601f8311600114610a4757918091610a36935f92610a3b575b50506109d3565b90555b565b90915001515f80610a2f565b601f19831691610a56856103bd565b925f5b818110610a9757509160029391856001969410610a7d575b50505002019055610a39565b610a8d910151601f8416906109be565b90555f8080610a71565b91936020600181928787015181550195019201610a59565b610469565b90610abe916109e5565b565b90610aeb60206001610af194610ae35f8201610add5f880161086d565b90610898565b0192016108b8565b90610ab4565b565b90610afd91610ac0565b565b90565b5f5260205f2090565b5490565b919091610b1b81610b0b565b831015610b39576004610b2f600892610b02565b8185040193060290565b610233565b91906008610b60910291610b5a67ffffffffffffffff846108c6565b926108c6565b9181191691161790565b9190610b80610b7b610b88936100e5565b61082c565b908354610b3e565b9055565b9081549168010000000000000000831015610bbc5782610bb4916001610bba95018155610b0f565b90610b6a565b565b610469565b610bcb60606105a7565b90565b90610bd8906100d5565b9052565b610bf19160208201915f818403910152610512565b90565b610cf3610ce491610c32610c2b610c26610c16610c1160026107a0565b6100e5565b610c2060016107b0565b906107e0565b6100e5565b600261082f565b610cd0610c3f60026107a0565b91610c623391610c59610c5061084f565b935f850161085c565b6020830161086a565b91610c7783610c725f849061032f565b610af3565b610c95610c8e610c896001339061021d565b610aff565b8290610b8c565b91610cc76020610ca65f840161086d565b92015191610cbe610cb5610bc1565b955f8701610bce565b6020850161085c565b6040830161086a565b610cd8610072565b9283916020830161073b565b6020820181038252038261047d565b610d297f86eacd23610d81706516de1ed0476c87772fdf939c7c771fbbd7f0230d619e6891610d20610072565b91829182610bdc565b0390a1565b610d3860606105a7565b90565b5f90565b5f90565b606090565b610d50610d2e565b906020808084610d5e610d3b565b815201610d69610d3f565b815201610d74610d43565b81525050565b610d82610d48565b90565b90565b610d91906104a6565b90565b610d9c610d7a565b50610df4610deb610db6610db15f859061032f565b610d85565b610de66001610dc65f8401610369565b920191610ddd610dd4610bc1565b965f8801610bce565b6020860161085c565b610d88565b6040830161086a565b9056fea2646970667358221220e61cb56f6409e5c19eff38ecc4632839df152a6bf5c8966e30178bbcc0cd094f64736f6c634300081c0033","sourceMap":"280:1861:9:-:0;;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;","linkReferences":{}},"deployedBytecode":{"object":"0x60806040526004361015610013575b610788565b61001d5f3561006c565b806342227fa414610067578063913b1fbf14610062578063ce2896121461005d578063e31e0788146100585763e328ed770361000e57610753565b61067d565b610569565b6102b8565b610123565b60e01c90565b60405190565b5f80fd5b5f80fd5b5f91031261008a57565b61007c565b1c90565b67ffffffffffffffff1690565b6100b09060086100b5930261008f565b610093565b90565b906100c391546100a0565b90565b6100d260025f906100b8565b90565b67ffffffffffffffff1690565b90565b6100f96100f46100fe926100d5565b6100e2565b6100d5565b90565b61010a906100e5565b9052565b9190610121905f60208501940190610101565b565b3461015357610133366004610080565b61014f61013e6100c6565b610146610072565b9182918261010e565b0390f35b610078565b5f80fd5b60018060a01b031690565b6101709061015c565b90565b61017c81610167565b0361018357565b5f80fd5b9050359061019482610173565b565b90565b6101a281610196565b036101a957565b5f80fd5b905035906101ba82610199565b565b91906040838203126101e457806101d86101e1925f8601610187565b936020016101ad565b90565b61007c565b6101fd6101f86102029261015c565b6100e2565b61015c565b90565b61020e906101e9565b90565b61021a90610205565b90565b9061022790610211565b5f5260205260405f2090565b634e487b7160e01b5f52603260045260245ffd5b5490565b5f5260205f2090565b91909161026081610247565b83101561027e57600461027460089261024b565b8185040193060290565b610233565b61028e90600161021d565b61029781610247565b8210156102b4576102b1916102ab91610254565b906100b8565b90565b5f80fd5b346102e9576102e56102d46102ce3660046101bc565b90610283565b6102dc610072565b9182918261010e565b0390f35b610078565b6102f7816100d5565b036102fe57565b5f80fd5b9050359061030f826102ee565b565b9060208282031261032a57610327915f01610302565b90565b61007c565b90610339906100e5565b5f5260205260405f2090565b5f1c90565b60018060a01b031690565b61036161036691610345565b61034a565b90565b6103739054610355565b90565b634e487b7160e01b5f52602260045260245ffd5b90600160028304921680156103aa575b60208310146103a557565b610376565b91607f169161039a565b60209181520190565b5f5260205f2090565b905f92918054906103e06103d98361038a565b80946103b4565b916001811690815f1461043757506001146103fb575b505050565b61040891929394506103bd565b915f925b81841061041f57505001905f80806103f6565b6001816020929593955484860152019101929061040c565b92949550505060ff19168252151560200201905f80806103f6565b9061045c916103c6565b90565b601f801991011690565b634e487b7160e01b5f52604160045260245ffd5b906104879061045f565b810190811067ffffffffffffffff8211176104a157604052565b610469565b906104c66104bf926104b6610072565b93848092610452565b038361047d565b565b6104d2905f61032f565b906104ea60016104e35f8501610369565b93016104a6565b90565b6104f690610167565b9052565b5190565b60209181520190565b90825f9392825e0152565b61053161053a60209361053f93610528816104fa565b938480936104fe565b95869101610507565b61045f565b0190565b916105669261055960408201935f8301906104ed565b6020818403910152610512565b90565b3461059a5761058161057c366004610311565b6104c8565b9061059661058d610072565b92839283610543565b0390f35b610078565b5f80fd5b5f80fd5b906105ba6105b3610072565b928361047d565b565b67ffffffffffffffff81116105da576105d660209161045f565b0190565b610469565b90825f939282370152565b909291926105ff6105fa826105bc565b6105a7565b9381855260208501908284011161061b57610619926105df565b565b6105a3565b9080601f8301121561063e5781602061063b933591016105ea565b90565b61059f565b90602082820312610673575f82013567ffffffffffffffff811161066e5761066b9201610620565b90565b610158565b61007c565b5f0190565b346106ab57610695610690366004610643565b610bf4565b61069d610072565b806106a781610678565b0390f35b610078565b6106b9906100e5565b9052565b6106c690610167565b9052565b6106e96106f26020936106f7936106e0816104fa565b938480936103b4565b95869101610507565b61045f565b0190565b61073891604060608201926107165f8201515f8501906106b0565b610728602082015160208501906106bd565b01519060408184039101526106ca565b90565b6107509160208201915f8184039101526106fb565b90565b346107835761077f61076e610769366004610311565b610d94565b610776610072565b9182918261073b565b0390f35b610078565b5f80fd5b61079861079d91610345565b610093565b90565b6107aa905461078c565b90565b90565b6107c46107bf6107c9926107ad565b6100e2565b6100d5565b90565b634e487b7160e01b5f52601160045260245ffd5b6107ec6107f2916100d5565b916100d5565b019067ffffffffffffffff821161080557565b6107cc565b5f1b90565b9061082267ffffffffffffffff9161080a565b9181191691161790565b90565b9061084461083f61084b926100e5565b61082c565b825461080f565b9055565b61085960406105a7565b90565b9061086690610167565b9052565b52565b6108779051610167565b90565b9061088b60018060a01b039161080a565b9181191691161790565b90565b906108ad6108a86108b492610211565b610895565b825461087a565b9055565b5190565b601f602091010490565b1b90565b919060086108e59102916108df5f19846108c6565b926108c6565b9181191691161790565b6109036108fe61090892610196565b6100e2565b610196565b90565b90565b919061092461091f61092c936108ef565b61090b565b9083546108ca565b9055565b5f90565b61094691610940610930565b9161090e565b565b5b818110610954575050565b806109615f600193610934565b01610949565b9190601f8111610977575b505050565b6109836109a8936103bd565b90602061098f846108bc565b830193106109b0575b6109a1906108bc565b0190610948565b5f8080610972565b91506109a181929050610998565b906109ce905f199060080261008f565b191690565b816109dd916109be565b906002021790565b906109ef816104fa565b9067ffffffffffffffff8211610aaf57610a1382610a0d855461038a565b85610967565b602090601f8311600114610a4757918091610a36935f92610a3b575b50506109d3565b90555b565b90915001515f80610a2f565b601f19831691610a56856103bd565b925f5b818110610a9757509160029391856001969410610a7d575b50505002019055610a39565b610a8d910151601f8416906109be565b90555f8080610a71565b91936020600181928787015181550195019201610a59565b610469565b90610abe916109e5565b565b90610aeb60206001610af194610ae35f8201610add5f880161086d565b90610898565b0192016108b8565b90610ab4565b565b90610afd91610ac0565b565b90565b5f5260205f2090565b5490565b919091610b1b81610b0b565b831015610b39576004610b2f600892610b02565b8185040193060290565b610233565b91906008610b60910291610b5a67ffffffffffffffff846108c6565b926108c6565b9181191691161790565b9190610b80610b7b610b88936100e5565b61082c565b908354610b3e565b9055565b9081549168010000000000000000831015610bbc5782610bb4916001610bba95018155610b0f565b90610b6a565b565b610469565b610bcb60606105a7565b90565b90610bd8906100d5565b9052565b610bf19160208201915f818403910152610512565b90565b610cf3610ce491610c32610c2b610c26610c16610c1160026107a0565b6100e5565b610c2060016107b0565b906107e0565b6100e5565b600261082f565b610cd0610c3f60026107a0565b91610c623391610c59610c5061084f565b935f850161085c565b6020830161086a565b91610c7783610c725f849061032f565b610af3565b610c95610c8e610c896001339061021d565b610aff565b8290610b8c565b91610cc76020610ca65f840161086d565b92015191610cbe610cb5610bc1565b955f8701610bce565b6020850161085c565b6040830161086a565b610cd8610072565b9283916020830161073b565b6020820181038252038261047d565b610d297f86eacd23610d81706516de1ed0476c87772fdf939c7c771fbbd7f0230d619e6891610d20610072565b91829182610bdc565b0390a1565b610d3860606105a7565b90565b5f90565b5f90565b606090565b610d50610d2e565b906020808084610d5e610d3b565b815201610d69610d3f565b815201610d74610d43565b81525050565b610d82610d48565b90565b90565b610d91906104a6565b90565b610d9c610d7a565b50610df4610deb610db6610db15f859061032f565b610d85565b610de66001610dc65f8401610369565b920191610ddd610dd4610bc1565b965f8801610bce565b6020860161085c565b610d88565b6040830161086a565b9056fea2646970667358221220e61cb56f6409e5c19eff38ecc4632839df152a6bf5c8966e30178bbcc0cd094f64736f6c634300081c0033","sourceMap":"280:1861:9:-:0;;;;;;;;;-1:-1:-1;280:1861:9;:::i;:::-;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;:::o;:::-;;;;:::o;:::-;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;:::o;:::-;;;;:::o;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::o;978:30::-;;;;;;:::i;:::-;;:::o;280:1861::-;;;;:::o;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;:::i;712:58::-;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;:::o;:::-;;;;280:1861;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;:::o;:::-;;;;;;;;:::o;:::-;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;:::o;596:49::-;;;;;:::i;:::-;;;;;;;;;:::i;:::-;;;;:::i;:::-;;:::o;280:1861::-;;;;:::i;:::-;;;:::o;:::-;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;;;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;;:::i;:::-;:::o;:::-;;;;;;;;;;:::i;:::-;;;:::o;:::-;;:::i;:::-;;;;;;;;;;:::o;:::-;;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;:::i;:::-;;;;:::o;:::-;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;:::o;:::-;;:::i;:::-;;;;:::o;:::-;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;:::o;:::-;;;;;;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;:::o;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;:::o;:::-;;;;;;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;:::o;:::-;;;;;;;:::o;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;;;:::o;:::-;;;:::o;:::-;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;:::i;:::-;;;;;;:::o;:::-;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;;;;:::i;:::-;:::o;:::-;;:::o;:::-;;;;;;;:::o;:::-;;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;:::i;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::o;1108:729::-;1806:23;;1108:729;1213:67;1229:51;1244:35;:31;1261:13;;;:::i;:::-;1244:31;:::i;:::-;:35;1278:1;1244:35;:::i;:::-;;;:::i;:::-;1229:51;:::i;:::-;1213:67;;:::i;:::-;1698:81;1312:13;;;:::i;:::-;1409:10;1391:42;1409:10;1427:4;1391:42;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::i;:::-;1497:7;1471:33;1497:7;1471:23;:12;1484:9;1471:23;;:::i;:::-;:33;:::i;:::-;1515:47;:36;:31;:19;1535:10;1515:31;;:::i;:::-;:36;:::i;:::-;1552:9;1515:47;;:::i;:::-;1742:7;1698:81;1765:12;1742:15;;:7;:15;;:::i;:::-;1765:7;:12;;1698:81;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;:::i;:::-;1806:23;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;1795:35;;;;;:::i;:::-;;;;;;:::i;:::-;;;;1108:729::o;280:1861::-;;;;:::i;:::-;;:::o;:::-;;;:::o;:::-;;;:::o;:::-;;;:::o;:::-;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::o;:::-;;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;1878:261::-;1954:18;;:::i;:::-;2010:12;2051:81;;1984:49;2010:23;:12;2023:9;2010:23;;:::i;:::-;1984:49;:::i;:::-;2051:81;2118:12;2095:15;;:7;:15;;:::i;:::-;2118:7;:12;2051:81;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;2044:88;:::o","linkReferences":{}},"methodIdentifiers":{"addTrigger(bytes)":"e31e0788","getTrigger(uint64)":"e328ed77","nextTriggerId()":"42227fa4","triggerIdsByCreator(address,uint256)":"913b1fbf","triggersById(uint64)":"ce289612"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.28+commit.7893614a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"triggerData\",\"type\":\"bytes\"}],\"name\":\"NewTrigger\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"addTrigger\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"getTrigger\",\"outputs\":[{\"components\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"creator\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"internalType\":\"struct ISimpleTrigger.TriggerInfo\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"nextTriggerId\",\"outputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"triggerIdsByCreator\",\"outputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"\",\"type\":\"uint64\"}],\"name\":\"triggersById\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"creator\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"Lay3r Labs\",\"details\":\"This contract implements the ISimpleTrigger interface\",\"events\":{\"NewTrigger(bytes)\":{\"params\":{\"triggerData\":\"The data of the trigger\"}}},\"kind\":\"dev\",\"methods\":{\"addTrigger(bytes)\":{\"params\":{\"data\":\"The data of the trigger\"}},\"getTrigger(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID\"},\"returns\":{\"_0\":\"triggerInfo The trigger info\"}}},\"title\":\"SimpleTrigger\",\"version\":1},\"userdoc\":{\"events\":{\"NewTrigger(bytes)\":{\"notice\":\"Event emitted when a new trigger is added\"}},\"kind\":\"user\",\"methods\":{\"addTrigger(bytes)\":{\"notice\":\"Adds a new trigger\"},\"getTrigger(uint64)\":{\"notice\":\"Returns the trigger info for a given trigger ID\"},\"nextTriggerId()\":{\"notice\":\"The next trigger id\"},\"triggerIdsByCreator(address,uint256)\":{\"notice\":\"Mapping from creator address to trigger IDs\"},\"triggersById(uint64)\":{\"notice\":\"Mapping from trigger ID to trigger\"}},\"notice\":\"Contract for the simple trigger contract\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"examples/contracts/solidity/mocks/SimpleTrigger.sol\":\"SimpleTrigger\"},\"evmVersion\":\"prague\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[],\"viaIR\":true},\"sources\":{\"examples/contracts/solidity/mocks/ISimpleTrigger.sol\":{\"keccak256\":\"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1\",\"dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG\"]},\"examples/contracts/solidity/mocks/SimpleTrigger.sol\":{\"keccak256\":\"0xd1503ace1c3a4e08aec278d40e94b7205729fea06d428fc1a1f2a72cd9ad6ba1\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://43184f8449ab3ce225f626a8b5fdea177ce7236652523ab3b6ef49a9b755df64\",\"dweb:/ipfs/QmdUGtdFhuvVjXKwZmC99gFrnzRiYvG9GKer82Zf3qZNWd\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.28+commit.7893614a"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"bytes","name":"triggerData","type":"bytes","indexed":false}],"type":"event","name":"NewTrigger","anonymous":false},{"inputs":[{"internalType":"bytes","name":"data","type":"bytes"}],"stateMutability":"nonpayable","type":"function","name":"addTrigger"},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"getTrigger","outputs":[{"internalType":"struct ISimpleTrigger.TriggerInfo","name":"","type":"tuple","components":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"},{"internalType":"address","name":"creator","type":"address"},{"internalType":"bytes","name":"data","type":"bytes"}]}]},{"inputs":[],"stateMutability":"view","type":"function","name":"nextTriggerId","outputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"","type":"uint64"}]},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function","name":"triggerIdsByCreator","outputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"","type":"uint64"}]},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"","type":"uint64"}],"stateMutability":"view","type":"function","name":"triggersById","outputs":[{"internalType":"address","name":"creator","type":"address"},{"internalType":"bytes","name":"data","type":"bytes"}]}],"devdoc":{"kind":"dev","methods":{"addTrigger(bytes)":{"params":{"data":"The data of the trigger"}},"getTrigger(uint64)":{"params":{"triggerId":"The trigger ID"},"returns":{"_0":"triggerInfo The trigger info"}}},"version":1},"userdoc":{"kind":"user","methods":{"addTrigger(bytes)":{"notice":"Adds a new trigger"},"getTrigger(uint64)":{"notice":"Returns the trigger info for a given trigger ID"},"nextTriggerId()":{"notice":"The next trigger id"},"triggerIdsByCreator(address,uint256)":{"notice":"Mapping from creator address to trigger IDs"},"triggersById(uint64)":{"notice":"Mapping from trigger ID to trigger"}},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":false,"runs":200},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"examples/contracts/solidity/mocks/SimpleTrigger.sol":"SimpleTrigger"},"evmVersion":"prague","libraries":{},"viaIR":true},"sources":{"examples/contracts/solidity/mocks/ISimpleTrigger.sol":{"keccak256":"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814","urls":["bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1","dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG"],"license":"MIT"},"examples/contracts/solidity/mocks/SimpleTrigger.sol":{"keccak256":"0xd1503ace1c3a4e08aec278d40e94b7205729fea06d428fc1a1f2a72cd9ad6ba1","urls":["bzz-raw://43184f8449ab3ce225f626a8b5fdea177ce7236652523ab3b6ef49a9b755df64","dweb:/ipfs/QmdUGtdFhuvVjXKwZmC99gFrnzRiYvG9GKer82Zf3qZNWd"],"license":"MIT"}},"version":1},"id":9}
\ No newline at end of file
+{"abi":[{"type":"function","name":"addTrigger","inputs":[{"name":"data","type":"bytes","internalType":"bytes"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"getTrigger","inputs":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"","type":"tuple","internalType":"struct ISimpleTrigger.TriggerInfo","components":[{"name":"triggerId","type":"uint64","internalType":"ISimpleTrigger.TriggerId"},{"name":"creator","type":"address","internalType":"address"},{"name":"data","type":"bytes","internalType":"bytes"}]}],"stateMutability":"view"},{"type":"function","name":"nextTriggerId","inputs":[],"outputs":[{"name":"","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"stateMutability":"view"},{"type":"function","name":"triggerIdsByCreator","inputs":[{"name":"","type":"address","internalType":"address"},{"name":"","type":"uint256","internalType":"uint256"}],"outputs":[{"name":"","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"stateMutability":"view"},{"type":"function","name":"triggersById","inputs":[{"name":"","type":"uint64","internalType":"ISimpleTrigger.TriggerId"}],"outputs":[{"name":"creator","type":"address","internalType":"address"},{"name":"data","type":"bytes","internalType":"bytes"}],"stateMutability":"view"},{"type":"event","name":"NewTrigger","inputs":[{"name":"triggerData","type":"bytes","indexed":false,"internalType":"bytes"}],"anonymous":false}],"bytecode":{"object":"0x608060405234601c57600e6020565b610e2d61002b8239610e2d90f35b6026565b60405190565b5f80fdfe60806040526004361015610013575b610788565b61001d5f3561006c565b806342227fa414610067578063913b1fbf14610062578063ce2896121461005d578063e31e0788146100585763e328ed770361000e57610753565b61067d565b610569565b6102b8565b610123565b60e01c90565b60405190565b5f80fd5b5f80fd5b5f91031261008a57565b61007c565b1c90565b67ffffffffffffffff1690565b6100b09060086100b5930261008f565b610093565b90565b906100c391546100a0565b90565b6100d260025f906100b8565b90565b67ffffffffffffffff1690565b90565b6100f96100f46100fe926100d5565b6100e2565b6100d5565b90565b61010a906100e5565b9052565b9190610121905f60208501940190610101565b565b3461015357610133366004610080565b61014f61013e6100c6565b610146610072565b9182918261010e565b0390f35b610078565b5f80fd5b60018060a01b031690565b6101709061015c565b90565b61017c81610167565b0361018357565b5f80fd5b9050359061019482610173565b565b90565b6101a281610196565b036101a957565b5f80fd5b905035906101ba82610199565b565b91906040838203126101e457806101d86101e1925f8601610187565b936020016101ad565b90565b61007c565b6101fd6101f86102029261015c565b6100e2565b61015c565b90565b61020e906101e9565b90565b61021a90610205565b90565b9061022790610211565b5f5260205260405f2090565b634e487b7160e01b5f52603260045260245ffd5b5490565b5f5260205f2090565b91909161026081610247565b83101561027e57600461027460089261024b565b8185040193060290565b610233565b61028e90600161021d565b61029781610247565b8210156102b4576102b1916102ab91610254565b906100b8565b90565b5f80fd5b346102e9576102e56102d46102ce3660046101bc565b90610283565b6102dc610072565b9182918261010e565b0390f35b610078565b6102f7816100d5565b036102fe57565b5f80fd5b9050359061030f826102ee565b565b9060208282031261032a57610327915f01610302565b90565b61007c565b90610339906100e5565b5f5260205260405f2090565b5f1c90565b60018060a01b031690565b61036161036691610345565b61034a565b90565b6103739054610355565b90565b634e487b7160e01b5f52602260045260245ffd5b90600160028304921680156103aa575b60208310146103a557565b610376565b91607f169161039a565b60209181520190565b5f5260205f2090565b905f92918054906103e06103d98361038a565b80946103b4565b916001811690815f1461043757506001146103fb575b505050565b61040891929394506103bd565b915f925b81841061041f57505001905f80806103f6565b6001816020929593955484860152019101929061040c565b92949550505060ff19168252151560200201905f80806103f6565b9061045c916103c6565b90565b601f801991011690565b634e487b7160e01b5f52604160045260245ffd5b906104879061045f565b810190811067ffffffffffffffff8211176104a157604052565b610469565b906104c66104bf926104b6610072565b93848092610452565b038361047d565b565b6104d2905f61032f565b906104ea60016104e35f8501610369565b93016104a6565b90565b6104f690610167565b9052565b5190565b60209181520190565b90825f9392825e0152565b61053161053a60209361053f93610528816104fa565b938480936104fe565b95869101610507565b61045f565b0190565b916105669261055960408201935f8301906104ed565b6020818403910152610512565b90565b3461059a5761058161057c366004610311565b6104c8565b9061059661058d610072565b92839283610543565b0390f35b610078565b5f80fd5b5f80fd5b906105ba6105b3610072565b928361047d565b565b67ffffffffffffffff81116105da576105d660209161045f565b0190565b610469565b90825f939282370152565b909291926105ff6105fa826105bc565b6105a7565b9381855260208501908284011161061b57610619926105df565b565b6105a3565b9080601f8301121561063e5781602061063b933591016105ea565b90565b61059f565b90602082820312610673575f82013567ffffffffffffffff811161066e5761066b9201610620565b90565b610158565b61007c565b5f0190565b346106ab57610695610690366004610643565b610bf4565b61069d610072565b806106a781610678565b0390f35b610078565b6106b9906100e5565b9052565b6106c690610167565b9052565b6106e96106f26020936106f7936106e0816104fa565b938480936103b4565b95869101610507565b61045f565b0190565b61073891604060608201926107165f8201515f8501906106b0565b610728602082015160208501906106bd565b01519060408184039101526106ca565b90565b6107509160208201915f8184039101526106fb565b90565b346107835761077f61076e610769366004610311565b610d94565b610776610072565b9182918261073b565b0390f35b610078565b5f80fd5b61079861079d91610345565b610093565b90565b6107aa905461078c565b90565b90565b6107c46107bf6107c9926107ad565b6100e2565b6100d5565b90565b634e487b7160e01b5f52601160045260245ffd5b6107ec6107f2916100d5565b916100d5565b019067ffffffffffffffff821161080557565b6107cc565b5f1b90565b9061082267ffffffffffffffff9161080a565b9181191691161790565b90565b9061084461083f61084b926100e5565b61082c565b825461080f565b9055565b61085960406105a7565b90565b9061086690610167565b9052565b52565b6108779051610167565b90565b9061088b60018060a01b039161080a565b9181191691161790565b90565b906108ad6108a86108b492610211565b610895565b825461087a565b9055565b5190565b601f602091010490565b1b90565b919060086108e59102916108df5f19846108c6565b926108c6565b9181191691161790565b6109036108fe61090892610196565b6100e2565b610196565b90565b90565b919061092461091f61092c936108ef565b61090b565b9083546108ca565b9055565b5f90565b61094691610940610930565b9161090e565b565b5b818110610954575050565b806109615f600193610934565b01610949565b9190601f8111610977575b505050565b6109836109a8936103bd565b90602061098f846108bc565b830193106109b0575b6109a1906108bc565b0190610948565b5f8080610972565b91506109a181929050610998565b906109ce905f199060080261008f565b191690565b816109dd916109be565b906002021790565b906109ef816104fa565b9067ffffffffffffffff8211610aaf57610a1382610a0d855461038a565b85610967565b602090601f8311600114610a4757918091610a36935f92610a3b575b50506109d3565b90555b565b90915001515f80610a2f565b601f19831691610a56856103bd565b925f5b818110610a9757509160029391856001969410610a7d575b50505002019055610a39565b610a8d910151601f8416906109be565b90555f8080610a71565b91936020600181928787015181550195019201610a59565b610469565b90610abe916109e5565b565b90610aeb60206001610af194610ae35f8201610add5f880161086d565b90610898565b0192016108b8565b90610ab4565b565b90610afd91610ac0565b565b90565b5f5260205f2090565b5490565b919091610b1b81610b0b565b831015610b39576004610b2f600892610b02565b8185040193060290565b610233565b91906008610b60910291610b5a67ffffffffffffffff846108c6565b926108c6565b9181191691161790565b9190610b80610b7b610b88936100e5565b61082c565b908354610b3e565b9055565b9081549168010000000000000000831015610bbc5782610bb4916001610bba95018155610b0f565b90610b6a565b565b610469565b610bcb60606105a7565b90565b90610bd8906100d5565b9052565b610bf19160208201915f818403910152610512565b90565b610cf3610ce491610c32610c2b610c26610c16610c1160026107a0565b6100e5565b610c2060016107b0565b906107e0565b6100e5565b600261082f565b610cd0610c3f60026107a0565b91610c623391610c59610c5061084f565b935f850161085c565b6020830161086a565b91610c7783610c725f849061032f565b610af3565b610c95610c8e610c896001339061021d565b610aff565b8290610b8c565b91610cc76020610ca65f840161086d565b92015191610cbe610cb5610bc1565b955f8701610bce565b6020850161085c565b6040830161086a565b610cd8610072565b9283916020830161073b565b6020820181038252038261047d565b610d297f86eacd23610d81706516de1ed0476c87772fdf939c7c771fbbd7f0230d619e6891610d20610072565b91829182610bdc565b0390a1565b610d3860606105a7565b90565b5f90565b5f90565b606090565b610d50610d2e565b906020808084610d5e610d3b565b815201610d69610d3f565b815201610d74610d43565b81525050565b610d82610d48565b90565b90565b610d91906104a6565b90565b610d9c610d7a565b50610df4610deb610db6610db15f859061032f565b610d85565b610de66001610dc65f8401610369565b920191610ddd610dd4610bc1565b965f8801610bce565b6020860161085c565b610d88565b6040830161086a565b9056fea2646970667358221220e61cb56f6409e5c19eff38ecc4632839df152a6bf5c8966e30178bbcc0cd094f64736f6c634300081c0033","sourceMap":"280:1861:12:-:0;;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;","linkReferences":{}},"deployedBytecode":{"object":"0x60806040526004361015610013575b610788565b61001d5f3561006c565b806342227fa414610067578063913b1fbf14610062578063ce2896121461005d578063e31e0788146100585763e328ed770361000e57610753565b61067d565b610569565b6102b8565b610123565b60e01c90565b60405190565b5f80fd5b5f80fd5b5f91031261008a57565b61007c565b1c90565b67ffffffffffffffff1690565b6100b09060086100b5930261008f565b610093565b90565b906100c391546100a0565b90565b6100d260025f906100b8565b90565b67ffffffffffffffff1690565b90565b6100f96100f46100fe926100d5565b6100e2565b6100d5565b90565b61010a906100e5565b9052565b9190610121905f60208501940190610101565b565b3461015357610133366004610080565b61014f61013e6100c6565b610146610072565b9182918261010e565b0390f35b610078565b5f80fd5b60018060a01b031690565b6101709061015c565b90565b61017c81610167565b0361018357565b5f80fd5b9050359061019482610173565b565b90565b6101a281610196565b036101a957565b5f80fd5b905035906101ba82610199565b565b91906040838203126101e457806101d86101e1925f8601610187565b936020016101ad565b90565b61007c565b6101fd6101f86102029261015c565b6100e2565b61015c565b90565b61020e906101e9565b90565b61021a90610205565b90565b9061022790610211565b5f5260205260405f2090565b634e487b7160e01b5f52603260045260245ffd5b5490565b5f5260205f2090565b91909161026081610247565b83101561027e57600461027460089261024b565b8185040193060290565b610233565b61028e90600161021d565b61029781610247565b8210156102b4576102b1916102ab91610254565b906100b8565b90565b5f80fd5b346102e9576102e56102d46102ce3660046101bc565b90610283565b6102dc610072565b9182918261010e565b0390f35b610078565b6102f7816100d5565b036102fe57565b5f80fd5b9050359061030f826102ee565b565b9060208282031261032a57610327915f01610302565b90565b61007c565b90610339906100e5565b5f5260205260405f2090565b5f1c90565b60018060a01b031690565b61036161036691610345565b61034a565b90565b6103739054610355565b90565b634e487b7160e01b5f52602260045260245ffd5b90600160028304921680156103aa575b60208310146103a557565b610376565b91607f169161039a565b60209181520190565b5f5260205f2090565b905f92918054906103e06103d98361038a565b80946103b4565b916001811690815f1461043757506001146103fb575b505050565b61040891929394506103bd565b915f925b81841061041f57505001905f80806103f6565b6001816020929593955484860152019101929061040c565b92949550505060ff19168252151560200201905f80806103f6565b9061045c916103c6565b90565b601f801991011690565b634e487b7160e01b5f52604160045260245ffd5b906104879061045f565b810190811067ffffffffffffffff8211176104a157604052565b610469565b906104c66104bf926104b6610072565b93848092610452565b038361047d565b565b6104d2905f61032f565b906104ea60016104e35f8501610369565b93016104a6565b90565b6104f690610167565b9052565b5190565b60209181520190565b90825f9392825e0152565b61053161053a60209361053f93610528816104fa565b938480936104fe565b95869101610507565b61045f565b0190565b916105669261055960408201935f8301906104ed565b6020818403910152610512565b90565b3461059a5761058161057c366004610311565b6104c8565b9061059661058d610072565b92839283610543565b0390f35b610078565b5f80fd5b5f80fd5b906105ba6105b3610072565b928361047d565b565b67ffffffffffffffff81116105da576105d660209161045f565b0190565b610469565b90825f939282370152565b909291926105ff6105fa826105bc565b6105a7565b9381855260208501908284011161061b57610619926105df565b565b6105a3565b9080601f8301121561063e5781602061063b933591016105ea565b90565b61059f565b90602082820312610673575f82013567ffffffffffffffff811161066e5761066b9201610620565b90565b610158565b61007c565b5f0190565b346106ab57610695610690366004610643565b610bf4565b61069d610072565b806106a781610678565b0390f35b610078565b6106b9906100e5565b9052565b6106c690610167565b9052565b6106e96106f26020936106f7936106e0816104fa565b938480936103b4565b95869101610507565b61045f565b0190565b61073891604060608201926107165f8201515f8501906106b0565b610728602082015160208501906106bd565b01519060408184039101526106ca565b90565b6107509160208201915f8184039101526106fb565b90565b346107835761077f61076e610769366004610311565b610d94565b610776610072565b9182918261073b565b0390f35b610078565b5f80fd5b61079861079d91610345565b610093565b90565b6107aa905461078c565b90565b90565b6107c46107bf6107c9926107ad565b6100e2565b6100d5565b90565b634e487b7160e01b5f52601160045260245ffd5b6107ec6107f2916100d5565b916100d5565b019067ffffffffffffffff821161080557565b6107cc565b5f1b90565b9061082267ffffffffffffffff9161080a565b9181191691161790565b90565b9061084461083f61084b926100e5565b61082c565b825461080f565b9055565b61085960406105a7565b90565b9061086690610167565b9052565b52565b6108779051610167565b90565b9061088b60018060a01b039161080a565b9181191691161790565b90565b906108ad6108a86108b492610211565b610895565b825461087a565b9055565b5190565b601f602091010490565b1b90565b919060086108e59102916108df5f19846108c6565b926108c6565b9181191691161790565b6109036108fe61090892610196565b6100e2565b610196565b90565b90565b919061092461091f61092c936108ef565b61090b565b9083546108ca565b9055565b5f90565b61094691610940610930565b9161090e565b565b5b818110610954575050565b806109615f600193610934565b01610949565b9190601f8111610977575b505050565b6109836109a8936103bd565b90602061098f846108bc565b830193106109b0575b6109a1906108bc565b0190610948565b5f8080610972565b91506109a181929050610998565b906109ce905f199060080261008f565b191690565b816109dd916109be565b906002021790565b906109ef816104fa565b9067ffffffffffffffff8211610aaf57610a1382610a0d855461038a565b85610967565b602090601f8311600114610a4757918091610a36935f92610a3b575b50506109d3565b90555b565b90915001515f80610a2f565b601f19831691610a56856103bd565b925f5b818110610a9757509160029391856001969410610a7d575b50505002019055610a39565b610a8d910151601f8416906109be565b90555f8080610a71565b91936020600181928787015181550195019201610a59565b610469565b90610abe916109e5565b565b90610aeb60206001610af194610ae35f8201610add5f880161086d565b90610898565b0192016108b8565b90610ab4565b565b90610afd91610ac0565b565b90565b5f5260205f2090565b5490565b919091610b1b81610b0b565b831015610b39576004610b2f600892610b02565b8185040193060290565b610233565b91906008610b60910291610b5a67ffffffffffffffff846108c6565b926108c6565b9181191691161790565b9190610b80610b7b610b88936100e5565b61082c565b908354610b3e565b9055565b9081549168010000000000000000831015610bbc5782610bb4916001610bba95018155610b0f565b90610b6a565b565b610469565b610bcb60606105a7565b90565b90610bd8906100d5565b9052565b610bf19160208201915f818403910152610512565b90565b610cf3610ce491610c32610c2b610c26610c16610c1160026107a0565b6100e5565b610c2060016107b0565b906107e0565b6100e5565b600261082f565b610cd0610c3f60026107a0565b91610c623391610c59610c5061084f565b935f850161085c565b6020830161086a565b91610c7783610c725f849061032f565b610af3565b610c95610c8e610c896001339061021d565b610aff565b8290610b8c565b91610cc76020610ca65f840161086d565b92015191610cbe610cb5610bc1565b955f8701610bce565b6020850161085c565b6040830161086a565b610cd8610072565b9283916020830161073b565b6020820181038252038261047d565b610d297f86eacd23610d81706516de1ed0476c87772fdf939c7c771fbbd7f0230d619e6891610d20610072565b91829182610bdc565b0390a1565b610d3860606105a7565b90565b5f90565b5f90565b606090565b610d50610d2e565b906020808084610d5e610d3b565b815201610d69610d3f565b815201610d74610d43565b81525050565b610d82610d48565b90565b90565b610d91906104a6565b90565b610d9c610d7a565b50610df4610deb610db6610db15f859061032f565b610d85565b610de66001610dc65f8401610369565b920191610ddd610dd4610bc1565b965f8801610bce565b6020860161085c565b610d88565b6040830161086a565b9056fea2646970667358221220e61cb56f6409e5c19eff38ecc4632839df152a6bf5c8966e30178bbcc0cd094f64736f6c634300081c0033","sourceMap":"280:1861:12:-:0;;;;;;;;;-1:-1:-1;280:1861:12;:::i;:::-;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;:::o;:::-;;;;:::o;:::-;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;:::o;:::-;;;;:::o;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::o;978:30::-;;;;;;:::i;:::-;;:::o;280:1861::-;;;;:::o;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;:::i;712:58::-;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;:::o;:::-;;;;280:1861;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;:::o;:::-;;;;;;;;:::o;:::-;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;:::o;596:49::-;;;;;:::i;:::-;;;;;;;;;:::i;:::-;;;;:::i;:::-;;:::o;280:1861::-;;;;:::i;:::-;;;:::o;:::-;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;;;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;;:::i;:::-;:::o;:::-;;;;;;;;;;:::i;:::-;;;:::o;:::-;;:::i;:::-;;;;;;;;;;:::o;:::-;;;;;;;;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;:::i;:::-;;;;:::o;:::-;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;:::o;:::-;;:::i;:::-;;;;:::o;:::-;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;:::o;:::-;;;;;;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;:::o;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;:::o;:::-;;;;;;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;:::o;:::-;;;;;;;:::o;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;;;:::o;:::-;;;:::o;:::-;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;:::i;:::-;;;;;;:::o;:::-;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;;;;:::i;:::-;:::o;:::-;;:::o;:::-;;;;;;;:::o;:::-;;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;:::i;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::o;1108:729::-;1806:23;;1108:729;1213:67;1229:51;1244:35;:31;1261:13;;;:::i;:::-;1244:31;:::i;:::-;:35;1278:1;1244:35;:::i;:::-;;;:::i;:::-;1229:51;:::i;:::-;1213:67;;:::i;:::-;1698:81;1312:13;;;:::i;:::-;1409:10;1391:42;1409:10;1427:4;1391:42;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::i;:::-;1497:7;1471:33;1497:7;1471:23;:12;1484:9;1471:23;;:::i;:::-;:33;:::i;:::-;1515:47;:36;:31;:19;1535:10;1515:31;;:::i;:::-;:36;:::i;:::-;1552:9;1515:47;;:::i;:::-;1742:7;1698:81;1765:12;1742:15;;:7;:15;;:::i;:::-;1765:7;:12;;1698:81;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::i;:::-;;;;;:::i;:::-;1806:23;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;1795:35;;;;;:::i;:::-;;;;;;:::i;:::-;;;;1108:729::o;280:1861::-;;;;:::i;:::-;;:::o;:::-;;;:::o;:::-;;;:::o;:::-;;;:::o;:::-;;;:::i;:::-;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::o;:::-;;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;1878:261::-;1954:18;;:::i;:::-;2010:12;2051:81;;1984:49;2010:23;:12;2023:9;2010:23;;:::i;:::-;1984:49;:::i;:::-;2051:81;2118:12;2095:15;;:7;:15;;:::i;:::-;2118:7;:12;2051:81;;;;:::i;:::-;;;;;;:::i;:::-;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;2044:88;:::o","linkReferences":{}},"methodIdentifiers":{"addTrigger(bytes)":"e31e0788","getTrigger(uint64)":"e328ed77","nextTriggerId()":"42227fa4","triggerIdsByCreator(address,uint256)":"913b1fbf","triggersById(uint64)":"ce289612"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.28+commit.7893614a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"triggerData\",\"type\":\"bytes\"}],\"name\":\"NewTrigger\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"addTrigger\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"}],\"name\":\"getTrigger\",\"outputs\":[{\"components\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"triggerId\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"creator\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"internalType\":\"struct ISimpleTrigger.TriggerInfo\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"nextTriggerId\",\"outputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"triggerIdsByCreator\",\"outputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"ISimpleTrigger.TriggerId\",\"name\":\"\",\"type\":\"uint64\"}],\"name\":\"triggersById\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"creator\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"Lay3r Labs\",\"details\":\"This contract implements the ISimpleTrigger interface\",\"events\":{\"NewTrigger(bytes)\":{\"params\":{\"triggerData\":\"The data of the trigger\"}}},\"kind\":\"dev\",\"methods\":{\"addTrigger(bytes)\":{\"params\":{\"data\":\"The data of the trigger\"}},\"getTrigger(uint64)\":{\"params\":{\"triggerId\":\"The trigger ID\"},\"returns\":{\"_0\":\"triggerInfo The trigger info\"}}},\"title\":\"SimpleTrigger\",\"version\":1},\"userdoc\":{\"events\":{\"NewTrigger(bytes)\":{\"notice\":\"Event emitted when a new trigger is added\"}},\"kind\":\"user\",\"methods\":{\"addTrigger(bytes)\":{\"notice\":\"Adds a new trigger\"},\"getTrigger(uint64)\":{\"notice\":\"Returns the trigger info for a given trigger ID\"},\"nextTriggerId()\":{\"notice\":\"The next trigger id\"},\"triggerIdsByCreator(address,uint256)\":{\"notice\":\"Mapping from creator address to trigger IDs\"},\"triggersById(uint64)\":{\"notice\":\"Mapping from trigger ID to trigger\"}},\"notice\":\"Contract for the simple trigger contract\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"examples/contracts/solidity/mocks/SimpleTrigger.sol\":\"SimpleTrigger\"},\"evmVersion\":\"prague\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[],\"viaIR\":true},\"sources\":{\"examples/contracts/solidity/mocks/ISimpleTrigger.sol\":{\"keccak256\":\"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1\",\"dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG\"]},\"examples/contracts/solidity/mocks/SimpleTrigger.sol\":{\"keccak256\":\"0xd1503ace1c3a4e08aec278d40e94b7205729fea06d428fc1a1f2a72cd9ad6ba1\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://43184f8449ab3ce225f626a8b5fdea177ce7236652523ab3b6ef49a9b755df64\",\"dweb:/ipfs/QmdUGtdFhuvVjXKwZmC99gFrnzRiYvG9GKer82Zf3qZNWd\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.28+commit.7893614a"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"bytes","name":"triggerData","type":"bytes","indexed":false}],"type":"event","name":"NewTrigger","anonymous":false},{"inputs":[{"internalType":"bytes","name":"data","type":"bytes"}],"stateMutability":"nonpayable","type":"function","name":"addTrigger"},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"}],"stateMutability":"view","type":"function","name":"getTrigger","outputs":[{"internalType":"struct ISimpleTrigger.TriggerInfo","name":"","type":"tuple","components":[{"internalType":"ISimpleTrigger.TriggerId","name":"triggerId","type":"uint64"},{"internalType":"address","name":"creator","type":"address"},{"internalType":"bytes","name":"data","type":"bytes"}]}]},{"inputs":[],"stateMutability":"view","type":"function","name":"nextTriggerId","outputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"","type":"uint64"}]},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function","name":"triggerIdsByCreator","outputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"","type":"uint64"}]},{"inputs":[{"internalType":"ISimpleTrigger.TriggerId","name":"","type":"uint64"}],"stateMutability":"view","type":"function","name":"triggersById","outputs":[{"internalType":"address","name":"creator","type":"address"},{"internalType":"bytes","name":"data","type":"bytes"}]}],"devdoc":{"kind":"dev","methods":{"addTrigger(bytes)":{"params":{"data":"The data of the trigger"}},"getTrigger(uint64)":{"params":{"triggerId":"The trigger ID"},"returns":{"_0":"triggerInfo The trigger info"}}},"version":1},"userdoc":{"kind":"user","methods":{"addTrigger(bytes)":{"notice":"Adds a new trigger"},"getTrigger(uint64)":{"notice":"Returns the trigger info for a given trigger ID"},"nextTriggerId()":{"notice":"The next trigger id"},"triggerIdsByCreator(address,uint256)":{"notice":"Mapping from creator address to trigger IDs"},"triggersById(uint64)":{"notice":"Mapping from trigger ID to trigger"}},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":false,"runs":200},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"examples/contracts/solidity/mocks/SimpleTrigger.sol":"SimpleTrigger"},"evmVersion":"prague","libraries":{},"viaIR":true},"sources":{"examples/contracts/solidity/mocks/ISimpleTrigger.sol":{"keccak256":"0xd7fcd5d67ba9352e5b495db030bc519c253118a4d0073a33fe6387e10d81f814","urls":["bzz-raw://eba963e1d84d269ed3a6babdce1a0ce33822864849e9bdf71904d4e14e7426e1","dweb:/ipfs/QmZgopqfLhuLtQbhMJShqRcn6bsdAGgzdDanyVHFgn7DgG"],"license":"MIT"},"examples/contracts/solidity/mocks/SimpleTrigger.sol":{"keccak256":"0xd1503ace1c3a4e08aec278d40e94b7205729fea06d428fc1a1f2a72cd9ad6ba1","urls":["bzz-raw://43184f8449ab3ce225f626a8b5fdea177ce7236652523ab3b6ef49a9b755df64","dweb:/ipfs/QmdUGtdFhuvVjXKwZmC99gFrnzRiYvG9GKer82Zf3qZNWd"],"license":"MIT"}},"version":1},"id":12}
\ No newline at end of file
diff --git a/examples/contracts/solidity/interfaces/bls/IWavsServiceHandler.sol b/examples/contracts/solidity/interfaces/bls/IWavsServiceHandler.sol
new file mode 100644
index 000000000..a0230298f
--- /dev/null
+++ b/examples/contracts/solidity/interfaces/bls/IWavsServiceHandler.sol
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.27;
+
+/**
+ * @title IWavsServiceHandler
+ * @author Lay3r Labs
+ * @notice Interface for the Wavs service handler (BLS variant)
+ * @dev This interface defines the functions and events for the Wavs service handler
+ */
+interface IWavsServiceHandler {
+    /// @notice The BLS signature data struct
+    struct SignatureData {
+        bytes[] signerPubkeys; // Array of 128-byte G1 public keys
+        bytes aggregateSignature; // Single 256-byte G2 aggregate signature
+        uint32 referenceBlock;
+    }
+
+    /// @notice The envelope struct
+    struct Envelope {
+        bytes20 eventId;
+        // currently unused, for future version. added now for padding
+        bytes12 ordering;
+        bytes payload;
+    }
+
+    /**
+     * @notice Handles a signed envelope
+     * @param envelope The envelope containing the data.
+     * @param signatureData The signature data.
+     */
+    function handleSignedEnvelope(
+        Envelope calldata envelope,
+        SignatureData calldata signatureData
+    ) external;
+
+    /**
+     * @notice Returns the address of the service manager
+     * @return The address of the service manager
+     */
+    function getServiceManager() external view returns (address);
+}
diff --git a/examples/contracts/solidity/interfaces/bls/IWavsServiceManager.sol b/examples/contracts/solidity/interfaces/bls/IWavsServiceManager.sol
new file mode 100644
index 000000000..8def48962
--- /dev/null
+++ b/examples/contracts/solidity/interfaces/bls/IWavsServiceManager.sol
@@ -0,0 +1,113 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.27;
+
+import {IWavsServiceHandler} from "./IWavsServiceHandler.sol";
+
+/**
+ * @title IWavsServiceManager
+ * @author Lay3r Labs
+ * @notice Interface for the Wavs service manager (BLS variant)
+ * @dev This interface defines the functions and events for the Wavs service manager
+ */
+interface IWavsServiceManager {
+    // ------------------------------------------------------------------------
+    // Custom Errors
+    // ------------------------------------------------------------------------
+    /// @notice The error for the invalid signature length.
+    error InvalidSignatureLength();
+    /// @notice The error for the invalid signature block.
+    error InvalidSignatureBlock();
+    /// @notice The error for the invalid signature order.
+    error InvalidSignatureOrder();
+    /// @notice The error for the invalid signature.
+    error InvalidSignature();
+    /// @notice The error for the insufficient quorum zero.
+    error InsufficientQuorumZero();
+    /**
+     * @notice The error for the insufficient quorum
+     * @param signerWeight The weight of the signer
+     * @param thresholdWeight The threshold weight
+     * @param totalWeight The total weight
+     */
+    error InsufficientQuorum(uint256 signerWeight, uint256 thresholdWeight, uint256 totalWeight);
+    /// @notice The error for the invalid quorum parameters.
+    error InvalidQuorumParameters();
+
+    // ------------------------------------------------------------------------
+    // Events
+    // ------------------------------------------------------------------------
+    /**
+     * @notice Event emitted when the service URI is updated
+     * @param serviceURI The service URI
+     */
+    event ServiceURIUpdated(string serviceURI);
+    /**
+     * @notice Event emitted when the quorum threshold is updated
+     * @param numerator The numerator of the quorum threshold
+     * @param denominator The denominator of the quorum threshold
+     */
+    event QuorumThresholdUpdated(uint256 indexed numerator, uint256 indexed denominator);
+
+    // ------------------------------------------------------------------------
+    // Stake Registry View Functions
+    // ------------------------------------------------------------------------
+    /**
+     * @notice Gets the operator's current weight
+     * @param operator The address of the operator
+     * @return The current weight of the operator
+     */
+    function getOperatorWeight(
+        address operator
+    ) external view returns (uint256);
+
+    /**
+     * @notice Validates a signed envelope
+     * @param envelope The envelope containing the data.
+     * @param signatureData The signature data.
+     */
+    function validate(
+        IWavsServiceHandler.Envelope calldata envelope,
+        IWavsServiceHandler.SignatureData calldata signatureData
+    ) external view;
+
+    /**
+     * @notice Returns the service URI
+     * @return The service URI.
+     */
+    function getServiceURI() external view returns (string memory);
+
+    /**
+     * @notice Sets the service URI
+     * @param _serviceURI The service URI to update.
+     */
+    function setServiceURI(
+        string calldata _serviceURI
+    ) external;
+
+    /**
+     * @notice Returns the latest operator address associated with a BLS signing key hash.
+     * @param keyHash The keccak256 hash of the BLS public key.
+     * @return The latest operator address associated with the key, or address(0) if none.
+     */
+    function getLatestOperatorForSigningKey(
+        bytes32 keyHash
+    ) external view returns (address);
+
+    /**
+     * @notice Returns the allocation manager address.
+     * @return The allocation manager address.
+     */
+    function getAllocationManager() external view returns (address);
+
+    /**
+     * @notice Returns the delegation manager address.
+     * @return The delegation manager address.
+     */
+    function getDelegationManager() external view returns (address);
+
+    /**
+     * @notice Returns the stake registry address.
+     * @return The stake registry address.
+     */
+    function getStakeRegistry() external view returns (address);
+}
diff --git a/examples/contracts/solidity/mocks/SimpleBlsSubmit.sol b/examples/contracts/solidity/mocks/SimpleBlsSubmit.sol
new file mode 100644
index 000000000..ffa294f33
--- /dev/null
+++ b/examples/contracts/solidity/mocks/SimpleBlsSubmit.sol
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.27;
+
+import {IWavsServiceHandler} from "../interfaces/bls/IWavsServiceHandler.sol";
+import {IWavsServiceManager} from "../interfaces/bls/IWavsServiceManager.sol";
+import {ISimpleTrigger} from "./ISimpleTrigger.sol";
+
+/**
+ * @title SimpleBlsSubmit
+ * @author Lay3r Labs
+ * @notice Contract for BLS-signed submission handling
+ * @dev This contract implements the BLS variant of IWavsServiceHandler.
+ *      It does NOT implement ISimpleSubmit because that interface references
+ *      the ECDSA SignatureData type. BLS tests verify via isValidTriggerId()
+ *      after the BLS pairing check passes in _SERVICE_MANAGER.validate().
+ */
+contract SimpleBlsSubmit is IWavsServiceHandler {
+    IWavsServiceManager private immutable _SERVICE_MANAGER;
+
+    /// @notice Mapping from trigger ID to valid triggers
+    mapping(ISimpleTrigger.TriggerId => bool) public validTriggers;
+
+    /// @notice DataWithId is a struct containing a trigger ID and data (mirrors ISimpleSubmit.DataWithId)
+    struct DataWithId {
+        ISimpleTrigger.TriggerId triggerId;
+        bytes data;
+    }
+
+    /**
+     * @notice Constructor
+     * @param serviceManager The BLS service manager
+     */
+    constructor(IWavsServiceManager serviceManager) {
+        _SERVICE_MANAGER = serviceManager;
+    }
+
+    /// @inheritdoc IWavsServiceHandler
+    function handleSignedEnvelope(
+        IWavsServiceHandler.Envelope calldata envelope,
+        IWavsServiceHandler.SignatureData calldata signatureData
+    ) external {
+        _SERVICE_MANAGER.validate(envelope, signatureData);
+
+        DataWithId memory dataWithId = abi.decode(envelope.payload, (DataWithId));
+        validTriggers[dataWithId.triggerId] = true;
+    }
+
+    /**
+     * @notice Checks if a trigger ID is valid (BLS signature was verified)
+     * @param triggerId The trigger ID to check
+     * @return True if the trigger ID has been verified, false otherwise
+     */
+    function isValidTriggerId(
+        ISimpleTrigger.TriggerId triggerId
+    ) external view returns (bool) {
+        return validTriggers[triggerId];
+    }
+
+    /// @inheritdoc IWavsServiceHandler
+    function getServiceManager() external view returns (address) {
+        return address(_SERVICE_MANAGER);
+    }
+}
diff --git a/justfile b/justfile
index 6d0d959fa..a27387ac3 100644
--- a/justfile
+++ b/justfile
@@ -141,6 +141,7 @@ solidity-build CLEAN="":
     cp -r {{REPO_ROOT}}/out/ISimpleTrigger.sol {{REPO_ROOT}}/examples/contracts/solidity/abi/
     cp -r {{REPO_ROOT}}/out/SimpleSubmit.sol {{REPO_ROOT}}/examples/contracts/solidity/abi/
     cp -r {{REPO_ROOT}}/out/ISimpleSubmit.sol {{REPO_ROOT}}/examples/contracts/solidity/abi/
+    cp -r {{REPO_ROOT}}/out/SimpleBlsSubmit.sol {{REPO_ROOT}}/examples/contracts/solidity/abi/
     # wavs-types
     cp -r {{REPO_ROOT}}/out/IWavsServiceHandler.sol {{REPO_ROOT}}/packages/types/src/contracts/solidity/abi/
     cp -r {{REPO_ROOT}}/out/IWavsServiceManager.sol {{REPO_ROOT}}/packages/types/src/contracts/solidity/abi/
diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml
index bd5186a00..addb6de65 100644
--- a/packages/cli/Cargo.toml
+++ b/packages/cli/Cargo.toml
@@ -30,7 +30,7 @@ shellexpand = { workspace = true }
 uuid = { workspace = true }
 cfg-if = { workspace = true }
 alloy-primitives = { workspace = true }
-alloy-provider = { workspace = true }
+alloy-provider = { workspace = true, features = ["reqwest", "reqwest-default-tls", "ws", "pubsub"] }
 alloy-json-abi = { workspace = true }
 cron = { workspace = true }
 rand = { workspace = true }
diff --git a/packages/cli/src/main.rs b/packages/cli/src/main.rs
index af940f792..12193223f 100644
--- a/packages/cli/src/main.rs
+++ b/packages/cli/src/main.rs
@@ -26,8 +26,8 @@ use wavs_cli::{
     util::{write_output_file, ComponentInput},
 };
 use wavs_types::SignatureKind;
-use wavs_types::WavsSigner;
 use wavs_types::{ChainKeyId, Envelope, IWavsServiceHandler};
+use wavs_types::{SignatureData, WavsCryptoSigner, WavsSigner};
 
 // Shared function to create EVM client with any credential
 // duplicated here instead of using the one in CliContext so
@@ -307,8 +307,11 @@ async fn main() {
                         };
 
                         // Create signature using the operator EVM client's signer
+                        let crypto_signer = WavsCryptoSigner::Secp256k1(
+                            operator_evm_client.signer.as_ref().clone(),
+                        );
                         let signature = envelope
-                            .sign(&operator_evm_client.signer, SignatureKind::evm_default())
+                            .sign(&crypto_signer, SignatureKind::evm_default())
                             .await
                             .unwrap();
 
@@ -342,9 +345,18 @@ async fn main() {
                             payload: envelope.payload,
                         };
 
+                        // Extract the inner secp256k1 SignatureData for the contract call
+                        let inner_sig_data = match signature_data {
+                            SignatureData::Secp256k1(inner) => inner,
+                            SignatureData::Bls12381(_) => {
+                                eprintln!("BLS signature submission not yet implemented");
+                                std::process::exit(1);
+                            }
+                        };
+
                         // Submit to chain using the original EVM client (as transaction sender)
                         match contract
-                            .handleSignedEnvelope(contract_envelope, signature_data)
+                            .handleSignedEnvelope(contract_envelope, inner_sig_data)
                             .send()
                             .await
                         {
diff --git a/packages/engine/src/bindings/types/component_to_wavs.rs b/packages/engine/src/bindings/types/component_to_wavs.rs
index cdc20d307..90f24d43a 100644
--- a/packages/engine/src/bindings/types/component_to_wavs.rs
+++ b/packages/engine/src/bindings/types/component_to_wavs.rs
@@ -261,6 +261,9 @@ impl From<component_service::SignatureAlgorithm> for wavs_types::SignatureAlgori
             component_service::SignatureAlgorithm::Secp256k1 => {
                 wavs_types::SignatureAlgorithm::Secp256k1
             }
+            component_service::SignatureAlgorithm::Bls12381 => {
+                wavs_types::SignatureAlgorithm::Bls12381
+            }
         }
     }
 }
diff --git a/packages/engine/src/bindings/types/wavs_to_component.rs b/packages/engine/src/bindings/types/wavs_to_component.rs
index 2de1974fa..88cd8aea8 100644
--- a/packages/engine/src/bindings/types/wavs_to_component.rs
+++ b/packages/engine/src/bindings/types/wavs_to_component.rs
@@ -286,6 +286,9 @@ impl From<wavs_types::SignatureAlgorithm> for component_service::SignatureAlgori
             wavs_types::SignatureAlgorithm::Secp256k1 => {
                 component_service::SignatureAlgorithm::Secp256k1
             }
+            wavs_types::SignatureAlgorithm::Bls12381 => {
+                component_service::SignatureAlgorithm::Bls12381
+            }
         }
     }
 }
@@ -850,6 +853,9 @@ impl From<wavs_types::SignatureAlgorithm> for aggregator_service::SignatureAlgor
             wavs_types::SignatureAlgorithm::Secp256k1 => {
                 aggregator_service::SignatureAlgorithm::Secp256k1
             }
+            wavs_types::SignatureAlgorithm::Bls12381 => {
+                aggregator_service::SignatureAlgorithm::Bls12381
+            }
         }
     }
 }
diff --git a/packages/gui/shared/src/event.rs b/packages/gui/shared/src/event.rs
index 31af750ce..04f3d992c 100644
--- a/packages/gui/shared/src/event.rs
+++ b/packages/gui/shared/src/event.rs
@@ -57,12 +57,26 @@ pub struct SubmissionEvent {
     pub service_id: ServiceId,
     pub workflow_id: WorkflowId,
     pub trigger_data: TriggerData,
+    pub tx_hash: Option<String>,
 }
 
 impl TauriEventExt for SubmissionEvent {
     const NAME: &'static str = "submission";
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub struct SubmissionErrorEvent {
+    pub service_id: ServiceId,
+    pub workflow_id: WorkflowId,
+    pub trigger_data: TriggerData,
+    pub error_message: String,
+}
+
+impl TauriEventExt for SubmissionErrorEvent {
+    const NAME: &'static str = "submission_error";
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct ServiceEvent {
     pub action: ServiceAction,
diff --git a/packages/layer-tests/Cargo.toml b/packages/layer-tests/Cargo.toml
index 5496c285b..a0ec95502 100644
--- a/packages/layer-tests/Cargo.toml
+++ b/packages/layer-tests/Cargo.toml
@@ -37,7 +37,7 @@ alloy-signer-local = { workspace = true }
 alloy-rpc-types-eth = { workspace = true }
 alloy-sol-types = { workspace = true }
 alloy-primitives = { workspace = true }
-alloy-provider = { workspace = true, features = ["anvil-node"] }
+alloy-provider = { workspace = true, features = ["reqwest", "reqwest-default-tls", "anvil-node", "ws", "pubsub"] }
 alloy-signer = { workspace = true }
 alloy-contract = { workspace = true }
 uuid = { workspace = true }
diff --git a/packages/layer-tests/layer-tests.toml b/packages/layer-tests/layer-tests.toml
index f2d064c5b..7bf921c6d 100644
--- a/packages/layer-tests/layer-tests.toml
+++ b/packages/layer-tests/layer-tests.toml
@@ -6,9 +6,12 @@ wavs_concurrency = true
 middleware_concurrency = true
 grouping = false
 evm_middleware_type = "poa"   # "eigenlayer" or "poa"
-p2p = "kademlia"              # "mdns" (local) or "kademlia" (remote)
+p2p = "remote"                # "local" or "remote"
 # Run all tests
 mode = "all"
+# mode = { "isolated" = [{ evm = "echo_data" }, { evm = "bls_multi_operator" }] }
+# mode = { "isolated" = [{ evm = "change_workflow" }] }
+# mode = { "isolated" = [{ evm = "echo_data" }] }
 # mode = { "isolated" = [{ evm = "hypercore_echo_data" }] }
 # mode = { "isolated" = [{ evm = "echo_data" }, {evm = "multi_operator"}] }
 # mode = { "isolated" = [{ evm = "echo_data" }, {evm = "multi_operator"}] }
diff --git a/packages/layer-tests/src/config.rs b/packages/layer-tests/src/config.rs
index 9637282eb..c6cd082a6 100644
--- a/packages/layer-tests/src/config.rs
+++ b/packages/layer-tests/src/config.rs
@@ -9,8 +9,8 @@ use crate::e2e::{AnyService, CosmosService, CrossChainService, EvmService, TestM
 #[serde(rename_all = "snake_case")]
 pub enum TestP2pMode {
     #[default]
-    Mdns,
-    Kademlia,
+    Local,
+    Remote,
 }
 
 /// The fully parsed and validated config struct we use in the application
diff --git a/packages/layer-tests/src/e2e.rs b/packages/layer-tests/src/e2e.rs
index 0d0c0a1a1..8b3300f6e 100644
--- a/packages/layer-tests/src/e2e.rs
+++ b/packages/layer-tests/src/e2e.rs
@@ -22,9 +22,10 @@ use utils::{
     config::{ConfigBuilder, ConfigExt},
     context::AppContext,
     telemetry::{setup_metrics, setup_tracing, Metrics},
-    test_utils::middleware::evm::EvmMiddleware,
 };
 
+use handles::EvmMiddlewares;
+
 use crate::{
     args::TestArgs,
     config::{TestConfig, TestMode},
@@ -97,7 +98,7 @@ pub fn run(args: TestArgs, ctx: AppContext) {
             _ = kill_receiver.recv() => {
                 tracing::debug!("Test runner killed");
             },
-            _ = _run(configs, clients, mode, handles.evm_middleware.clone(), handles.cosmos_middlewares.clone()) => {
+            _ = _run(configs, clients, mode, handles.evm_middlewares.clone(), handles.cosmos_middlewares.clone()) => {
                 tracing::debug!("Test runner completed");
             }
         }
@@ -137,7 +138,7 @@ async fn _run(
     configs: Configs,
     clients: Clients,
     mode: TestMode,
-    evm_middleware: Option<EvmMiddleware>,
+    evm_middlewares: Option<EvmMiddlewares>,
     cosmos_middlewares: CosmosMiddlewares,
 ) {
     let report = TestReport::new();
@@ -160,7 +161,7 @@ async fn _run(
     // bootstrap service managers
     let mut service_managers = ServiceManagers::new(configs.clone());
     service_managers
-        .bootstrap(&registry, &clients, evm_middleware, cosmos_middlewares)
+        .bootstrap(&registry, &clients, evm_middlewares, cosmos_middlewares)
         .await;
 
     // upload components to ALL WAVS instances
diff --git a/packages/layer-tests/src/e2e/config.rs b/packages/layer-tests/src/e2e/config.rs
index 13da3f9fd..058618876 100644
--- a/packages/layer-tests/src/e2e/config.rs
+++ b/packages/layer-tests/src/e2e/config.rs
@@ -11,7 +11,7 @@ use utils::{
     filesystem::workspace_path,
     test_utils::middleware::evm::EvmMiddlewareType,
 };
-use wavs::subsystems::aggregator::p2p::P2pConfig;
+use wavs::subsystems::aggregator::p2p::{pubkey_from_mnemonic, P2pConfig};
 use wavs_types::{ChainConfigs, CosmosChainConfigBuilder, Credential, EvmChainConfigBuilder};
 
 use crate::config::{TestConfig, TestP2pMode};
@@ -250,39 +250,55 @@ impl From<TestConfig> for Configs {
 
             // Enable P2P for multi-operator tests
             if num_operators > 1 {
+                // Pre-compute Ed25519 pubkeys for all operators from their mnemonics.
+                // In commonware-p2p, peers must be in the oracle's authorized set to connect.
+                // Without this, operators reject each other's connections.
+                let all_operator_pubkeys: Vec<String> = mnemonics
+                    .operators
+                    .iter()
+                    .map(|cred| {
+                        pubkey_from_mnemonic(cred.as_str())
+                            .expect("Failed to derive P2P pubkey from operator mnemonic")
+                    })
+                    .collect();
+
+                // Each operator authorizes all OTHER operators
+                let other_pubkeys: Vec<String> = all_operator_pubkeys
+                    .iter()
+                    .enumerate()
+                    .filter(|(i, _)| *i != operator_index)
+                    .map(|(_, pk)| pk.clone())
+                    .collect();
+
                 match test_config.p2p {
-                    TestP2pMode::Kademlia => {
-                        // Remote mode: Kademlia DHT discovery
-                        // Operator 0 is the bootstrap server (empty bootstrap_nodes)
-                        // Operators 1+ will have bootstrap_nodes set at runtime after operator 0 starts
+                    TestP2pMode::Remote => {
+                        // Remote mode: discovery with bootstrapper nodes
+                        // Operator 0 is the bootstrap server (empty bootstrappers)
+                        // Operators 1+ will have bootstrappers set at runtime after operator 0 starts
                         wavs_config.p2p = P2pConfig::Remote {
                             listen_port: DEFAULT_P2P_BASE_PORT + operator_index as u16,
-                            bootstrap_nodes: vec![], // Set at runtime for operators 1+
-                            max_retry_duration_secs: None,
-                            retry_interval_ms: None,
-                            submission_ttl_secs: None,
-                            max_catchup_submissions: None,
-                            cleanup_interval_secs: None,
-                            kademlia_discovery_interval_secs: Some(2),
-                            catchup_request_timeout_secs: None,
-                            max_concurrent_catchup_requests_per_service: None,
-                            max_pending_publishes: None,
-                            max_stored_submissions_per_service: None,
+                            bootstrappers: vec![], // Set at runtime for operators 1+
+                            authorized_peers: other_pubkeys,
+                            max_message_size: None,
+                            deque_size: None,
                         };
                     }
-                    TestP2pMode::Mdns => {
-                        // Local mode: mDNS discovery
+                    TestP2pMode::Local => {
+                        // Local mode: lookup with known peer addresses (pubkey@host:port)
+                        let peer_addresses: Vec<String> = all_operator_pubkeys
+                            .iter()
+                            .enumerate()
+                            .filter(|(i, _)| *i != operator_index)
+                            .map(|(i, pk)| {
+                                format!("{}@127.0.0.1:{}", pk, DEFAULT_P2P_BASE_PORT + i as u16)
+                            })
+                            .collect();
                         wavs_config.p2p = P2pConfig::Local {
                             listen_port: DEFAULT_P2P_BASE_PORT + operator_index as u16,
-                            max_retry_duration_secs: None,
-                            retry_interval_ms: None,
-                            submission_ttl_secs: None,
-                            max_catchup_submissions: None,
-                            cleanup_interval_secs: None,
-                            catchup_request_timeout_secs: None,
-                            max_concurrent_catchup_requests_per_service: None,
-                            max_pending_publishes: None,
-                            max_stored_submissions_per_service: None,
+                            peer_addresses,
+                            authorized_peers: other_pubkeys,
+                            max_message_size: None,
+                            deque_size: None,
                         };
                     }
                 }
diff --git a/packages/layer-tests/src/e2e/handles.rs b/packages/layer-tests/src/e2e/handles.rs
index 87efb1655..f3c43b2f1 100644
--- a/packages/layer-tests/src/e2e/handles.rs
+++ b/packages/layer-tests/src/e2e/handles.rs
@@ -11,7 +11,7 @@ use utils::{
     telemetry::Metrics,
     test_utils::middleware::{
         cosmos::{CosmosMiddleware, CosmosMiddlewareKind},
-        evm::EvmMiddleware,
+        evm::{EvmMiddleware, EvmMiddlewareType},
     },
 };
 use wavs::dispatcher::{Dispatcher, TauriHandle};
@@ -26,10 +26,18 @@ use crate::config::TestP2pMode;
 use super::config::Configs;
 //use super::matrix::EvmService;
 
+/// Holds both the default (secp256k1) and optional BLS middleware so that
+/// per-test dispatch can select the right one without global state.
+#[derive(Clone)]
+pub struct EvmMiddlewares {
+    pub default: EvmMiddleware,
+    pub bls: Option<EvmMiddleware>,
+}
+
 pub struct AppHandles {
     /// One handle per WAVS operator instance
     pub wavs_handles: Vec<std::thread::JoinHandle<()>>,
-    pub evm_middleware: Option<EvmMiddleware>,
+    pub evm_middlewares: Option<EvmMiddlewares>,
     pub cosmos_middlewares: CosmosMiddlewares,
     _evm_chains: Vec<EvmInstance>,
     _cosmos_chains: Vec<CosmosInstance>,
@@ -99,7 +107,7 @@ impl AppHandles {
 
         // Check if we're using Remote P2P mode (Kademlia)
 
-        if configs.p2p == TestP2pMode::Kademlia && configs.num_operators() > 1 {
+        if configs.p2p == TestP2pMode::Remote && configs.num_operators() > 1 {
             // Remote mode: start operator 0 first, get bootstrap address, then start others
             wavs_handles = Self::start_wavs_remote_mode(ctx, configs, &metrics)
                 .expect("Failed to start operators in remote mode");
@@ -111,15 +119,21 @@ impl AppHandles {
             }
         }
 
-        let evm_middleware = if evm_chains.is_empty() {
+        let evm_middlewares = if evm_chains.is_empty() {
             None
         } else {
-            Some(EvmMiddleware::new(configs.evm_middleware_type).unwrap())
+            let default = EvmMiddleware::new(configs.evm_middleware_type).unwrap();
+            let bls = if configs.matrix.bls_multi_operator_enabled() {
+                Some(EvmMiddleware::new(EvmMiddlewareType::PoaBls).unwrap())
+            } else {
+                None
+            };
+            Some(EvmMiddlewares { default, bls })
         };
 
         Self {
             wavs_handles,
-            evm_middleware,
+            evm_middlewares,
             cosmos_middlewares: Arc::new(cosmos_middlewares),
             _evm_chains: evm_chains,
             _cosmos_chains: cosmos_chains,
@@ -200,16 +214,19 @@ impl AppHandles {
             loop {
                 match client.get_p2p_status().await {
                     Ok(status) => {
-                        // Prefer external_addresses, fall back to listen_addresses
-                        let addr = status
-                            .external_addresses
-                            .first()
-                            .or(status.listen_addresses.first())
-                            .cloned();
-
-                        if let Some(addr) = addr {
-                            tracing::info!("Got bootstrap address from operator 0: {}", addr);
-                            return Ok(addr);
+                        // Combine peer_id + listen address into bootstrapper format:
+                        // "<hex_ed25519_pubkey>@<host>:<port>"
+                        if let (Some(peer_id), Some(socket_addr)) =
+                            (status.local_peer_id, status.listen_addresses.first())
+                        {
+                            // Replace 0.0.0.0 wildcard with 127.0.0.1 for local testing
+                            let port = socket_addr.split(':').next_back().unwrap_or("9000");
+                            let bootstrap_addr = format!("{}@127.0.0.1:{}", peer_id, port);
+                            tracing::info!(
+                                "Got bootstrap address from operator 0: {}",
+                                bootstrap_addr
+                            );
+                            return Ok(bootstrap_addr);
                         }
                     }
                     Err(e) => {
@@ -234,33 +251,16 @@ impl AppHandles {
             let mut config = wavs_config.clone();
             if let P2pConfig::Remote {
                 listen_port,
-                bootstrap_nodes: _,
-                max_retry_duration_secs,
-                retry_interval_ms,
-                submission_ttl_secs,
-                max_catchup_submissions,
-                cleanup_interval_secs,
-                kademlia_discovery_interval_secs,
-                max_pending_publishes,
-                max_stored_submissions_per_service,
-                catchup_request_timeout_secs,
-                max_concurrent_catchup_requests_per_service,
+                authorized_peers,
+                ..
             } = &config.p2p
             {
                 config.p2p = P2pConfig::Remote {
                     listen_port: *listen_port,
-                    bootstrap_nodes: vec![bootstrap_addr.clone()],
-                    max_retry_duration_secs: *max_retry_duration_secs,
-                    retry_interval_ms: *retry_interval_ms,
-                    submission_ttl_secs: *submission_ttl_secs,
-                    max_catchup_submissions: *max_catchup_submissions,
-                    cleanup_interval_secs: *cleanup_interval_secs,
-                    kademlia_discovery_interval_secs: *kademlia_discovery_interval_secs,
-                    max_pending_publishes: *max_pending_publishes,
-                    max_stored_submissions_per_service: *max_stored_submissions_per_service,
-                    catchup_request_timeout_secs: *catchup_request_timeout_secs,
-                    max_concurrent_catchup_requests_per_service:
-                        *max_concurrent_catchup_requests_per_service,
+                    bootstrappers: vec![bootstrap_addr.clone()],
+                    authorized_peers: authorized_peers.clone(),
+                    max_message_size: None,
+                    deque_size: None,
                 };
             }
 
diff --git a/packages/layer-tests/src/e2e/handles/evm.rs b/packages/layer-tests/src/e2e/handles/evm.rs
index cdb164240..e9b434c89 100644
--- a/packages/layer-tests/src/e2e/handles/evm.rs
+++ b/packages/layer-tests/src/e2e/handles/evm.rs
@@ -29,6 +29,8 @@ impl EvmInstance {
         );
 
         // Something is broken with Alloy's anvil thing... let's use our own
+        // Note: anvil 1.4.4+ defaults to Prague hardfork, which includes EIP-2537
+        // precompiles needed for BLS. No explicit --hardfork flag needed.
         let anvil = LameAnvilInstanceBuilder {
             port,
             chain_id: chain_config.chain_id.to_string(),
diff --git a/packages/layer-tests/src/e2e/helpers.rs b/packages/layer-tests/src/e2e/helpers.rs
index eb0636c8f..439d0c7dc 100644
--- a/packages/layer-tests/src/e2e/helpers.rs
+++ b/packages/layer-tests/src/e2e/helpers.rs
@@ -78,6 +78,7 @@ pub async fn create_service_for_test(
             clients,
             component_sources,
             cosmos_code_map.clone(),
+            test.bls,
         )
         .await;
 
@@ -135,6 +136,7 @@ async fn deploy_workflow(
     clients: &Clients,
     component_sources: &ComponentSources,
     cosmos_code_map: CosmosCodeMap,
+    bls: bool,
 ) -> WorkflowDeployment {
     let component = deploy_component(
         component_sources,
@@ -146,7 +148,7 @@ async fn deploy_workflow(
     tracing::info!("[{}] Creating submit from config", test_name);
 
     let submission_contract =
-        deploy_submit_contract(clients, cosmos_code_map.clone(), service_manager)
+        deploy_submit_contract(clients, cosmos_code_map.clone(), service_manager, bls)
             .await
             .unwrap();
 
@@ -154,6 +156,7 @@ async fn deploy_workflow(
         &workflow_definition.submit,
         &submission_contract,
         Some(component_sources),
+        bls,
     )
     .await
     .unwrap();
@@ -290,6 +293,7 @@ pub async fn create_submit_from_config(
     submit_config: &SubmitDefinition,
     submission_contract: &layer_climb::prelude::Address,
     component_sources: Option<&ComponentSources>,
+    bls: bool,
 ) -> Result<Submit> {
     match submit_config {
         SubmitDefinition::Aggregator(aggregator) => match aggregator {
@@ -321,9 +325,15 @@ pub async fn create_submit_from_config(
 
                 let component = deploy_component(sources, component_def, config_vars, env_vars);
 
+                let signature_kind = if bls {
+                    SignatureKind::bls_default()
+                } else {
+                    SignatureKind::evm_default()
+                };
+
                 Ok(Submit::Aggregator {
                     component: Box::new(component),
-                    signature_kind: SignatureKind::evm_default(),
+                    signature_kind,
                 })
             }
         },
@@ -335,6 +345,7 @@ pub async fn deploy_submit_contract(
     clients: &Clients,
     cosmos_code_map: CosmosCodeMap,
     service_manager: ServiceManager,
+    bls: bool,
 ) -> Result<layer_climb::prelude::Address> {
     match service_manager {
         ServiceManager::Cosmos { chain, address } => {
@@ -362,23 +373,44 @@ pub async fn deploy_submit_contract(
         ServiceManager::Evm { chain, address } => {
             let evm_client = clients.get_evm_client(&chain);
 
-            tracing::info!(
-                "Deploying submit contract on chain {} with service manager: {}",
-                chain,
-                address
-            );
+            if bls {
+                tracing::info!(
+                    "Deploying BLS submit contract on chain {} with service manager: {}",
+                    chain,
+                    address
+                );
 
-            let result = crate::example_evm_client::example_submit::SimpleSubmit::deploy(
-                evm_client.provider.clone(),
-                address,
-            )
-            .await
-            .context("Failed to deploy submit contract")?;
+                let result =
+                    crate::example_evm_client::example_bls_submit::SimpleBlsSubmit::deploy(
+                        evm_client.provider.clone(),
+                        address,
+                    )
+                    .await
+                    .context("Failed to deploy BLS submit contract")?;
+
+                let address = *result.address();
+                tracing::info!("BLS submit contract deployed at address: {}", address);
 
-            let address = *result.address();
-            tracing::info!("Submit contract deployed at address: {}", address);
+                Ok(address.into())
+            } else {
+                tracing::info!(
+                    "Deploying submit contract on chain {} with service manager: {}",
+                    chain,
+                    address
+                );
+
+                let result = crate::example_evm_client::example_submit::SimpleSubmit::deploy(
+                    evm_client.provider.clone(),
+                    address,
+                )
+                .await
+                .context("Failed to deploy submit contract")?;
+
+                let address = *result.address();
+                tracing::info!("Submit contract deployed at address: {}", address);
 
-            Ok(address.into())
+                Ok(address.into())
+            }
         }
     }
 }
@@ -512,6 +544,43 @@ pub async fn simulate_anvil_reorg(
     Ok(())
 }
 
+pub async fn evm_wait_for_bls_trigger_validated(
+    evm_submit_client: EvmSigningClient,
+    address: alloy_primitives::Address,
+    trigger_id: TriggerId,
+    submit_start_block: u64,
+    timeout: Duration,
+) -> Result<()> {
+    let submit_client = SimpleEvmSubmitClient::new(evm_submit_client, address);
+
+    tokio::time::timeout(timeout, async move {
+        loop {
+            let current_block = submit_client
+                .evm_client
+                .provider
+                .get_block_number()
+                .await
+                .map_err(|e| anyhow!("Failed to get block number: {e}"))?;
+
+            if current_block <= submit_start_block {
+                submit_client.evm_client.provider.evm_mine(None).await?;
+            }
+
+            if submit_client.trigger_validated(trigger_id).await {
+                return Ok(());
+            }
+
+            tracing::debug!(
+                "Waiting for BLS trigger validation on trigger {}",
+                trigger_id
+            );
+            tokio::time::sleep(std::time::Duration::from_millis(100)).await;
+        }
+    })
+    .await
+    .map_err(|_| anyhow::anyhow!("Timeout when waiting for BLS trigger to be validated"))?
+}
+
 pub async fn evm_wait_for_task_to_land(
     evm_submit_client: EvmSigningClient,
     address: alloy_primitives::Address,
@@ -616,6 +685,7 @@ pub async fn change_service_for_test(
                 clients,
                 component_sources,
                 cosmos_code_map,
+                false, // change_service doesn't support BLS workflow changes
             )
             .await;
 
diff --git a/packages/layer-tests/src/e2e/matrix.rs b/packages/layer-tests/src/e2e/matrix.rs
index 79682a0fd..e60f83e87 100644
--- a/packages/layer-tests/src/e2e/matrix.rs
+++ b/packages/layer-tests/src/e2e/matrix.rs
@@ -40,6 +40,7 @@ pub enum EvmService {
     TimerAggregatorReorg,
     GasPrice,
     MultiOperator,
+    BlsMultiOperator,
 }
 
 #[derive(
@@ -134,6 +135,11 @@ impl TestMatrix {
 
     pub fn multi_operator_enabled(&self) -> bool {
         self.evm.contains(&EvmService::MultiOperator)
+            || self.evm.contains(&EvmService::BlsMultiOperator)
+    }
+
+    pub fn bls_multi_operator_enabled(&self) -> bool {
+        self.evm.contains(&EvmService::BlsMultiOperator)
     }
 }
 
@@ -204,6 +210,9 @@ impl From<EvmService> for Vec<ComponentName> {
             EvmService::MultiOperator => {
                 vec![ComponentName::Operator(OperatorComponent::EchoData)]
             }
+            EvmService::BlsMultiOperator => {
+                vec![ComponentName::Operator(OperatorComponent::EchoData)]
+            }
         }
     }
 }
diff --git a/packages/layer-tests/src/e2e/runner.rs b/packages/layer-tests/src/e2e/runner.rs
index c7748db97..a2040f890 100644
--- a/packages/layer-tests/src/e2e/runner.rs
+++ b/packages/layer-tests/src/e2e/runner.rs
@@ -40,7 +40,9 @@ use crate::{
 };
 use serde_json::json;
 
-use super::helpers::{evm_wait_for_task_to_land, simulate_anvil_reorg};
+use super::helpers::{
+    evm_wait_for_bls_trigger_validated, evm_wait_for_task_to_land, simulate_anvil_reorg,
+};
 use super::test_definition::WorkflowDefinition;
 
 /// Simplified test runner that leverages services directly attached to test definitions
@@ -727,6 +729,29 @@ async fn run_test(
                                         // return mocked signed data with empty content to match ExpectedOutput::Dropped
                                         Err(_) => Vec::new(),
                                     }
+                                } else if test.bls {
+                                    // BLS: SimpleBlsSubmit doesn't have getSignedData(),
+                                    // so just verify the trigger was validated (BLS pairing check passed on-chain)
+                                    tracing::info!(
+                                        "Waiting for BLS trigger validation for trigger_id: {}",
+                                        trigger_id
+                                    );
+                                    evm_wait_for_bls_trigger_validated(
+                                        client,
+                                        submission_contract.clone().try_into().unwrap(),
+                                        trigger_id,
+                                        submit_start_block,
+                                        *timeout,
+                                    )
+                                    .await?;
+                                    tracing::info!(
+                                        "BLS trigger validated for trigger_id: {}",
+                                        trigger_id
+                                    );
+                                    // Return the input data as the "signed data" since the echo
+                                    // component echoes input and we verified the BLS signature
+                                    // check passed on-chain
+                                    workflow_def.input_data.to_bytes().unwrap_or_default()
                                 } else {
                                     tracing::info!(
                                         "Waiting for task to land (no re-org) for trigger_id: {}",
diff --git a/packages/layer-tests/src/e2e/service_managers.rs b/packages/layer-tests/src/e2e/service_managers.rs
index c55eed46c..966f510a8 100644
--- a/packages/layer-tests/src/e2e/service_managers.rs
+++ b/packages/layer-tests/src/e2e/service_managers.rs
@@ -3,15 +3,16 @@ use std::{collections::HashMap, sync::Arc};
 use futures::{stream::FuturesUnordered, StreamExt};
 use utils::test_utils::{
     middleware::{
-        cosmos::CosmosServiceManager,
-        evm::{EvmMiddleware, MiddlewareServiceManagerConfig},
-        operator::AvsOperator,
+        cosmos::CosmosServiceManager, evm::MiddlewareServiceManagerConfig, operator::AvsOperator,
     },
     mock_service_manager::MockEvmServiceManager,
 };
+
+use crate::e2e::handles::EvmMiddlewares;
+use alloy_sol_types::SolType;
 use wavs_cli::command::deploy_service::DeployService;
 use wavs_types::{
-    ChainKey, ChainKeyNamespace, Service, ServiceManager, ServiceStatus, SignerResponse,
+    ChainKey, ChainKeyNamespace, Service, ServiceManager, ServiceStatus, SignerResponse, Trigger,
 };
 
 use crate::{
@@ -58,7 +59,7 @@ impl ServiceManagers {
         &mut self,
         registry: &TestRegistry,
         clients: &Clients,
-        evm_middleware: Option<EvmMiddleware>,
+        evm_middlewares: Option<EvmMiddlewares>,
         cosmos_middlewares: CosmosMiddlewares,
     ) {
         tracing::warn!("WAVS Concurrency: {}", self.configs.wavs_concurrency);
@@ -67,7 +68,7 @@ impl ServiceManagers {
             self.configs.middleware_concurrency
         );
         tracing::warn!("Bootstrapping service managers...");
-        self.deploy_service_managers(registry, clients, evm_middleware, cosmos_middlewares)
+        self.deploy_service_managers(registry, clients, evm_middlewares, cosmos_middlewares)
             .await;
         tracing::warn!("Bootstrapping initial service uris...");
         self.set_initial_service_uris(registry, clients).await;
@@ -94,7 +95,7 @@ impl ServiceManagers {
         &mut self,
         registry: &TestRegistry,
         clients: &Clients,
-        evm_middleware: Option<EvmMiddleware>,
+        evm_middlewares: Option<EvmMiddlewares>,
         cosmos_middlewares: CosmosMiddlewares,
     ) {
         let mut lookup = HashMap::new();
@@ -107,15 +108,24 @@ impl ServiceManagers {
                 .clone()
                 .unwrap_or_else(|| panic!("missing service manager chain for test {}", test.name));
             futures.push({
-                let evm_middleware = evm_middleware.clone();
+                let evm_middlewares = evm_middlewares.clone();
                 let cosmos_middlewares = cosmos_middlewares.clone();
+                let test_bls = test.bls;
                 async move {
                     match chain.namespace.as_str() {
                         ChainKeyNamespace::EVM => {
                             let wallet_client = clients.get_evm_client(&chain);
                             let test_name = test.name.clone();
-                            let middleware = evm_middleware.clone().unwrap();
-                            tracing::info!("Deploying service manager for test {}", test_name);
+                            // Per-test middleware dispatch: BLS tests use PoaBls, others use default
+                            let middlewares = evm_middlewares.as_ref()
+                                .expect("EVM middlewares required for EVM test");
+                            let middleware = if test_bls {
+                                middlewares.bls.clone()
+                                    .expect("BLS middleware required for BLS test but not created -- is BlsMultiOperator in matrix?")
+                            } else {
+                                middlewares.default.clone()
+                            };
+                            tracing::info!("Deploying service manager for test {} (bls={})", test_name, test_bls);
                             let manager = MockEvmServiceManager::new(middleware, wallet_client)
                                 .await
                                 .unwrap();
@@ -262,10 +272,7 @@ impl ServiceManagers {
                 // Reuse existing HTTP client for this WAVS instance
                 let http_client = &clients.http_clients[operator_offset];
 
-                let SignerResponse::Secp256k1 {
-                    evm_address: avs_signer_address,
-                    hd_index: wavs_signer_hd_index,
-                } = http_client
+                let signer_resp = http_client
                     .get_service_signer(service_manager.clone())
                     .await
                     .unwrap();
@@ -282,28 +289,88 @@ impl ServiceManagers {
                 let operator_address = operator_signer.address();
                 let operator_private_key = const_hex::encode(operator_signer.to_bytes());
 
-                // Get the signing key that this WAVS instance will use
-                let signing_signer = utils::evm_client::signing::make_signer(
-                    operator_mnemonic,
-                    Some(wavs_signer_hd_index),
-                )
-                .unwrap();
-                let signing_address = signing_signer.address();
-                let signing_private_key = const_hex::encode(signing_signer.to_bytes());
-
-                assert_eq!(
-                    signing_address.to_string().to_lowercase(),
-                    avs_signer_address.to_lowercase(),
-                    "Derived signing address doesn't match WAVS signer address for operator {}",
-                    operator_offset
-                );
-
-                let avs_operator = AvsOperator::with_keys(
-                    operator_address,
-                    signing_address,
-                    operator_private_key,
-                    signing_private_key,
-                );
+                let avs_operator = if test.bls {
+                    // BLS operator registration: derive BLS key, create G1 pubkey + G2 proof.
+                    // At bootstrap time the service may still be registered with Secp256k1 (empty
+                    // workflows placeholder). Accept either response type — only the HD index is
+                    // needed to derive the BLS key. The signer algorithm is corrected to Bls12381
+                    // later when update_services runs change_service_inner.
+                    let wavs_signer_hd_index = match signer_resp {
+                        SignerResponse::Bls12381 { hd_index, .. } => hd_index,
+                        SignerResponse::Secp256k1 { hd_index, .. } => {
+                            tracing::warn!(
+                                "BLS test '{}' got Secp256k1 signer response at bootstrap (HD {}); \
+                                 using HD index for BLS key derivation — algorithm will be updated by update_services",
+                                test.name, hd_index
+                            );
+                            hd_index
+                        }
+                    };
+
+                    // Derive BLS key from operator mnemonic + WAVS signer HD index
+                    let bls_secret = utils::bls_signing::bls_private_key_from_mnemonic(
+                        operator_mnemonic.as_str(),
+                        wavs_signer_hd_index,
+                    )
+                    .expect("Failed to derive BLS key from operator mnemonic");
+
+                    // Get G1 pubkey (128 bytes EIP-2537)
+                    let g1_pubkey = utils::bls_signing::bls_g1_pubkey_bytes(&bls_secret)
+                        .expect("Failed to get G1 pubkey bytes");
+
+                    // Create proof-of-possession: sign keccak256(abi.encode(operator_address))
+                    let encoded_addr =
+                        alloy_sol_types::sol_data::Address::abi_encode(&operator_address);
+                    let message = alloy_primitives::keccak256(&encoded_addr);
+                    let g2_proof =
+                        utils::bls_signing::bls_sign_digest(&bls_secret, message.as_ref())
+                            .expect("Failed to create BLS proof of possession");
+
+                    AvsOperator::with_bls_keys(
+                        operator_address,
+                        operator_private_key,
+                        g1_pubkey.to_vec(),
+                        g2_proof.to_vec(),
+                    )
+                } else {
+                    // Secp256k1 operator registration: existing path unchanged
+                    match signer_resp {
+                        SignerResponse::Secp256k1 {
+                            evm_address,
+                            hd_index,
+                        } => {
+                            let wavs_signer_hd_index = hd_index;
+
+                            // Get the signing key that this WAVS instance will use
+                            let signing_signer = utils::evm_client::signing::make_signer(
+                                operator_mnemonic,
+                                Some(wavs_signer_hd_index),
+                            )
+                            .unwrap();
+                            let signing_address = signing_signer.address();
+                            let signing_private_key = const_hex::encode(signing_signer.to_bytes());
+
+                            assert_eq!(
+                                signing_address.to_string().to_lowercase(),
+                                evm_address.to_lowercase(),
+                                "Derived signing address doesn't match WAVS signer address for operator {}",
+                                operator_offset
+                            );
+
+                            AvsOperator::with_keys(
+                                operator_address,
+                                signing_address,
+                                operator_private_key,
+                                signing_private_key,
+                            )
+                        }
+                        SignerResponse::Bls12381 { .. } => {
+                            panic!(
+                                "Expected Secp256k1 SignerResponse for non-BLS test, got Bls12381"
+                            );
+                        }
+                    }
+                };
 
                 avs_operators.push(avs_operator);
             }
@@ -494,7 +561,10 @@ impl ServiceManagers {
                     }
                 }
 
-                // doesn't hurt to wait again for rpcs at least in case trigger contract changed
+                // Wait specifically for each EVM trigger contract address to be in the
+                // subscription, not just any subscription. Using None would return prematurely
+                // if the service manager address is already subscribed, before the trigger
+                // contract address is added.
                 if let AnyServiceManagerInstance::Evm { .. } = service_manager_instance {
                     for (idx, http_client) in http_clients.iter().enumerate() {
                         tracing::info!(
@@ -502,7 +572,25 @@ impl ServiceManagers {
                             idx,
                             service.name
                         );
-                        wait_for_evm_trigger_streams_to_finalize(http_client, None).await;
+                        let mut found_evm_trigger = false;
+                        for workflow in service.workflows.values() {
+                            if let Trigger::EvmContractEvent { chain, address, .. } =
+                                &workflow.trigger
+                            {
+                                wait_for_evm_trigger_streams_to_finalize(
+                                    http_client,
+                                    Some(ServiceManager::Evm {
+                                        chain: chain.clone(),
+                                        address: *address,
+                                    }),
+                                )
+                                .await;
+                                found_evm_trigger = true;
+                            }
+                        }
+                        if !found_evm_trigger {
+                            wait_for_evm_trigger_streams_to_finalize(http_client, None).await;
+                        }
                     }
                 }
             });
diff --git a/packages/layer-tests/src/e2e/test_definition.rs b/packages/layer-tests/src/e2e/test_definition.rs
index 54fb9679b..fe66b714a 100644
--- a/packages/layer-tests/src/e2e/test_definition.rs
+++ b/packages/layer-tests/src/e2e/test_definition.rs
@@ -54,6 +54,9 @@ pub struct TestDefinition {
 
     /// If true, this test requires multiple operators with 2/3 quorum
     pub multi_operator: bool,
+
+    /// If true, this test uses BLS signature scheme instead of secp256k1
+    pub bls: bool,
 }
 
 #[derive(Clone, Debug)]
@@ -293,6 +296,7 @@ impl TestBuilder {
                 change_service: None,
                 group: TestGroupId::Default,
                 multi_operator: false,
+                bls: false,
             },
         }
     }
@@ -315,6 +319,12 @@ impl TestBuilder {
         self
     }
 
+    /// Mark this test as using BLS signature scheme
+    pub fn with_bls(mut self) -> Self {
+        self.definition.bls = true;
+        self
+    }
+
     /// Add a workflow
     pub fn add_workflow(mut self, workflow_id: WorkflowId, workflow: WorkflowDefinition) -> Self {
         if self.definition.workflows.contains_key(&workflow_id) {
diff --git a/packages/layer-tests/src/e2e/test_registry.rs b/packages/layer-tests/src/e2e/test_registry.rs
index 1edaccfbd..47181d798 100644
--- a/packages/layer-tests/src/e2e/test_registry.rs
+++ b/packages/layer-tests/src/e2e/test_registry.rs
@@ -243,6 +243,9 @@ impl TestRegistry {
                 EvmService::MultiOperator => {
                     registry.register_evm_multi_operator_test(chain);
                 }
+                EvmService::BlsMultiOperator => {
+                    registry.register_evm_bls_multi_operator_test(chain);
+                }
             }
         }
 
@@ -1024,6 +1027,39 @@ impl TestRegistry {
         )
     }
 
+    fn register_evm_bls_multi_operator_test(&mut self, chain: &ChainKey) -> &mut Self {
+        self.register(
+            TestBuilder::new("evm_bls_multi_operator")
+                .with_description(
+                    "Tests BLS multi-operator quorum with P2P and on-chain BLS signature verification",
+                )
+                .add_workflow(
+                    WorkflowId::new("bls_multi_operator_echo").unwrap(),
+                    WorkflowBuilder::new()
+                        .with_operator_component(OperatorComponent::EchoData)
+                        .with_aggregator_component(AggregatorComponent::SimpleAggregator)
+                        .with_trigger(TriggerDefinition::NewEvmContract(
+                            EvmTriggerDefinition::SimpleContractEvent {
+                                chain: chain.clone(),
+                            },
+                        ))
+                        .with_submit(SubmitDefinition::Aggregator(Self::simple_aggregator(chain)))
+                        .with_input_data(InputData::Text(
+                            "bls-multi-operator test".to_string(),
+                        ))
+                        .with_expected_output(ExpectedOutput::Text(
+                            "bls-multi-operator test".to_string(),
+                        ))
+                        .build(),
+                )
+                .with_service_manager_chain(chain)
+                .with_multi_operator()
+                .with_bls()
+                .with_group(TestGroupId::P2p)
+                .build(),
+        )
+    }
+
     // Cosmos test registrations
 
     fn register_cosmos_echo_data_test(
diff --git a/packages/layer-tests/src/example_evm_client/solidity_types.rs b/packages/layer-tests/src/example_evm_client/solidity_types.rs
index 121fe40c1..d64af559a 100644
--- a/packages/layer-tests/src/example_evm_client/solidity_types.rs
+++ b/packages/layer-tests/src/example_evm_client/solidity_types.rs
@@ -49,6 +49,20 @@ pub mod example_submit {
     }
 }
 
+pub mod example_bls_submit {
+    use alloy_sol_types::sol;
+
+    sol!(
+        #[allow(missing_docs)]
+        #[sol(rpc)]
+        SimpleBlsSubmit,
+        "../../examples/contracts/solidity/abi/SimpleBlsSubmit.sol/SimpleBlsSubmit.json"
+    );
+}
+
+pub use example_bls_submit::SimpleBlsSubmit::SimpleBlsSubmitInstance;
+pub type SimpleBlsSubmitT = SimpleBlsSubmitInstance<DynProvider>;
+
 pub type SimpleTriggerT = SimpleTriggerInstance<DynProvider>;
 pub type SimpleSubmitT = SimpleSubmitInstance<DynProvider>;
 pub use example_log_spam::LogSpam;
diff --git a/packages/types/Cargo.toml b/packages/types/Cargo.toml
index e169ce4a0..a4777c3a8 100644
--- a/packages/types/Cargo.toml
+++ b/packages/types/Cargo.toml
@@ -10,8 +10,9 @@ license.workspace = true
 publish = true
 
 [features]
-default = ["cosmwasm"]
-full = ["solidity-rpc", "cosmwasm", "signer", "clock"]
+default = ["cosmwasm", "bls"]
+full = ["solidity-rpc", "cosmwasm", "signer", "clock", "bls"]
+bls = ["dep:commonware-cryptography", "dep:blst", "dep:commonware-codec", "dep:tokio"]
 clock = ["dep:chrono"]
 signer = ["dep:alloy-signer", "dep:alloy-signer-local"]
 solidity-rpc = ["dep:alloy-contract", "dep:alloy-provider"]
@@ -51,6 +52,10 @@ alloy-contract = { workspace = true, optional = true }
 alloy-provider = { workspace = true, optional = true }
 alloy-signer = { workspace = true, optional = true }
 alloy-signer-local = { workspace = true, optional = true }
+commonware-cryptography = { workspace = true, optional = true }
+blst = { version = "0.3.16", optional = true }
+commonware-codec = { version = "2026.3.0", optional = true }
+tokio = { version = "1", optional = true, default-features = false, features = ["sync", "rt"] }
 cosmwasm-schema = { workspace = true, optional = true }
 ts-rs = { version = "11.1", features = ["serde-compat"], optional = true }
 
@@ -60,3 +65,6 @@ alloy-primitives = { workspace = true }
 alloy-provider = { workspace = true }
 alloy-signer-local = { workspace = true }
 alloy-sol-types = { workspace = true }
+rand_chacha = "0.3"
+commonware-cryptography = { workspace = true }
+commonware-math = "2026.3.0"
diff --git a/packages/types/src/contracts/cosmwasm/service_handler.rs b/packages/types/src/contracts/cosmwasm/service_handler.rs
index 3d22d5943..3d412e5a7 100644
--- a/packages/types/src/contracts/cosmwasm/service_handler.rs
+++ b/packages/types/src/contracts/cosmwasm/service_handler.rs
@@ -90,32 +90,37 @@ pub struct WavsSignatureData {
 }
 
 impl WavsSignatureData {
-    pub fn new(signature_data: crate::solidity_types::SignatureData) -> Self {
-        Self {
-            signers: signature_data
-                .signers
-                .into_iter()
-                .map(layer_climb_address::EvmAddr::from)
-                .collect(),
-            signatures: signature_data
-                .signatures
-                .into_iter()
-                .map(|s| s.to_vec().into())
-                .collect(),
-            reference_block: signature_data.referenceBlock,
+    pub fn new(signature_data: crate::SignatureData) -> Self {
+        match signature_data {
+            crate::SignatureData::Secp256k1(inner) => Self {
+                signers: inner
+                    .signers
+                    .into_iter()
+                    .map(layer_climb_address::EvmAddr::from)
+                    .collect(),
+                signatures: inner
+                    .signatures
+                    .into_iter()
+                    .map(|s| s.to_vec().into())
+                    .collect(),
+                reference_block: inner.referenceBlock,
+            },
+            crate::SignatureData::Bls12381(_) => {
+                unimplemented!("CosmWasm BLS SignatureData conversion not supported in v1.1")
+            }
         }
     }
 }
 
-impl From<crate::solidity_types::SignatureData> for WavsSignatureData {
-    fn from(signature_data: crate::solidity_types::SignatureData) -> Self {
+impl From<crate::SignatureData> for WavsSignatureData {
+    fn from(signature_data: crate::SignatureData) -> Self {
         Self::new(signature_data)
     }
 }
 
-impl From<WavsSignatureData> for crate::solidity_types::SignatureData {
+impl From<WavsSignatureData> for crate::SignatureData {
     fn from(signature_data: WavsSignatureData) -> Self {
-        crate::solidity_types::SignatureData {
+        crate::SignatureData::Secp256k1(crate::solidity_types::SignatureData {
             signers: signature_data
                 .signers
                 .into_iter()
@@ -127,7 +132,7 @@ impl From<WavsSignatureData> for crate::solidity_types::SignatureData {
                 .map(|s| s.to_vec().into())
                 .collect(),
             referenceBlock: signature_data.reference_block,
-        }
+        })
     }
 }
 
@@ -154,17 +159,18 @@ mod tests {
             payload: vec![1, 2, 3].into(),
         };
 
-        let signature_data = crate::solidity_types::SignatureData {
-            signers: vec![
-                alloy_primitives::Address::new([42; 20]),
-                alloy_primitives::Address::new([1; 20]),
-            ],
-            signatures: vec![
-                alloy_primitives::Bytes::from(vec![1, 2, 3]),
-                alloy_primitives::Bytes::from(vec![4, 5, 6]),
-            ],
-            referenceBlock: 12345,
-        };
+        let signature_data =
+            crate::SignatureData::Secp256k1(crate::solidity_types::SignatureData {
+                signers: vec![
+                    alloy_primitives::Address::new([42; 20]),
+                    alloy_primitives::Address::new([1; 20]),
+                ],
+                signatures: vec![
+                    alloy_primitives::Bytes::from(vec![1, 2, 3]),
+                    alloy_primitives::Bytes::from(vec![4, 5, 6]),
+                ],
+                referenceBlock: 12345,
+            });
 
         // Create the messages for the service handler via .into()
         let msg_1 = ExampleServiceHandlerExecuteMsg::ServiceHandler(
diff --git a/packages/types/src/contracts/cosmwasm/service_manager.rs b/packages/types/src/contracts/cosmwasm/service_manager.rs
index 824b6bc36..4aac3e39d 100644
--- a/packages/types/src/contracts/cosmwasm/service_manager.rs
+++ b/packages/types/src/contracts/cosmwasm/service_manager.rs
@@ -202,17 +202,18 @@ mod tests {
             payload: vec![1, 2, 3].into(),
         };
 
-        let signature_data = crate::solidity_types::SignatureData {
-            signers: vec![
-                alloy_primitives::Address::new([42; 20]),
-                alloy_primitives::Address::new([1; 20]),
-            ],
-            signatures: vec![
-                alloy_primitives::Bytes::from(vec![1, 2, 3]),
-                alloy_primitives::Bytes::from(vec![4, 5, 6]),
-            ],
-            referenceBlock: 12345,
-        };
+        let signature_data =
+            crate::SignatureData::Secp256k1(crate::solidity_types::SignatureData {
+                signers: vec![
+                    alloy_primitives::Address::new([42; 20]),
+                    alloy_primitives::Address::new([1; 20]),
+                ],
+                signatures: vec![
+                    alloy_primitives::Bytes::from(vec![1, 2, 3]),
+                    alloy_primitives::Bytes::from(vec![4, 5, 6]),
+                ],
+                referenceBlock: 12345,
+            });
 
         // Create the messages for the service manger via .into()
         let msg_1 = ExampleServiceManagerQueryMsg::ServiceManager(
diff --git a/packages/types/src/contracts/solidity/abi/SimpleServiceManager.sol/SimpleServiceManager.json b/packages/types/src/contracts/solidity/abi/SimpleServiceManager.sol/SimpleServiceManager.json
new file mode 100644
index 000000000..7ba0adaa2
--- /dev/null
+++ b/packages/types/src/contracts/solidity/abi/SimpleServiceManager.sol/SimpleServiceManager.json
@@ -0,0 +1 @@
+{"abi":[{"type":"function","name":"getAllocationManager","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"pure"},{"type":"function","name":"getDelegationManager","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"pure"},{"type":"function","name":"getLastCheckpointThresholdWeight","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"getLastCheckpointTotalWeight","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"getLatestOperatorForSigningKey","inputs":[{"name":"signingKeyAddress","type":"address","internalType":"address"}],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"pure"},{"type":"function","name":"getOperatorWeight","inputs":[{"name":"operator","type":"address","internalType":"address"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"getServiceURI","inputs":[],"outputs":[{"name":"","type":"string","internalType":"string"}],"stateMutability":"view"},{"type":"function","name":"getStakeRegistry","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"pure"},{"type":"function","name":"setLastCheckpointThresholdWeight","inputs":[{"name":"weight","type":"uint256","internalType":"uint256"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"setLastCheckpointTotalWeight","inputs":[{"name":"weight","type":"uint256","internalType":"uint256"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"setOperatorWeight","inputs":[{"name":"operator","type":"address","internalType":"address"},{"name":"weight","type":"uint256","internalType":"uint256"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"setServiceURI","inputs":[{"name":"_serviceURI","type":"string","internalType":"string"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"validate","inputs":[{"name":"","type":"tuple","internalType":"struct IWavsServiceHandler.Envelope","components":[{"name":"eventId","type":"bytes20","internalType":"bytes20"},{"name":"ordering","type":"bytes12","internalType":"bytes12"},{"name":"payload","type":"bytes","internalType":"bytes"}]},{"name":"signatureData","type":"tuple","internalType":"struct IWavsServiceHandler.SignatureData","components":[{"name":"signers","type":"address[]","internalType":"address[]"},{"name":"signatures","type":"bytes[]","internalType":"bytes[]"},{"name":"referenceBlock","type":"uint32","internalType":"uint32"}]}],"outputs":[],"stateMutability":"view"},{"type":"event","name":"QuorumThresholdUpdated","inputs":[{"name":"numerator","type":"uint256","indexed":true,"internalType":"uint256"},{"name":"denominator","type":"uint256","indexed":true,"internalType":"uint256"}],"anonymous":false},{"type":"event","name":"ServiceURIUpdated","inputs":[{"name":"serviceURI","type":"string","indexed":false,"internalType":"string"}],"anonymous":false},{"type":"error","name":"InsufficientQuorum","inputs":[{"name":"signerWeight","type":"uint256","internalType":"uint256"},{"name":"thresholdWeight","type":"uint256","internalType":"uint256"},{"name":"totalWeight","type":"uint256","internalType":"uint256"}]},{"type":"error","name":"InsufficientQuorumZero","inputs":[]},{"type":"error","name":"InvalidQuorumParameters","inputs":[]},{"type":"error","name":"InvalidSignature","inputs":[]},{"type":"error","name":"InvalidSignatureBlock","inputs":[]},{"type":"error","name":"InvalidSignatureLength","inputs":[]},{"type":"error","name":"InvalidSignatureOrder","inputs":[]}],"bytecode":{"object":"0x608060405234601c57600e6020565b61114a61002b823961114a90f35b6026565b60405190565b5f80fdfe60806040526004361015610013575b610642565b61001d5f356100ec565b806308fc760a146100e75780630e6b1110146100e2578063314f3a49146100dd5780635f11301b146100d857806398ec1ac9146100d3578063a28efd6b146100ce578063ac7cbfd9146100c9578063b24e5a3a146100c4578063b933fa74146100bf578063bef4c839146100ba578063cc922c6a146100b5578063cd71589e146100b05763fb8524b10361000e5761060f565b6105db565b61051f565b61047f565b61044a565b610415565b6103e0565b6103ab565b610354565b610302565b61024c565b6101e7565b61014d565b60e01c90565b60405190565b5f80fd5b5f80fd5b5f80fd5b90565b61011081610104565b0361011757565b5f80fd5b9050359061012882610107565b565b9060208282031261014357610140915f0161011b565b90565b6100fc565b5f0190565b3461017b5761016561016036600461012a565b6106a3565b61016d6100f2565b8061017781610148565b0390f35b6100f8565b60018060a01b031690565b61019490610180565b90565b6101a08161018b565b036101a757565b5f80fd5b905035906101b882610197565b565b91906040838203126101e257806101d66101df925f86016101ab565b9360200161011b565b90565b6100fc565b34610216576102006101fa3660046101ba565b906106fa565b6102086100f2565b8061021281610148565b0390f35b6100f8565b5f91031261022557565b6100fc565b61023390610104565b9052565b919061024a905f6020850194019061022a565b565b3461027c5761025c36600461021b565b61027861026761073d565b61026f6100f2565b91829182610237565b0390f35b6100f8565b5f80fd5b5f80fd5b5f80fd5b909182601f830112156102c75781359167ffffffffffffffff83116102c25760200192600183028401116102bd57565b610289565b610285565b610281565b906020828203126102fd575f82013567ffffffffffffffff81116102f8576102f4920161028d565b9091565b610100565b6100fc565b346103315761031b6103153660046102cc565b906109e0565b6103236100f2565b8061032d81610148565b0390f35b6100f8565b9060208282031261034f5761034c915f016101ab565b90565b6100fc565b346103845761038061036f61036a366004610336565b610a28565b6103776100f2565b91829182610237565b0390f35b6100f8565b6103929061018b565b9052565b91906103a9905f60208501940190610389565b565b346103db576103bb36600461021b565b6103d76103c6610a76565b6103ce6100f2565b91829182610396565b0390f35b6100f8565b346104105761040c6103fb6103f6366004610336565b610a8b565b6104036100f2565b91829182610396565b0390f35b6100f8565b346104455761042536600461021b565b610441610430610a97565b6104386100f2565b91829182610396565b0390f35b6100f8565b3461047a5761045a36600461021b565b610476610465610aac565b61046d6100f2565b91829182610237565b0390f35b6100f8565b346104af5761048f36600461021b565b6104ab61049a610ac2565b6104a26100f2565b91829182610396565b0390f35b6100f8565b5190565b60209181520190565b90825f9392825e0152565b601f801991011690565b6104f56104fe602093610503936104ec816104b4565b938480936104b8565b958691016104c1565b6104cc565b0190565b61051c9160208201915f8184039101526104d6565b90565b3461054f5761052f36600461021b565b61054b61053a610bd5565b6105426100f2565b91829182610507565b0390f35b6100f8565b5f80fd5b908160609103126105665790565b610554565b908160609103126105795790565b610554565b9190916040818403126105d6575f81013567ffffffffffffffff81116105d157836105aa918301610558565b92602082013567ffffffffffffffff81116105cc576105c9920161056b565b90565b610100565b610100565b6100fc565b3461060a576105f46105ee36600461057e565b90610da3565b6105fc6100f2565b8061060681610148565b0390f35b6100f8565b3461063d5761062761062236600461012a565b610fdd565b61062f6100f2565b8061063981610148565b0390f35b6100f8565b5f80fd5b5f1b90565b906106575f1991610646565b9181191691161790565b90565b61067861067361067d92610104565b610661565b610104565b90565b90565b9061069861069361069f92610664565b610680565b825461064b565b9055565b6106ae906003610683565b565b6106c46106bf6106c992610180565b610661565b610180565b90565b6106d5906106b0565b90565b6106e1906106cc565b90565b906106ee906106d8565b5f5260205260405f2090565b61070961070e929160016106e4565b610683565b565b5f90565b5f1c90565b90565b61072861072d91610714565b610719565b90565b61073a905461071c565b90565b610745610710565b506107506003610730565b90565b5090565b634e487b7160e01b5f52604160045260245ffd5b634e487b7160e01b5f52602260045260245ffd5b906001600283049216801561079f575b602083101461079a57565b61076b565b91607f169161078f565b5f5260205f2090565b601f602091010490565b1b90565b919060086107db9102916107d55f19846107bc565b926107bc565b9181191691161790565b91906107fb6107f661080393610664565b610680565b9083546107c0565b9055565b61081991610813610710565b916107e5565b565b5b818110610827575050565b806108345f600193610807565b0161081c565b9190601f811161084a575b505050565b61085661087b936107a9565b906020610862846107b2565b83019310610883575b610874906107b2565b019061081b565b5f8080610845565b91506108748192905061086b565b1c90565b906108a5905f1990600802610891565b191690565b816108b491610895565b906002021790565b916108c79082610753565b9067ffffffffffffffff8211610986576108eb826108e5855461077f565b8561083a565b5f90601f831160011461091e5791809161090d935f92610912575b50506108aa565b90555b565b90915001355f80610906565b601f1983169161092d856107a9565b925f5b81811061096e57509160029391856001969410610954575b50505002019055610910565b610964910135601f841690610895565b90555f8080610948565b91936020600181928787013581550195019201610930565b610757565b9061099692916108bc565b565b90825f939282370152565b91906109bd816109b6816109c2956104b8565b8095610998565b6104cc565b0190565b90916109dd9260208301925f8185039101526109a3565b90565b6109ec8183905f61098b565b907fd2f056df94c31bdb3b4e16080f2ac6dbd4233c6001058d94afc3ad1242dff48891610a23610a1a6100f2565b928392836109c6565b0390a1565b610a3f610a4491610a37610710565b5060016106e4565b610730565b90565b5f90565b90565b610a62610a5d610a6792610a4b565b610661565b610180565b90565b610a7390610a4e565b90565b610a7e610a47565b50610a885f610a6a565b90565b610a93610a47565b5090565b610a9f610a47565b50610aa95f610a6a565b90565b610ab4610710565b50610abf6002610730565b90565b610aca610a47565b50610ad45f610a6a565b90565b606090565b60209181520190565b905f9291805490610aff610af88361077f565b8094610adc565b916001811690815f14610b565750600114610b1a575b505050565b610b2791929394506107a9565b915f925b818410610b3e57505001905f8080610b15565b60018160209295939554848601520191019290610b2b565b92949550505060ff19168252151560200201905f8080610b15565b90610b7b91610ae5565b90565b90610b88906104cc565b810190811067ffffffffffffffff821117610ba257604052565b610757565b90610bc7610bc092610bb76100f2565b93848092610b71565b0383610b7e565b565b610bd290610ba7565b90565b610bdd610ad7565b50610be75f610bc9565b90565b5f80fd5b5f80fd5b5f80fd5b903590600160200381360303821215610c38570180359067ffffffffffffffff8211610c3357602001916020820236038313610c2e57565b610bf2565b610bee565b610bea565b5090565b610c55610c50610c5a92610a4b565b610661565b610104565b90565b903590600160200381360303821215610c9f570180359067ffffffffffffffff8211610c9a57602001916020820236038313610c9557565b610bf2565b610bee565b610bea565b5090565b63ffffffff1690565b610cba81610ca8565b03610cc157565b5f80fd5b35610ccf81610cb1565b90565b610ce6610ce1610ceb92610ca8565b610661565b610104565b90565b151590565b6001610cff9101610104565b90565b634e487b7160e01b5f52603260045260245ffd5b9190811015610d26576020020190565b610d02565b35610d3581610197565b90565b634e487b7160e01b5f52601160045260245ffd5b610d5b610d6191939293610104565b92610104565b8201809211610d6c57565b610d38565b604090610d9a610da19496959396610d9060608401985f85019061022a565b602083019061022a565b019061022a565b565b50610dba610db4825f810190610bf6565b90610c3d565b610dcc610dc65f610c41565b91610104565b148015610f97575b610f7b57610e00610de760408301610cc5565b610df9610df343610104565b91610cd2565b1015610cee565b610f5f57610e23610e1d610e17835f810190610bf6565b90611032565b15610cee565b610f4357610e305f610c41565b90610e3a5f610c41565b915b82610e64610e5e610e59610e53865f810190610bf6565b90610c3d565b610104565b91610104565b1015610eb557610ea9610eaf91610ea3610e9e6001610e98610e93610e8c895f810190610bf6565b8b91610d16565b610d2b565b906106e4565b610730565b90610d4c565b92610cf3565b91610e3c565b91505080610ecb610ec55f610c41565b91610104565b14610f275780610eec610ee6610ee16002610730565b610104565b91610104565b10610ef45750565b610efe6002610730565b90610f23610f0c6003610730565b5f9384936386b1609160e01b855260048501610d71565b0390fd5b5f632f41f79b60e01b815280610f3f60048201610148565b0390fd5b5f6309cf9e4960e11b815280610f5b60048201610148565b0390fd5b5f63898deb1d60e01b815280610f7760048201610148565b0390fd5b5f634be6321b60e01b815280610f9360048201610148565b0390fd5b50610fae610fa8825f810190610bf6565b90610c3d565b610fd6610fd0610fcb610fc5856020810190610c5d565b90610ca4565b610104565b91610104565b1415610dd4565b610fe8906002610683565b565b5f90565b90565b61100561100061100a92610fee565b610661565b610104565b90565b61101c61102291939293610104565b92610104565b820391821161102d57565b610d38565b9061103b610fea565b5061106461104a838390610c3d565b61105d6110576001610ff1565b91610104565b1115610cee565b61110d576110726001610ff1565b5b8061109061108a611085868690610c3d565b610104565b91610104565b1015611105576110ec6110ad6110a885858591610d16565b610d2b565b6110e56110df6110da6110d588886110cf896110c96001610ff1565b9061100d565b91610d16565b610d2b565b61018b565b9161018b565b1115610cee565b6110fe576110f990610cf3565b611073565b5050505f90565b505050600190565b505060019056fea2646970667358221220acdaec2211c2ca6b38003d6a9d44e5f4ff89d013cc5cebc349ba73e9deab495264736f6c634300081c0033","sourceMap":"388:4970:10:-:0;;;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;","linkReferences":{}},"deployedBytecode":{"object":"0x60806040526004361015610013575b610642565b61001d5f356100ec565b806308fc760a146100e75780630e6b1110146100e2578063314f3a49146100dd5780635f11301b146100d857806398ec1ac9146100d3578063a28efd6b146100ce578063ac7cbfd9146100c9578063b24e5a3a146100c4578063b933fa74146100bf578063bef4c839146100ba578063cc922c6a146100b5578063cd71589e146100b05763fb8524b10361000e5761060f565b6105db565b61051f565b61047f565b61044a565b610415565b6103e0565b6103ab565b610354565b610302565b61024c565b6101e7565b61014d565b60e01c90565b60405190565b5f80fd5b5f80fd5b5f80fd5b90565b61011081610104565b0361011757565b5f80fd5b9050359061012882610107565b565b9060208282031261014357610140915f0161011b565b90565b6100fc565b5f0190565b3461017b5761016561016036600461012a565b6106a3565b61016d6100f2565b8061017781610148565b0390f35b6100f8565b60018060a01b031690565b61019490610180565b90565b6101a08161018b565b036101a757565b5f80fd5b905035906101b882610197565b565b91906040838203126101e257806101d66101df925f86016101ab565b9360200161011b565b90565b6100fc565b34610216576102006101fa3660046101ba565b906106fa565b6102086100f2565b8061021281610148565b0390f35b6100f8565b5f91031261022557565b6100fc565b61023390610104565b9052565b919061024a905f6020850194019061022a565b565b3461027c5761025c36600461021b565b61027861026761073d565b61026f6100f2565b91829182610237565b0390f35b6100f8565b5f80fd5b5f80fd5b5f80fd5b909182601f830112156102c75781359167ffffffffffffffff83116102c25760200192600183028401116102bd57565b610289565b610285565b610281565b906020828203126102fd575f82013567ffffffffffffffff81116102f8576102f4920161028d565b9091565b610100565b6100fc565b346103315761031b6103153660046102cc565b906109e0565b6103236100f2565b8061032d81610148565b0390f35b6100f8565b9060208282031261034f5761034c915f016101ab565b90565b6100fc565b346103845761038061036f61036a366004610336565b610a28565b6103776100f2565b91829182610237565b0390f35b6100f8565b6103929061018b565b9052565b91906103a9905f60208501940190610389565b565b346103db576103bb36600461021b565b6103d76103c6610a76565b6103ce6100f2565b91829182610396565b0390f35b6100f8565b346104105761040c6103fb6103f6366004610336565b610a8b565b6104036100f2565b91829182610396565b0390f35b6100f8565b346104455761042536600461021b565b610441610430610a97565b6104386100f2565b91829182610396565b0390f35b6100f8565b3461047a5761045a36600461021b565b610476610465610aac565b61046d6100f2565b91829182610237565b0390f35b6100f8565b346104af5761048f36600461021b565b6104ab61049a610ac2565b6104a26100f2565b91829182610396565b0390f35b6100f8565b5190565b60209181520190565b90825f9392825e0152565b601f801991011690565b6104f56104fe602093610503936104ec816104b4565b938480936104b8565b958691016104c1565b6104cc565b0190565b61051c9160208201915f8184039101526104d6565b90565b3461054f5761052f36600461021b565b61054b61053a610bd5565b6105426100f2565b91829182610507565b0390f35b6100f8565b5f80fd5b908160609103126105665790565b610554565b908160609103126105795790565b610554565b9190916040818403126105d6575f81013567ffffffffffffffff81116105d157836105aa918301610558565b92602082013567ffffffffffffffff81116105cc576105c9920161056b565b90565b610100565b610100565b6100fc565b3461060a576105f46105ee36600461057e565b90610da3565b6105fc6100f2565b8061060681610148565b0390f35b6100f8565b3461063d5761062761062236600461012a565b610fdd565b61062f6100f2565b8061063981610148565b0390f35b6100f8565b5f80fd5b5f1b90565b906106575f1991610646565b9181191691161790565b90565b61067861067361067d92610104565b610661565b610104565b90565b90565b9061069861069361069f92610664565b610680565b825461064b565b9055565b6106ae906003610683565b565b6106c46106bf6106c992610180565b610661565b610180565b90565b6106d5906106b0565b90565b6106e1906106cc565b90565b906106ee906106d8565b5f5260205260405f2090565b61070961070e929160016106e4565b610683565b565b5f90565b5f1c90565b90565b61072861072d91610714565b610719565b90565b61073a905461071c565b90565b610745610710565b506107506003610730565b90565b5090565b634e487b7160e01b5f52604160045260245ffd5b634e487b7160e01b5f52602260045260245ffd5b906001600283049216801561079f575b602083101461079a57565b61076b565b91607f169161078f565b5f5260205f2090565b601f602091010490565b1b90565b919060086107db9102916107d55f19846107bc565b926107bc565b9181191691161790565b91906107fb6107f661080393610664565b610680565b9083546107c0565b9055565b61081991610813610710565b916107e5565b565b5b818110610827575050565b806108345f600193610807565b0161081c565b9190601f811161084a575b505050565b61085661087b936107a9565b906020610862846107b2565b83019310610883575b610874906107b2565b019061081b565b5f8080610845565b91506108748192905061086b565b1c90565b906108a5905f1990600802610891565b191690565b816108b491610895565b906002021790565b916108c79082610753565b9067ffffffffffffffff8211610986576108eb826108e5855461077f565b8561083a565b5f90601f831160011461091e5791809161090d935f92610912575b50506108aa565b90555b565b90915001355f80610906565b601f1983169161092d856107a9565b925f5b81811061096e57509160029391856001969410610954575b50505002019055610910565b610964910135601f841690610895565b90555f8080610948565b91936020600181928787013581550195019201610930565b610757565b9061099692916108bc565b565b90825f939282370152565b91906109bd816109b6816109c2956104b8565b8095610998565b6104cc565b0190565b90916109dd9260208301925f8185039101526109a3565b90565b6109ec8183905f61098b565b907fd2f056df94c31bdb3b4e16080f2ac6dbd4233c6001058d94afc3ad1242dff48891610a23610a1a6100f2565b928392836109c6565b0390a1565b610a3f610a4491610a37610710565b5060016106e4565b610730565b90565b5f90565b90565b610a62610a5d610a6792610a4b565b610661565b610180565b90565b610a7390610a4e565b90565b610a7e610a47565b50610a885f610a6a565b90565b610a93610a47565b5090565b610a9f610a47565b50610aa95f610a6a565b90565b610ab4610710565b50610abf6002610730565b90565b610aca610a47565b50610ad45f610a6a565b90565b606090565b60209181520190565b905f9291805490610aff610af88361077f565b8094610adc565b916001811690815f14610b565750600114610b1a575b505050565b610b2791929394506107a9565b915f925b818410610b3e57505001905f8080610b15565b60018160209295939554848601520191019290610b2b565b92949550505060ff19168252151560200201905f8080610b15565b90610b7b91610ae5565b90565b90610b88906104cc565b810190811067ffffffffffffffff821117610ba257604052565b610757565b90610bc7610bc092610bb76100f2565b93848092610b71565b0383610b7e565b565b610bd290610ba7565b90565b610bdd610ad7565b50610be75f610bc9565b90565b5f80fd5b5f80fd5b5f80fd5b903590600160200381360303821215610c38570180359067ffffffffffffffff8211610c3357602001916020820236038313610c2e57565b610bf2565b610bee565b610bea565b5090565b610c55610c50610c5a92610a4b565b610661565b610104565b90565b903590600160200381360303821215610c9f570180359067ffffffffffffffff8211610c9a57602001916020820236038313610c9557565b610bf2565b610bee565b610bea565b5090565b63ffffffff1690565b610cba81610ca8565b03610cc157565b5f80fd5b35610ccf81610cb1565b90565b610ce6610ce1610ceb92610ca8565b610661565b610104565b90565b151590565b6001610cff9101610104565b90565b634e487b7160e01b5f52603260045260245ffd5b9190811015610d26576020020190565b610d02565b35610d3581610197565b90565b634e487b7160e01b5f52601160045260245ffd5b610d5b610d6191939293610104565b92610104565b8201809211610d6c57565b610d38565b604090610d9a610da19496959396610d9060608401985f85019061022a565b602083019061022a565b019061022a565b565b50610dba610db4825f810190610bf6565b90610c3d565b610dcc610dc65f610c41565b91610104565b148015610f97575b610f7b57610e00610de760408301610cc5565b610df9610df343610104565b91610cd2565b1015610cee565b610f5f57610e23610e1d610e17835f810190610bf6565b90611032565b15610cee565b610f4357610e305f610c41565b90610e3a5f610c41565b915b82610e64610e5e610e59610e53865f810190610bf6565b90610c3d565b610104565b91610104565b1015610eb557610ea9610eaf91610ea3610e9e6001610e98610e93610e8c895f810190610bf6565b8b91610d16565b610d2b565b906106e4565b610730565b90610d4c565b92610cf3565b91610e3c565b91505080610ecb610ec55f610c41565b91610104565b14610f275780610eec610ee6610ee16002610730565b610104565b91610104565b10610ef45750565b610efe6002610730565b90610f23610f0c6003610730565b5f9384936386b1609160e01b855260048501610d71565b0390fd5b5f632f41f79b60e01b815280610f3f60048201610148565b0390fd5b5f6309cf9e4960e11b815280610f5b60048201610148565b0390fd5b5f63898deb1d60e01b815280610f7760048201610148565b0390fd5b5f634be6321b60e01b815280610f9360048201610148565b0390fd5b50610fae610fa8825f810190610bf6565b90610c3d565b610fd6610fd0610fcb610fc5856020810190610c5d565b90610ca4565b610104565b91610104565b1415610dd4565b610fe8906002610683565b565b5f90565b90565b61100561100061100a92610fee565b610661565b610104565b90565b61101c61102291939293610104565b92610104565b820391821161102d57565b610d38565b9061103b610fea565b5061106461104a838390610c3d565b61105d6110576001610ff1565b91610104565b1115610cee565b61110d576110726001610ff1565b5b8061109061108a611085868690610c3d565b610104565b91610104565b1015611105576110ec6110ad6110a885858591610d16565b610d2b565b6110e56110df6110da6110d588886110cf896110c96001610ff1565b9061100d565b91610d16565b610d2b565b61018b565b9161018b565b1115610cee565b6110fe576110f990610cf3565b611073565b5050505f90565b505050600190565b505060019056fea2646970667358221220acdaec2211c2ca6b38003d6a9d44e5f4ff89d013cc5cebc349ba73e9deab495264736f6c634300081c0033","sourceMap":"388:4970:10:-:0;;;;;;;;;-1:-1:-1;388:4970:10;:::i;:::-;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;:::o;:::-;;;;:::o;:::-;;;;;;;;;;;;;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;:::o;:::-;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;:::o;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;:::o;:::-;;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;;;;:::o;:::-;;;;;;;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;:::i;:::-;;;;:::i;:::-;;;:::i;:::-;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;;;;;;;:::i;:::-;;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;:::i;:::-;;:::i;:::-;;;:::i;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;;:::o;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;:::o;:::-;;;;;;;:::i;:::-;;:::i;:::-;;;;:::i;:::-;;;:::o;3867:128::-;3954:34;3867:128;3954:34;;:::i;:::-;3867:128::o;388:4970::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;;;;;;;:::o;3316:121::-;3396:25;:34;3316:121;3396:15;;:25;:::i;:::-;:34;:::i;:::-;3316:121::o;388:4970::-;;;:::o;:::-;;;;:::o;:::-;;:::o;:::-;;;;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;:::o;4598:121::-;4661:7;;:::i;:::-;4687:25;;;;:::i;:::-;4680:32;:::o;388:4970::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;;;;;;:::o;:::-;;;:::o;:::-;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;:::i;:::-;;;;;:::i;:::-;;;:::o;:::-;;;;;:::i;:::-;;;:::i;:::-;:::o;:::-;;;;;;;;;:::o;:::-;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;:::o;:::-;;;;;:::i;:::-;;;;;;:::i;:::-;;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;:::i;:::-;;;;;;:::o;:::-;;;;;;:::i;:::-;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;:::o;:::-;;;;;;;;;;:::o;:::-;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;3003:161::-;3088:24;3101:11;;3088:24;;;:::i;:::-;3145:11;3127:30;;;;;:::i;:::-;;;;;;:::i;:::-;;;;3003:161::o;4041:140::-;4149:25;;4041:140;4123:7;;:::i;:::-;4149:15;;:25;:::i;:::-;;:::i;:::-;4142:32;:::o;388:4970::-;;;:::o;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;:::i;:::-;;:::o;5118:98::-;5173:7;;:::i;:::-;5207:1;5199:10;5207:1;5199:10;:::i;:::-;5192:17;:::o;4765:163::-;4878:7;;:::i;:::-;4904:17;4897:24;:::o;4974:98::-;5029:7;;:::i;:::-;5063:1;5055:10;5063:1;5055:10;:::i;:::-;5048:17;:::o;4329:129::-;4396:7;;:::i;:::-;4422:29;;;;:::i;:::-;4415:36;:::o;5262:94::-;5313:7;;:::i;:::-;5347:1;5339:10;5347:1;5339:10;:::i;:::-;5332:17;:::o;388:4970::-;;;:::o;:::-;;;;;;;:::o;:::-;;;;;;;;;;;;:::i;:::-;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;:::i;:::-;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;:::o;:::-;;;;:::i;:::-;;:::o;2860:97::-;2908:13;;:::i;:::-;2940:10;2933:17;2940:10;2933:17;:::i;:::-;;:::o;388:4970::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;:::i;:::-;;:::i;:::-;;;:::o;:::-;;;;:::o;:::-;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;:::i;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;:::o;:::-;;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;:::i;:::-;;;;;:::i;:::-;;:::o;:::-;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;:::o;:::-;;:::i;:::-;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;:::i;:::-;;;;:::i;:::-;:::o;675:1423::-;;905:28;:21;:13;:21;;;;;:::i;:::-;:28;;:::i;:::-;:33;;937:1;905:33;:::i;:::-;;;:::i;:::-;;:116;;;;675:1423;888:220;;1121:46;1123:28;;:13;:28;;:::i;:::-;:43;;1154:12;1123:43;:::i;:::-;;;:::i;:::-;;1121:46;;:::i;:::-;1117:127;;1257:48;1258:47;1283:21;:13;:21;;;;;:::i;:::-;1258:47;;:::i;:::-;1257:48;;:::i;:::-;1253:129;;1453:24;1476:1;1453:24;:::i;:::-;1504:1;1492:13;1504:1;1492:13;:::i;:::-;1487:141;1541:3;1507:1;:32;;1511:28;:21;:13;:21;;;;;:::i;:::-;:28;;:::i;:::-;1507:32;:::i;:::-;;;:::i;:::-;;;;;1560:57;1541:3;1576:15;:41;;:15;1592:24;;:21;:13;:21;;;;;:::i;:::-;1614:1;1592:24;;:::i;:::-;;:::i;:::-;1576:41;;:::i;:::-;;:::i;:::-;1560:57;;:::i;:::-;1541:3;;:::i;:::-;1492:13;;;1507:32;;;;1692:12;:17;;1708:1;1692:17;:::i;:::-;;;:::i;:::-;;1688:99;;1874:12;:44;;1889:29;;;:::i;:::-;1874:44;:::i;:::-;;;:::i;:::-;;1870:222;;675:1423;:::o;1870:222::-;2011:29;;;:::i;:::-;2042:25;1941:140;2042:25;;;:::i;:::-;1941:140;;;;;;;;;;;;;:::i;:::-;;;;1688:99;1732:44;;;;;;;;;;;;:::i;:::-;;;;1253:129;1328:43;;;;;;;;;;;;:::i;:::-;;;;1117:127;1190:43;;;;;;;;;;;;:::i;:::-;;;;888:220;1053:44;;;;;;;;;;;;:::i;:::-;;;;905:116;958:13;:28;:21;:13;:21;;;;;:::i;:::-;:28;;:::i;:::-;:63;;990:31;:24;:13;:24;;;;;:::i;:::-;:31;;:::i;:::-;958:63;:::i;:::-;;;:::i;:::-;;;905:116;;3588:136;3679:38;3588:136;3679:38;;:::i;:::-;3588:136::o;388:4970::-;;;:::o;:::-;;:::o;:::-;;;;;;:::i;:::-;;:::i;:::-;;:::i;:::-;;:::o;:::-;;;;;;;;:::i;:::-;;;:::i;:::-;;;;;;;;:::o;:::-;;:::i;2312:502::-;;2413:4;;:::i;:::-;2493:9;2491:23;2493:16;:9;;:16;;:::i;:::-;:20;;2512:1;2493:20;:::i;:::-;;;:::i;:::-;;2491:23;;:::i;:::-;2487:65;;2635:13;2647:1;2635:13;:::i;:::-;2672:3;2650:1;:20;;2654:16;:9;;:16;;:::i;:::-;2650:20;:::i;:::-;;;:::i;:::-;;;;;2695:34;2697:12;;:9;;2707:1;2697:12;;:::i;:::-;;:::i;:::-;:31;;2712:16;;:9;;2722:5;:1;:5;2726:1;2722:5;:::i;:::-;;;:::i;:::-;2712:16;;:::i;:::-;;:::i;:::-;2697:31;:::i;:::-;;;:::i;:::-;;2695:34;;:::i;:::-;2691:85;;2672:3;;;:::i;:::-;2635:13;;2691:85;2756:5;;;;2749:12;:::o;2650:20::-;;;;2803:4;2796:11;:::o;2487:65::-;2537:4;;;2530:11;:::o","linkReferences":{}},"methodIdentifiers":{"getAllocationManager()":"a28efd6b","getDelegationManager()":"b24e5a3a","getLastCheckpointThresholdWeight()":"b933fa74","getLastCheckpointTotalWeight()":"314f3a49","getLatestOperatorForSigningKey(address)":"ac7cbfd9","getOperatorWeight(address)":"98ec1ac9","getServiceURI()":"cc922c6a","getStakeRegistry()":"bef4c839","setLastCheckpointThresholdWeight(uint256)":"fb8524b1","setLastCheckpointTotalWeight(uint256)":"08fc760a","setOperatorWeight(address,uint256)":"0e6b1110","setServiceURI(string)":"5f11301b","validate((bytes20,bytes12,bytes),(address[],bytes[],uint32))":"cd71589e"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.28+commit.7893614a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"signerWeight\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"thresholdWeight\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"totalWeight\",\"type\":\"uint256\"}],\"name\":\"InsufficientQuorum\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InsufficientQuorumZero\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidQuorumParameters\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidSignature\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidSignatureBlock\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidSignatureLength\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidSignatureOrder\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"numerator\",\"type\":\"uint256\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"denominator\",\"type\":\"uint256\"}],\"name\":\"QuorumThresholdUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"string\",\"name\":\"serviceURI\",\"type\":\"string\"}],\"name\":\"ServiceURIUpdated\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"getAllocationManager\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getDelegationManager\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getLastCheckpointThresholdWeight\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getLastCheckpointTotalWeight\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"signingKeyAddress\",\"type\":\"address\"}],\"name\":\"getLatestOperatorForSigningKey\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"}],\"name\":\"getOperatorWeight\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getServiceURI\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getStakeRegistry\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"weight\",\"type\":\"uint256\"}],\"name\":\"setLastCheckpointThresholdWeight\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"weight\",\"type\":\"uint256\"}],\"name\":\"setLastCheckpointTotalWeight\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"weight\",\"type\":\"uint256\"}],\"name\":\"setOperatorWeight\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_serviceURI\",\"type\":\"string\"}],\"name\":\"setServiceURI\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes20\",\"name\":\"eventId\",\"type\":\"bytes20\"},{\"internalType\":\"bytes12\",\"name\":\"ordering\",\"type\":\"bytes12\"},{\"internalType\":\"bytes\",\"name\":\"payload\",\"type\":\"bytes\"}],\"internalType\":\"struct IWavsServiceHandler.Envelope\",\"name\":\"\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"internalType\":\"bytes[]\",\"name\":\"signatures\",\"type\":\"bytes[]\"},{\"internalType\":\"uint32\",\"name\":\"referenceBlock\",\"type\":\"uint32\"}],\"internalType\":\"struct IWavsServiceHandler.SignatureData\",\"name\":\"signatureData\",\"type\":\"tuple\"}],\"name\":\"validate\",\"outputs\":[],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"Lay3r Labs\",\"details\":\"This contract implements the IWavsServiceManager interface\",\"errors\":{\"InsufficientQuorum(uint256,uint256,uint256)\":[{\"params\":{\"signerWeight\":\"The weight of the signer\",\"thresholdWeight\":\"The threshold weight\",\"totalWeight\":\"The total weight\"}}]},\"events\":{\"QuorumThresholdUpdated(uint256,uint256)\":{\"params\":{\"denominator\":\"The denominator of the quorum threshold\",\"numerator\":\"The numerator of the quorum threshold\"}},\"ServiceURIUpdated(string)\":{\"params\":{\"serviceURI\":\"The service URI\"}}},\"kind\":\"dev\",\"methods\":{\"getAllocationManager()\":{\"returns\":{\"_0\":\"The allocation manager address.\"}},\"getDelegationManager()\":{\"returns\":{\"_0\":\"The delegation manager address.\"}},\"getLastCheckpointThresholdWeight()\":{\"returns\":{\"_0\":\"The threshold weight of the last checkpoint\"}},\"getLastCheckpointTotalWeight()\":{\"returns\":{\"_0\":\"The total weight of the last checkpoint\"}},\"getLatestOperatorForSigningKey(address)\":{\"params\":{\"signingKeyAddress\":\"The address of the signing key.\"},\"returns\":{\"_0\":\"The latest operator address associated with the signing key, or address(0) if none.\"}},\"getOperatorWeight(address)\":{\"params\":{\"operator\":\"The address of the operator\"},\"returns\":{\"_0\":\"The current weight of the operator\"}},\"getServiceURI()\":{\"returns\":{\"_0\":\"The service URI.\"}},\"getStakeRegistry()\":{\"returns\":{\"_0\":\"The stake registry address.\"}},\"setLastCheckpointThresholdWeight(uint256)\":{\"params\":{\"weight\":\"The threshold weight of the last checkpoint\"}},\"setLastCheckpointTotalWeight(uint256)\":{\"params\":{\"weight\":\"The total weight of the last checkpoint\"}},\"setOperatorWeight(address,uint256)\":{\"params\":{\"operator\":\"The operator\",\"weight\":\"The weight of the operator\"}},\"setServiceURI(string)\":{\"params\":{\"_serviceURI\":\"The service URI to update.\"}},\"validate((bytes20,bytes12,bytes),(address[],bytes[],uint32))\":{\"params\":{\"envelope\":\"The envelope containing the data.\",\"signatureData\":\"The signature data.\"}}},\"title\":\"SimpleServiceManager\",\"version\":1},\"userdoc\":{\"errors\":{\"InsufficientQuorum(uint256,uint256,uint256)\":[{\"notice\":\"The error for the insufficient quorum\"}],\"InsufficientQuorumZero()\":[{\"notice\":\"The error for the insufficient quorum zero.\"}],\"InvalidQuorumParameters()\":[{\"notice\":\"The error for the invalid quorum parameters.\"}],\"InvalidSignature()\":[{\"notice\":\"The error for the invalid signature.\"}],\"InvalidSignatureBlock()\":[{\"notice\":\"The error for the invalid signature block.\"}],\"InvalidSignatureLength()\":[{\"notice\":\"The error for the invalid signature length.\"}],\"InvalidSignatureOrder()\":[{\"notice\":\"The error for the invalid signature order.\"}]},\"events\":{\"QuorumThresholdUpdated(uint256,uint256)\":{\"notice\":\"Event emitted when the quorum threshold is updated\"},\"ServiceURIUpdated(string)\":{\"notice\":\"Event emitted when the service URI is updated\"}},\"kind\":\"user\",\"methods\":{\"getAllocationManager()\":{\"notice\":\"Returns the allocation manager address.\"},\"getDelegationManager()\":{\"notice\":\"Returns the delegation manager address.\"},\"getLastCheckpointThresholdWeight()\":{\"notice\":\"Returns the threshold weight of the last checkpoint\"},\"getLastCheckpointTotalWeight()\":{\"notice\":\"Returns the total weight of the last checkpoint\"},\"getLatestOperatorForSigningKey(address)\":{\"notice\":\"Returns the latest operator address associated with a signing key.\"},\"getOperatorWeight(address)\":{\"notice\":\"Gets the operator's current weight\"},\"getServiceURI()\":{\"notice\":\"Returns the service URI\"},\"getStakeRegistry()\":{\"notice\":\"Returns the stake registry address.\"},\"setLastCheckpointThresholdWeight(uint256)\":{\"notice\":\"Sets the threshold weight of the last checkpoint\"},\"setLastCheckpointTotalWeight(uint256)\":{\"notice\":\"Sets the total weight of the last checkpoint\"},\"setOperatorWeight(address,uint256)\":{\"notice\":\"Sets the weight of an operator\"},\"setServiceURI(string)\":{\"notice\":\"Sets the service URI\"},\"validate((bytes20,bytes12,bytes),(address[],bytes[],uint32))\":{\"notice\":\"Validates a signed envelope\"}},\"notice\":\"Contract for the simple service manager\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"examples/contracts/solidity/mocks/SimpleServiceManager.sol\":\"SimpleServiceManager\"},\"evmVersion\":\"prague\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[],\"viaIR\":true},\"sources\":{\"examples/contracts/solidity/interfaces/IWavsServiceHandler.sol\":{\"keccak256\":\"0x427e63f26320f27f53975554ff530953d81fb51b681fca950754b576ce83a267\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://d39520e0561d2f65a04b76c265f7ede71feab34fc0e1bd9f21b868353b9c2b0a\",\"dweb:/ipfs/QmWgvBY8pim9hNLNFDRZyob4PvRmuxEoRSyqABkUNpDcef\"]},\"examples/contracts/solidity/interfaces/IWavsServiceManager.sol\":{\"keccak256\":\"0xc4abed1f1f462a601b8f855c6d16bcc97ac9e5eb081f82ca6bedb6420cd1c9b7\",\"license\":\"UNLICENSED\",\"urls\":[\"bzz-raw://27c6906e991bbbe4a589b97d3f883bfb66c6b86463f9e1ff0fb68ac9845ef3f1\",\"dweb:/ipfs/QmYh9y385CszJ4m8TSbqLkTwzFwYyUEBX8KNwvHCjEuXWn\"]},\"examples/contracts/solidity/mocks/SimpleServiceManager.sol\":{\"keccak256\":\"0x0fea3cac68e0f1222fa0d3225c03297fcd161d15eca2a7b5b00a1ad70d586300\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://ba44c2f191f64cef5b98d40e04c8da8896dacead776bbd1945714a082471f763\",\"dweb:/ipfs/QmZqgzsdC6kf33oQ6BWjDVHCTcUznpcbU7Fi2HSv7hW8U8\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.28+commit.7893614a"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"uint256","name":"signerWeight","type":"uint256"},{"internalType":"uint256","name":"thresholdWeight","type":"uint256"},{"internalType":"uint256","name":"totalWeight","type":"uint256"}],"type":"error","name":"InsufficientQuorum"},{"inputs":[],"type":"error","name":"InsufficientQuorumZero"},{"inputs":[],"type":"error","name":"InvalidQuorumParameters"},{"inputs":[],"type":"error","name":"InvalidSignature"},{"inputs":[],"type":"error","name":"InvalidSignatureBlock"},{"inputs":[],"type":"error","name":"InvalidSignatureLength"},{"inputs":[],"type":"error","name":"InvalidSignatureOrder"},{"inputs":[{"internalType":"uint256","name":"numerator","type":"uint256","indexed":true},{"internalType":"uint256","name":"denominator","type":"uint256","indexed":true}],"type":"event","name":"QuorumThresholdUpdated","anonymous":false},{"inputs":[{"internalType":"string","name":"serviceURI","type":"string","indexed":false}],"type":"event","name":"ServiceURIUpdated","anonymous":false},{"inputs":[],"stateMutability":"pure","type":"function","name":"getAllocationManager","outputs":[{"internalType":"address","name":"","type":"address"}]},{"inputs":[],"stateMutability":"pure","type":"function","name":"getDelegationManager","outputs":[{"internalType":"address","name":"","type":"address"}]},{"inputs":[],"stateMutability":"view","type":"function","name":"getLastCheckpointThresholdWeight","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[],"stateMutability":"view","type":"function","name":"getLastCheckpointTotalWeight","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[{"internalType":"address","name":"signingKeyAddress","type":"address"}],"stateMutability":"pure","type":"function","name":"getLatestOperatorForSigningKey","outputs":[{"internalType":"address","name":"","type":"address"}]},{"inputs":[{"internalType":"address","name":"operator","type":"address"}],"stateMutability":"view","type":"function","name":"getOperatorWeight","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[],"stateMutability":"view","type":"function","name":"getServiceURI","outputs":[{"internalType":"string","name":"","type":"string"}]},{"inputs":[],"stateMutability":"pure","type":"function","name":"getStakeRegistry","outputs":[{"internalType":"address","name":"","type":"address"}]},{"inputs":[{"internalType":"uint256","name":"weight","type":"uint256"}],"stateMutability":"nonpayable","type":"function","name":"setLastCheckpointThresholdWeight"},{"inputs":[{"internalType":"uint256","name":"weight","type":"uint256"}],"stateMutability":"nonpayable","type":"function","name":"setLastCheckpointTotalWeight"},{"inputs":[{"internalType":"address","name":"operator","type":"address"},{"internalType":"uint256","name":"weight","type":"uint256"}],"stateMutability":"nonpayable","type":"function","name":"setOperatorWeight"},{"inputs":[{"internalType":"string","name":"_serviceURI","type":"string"}],"stateMutability":"nonpayable","type":"function","name":"setServiceURI"},{"inputs":[{"internalType":"struct IWavsServiceHandler.Envelope","name":"","type":"tuple","components":[{"internalType":"bytes20","name":"eventId","type":"bytes20"},{"internalType":"bytes12","name":"ordering","type":"bytes12"},{"internalType":"bytes","name":"payload","type":"bytes"}]},{"internalType":"struct IWavsServiceHandler.SignatureData","name":"signatureData","type":"tuple","components":[{"internalType":"address[]","name":"signers","type":"address[]"},{"internalType":"bytes[]","name":"signatures","type":"bytes[]"},{"internalType":"uint32","name":"referenceBlock","type":"uint32"}]}],"stateMutability":"view","type":"function","name":"validate"}],"devdoc":{"kind":"dev","methods":{"getAllocationManager()":{"returns":{"_0":"The allocation manager address."}},"getDelegationManager()":{"returns":{"_0":"The delegation manager address."}},"getLastCheckpointThresholdWeight()":{"returns":{"_0":"The threshold weight of the last checkpoint"}},"getLastCheckpointTotalWeight()":{"returns":{"_0":"The total weight of the last checkpoint"}},"getLatestOperatorForSigningKey(address)":{"params":{"signingKeyAddress":"The address of the signing key."},"returns":{"_0":"The latest operator address associated with the signing key, or address(0) if none."}},"getOperatorWeight(address)":{"params":{"operator":"The address of the operator"},"returns":{"_0":"The current weight of the operator"}},"getServiceURI()":{"returns":{"_0":"The service URI."}},"getStakeRegistry()":{"returns":{"_0":"The stake registry address."}},"setLastCheckpointThresholdWeight(uint256)":{"params":{"weight":"The threshold weight of the last checkpoint"}},"setLastCheckpointTotalWeight(uint256)":{"params":{"weight":"The total weight of the last checkpoint"}},"setOperatorWeight(address,uint256)":{"params":{"operator":"The operator","weight":"The weight of the operator"}},"setServiceURI(string)":{"params":{"_serviceURI":"The service URI to update."}},"validate((bytes20,bytes12,bytes),(address[],bytes[],uint32))":{"params":{"envelope":"The envelope containing the data.","signatureData":"The signature data."}}},"version":1},"userdoc":{"kind":"user","methods":{"getAllocationManager()":{"notice":"Returns the allocation manager address."},"getDelegationManager()":{"notice":"Returns the delegation manager address."},"getLastCheckpointThresholdWeight()":{"notice":"Returns the threshold weight of the last checkpoint"},"getLastCheckpointTotalWeight()":{"notice":"Returns the total weight of the last checkpoint"},"getLatestOperatorForSigningKey(address)":{"notice":"Returns the latest operator address associated with a signing key."},"getOperatorWeight(address)":{"notice":"Gets the operator's current weight"},"getServiceURI()":{"notice":"Returns the service URI"},"getStakeRegistry()":{"notice":"Returns the stake registry address."},"setLastCheckpointThresholdWeight(uint256)":{"notice":"Sets the threshold weight of the last checkpoint"},"setLastCheckpointTotalWeight(uint256)":{"notice":"Sets the total weight of the last checkpoint"},"setOperatorWeight(address,uint256)":{"notice":"Sets the weight of an operator"},"setServiceURI(string)":{"notice":"Sets the service URI"},"validate((bytes20,bytes12,bytes),(address[],bytes[],uint32))":{"notice":"Validates a signed envelope"}},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":false,"runs":200},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"examples/contracts/solidity/mocks/SimpleServiceManager.sol":"SimpleServiceManager"},"evmVersion":"prague","libraries":{},"viaIR":true},"sources":{"examples/contracts/solidity/interfaces/IWavsServiceHandler.sol":{"keccak256":"0x427e63f26320f27f53975554ff530953d81fb51b681fca950754b576ce83a267","urls":["bzz-raw://d39520e0561d2f65a04b76c265f7ede71feab34fc0e1bd9f21b868353b9c2b0a","dweb:/ipfs/QmWgvBY8pim9hNLNFDRZyob4PvRmuxEoRSyqABkUNpDcef"],"license":"MIT"},"examples/contracts/solidity/interfaces/IWavsServiceManager.sol":{"keccak256":"0xc4abed1f1f462a601b8f855c6d16bcc97ac9e5eb081f82ca6bedb6420cd1c9b7","urls":["bzz-raw://27c6906e991bbbe4a589b97d3f883bfb66c6b86463f9e1ff0fb68ac9845ef3f1","dweb:/ipfs/QmYh9y385CszJ4m8TSbqLkTwzFwYyUEBX8KNwvHCjEuXWn"],"license":"UNLICENSED"},"examples/contracts/solidity/mocks/SimpleServiceManager.sol":{"keccak256":"0x0fea3cac68e0f1222fa0d3225c03297fcd161d15eca2a7b5b00a1ad70d586300","urls":["bzz-raw://ba44c2f191f64cef5b98d40e04c8da8896dacead776bbd1945714a082471f763","dweb:/ipfs/QmZqgzsdC6kf33oQ6BWjDVHCTcUznpcbU7Fi2HSv7hW8U8"],"license":"MIT"}},"version":1},"id":10}
\ No newline at end of file
diff --git a/packages/types/src/contracts/solidity/abi/bls/IPOAStakeRegistry.json b/packages/types/src/contracts/solidity/abi/bls/IPOAStakeRegistry.json
new file mode 100644
index 000000000..3504586c4
--- /dev/null
+++ b/packages/types/src/contracts/solidity/abi/bls/IPOAStakeRegistry.json
@@ -0,0 +1 @@
+{"abi":[{"type":"function","name":"deregisterOperator","inputs":[{"name":"operator","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"getLastCheckpointQuorum","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"},{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"getLastCheckpointQuorumAtBlock","inputs":[{"name":"blockNumber","type":"uint32","internalType":"uint32"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"},{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"getLastCheckpointThresholdWeight","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"getLastCheckpointThresholdWeightAtBlock","inputs":[{"name":"blockNumber","type":"uint32","internalType":"uint32"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"getLastCheckpointTotalWeight","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"getLastCheckpointTotalWeightAtBlock","inputs":[{"name":"blockNumber","type":"uint32","internalType":"uint32"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"getLatestOperatorSigningKey","inputs":[{"name":"operator","type":"address","internalType":"address"}],"outputs":[{"name":"","type":"bytes","internalType":"bytes"}],"stateMutability":"view"},{"type":"function","name":"getOperatorSigningKeyAtBlock","inputs":[{"name":"operator","type":"address","internalType":"address"},{"name":"blockNumber","type":"uint256","internalType":"uint256"}],"outputs":[{"name":"","type":"bytes","internalType":"bytes"}],"stateMutability":"view"},{"type":"function","name":"getOperatorWeightAtBlock","inputs":[{"name":"operator","type":"address","internalType":"address"},{"name":"blockNumber","type":"uint32","internalType":"uint32"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"isValidSignature","inputs":[{"name":"hash","type":"bytes32","internalType":"bytes32"},{"name":"signature","type":"bytes","internalType":"bytes"}],"outputs":[{"name":"magicValue","type":"bytes4","internalType":"bytes4"}],"stateMutability":"view"},{"type":"function","name":"operatorRegistered","inputs":[{"name":"operator","type":"address","internalType":"address"}],"outputs":[{"name":"","type":"bool","internalType":"bool"}],"stateMutability":"view"},{"type":"function","name":"registerOperator","inputs":[{"name":"operator","type":"address","internalType":"address"},{"name":"weight","type":"uint256","internalType":"uint256"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"updateOperatorSigningKey","inputs":[{"name":"blsKey","type":"bytes","internalType":"bytes"},{"name":"blsSigProof","type":"bytes","internalType":"bytes"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"updateOperatorWeight","inputs":[{"name":"operator","type":"address","internalType":"address"},{"name":"weight","type":"uint256","internalType":"uint256"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"updateQuorum","inputs":[{"name":"quorumNumerator","type":"uint256","internalType":"uint256"},{"name":"quorumDenominator","type":"uint256","internalType":"uint256"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"updateStakeThreshold","inputs":[{"name":"thresholdWeight","type":"uint256","internalType":"uint256"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"event","name":"OperatorDeregistered","inputs":[{"name":"operator","type":"address","indexed":true,"internalType":"address"}],"anonymous":false},{"type":"event","name":"OperatorRegistered","inputs":[{"name":"operator","type":"address","indexed":true,"internalType":"address"}],"anonymous":false},{"type":"event","name":"OperatorWeightUpdated","inputs":[{"name":"operator","type":"address","indexed":true,"internalType":"address"},{"name":"oldWeight","type":"uint256","indexed":false,"internalType":"uint256"},{"name":"newWeight","type":"uint256","indexed":false,"internalType":"uint256"}],"anonymous":false},{"type":"event","name":"SigningKeyUpdate","inputs":[{"name":"operator","type":"address","indexed":true,"internalType":"address"},{"name":"updateBlock","type":"uint256","indexed":true,"internalType":"uint256"},{"name":"newKeyHash","type":"bytes32","indexed":true,"internalType":"bytes32"},{"name":"oldKeyHash","type":"bytes32","indexed":false,"internalType":"bytes32"}],"anonymous":false},{"type":"event","name":"ThresholdWeightUpdated","inputs":[{"name":"thresholdWeight","type":"uint256","indexed":false,"internalType":"uint256"}],"anonymous":false},{"type":"event","name":"TotalWeightUpdated","inputs":[{"name":"oldTotalWeight","type":"uint256","indexed":false,"internalType":"uint256"},{"name":"newTotalWeight","type":"uint256","indexed":false,"internalType":"uint256"}],"anonymous":false},{"type":"error","name":"InsufficientSignedStake","inputs":[]},{"type":"error","name":"InvalidAddressZero","inputs":[]},{"type":"error","name":"InvalidBLSKeyLength","inputs":[]},{"type":"error","name":"InvalidBLSKeyOwnershipProof","inputs":[]},{"type":"error","name":"InvalidBLSSignature","inputs":[]},{"type":"error","name":"InvalidBLSSignatureLength","inputs":[]},{"type":"error","name":"InvalidLength","inputs":[]},{"type":"error","name":"InvalidQuorum","inputs":[]},{"type":"error","name":"InvalidReferenceBlock","inputs":[]},{"type":"error","name":"InvalidSignedWeight","inputs":[]},{"type":"error","name":"InvalidThresholdWeight","inputs":[]},{"type":"error","name":"InvalidWeight","inputs":[]},{"type":"error","name":"NotSorted","inputs":[]},{"type":"error","name":"OperatorAlreadyRegistered","inputs":[]},{"type":"error","name":"OperatorNotRegistered","inputs":[]},{"type":"error","name":"SignerNotRegistered","inputs":[]},{"type":"error","name":"SigningKeyAlreadyAssigned","inputs":[]}],"bytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"deployedBytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"methodIdentifiers":{"deregisterOperator(address)":"d8cf98ca","getLastCheckpointQuorum()":"7d39f06d","getLastCheckpointQuorumAtBlock(uint32)":"b00c04e1","getLastCheckpointThresholdWeight()":"b933fa74","getLastCheckpointThresholdWeightAtBlock(uint32)":"1e4cd85e","getLastCheckpointTotalWeight()":"314f3a49","getLastCheckpointTotalWeightAtBlock(uint32)":"0dba3394","getLatestOperatorSigningKey(address)":"a2ce5fd1","getOperatorSigningKeyAtBlock(address,uint256)":"5e1042e8","getOperatorWeightAtBlock(address,uint32)":"955f2d90","isValidSignature(bytes32,bytes)":"1626ba7e","operatorRegistered(address)":"ec7fbb31","registerOperator(address,uint256)":"c788c520","updateOperatorSigningKey(bytes,bytes)":"3b9a26ab","updateOperatorWeight(address,uint256)":"dec24b18","updateQuorum(uint256,uint256)":"530c74c0","updateStakeThreshold(uint256)":"5ef53329"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.27+commit.40a35a09\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"name\":\"InsufficientSignedStake\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidAddressZero\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidBLSKeyLength\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidBLSKeyOwnershipProof\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidBLSSignature\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidBLSSignatureLength\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidLength\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidQuorum\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidReferenceBlock\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidSignedWeight\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidThresholdWeight\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidWeight\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"NotSorted\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OperatorAlreadyRegistered\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OperatorNotRegistered\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"SignerNotRegistered\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"SigningKeyAlreadyAssigned\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"}],\"name\":\"OperatorDeregistered\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"}],\"name\":\"OperatorRegistered\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"oldWeight\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"newWeight\",\"type\":\"uint256\"}],\"name\":\"OperatorWeightUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"updateBlock\",\"type\":\"uint256\"},{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"newKeyHash\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"oldKeyHash\",\"type\":\"bytes32\"}],\"name\":\"SigningKeyUpdate\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"thresholdWeight\",\"type\":\"uint256\"}],\"name\":\"ThresholdWeightUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"oldTotalWeight\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"newTotalWeight\",\"type\":\"uint256\"}],\"name\":\"TotalWeightUpdated\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"}],\"name\":\"deregisterOperator\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getLastCheckpointQuorum\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"blockNumber\",\"type\":\"uint32\"}],\"name\":\"getLastCheckpointQuorumAtBlock\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getLastCheckpointThresholdWeight\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"blockNumber\",\"type\":\"uint32\"}],\"name\":\"getLastCheckpointThresholdWeightAtBlock\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getLastCheckpointTotalWeight\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"blockNumber\",\"type\":\"uint32\"}],\"name\":\"getLastCheckpointTotalWeightAtBlock\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"}],\"name\":\"getLatestOperatorSigningKey\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"blockNumber\",\"type\":\"uint256\"}],\"name\":\"getOperatorSigningKeyAtBlock\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"blockNumber\",\"type\":\"uint32\"}],\"name\":\"getOperatorWeightAtBlock\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"hash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"signature\",\"type\":\"bytes\"}],\"name\":\"isValidSignature\",\"outputs\":[{\"internalType\":\"bytes4\",\"name\":\"magicValue\",\"type\":\"bytes4\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"}],\"name\":\"operatorRegistered\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"weight\",\"type\":\"uint256\"}],\"name\":\"registerOperator\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"blsKey\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"blsSigProof\",\"type\":\"bytes\"}],\"name\":\"updateOperatorSigningKey\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"weight\",\"type\":\"uint256\"}],\"name\":\"updateOperatorWeight\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"quorumNumerator\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"quorumDenominator\",\"type\":\"uint256\"}],\"name\":\"updateQuorum\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"thresholdWeight\",\"type\":\"uint256\"}],\"name\":\"updateStakeThreshold\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"Lay3r Labs\",\"events\":{\"OperatorDeregistered(address)\":{\"params\":{\"operator\":\"The address of the deregistered operator.\"}},\"OperatorRegistered(address)\":{\"params\":{\"operator\":\"The address of the registered operator.\"}},\"OperatorWeightUpdated(address,uint256,uint256)\":{\"params\":{\"newWeight\":\"The operator's weight after the update.\",\"oldWeight\":\"The operator's weight before the update.\",\"operator\":\"The address of the operator updated.\"}},\"SigningKeyUpdate(address,uint256,bytes32,bytes32)\":{\"params\":{\"newKeyHash\":\"The keccak256 hash of the new BLS public key.\",\"oldKeyHash\":\"The keccak256 hash of the old BLS public key.\",\"operator\":\"The address of the operator whose signing key was updated.\",\"updateBlock\":\"The block number at which the signing key was updated.\"}},\"ThresholdWeightUpdated(uint256)\":{\"params\":{\"thresholdWeight\":\"The new threshold weight.\"}},\"TotalWeightUpdated(uint256,uint256)\":{\"params\":{\"newTotalWeight\":\"The total weight after the update.\",\"oldTotalWeight\":\"The total weight before the update.\"}}},\"kind\":\"dev\",\"methods\":{\"deregisterOperator(address)\":{\"params\":{\"operator\":\"The address of the operator to deregister.\"}},\"getLastCheckpointQuorum()\":{\"returns\":{\"_0\":\"The latest quorum numerator.\",\"_1\":\"The latest quorum denominator.\"}},\"getLastCheckpointQuorumAtBlock(uint32)\":{\"params\":{\"blockNumber\":\"The block number to query at.\"},\"returns\":{\"_0\":\"The quorum numerator at the given block.\",\"_1\":\"The quorum denominator at the given block.\"}},\"getLastCheckpointThresholdWeight()\":{\"returns\":{\"_0\":\"The latest threshold weight.\"}},\"getLastCheckpointThresholdWeightAtBlock(uint32)\":{\"params\":{\"blockNumber\":\"The block number to query at.\"},\"returns\":{\"_0\":\"The threshold weight at the given block.\"}},\"getLastCheckpointTotalWeight()\":{\"returns\":{\"_0\":\"The latest total weight.\"}},\"getLastCheckpointTotalWeightAtBlock(uint32)\":{\"params\":{\"blockNumber\":\"The block number to query at.\"},\"returns\":{\"_0\":\"The total weight at the given block.\"}},\"getLatestOperatorSigningKey(address)\":{\"params\":{\"operator\":\"The address of the operator.\"},\"returns\":{\"_0\":\"The latest BLS public key of the operator (128 bytes).\"}},\"getOperatorSigningKeyAtBlock(address,uint256)\":{\"params\":{\"blockNumber\":\"The block number to query at.\",\"operator\":\"The address of the operator.\"},\"returns\":{\"_0\":\"The BLS public key of the operator at the given block (128 bytes).\"}},\"getOperatorWeightAtBlock(address,uint32)\":{\"params\":{\"blockNumber\":\"The block number to query at.\",\"operator\":\"The address of the operator.\"},\"returns\":{\"_0\":\"The weight of the operator at the given block.\"}},\"isValidSignature(bytes32,bytes)\":{\"details\":\"Should return whether the signature provided is valid for the provided data\",\"params\":{\"hash\":\"Hash of the data to be signed\",\"signature\":\"Signature byte array associated with _data\"}},\"operatorRegistered(address)\":{\"params\":{\"operator\":\"The operator address to check.\"},\"returns\":{\"_0\":\"Whether the operator is registered.\"}},\"registerOperator(address,uint256)\":{\"params\":{\"operator\":\"The address of the operator to register.\",\"weight\":\"The weight of the operator.\"}},\"updateOperatorSigningKey(bytes,bytes)\":{\"details\":\"Only callable by the operator themselves.\",\"params\":{\"blsKey\":\"The new BLS G1 public key (128 bytes).\",\"blsSigProof\":\"BLS signature proving key ownership (256 bytes).        The operator signs keccak256(abi.encode(operator)) with their BLS private key.\"}},\"updateOperatorWeight(address,uint256)\":{\"details\":\"Only callable by owner.\",\"params\":{\"operator\":\"The address of the operator to update the weight for.\",\"weight\":\"The new weight to set for the operator.\"}},\"updateQuorum(uint256,uint256)\":{\"params\":{\"quorumDenominator\":\"The new quorum denominator.\",\"quorumNumerator\":\"The new quorum numerator.\"}},\"updateStakeThreshold(uint256)\":{\"params\":{\"thresholdWeight\":\"The updated threshold weight required to validate a message.\"}}},\"title\":\"IPOAStakeRegistry\",\"version\":1},\"userdoc\":{\"errors\":{\"InsufficientSignedStake()\":[{\"notice\":\"Thrown when the total signed stake fails to meet the required threshold.\"}],\"InvalidAddressZero()\":[{\"notice\":\"Thrown when the address is zero.\"}],\"InvalidBLSKeyLength()\":[{\"notice\":\"Thrown when the BLS public key has an invalid length (expected 128 bytes).\"}],\"InvalidBLSKeyOwnershipProof()\":[{\"notice\":\"Thrown when the BLS key ownership proof is invalid.\"}],\"InvalidBLSSignature()\":[{\"notice\":\"Thrown when the BLS signature verification fails.\"}],\"InvalidBLSSignatureLength()\":[{\"notice\":\"Thrown when the BLS signature has an invalid length (expected 256 bytes).\"}],\"InvalidLength()\":[{\"notice\":\"Thrown when the signers pubkeys array is empty.\"}],\"InvalidQuorum()\":[{\"notice\":\"Thrown when the quorum is invalid.\"}],\"InvalidReferenceBlock()\":[{\"notice\":\"Thrown when reference blocks must be for blocks that have already been confirmed.\"}],\"InvalidSignedWeight()\":[{\"notice\":\"Thrown when operator weights were out of sync and the signed weight exceed the total.\"}],\"InvalidThresholdWeight()\":[{\"notice\":\"Thrown when the threshold weight is invalid.\"}],\"InvalidWeight()\":[{\"notice\":\"Thrown when the weight is invalid.\"}],\"NotSorted()\":[{\"notice\":\"Thrown when the system finds a list of items unsorted.\"}],\"OperatorAlreadyRegistered()\":[{\"notice\":\"Thrown when registering an already registered operator.\"}],\"OperatorNotRegistered()\":[{\"notice\":\"Thrown when de-registering or updating the stake for an unregistered operator.\"}],\"SignerNotRegistered()\":[{\"notice\":\"Thrown when the signer is not registered.\"}],\"SigningKeyAlreadyAssigned()\":[{\"notice\":\"Thrown when the signing key is already assigned to another operator.\"}]},\"events\":{\"OperatorDeregistered(address)\":{\"notice\":\"Emitted when the system deregisters an operator.\"},\"OperatorRegistered(address)\":{\"notice\":\"Emitted when the system registers an operator.\"},\"OperatorWeightUpdated(address,uint256,uint256)\":{\"notice\":\"Emitted when the system updates an operator's weight.\"},\"SigningKeyUpdate(address,uint256,bytes32,bytes32)\":{\"notice\":\"Emitted when an operator's BLS signing key is updated.\"},\"ThresholdWeightUpdated(uint256)\":{\"notice\":\"Emits when setting a new threshold weight.\"},\"TotalWeightUpdated(uint256,uint256)\":{\"notice\":\"Emitted when the system updates the total weight.\"}},\"kind\":\"user\",\"methods\":{\"deregisterOperator(address)\":{\"notice\":\"Deregisters an existing operator.\"},\"getLastCheckpointQuorum()\":{\"notice\":\"Retrieves the last recorded quorum.\"},\"getLastCheckpointQuorumAtBlock(uint32)\":{\"notice\":\"Retrieves the quorum at a specific block number.\"},\"getLastCheckpointThresholdWeight()\":{\"notice\":\"Retrieves the last recorded threshold weight.\"},\"getLastCheckpointThresholdWeightAtBlock(uint32)\":{\"notice\":\"Retrieves the threshold weight at a specific block number.\"},\"getLastCheckpointTotalWeight()\":{\"notice\":\"Retrieves the last recorded total weight across all operators.\"},\"getLastCheckpointTotalWeightAtBlock(uint32)\":{\"notice\":\"Retrieves the total weight at a specific block number.\"},\"getLatestOperatorSigningKey(address)\":{\"notice\":\"Retrieves the latest BLS signing key for a given operator.\"},\"getOperatorSigningKeyAtBlock(address,uint256)\":{\"notice\":\"Retrieves the BLS signing key for an operator at a specific block.\"},\"getOperatorWeightAtBlock(address,uint32)\":{\"notice\":\"Retrieves the operator's weight at a specific block number.\"},\"operatorRegistered(address)\":{\"notice\":\"Returns whether an operator is currently registered.\"},\"registerOperator(address,uint256)\":{\"notice\":\"Registers a new operator using a provided operator address and weight.\"},\"updateOperatorSigningKey(bytes,bytes)\":{\"notice\":\"Updates the BLS signing key for an operator.\"},\"updateOperatorWeight(address,uint256)\":{\"notice\":\"Updates the weight for an operator.\"},\"updateQuorum(uint256,uint256)\":{\"notice\":\"Updates the quorum configuration.\"},\"updateStakeThreshold(uint256)\":{\"notice\":\"Sets a new cumulative threshold weight for message validation.\"}},\"notice\":\"Interface containing all functions for the BLS POAStakeRegistry contract.\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"contracts/src/bls/interfaces/IPOAStakeRegistry.sol\":\"IPOAStakeRegistry\"},\"evmVersion\":\"prague\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":100},\"remappings\":[\":@openzeppelin/=node_modules/@openzeppelin/\",\":forge-std/=node_modules/forge-std/src/\",\":script/=contracts/script/\",\":src/=contracts/src/\"],\"viaIR\":true},\"sources\":{\"contracts/src/bls/interfaces/IPOAStakeRegistry.sol\":{\"keccak256\":\"0xe364cccc6cb1cbac43afdcc01a065d8d5433931eab96c99415f4772a115193e3\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://a6b09296e66d75062dc280f1b4b0238be8cedecad325177336902507df09a0a9\",\"dweb:/ipfs/QmTDuEqfhxsWUbL3tdbk2xywwwWx8JvJkw28o8CC8idBez\"]},\"node_modules/@openzeppelin/contracts/interfaces/IERC1271.sol\":{\"keccak256\":\"0x4aaaf1c0737dd16e81f0d2b9833c549747a5ede6873bf1444bc72aa572d03e98\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://eada27d7668eebaea16c3b890aa1b38ffc53965292e26c96f7c44834623f4710\",\"dweb:/ipfs/QmVSWuLtxyCqNbLyY89ptxkvsk4CLLKDQYigEne5Qj8k1L\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.27+commit.40a35a09"},"language":"Solidity","output":{"abi":[{"inputs":[],"type":"error","name":"InsufficientSignedStake"},{"inputs":[],"type":"error","name":"InvalidAddressZero"},{"inputs":[],"type":"error","name":"InvalidBLSKeyLength"},{"inputs":[],"type":"error","name":"InvalidBLSKeyOwnershipProof"},{"inputs":[],"type":"error","name":"InvalidBLSSignature"},{"inputs":[],"type":"error","name":"InvalidBLSSignatureLength"},{"inputs":[],"type":"error","name":"InvalidLength"},{"inputs":[],"type":"error","name":"InvalidQuorum"},{"inputs":[],"type":"error","name":"InvalidReferenceBlock"},{"inputs":[],"type":"error","name":"InvalidSignedWeight"},{"inputs":[],"type":"error","name":"InvalidThresholdWeight"},{"inputs":[],"type":"error","name":"InvalidWeight"},{"inputs":[],"type":"error","name":"NotSorted"},{"inputs":[],"type":"error","name":"OperatorAlreadyRegistered"},{"inputs":[],"type":"error","name":"OperatorNotRegistered"},{"inputs":[],"type":"error","name":"SignerNotRegistered"},{"inputs":[],"type":"error","name":"SigningKeyAlreadyAssigned"},{"inputs":[{"internalType":"address","name":"operator","type":"address","indexed":true}],"type":"event","name":"OperatorDeregistered","anonymous":false},{"inputs":[{"internalType":"address","name":"operator","type":"address","indexed":true}],"type":"event","name":"OperatorRegistered","anonymous":false},{"inputs":[{"internalType":"address","name":"operator","type":"address","indexed":true},{"internalType":"uint256","name":"oldWeight","type":"uint256","indexed":false},{"internalType":"uint256","name":"newWeight","type":"uint256","indexed":false}],"type":"event","name":"OperatorWeightUpdated","anonymous":false},{"inputs":[{"internalType":"address","name":"operator","type":"address","indexed":true},{"internalType":"uint256","name":"updateBlock","type":"uint256","indexed":true},{"internalType":"bytes32","name":"newKeyHash","type":"bytes32","indexed":true},{"internalType":"bytes32","name":"oldKeyHash","type":"bytes32","indexed":false}],"type":"event","name":"SigningKeyUpdate","anonymous":false},{"inputs":[{"internalType":"uint256","name":"thresholdWeight","type":"uint256","indexed":false}],"type":"event","name":"ThresholdWeightUpdated","anonymous":false},{"inputs":[{"internalType":"uint256","name":"oldTotalWeight","type":"uint256","indexed":false},{"internalType":"uint256","name":"newTotalWeight","type":"uint256","indexed":false}],"type":"event","name":"TotalWeightUpdated","anonymous":false},{"inputs":[{"internalType":"address","name":"operator","type":"address"}],"stateMutability":"nonpayable","type":"function","name":"deregisterOperator"},{"inputs":[],"stateMutability":"view","type":"function","name":"getLastCheckpointQuorum","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[{"internalType":"uint32","name":"blockNumber","type":"uint32"}],"stateMutability":"view","type":"function","name":"getLastCheckpointQuorumAtBlock","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[],"stateMutability":"view","type":"function","name":"getLastCheckpointThresholdWeight","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[{"internalType":"uint32","name":"blockNumber","type":"uint32"}],"stateMutability":"view","type":"function","name":"getLastCheckpointThresholdWeightAtBlock","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[],"stateMutability":"view","type":"function","name":"getLastCheckpointTotalWeight","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[{"internalType":"uint32","name":"blockNumber","type":"uint32"}],"stateMutability":"view","type":"function","name":"getLastCheckpointTotalWeightAtBlock","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[{"internalType":"address","name":"operator","type":"address"}],"stateMutability":"view","type":"function","name":"getLatestOperatorSigningKey","outputs":[{"internalType":"bytes","name":"","type":"bytes"}]},{"inputs":[{"internalType":"address","name":"operator","type":"address"},{"internalType":"uint256","name":"blockNumber","type":"uint256"}],"stateMutability":"view","type":"function","name":"getOperatorSigningKeyAtBlock","outputs":[{"internalType":"bytes","name":"","type":"bytes"}]},{"inputs":[{"internalType":"address","name":"operator","type":"address"},{"internalType":"uint32","name":"blockNumber","type":"uint32"}],"stateMutability":"view","type":"function","name":"getOperatorWeightAtBlock","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[{"internalType":"bytes32","name":"hash","type":"bytes32"},{"internalType":"bytes","name":"signature","type":"bytes"}],"stateMutability":"view","type":"function","name":"isValidSignature","outputs":[{"internalType":"bytes4","name":"magicValue","type":"bytes4"}]},{"inputs":[{"internalType":"address","name":"operator","type":"address"}],"stateMutability":"view","type":"function","name":"operatorRegistered","outputs":[{"internalType":"bool","name":"","type":"bool"}]},{"inputs":[{"internalType":"address","name":"operator","type":"address"},{"internalType":"uint256","name":"weight","type":"uint256"}],"stateMutability":"nonpayable","type":"function","name":"registerOperator"},{"inputs":[{"internalType":"bytes","name":"blsKey","type":"bytes"},{"internalType":"bytes","name":"blsSigProof","type":"bytes"}],"stateMutability":"nonpayable","type":"function","name":"updateOperatorSigningKey"},{"inputs":[{"internalType":"address","name":"operator","type":"address"},{"internalType":"uint256","name":"weight","type":"uint256"}],"stateMutability":"nonpayable","type":"function","name":"updateOperatorWeight"},{"inputs":[{"internalType":"uint256","name":"quorumNumerator","type":"uint256"},{"internalType":"uint256","name":"quorumDenominator","type":"uint256"}],"stateMutability":"nonpayable","type":"function","name":"updateQuorum"},{"inputs":[{"internalType":"uint256","name":"thresholdWeight","type":"uint256"}],"stateMutability":"nonpayable","type":"function","name":"updateStakeThreshold"}],"devdoc":{"kind":"dev","methods":{"deregisterOperator(address)":{"params":{"operator":"The address of the operator to deregister."}},"getLastCheckpointQuorum()":{"returns":{"_0":"The latest quorum numerator.","_1":"The latest quorum denominator."}},"getLastCheckpointQuorumAtBlock(uint32)":{"params":{"blockNumber":"The block number to query at."},"returns":{"_0":"The quorum numerator at the given block.","_1":"The quorum denominator at the given block."}},"getLastCheckpointThresholdWeight()":{"returns":{"_0":"The latest threshold weight."}},"getLastCheckpointThresholdWeightAtBlock(uint32)":{"params":{"blockNumber":"The block number to query at."},"returns":{"_0":"The threshold weight at the given block."}},"getLastCheckpointTotalWeight()":{"returns":{"_0":"The latest total weight."}},"getLastCheckpointTotalWeightAtBlock(uint32)":{"params":{"blockNumber":"The block number to query at."},"returns":{"_0":"The total weight at the given block."}},"getLatestOperatorSigningKey(address)":{"params":{"operator":"The address of the operator."},"returns":{"_0":"The latest BLS public key of the operator (128 bytes)."}},"getOperatorSigningKeyAtBlock(address,uint256)":{"params":{"blockNumber":"The block number to query at.","operator":"The address of the operator."},"returns":{"_0":"The BLS public key of the operator at the given block (128 bytes)."}},"getOperatorWeightAtBlock(address,uint32)":{"params":{"blockNumber":"The block number to query at.","operator":"The address of the operator."},"returns":{"_0":"The weight of the operator at the given block."}},"isValidSignature(bytes32,bytes)":{"details":"Should return whether the signature provided is valid for the provided data","params":{"hash":"Hash of the data to be signed","signature":"Signature byte array associated with _data"}},"operatorRegistered(address)":{"params":{"operator":"The operator address to check."},"returns":{"_0":"Whether the operator is registered."}},"registerOperator(address,uint256)":{"params":{"operator":"The address of the operator to register.","weight":"The weight of the operator."}},"updateOperatorSigningKey(bytes,bytes)":{"details":"Only callable by the operator themselves.","params":{"blsKey":"The new BLS G1 public key (128 bytes).","blsSigProof":"BLS signature proving key ownership (256 bytes).        The operator signs keccak256(abi.encode(operator)) with their BLS private key."}},"updateOperatorWeight(address,uint256)":{"details":"Only callable by owner.","params":{"operator":"The address of the operator to update the weight for.","weight":"The new weight to set for the operator."}},"updateQuorum(uint256,uint256)":{"params":{"quorumDenominator":"The new quorum denominator.","quorumNumerator":"The new quorum numerator."}},"updateStakeThreshold(uint256)":{"params":{"thresholdWeight":"The updated threshold weight required to validate a message."}}},"version":1},"userdoc":{"kind":"user","methods":{"deregisterOperator(address)":{"notice":"Deregisters an existing operator."},"getLastCheckpointQuorum()":{"notice":"Retrieves the last recorded quorum."},"getLastCheckpointQuorumAtBlock(uint32)":{"notice":"Retrieves the quorum at a specific block number."},"getLastCheckpointThresholdWeight()":{"notice":"Retrieves the last recorded threshold weight."},"getLastCheckpointThresholdWeightAtBlock(uint32)":{"notice":"Retrieves the threshold weight at a specific block number."},"getLastCheckpointTotalWeight()":{"notice":"Retrieves the last recorded total weight across all operators."},"getLastCheckpointTotalWeightAtBlock(uint32)":{"notice":"Retrieves the total weight at a specific block number."},"getLatestOperatorSigningKey(address)":{"notice":"Retrieves the latest BLS signing key for a given operator."},"getOperatorSigningKeyAtBlock(address,uint256)":{"notice":"Retrieves the BLS signing key for an operator at a specific block."},"getOperatorWeightAtBlock(address,uint32)":{"notice":"Retrieves the operator's weight at a specific block number."},"operatorRegistered(address)":{"notice":"Returns whether an operator is currently registered."},"registerOperator(address,uint256)":{"notice":"Registers a new operator using a provided operator address and weight."},"updateOperatorSigningKey(bytes,bytes)":{"notice":"Updates the BLS signing key for an operator."},"updateOperatorWeight(address,uint256)":{"notice":"Updates the weight for an operator."},"updateQuorum(uint256,uint256)":{"notice":"Updates the quorum configuration."},"updateStakeThreshold(uint256)":{"notice":"Sets a new cumulative threshold weight for message validation."}},"version":1}},"settings":{"remappings":["@openzeppelin/=node_modules/@openzeppelin/","forge-std/=node_modules/forge-std/src/","script/=contracts/script/","src/=contracts/src/"],"optimizer":{"enabled":true,"runs":100},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"contracts/src/bls/interfaces/IPOAStakeRegistry.sol":"IPOAStakeRegistry"},"evmVersion":"prague","libraries":{},"viaIR":true},"sources":{"contracts/src/bls/interfaces/IPOAStakeRegistry.sol":{"keccak256":"0xe364cccc6cb1cbac43afdcc01a065d8d5433931eab96c99415f4772a115193e3","urls":["bzz-raw://a6b09296e66d75062dc280f1b4b0238be8cedecad325177336902507df09a0a9","dweb:/ipfs/QmTDuEqfhxsWUbL3tdbk2xywwwWx8JvJkw28o8CC8idBez"],"license":"MIT"},"node_modules/@openzeppelin/contracts/interfaces/IERC1271.sol":{"keccak256":"0x4aaaf1c0737dd16e81f0d2b9833c549747a5ede6873bf1444bc72aa572d03e98","urls":["bzz-raw://eada27d7668eebaea16c3b890aa1b38ffc53965292e26c96f7c44834623f4710","dweb:/ipfs/QmVSWuLtxyCqNbLyY89ptxkvsk4CLLKDQYigEne5Qj8k1L"],"license":"MIT"}},"version":1},"id":5}
\ No newline at end of file
diff --git a/packages/types/src/contracts/solidity/abi/bls/IWavsServiceHandler.json b/packages/types/src/contracts/solidity/abi/bls/IWavsServiceHandler.json
new file mode 100644
index 000000000..a8078d056
--- /dev/null
+++ b/packages/types/src/contracts/solidity/abi/bls/IWavsServiceHandler.json
@@ -0,0 +1 @@
+{"abi":[{"type":"function","name":"getServiceManager","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"handleSignedEnvelope","inputs":[{"name":"envelope","type":"tuple","internalType":"struct IWavsServiceHandler.Envelope","components":[{"name":"eventId","type":"bytes20","internalType":"bytes20"},{"name":"ordering","type":"bytes12","internalType":"bytes12"},{"name":"payload","type":"bytes","internalType":"bytes"}]},{"name":"signatureData","type":"tuple","internalType":"struct IWavsServiceHandler.SignatureData","components":[{"name":"signerPubkeys","type":"bytes[]","internalType":"bytes[]"},{"name":"aggregateSignature","type":"bytes","internalType":"bytes"},{"name":"referenceBlock","type":"uint32","internalType":"uint32"}]}],"outputs":[],"stateMutability":"nonpayable"}],"bytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"deployedBytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"methodIdentifiers":{"getServiceManager()":"4dda0b43","handleSignedEnvelope((bytes20,bytes12,bytes),(bytes[],bytes,uint32))":"5939468e"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.27+commit.40a35a09\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"name\":\"getServiceManager\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes20\",\"name\":\"eventId\",\"type\":\"bytes20\"},{\"internalType\":\"bytes12\",\"name\":\"ordering\",\"type\":\"bytes12\"},{\"internalType\":\"bytes\",\"name\":\"payload\",\"type\":\"bytes\"}],\"internalType\":\"struct IWavsServiceHandler.Envelope\",\"name\":\"envelope\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"bytes[]\",\"name\":\"signerPubkeys\",\"type\":\"bytes[]\"},{\"internalType\":\"bytes\",\"name\":\"aggregateSignature\",\"type\":\"bytes\"},{\"internalType\":\"uint32\",\"name\":\"referenceBlock\",\"type\":\"uint32\"}],\"internalType\":\"struct IWavsServiceHandler.SignatureData\",\"name\":\"signatureData\",\"type\":\"tuple\"}],\"name\":\"handleSignedEnvelope\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"Lay3r Labs\",\"details\":\"This interface defines the functions and events for the Wavs service handler\",\"kind\":\"dev\",\"methods\":{\"getServiceManager()\":{\"returns\":{\"_0\":\"The address of the service manager\"}},\"handleSignedEnvelope((bytes20,bytes12,bytes),(bytes[],bytes,uint32))\":{\"params\":{\"envelope\":\"The envelope containing the data.\",\"signatureData\":\"The signature data.\"}}},\"title\":\"IWavsServiceHandler\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"getServiceManager()\":{\"notice\":\"Returns the address of the service manager\"},\"handleSignedEnvelope((bytes20,bytes12,bytes),(bytes[],bytes,uint32))\":{\"notice\":\"Handles a signed envelope\"}},\"notice\":\"Interface for the Wavs service handler (BLS variant)\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"contracts/src/bls/interfaces/IWavsServiceHandler.sol\":\"IWavsServiceHandler\"},\"evmVersion\":\"prague\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":100},\"remappings\":[\":@openzeppelin/=node_modules/@openzeppelin/\",\":@wavs/=node_modules/@wavs/solidity/contracts/\",\":forge-std/=node_modules/forge-std/src/\",\":script/=contracts/script/\",\":src/=contracts/src/\"],\"viaIR\":true},\"sources\":{\"contracts/src/bls/interfaces/IWavsServiceHandler.sol\":{\"keccak256\":\"0xde638d3bcdec85b9be8c5fbf5914195fd10b3704a6ef4d9150570852310b2e3c\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://9f0c7ab2d9dff148aa83d555b225ef5242560f2a11c1380cfabb2a3dc61c5686\",\"dweb:/ipfs/QmQu8sJYF3SEFTRdqDAshy8F4SaNPR97zQN5NwoAdSgHcw\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.27+commit.40a35a09"},"language":"Solidity","output":{"abi":[{"inputs":[],"stateMutability":"view","type":"function","name":"getServiceManager","outputs":[{"internalType":"address","name":"","type":"address"}]},{"inputs":[{"internalType":"struct IWavsServiceHandler.Envelope","name":"envelope","type":"tuple","components":[{"internalType":"bytes20","name":"eventId","type":"bytes20"},{"internalType":"bytes12","name":"ordering","type":"bytes12"},{"internalType":"bytes","name":"payload","type":"bytes"}]},{"internalType":"struct IWavsServiceHandler.SignatureData","name":"signatureData","type":"tuple","components":[{"internalType":"bytes[]","name":"signerPubkeys","type":"bytes[]"},{"internalType":"bytes","name":"aggregateSignature","type":"bytes"},{"internalType":"uint32","name":"referenceBlock","type":"uint32"}]}],"stateMutability":"nonpayable","type":"function","name":"handleSignedEnvelope"}],"devdoc":{"kind":"dev","methods":{"getServiceManager()":{"returns":{"_0":"The address of the service manager"}},"handleSignedEnvelope((bytes20,bytes12,bytes),(bytes[],bytes,uint32))":{"params":{"envelope":"The envelope containing the data.","signatureData":"The signature data."}}},"version":1},"userdoc":{"kind":"user","methods":{"getServiceManager()":{"notice":"Returns the address of the service manager"},"handleSignedEnvelope((bytes20,bytes12,bytes),(bytes[],bytes,uint32))":{"notice":"Handles a signed envelope"}},"version":1}},"settings":{"remappings":["@openzeppelin/=node_modules/@openzeppelin/","@wavs/=node_modules/@wavs/solidity/contracts/","forge-std/=node_modules/forge-std/src/","script/=contracts/script/","src/=contracts/src/"],"optimizer":{"enabled":true,"runs":100},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"contracts/src/bls/interfaces/IWavsServiceHandler.sol":"IWavsServiceHandler"},"evmVersion":"prague","libraries":{},"viaIR":true},"sources":{"contracts/src/bls/interfaces/IWavsServiceHandler.sol":{"keccak256":"0xde638d3bcdec85b9be8c5fbf5914195fd10b3704a6ef4d9150570852310b2e3c","urls":["bzz-raw://9f0c7ab2d9dff148aa83d555b225ef5242560f2a11c1380cfabb2a3dc61c5686","dweb:/ipfs/QmQu8sJYF3SEFTRdqDAshy8F4SaNPR97zQN5NwoAdSgHcw"],"license":"MIT"}},"version":1},"id":6}
\ No newline at end of file
diff --git a/packages/types/src/contracts/solidity/abi/bls/IWavsServiceManager.json b/packages/types/src/contracts/solidity/abi/bls/IWavsServiceManager.json
new file mode 100644
index 000000000..ff83f3557
--- /dev/null
+++ b/packages/types/src/contracts/solidity/abi/bls/IWavsServiceManager.json
@@ -0,0 +1 @@
+{"abi":[{"type":"function","name":"getAllocationManager","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"getDelegationManager","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"getLatestOperatorForSigningKey","inputs":[{"name":"keyHash","type":"bytes32","internalType":"bytes32"}],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"getOperatorWeight","inputs":[{"name":"operator","type":"address","internalType":"address"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"getServiceURI","inputs":[],"outputs":[{"name":"","type":"string","internalType":"string"}],"stateMutability":"view"},{"type":"function","name":"getStakeRegistry","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"setServiceURI","inputs":[{"name":"_serviceURI","type":"string","internalType":"string"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"validate","inputs":[{"name":"envelope","type":"tuple","internalType":"struct IWavsServiceHandler.Envelope","components":[{"name":"eventId","type":"bytes20","internalType":"bytes20"},{"name":"ordering","type":"bytes12","internalType":"bytes12"},{"name":"payload","type":"bytes","internalType":"bytes"}]},{"name":"signatureData","type":"tuple","internalType":"struct IWavsServiceHandler.SignatureData","components":[{"name":"signerPubkeys","type":"bytes[]","internalType":"bytes[]"},{"name":"aggregateSignature","type":"bytes","internalType":"bytes"},{"name":"referenceBlock","type":"uint32","internalType":"uint32"}]}],"outputs":[],"stateMutability":"view"},{"type":"event","name":"QuorumThresholdUpdated","inputs":[{"name":"numerator","type":"uint256","indexed":true,"internalType":"uint256"},{"name":"denominator","type":"uint256","indexed":true,"internalType":"uint256"}],"anonymous":false},{"type":"event","name":"ServiceURIUpdated","inputs":[{"name":"serviceURI","type":"string","indexed":false,"internalType":"string"}],"anonymous":false},{"type":"error","name":"InsufficientQuorum","inputs":[{"name":"signerWeight","type":"uint256","internalType":"uint256"},{"name":"thresholdWeight","type":"uint256","internalType":"uint256"},{"name":"totalWeight","type":"uint256","internalType":"uint256"}]},{"type":"error","name":"InsufficientQuorumZero","inputs":[]},{"type":"error","name":"InvalidQuorumParameters","inputs":[]},{"type":"error","name":"InvalidSignature","inputs":[]},{"type":"error","name":"InvalidSignatureBlock","inputs":[]},{"type":"error","name":"InvalidSignatureLength","inputs":[]},{"type":"error","name":"InvalidSignatureOrder","inputs":[]}],"bytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"deployedBytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"methodIdentifiers":{"getAllocationManager()":"a28efd6b","getDelegationManager()":"b24e5a3a","getLatestOperatorForSigningKey(bytes32)":"aa9daf43","getOperatorWeight(address)":"98ec1ac9","getServiceURI()":"cc922c6a","getStakeRegistry()":"bef4c839","setServiceURI(string)":"5f11301b","validate((bytes20,bytes12,bytes),(bytes[],bytes,uint32))":"ace99660"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.27+commit.40a35a09\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"signerWeight\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"thresholdWeight\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"totalWeight\",\"type\":\"uint256\"}],\"name\":\"InsufficientQuorum\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InsufficientQuorumZero\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidQuorumParameters\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidSignature\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidSignatureBlock\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidSignatureLength\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidSignatureOrder\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"numerator\",\"type\":\"uint256\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"denominator\",\"type\":\"uint256\"}],\"name\":\"QuorumThresholdUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"string\",\"name\":\"serviceURI\",\"type\":\"string\"}],\"name\":\"ServiceURIUpdated\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"getAllocationManager\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getDelegationManager\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"keyHash\",\"type\":\"bytes32\"}],\"name\":\"getLatestOperatorForSigningKey\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"}],\"name\":\"getOperatorWeight\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getServiceURI\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getStakeRegistry\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_serviceURI\",\"type\":\"string\"}],\"name\":\"setServiceURI\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes20\",\"name\":\"eventId\",\"type\":\"bytes20\"},{\"internalType\":\"bytes12\",\"name\":\"ordering\",\"type\":\"bytes12\"},{\"internalType\":\"bytes\",\"name\":\"payload\",\"type\":\"bytes\"}],\"internalType\":\"struct IWavsServiceHandler.Envelope\",\"name\":\"envelope\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"bytes[]\",\"name\":\"signerPubkeys\",\"type\":\"bytes[]\"},{\"internalType\":\"bytes\",\"name\":\"aggregateSignature\",\"type\":\"bytes\"},{\"internalType\":\"uint32\",\"name\":\"referenceBlock\",\"type\":\"uint32\"}],\"internalType\":\"struct IWavsServiceHandler.SignatureData\",\"name\":\"signatureData\",\"type\":\"tuple\"}],\"name\":\"validate\",\"outputs\":[],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"Lay3r Labs\",\"details\":\"This interface defines the functions and events for the Wavs service manager\",\"errors\":{\"InsufficientQuorum(uint256,uint256,uint256)\":[{\"params\":{\"signerWeight\":\"The weight of the signer\",\"thresholdWeight\":\"The threshold weight\",\"totalWeight\":\"The total weight\"}}]},\"events\":{\"QuorumThresholdUpdated(uint256,uint256)\":{\"params\":{\"denominator\":\"The denominator of the quorum threshold\",\"numerator\":\"The numerator of the quorum threshold\"}},\"ServiceURIUpdated(string)\":{\"params\":{\"serviceURI\":\"The service URI\"}}},\"kind\":\"dev\",\"methods\":{\"getAllocationManager()\":{\"returns\":{\"_0\":\"The allocation manager address.\"}},\"getDelegationManager()\":{\"returns\":{\"_0\":\"The delegation manager address.\"}},\"getLatestOperatorForSigningKey(bytes32)\":{\"params\":{\"keyHash\":\"The keccak256 hash of the BLS public key.\"},\"returns\":{\"_0\":\"The latest operator address associated with the key, or address(0) if none.\"}},\"getOperatorWeight(address)\":{\"params\":{\"operator\":\"The address of the operator\"},\"returns\":{\"_0\":\"The current weight of the operator\"}},\"getServiceURI()\":{\"returns\":{\"_0\":\"The service URI.\"}},\"getStakeRegistry()\":{\"returns\":{\"_0\":\"The stake registry address.\"}},\"setServiceURI(string)\":{\"params\":{\"_serviceURI\":\"The service URI to update.\"}},\"validate((bytes20,bytes12,bytes),(bytes[],bytes,uint32))\":{\"params\":{\"envelope\":\"The envelope containing the data.\",\"signatureData\":\"The signature data.\"}}},\"title\":\"IWavsServiceManager\",\"version\":1},\"userdoc\":{\"errors\":{\"InsufficientQuorum(uint256,uint256,uint256)\":[{\"notice\":\"The error for the insufficient quorum\"}],\"InsufficientQuorumZero()\":[{\"notice\":\"The error for the insufficient quorum zero.\"}],\"InvalidQuorumParameters()\":[{\"notice\":\"The error for the invalid quorum parameters.\"}],\"InvalidSignature()\":[{\"notice\":\"The error for the invalid signature.\"}],\"InvalidSignatureBlock()\":[{\"notice\":\"The error for the invalid signature block.\"}],\"InvalidSignatureLength()\":[{\"notice\":\"The error for the invalid signature length.\"}],\"InvalidSignatureOrder()\":[{\"notice\":\"The error for the invalid signature order.\"}]},\"events\":{\"QuorumThresholdUpdated(uint256,uint256)\":{\"notice\":\"Event emitted when the quorum threshold is updated\"},\"ServiceURIUpdated(string)\":{\"notice\":\"Event emitted when the service URI is updated\"}},\"kind\":\"user\",\"methods\":{\"getAllocationManager()\":{\"notice\":\"Returns the allocation manager address.\"},\"getDelegationManager()\":{\"notice\":\"Returns the delegation manager address.\"},\"getLatestOperatorForSigningKey(bytes32)\":{\"notice\":\"Returns the latest operator address associated with a BLS signing key hash.\"},\"getOperatorWeight(address)\":{\"notice\":\"Gets the operator's current weight\"},\"getServiceURI()\":{\"notice\":\"Returns the service URI\"},\"getStakeRegistry()\":{\"notice\":\"Returns the stake registry address.\"},\"setServiceURI(string)\":{\"notice\":\"Sets the service URI\"},\"validate((bytes20,bytes12,bytes),(bytes[],bytes,uint32))\":{\"notice\":\"Validates a signed envelope\"}},\"notice\":\"Interface for the Wavs service manager (BLS variant)\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"contracts/src/bls/interfaces/IWavsServiceManager.sol\":\"IWavsServiceManager\"},\"evmVersion\":\"prague\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":100},\"remappings\":[\":@openzeppelin/=node_modules/@openzeppelin/\",\":forge-std/=node_modules/forge-std/src/\",\":script/=contracts/script/\",\":src/=contracts/src/\"],\"viaIR\":true},\"sources\":{\"contracts/src/bls/interfaces/IWavsServiceHandler.sol\":{\"keccak256\":\"0xde638d3bcdec85b9be8c5fbf5914195fd10b3704a6ef4d9150570852310b2e3c\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://9f0c7ab2d9dff148aa83d555b225ef5242560f2a11c1380cfabb2a3dc61c5686\",\"dweb:/ipfs/QmQu8sJYF3SEFTRdqDAshy8F4SaNPR97zQN5NwoAdSgHcw\"]},\"contracts/src/bls/interfaces/IWavsServiceManager.sol\":{\"keccak256\":\"0xfdfa0284ca08a3046f8aeaa7f42c17b3c6cf3327fd7a284a51c2ac495d9231b3\",\"license\":\"UNLICENSED\",\"urls\":[\"bzz-raw://a7e3871a2ce42c15376416ba8fb57cb2de0659af431b811bbd263be33b1ddb64\",\"dweb:/ipfs/QmYDg1EPkF9QSgrLaVgpmKyAjAPaVsyCuKnoPgMqMyyN7X\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.27+commit.40a35a09"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"uint256","name":"signerWeight","type":"uint256"},{"internalType":"uint256","name":"thresholdWeight","type":"uint256"},{"internalType":"uint256","name":"totalWeight","type":"uint256"}],"type":"error","name":"InsufficientQuorum"},{"inputs":[],"type":"error","name":"InsufficientQuorumZero"},{"inputs":[],"type":"error","name":"InvalidQuorumParameters"},{"inputs":[],"type":"error","name":"InvalidSignature"},{"inputs":[],"type":"error","name":"InvalidSignatureBlock"},{"inputs":[],"type":"error","name":"InvalidSignatureLength"},{"inputs":[],"type":"error","name":"InvalidSignatureOrder"},{"inputs":[{"internalType":"uint256","name":"numerator","type":"uint256","indexed":true},{"internalType":"uint256","name":"denominator","type":"uint256","indexed":true}],"type":"event","name":"QuorumThresholdUpdated","anonymous":false},{"inputs":[{"internalType":"string","name":"serviceURI","type":"string","indexed":false}],"type":"event","name":"ServiceURIUpdated","anonymous":false},{"inputs":[],"stateMutability":"view","type":"function","name":"getAllocationManager","outputs":[{"internalType":"address","name":"","type":"address"}]},{"inputs":[],"stateMutability":"view","type":"function","name":"getDelegationManager","outputs":[{"internalType":"address","name":"","type":"address"}]},{"inputs":[{"internalType":"bytes32","name":"keyHash","type":"bytes32"}],"stateMutability":"view","type":"function","name":"getLatestOperatorForSigningKey","outputs":[{"internalType":"address","name":"","type":"address"}]},{"inputs":[{"internalType":"address","name":"operator","type":"address"}],"stateMutability":"view","type":"function","name":"getOperatorWeight","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[],"stateMutability":"view","type":"function","name":"getServiceURI","outputs":[{"internalType":"string","name":"","type":"string"}]},{"inputs":[],"stateMutability":"view","type":"function","name":"getStakeRegistry","outputs":[{"internalType":"address","name":"","type":"address"}]},{"inputs":[{"internalType":"string","name":"_serviceURI","type":"string"}],"stateMutability":"nonpayable","type":"function","name":"setServiceURI"},{"inputs":[{"internalType":"struct IWavsServiceHandler.Envelope","name":"envelope","type":"tuple","components":[{"internalType":"bytes20","name":"eventId","type":"bytes20"},{"internalType":"bytes12","name":"ordering","type":"bytes12"},{"internalType":"bytes","name":"payload","type":"bytes"}]},{"internalType":"struct IWavsServiceHandler.SignatureData","name":"signatureData","type":"tuple","components":[{"internalType":"bytes[]","name":"signerPubkeys","type":"bytes[]"},{"internalType":"bytes","name":"aggregateSignature","type":"bytes"},{"internalType":"uint32","name":"referenceBlock","type":"uint32"}]}],"stateMutability":"view","type":"function","name":"validate"}],"devdoc":{"kind":"dev","methods":{"getAllocationManager()":{"returns":{"_0":"The allocation manager address."}},"getDelegationManager()":{"returns":{"_0":"The delegation manager address."}},"getLatestOperatorForSigningKey(bytes32)":{"params":{"keyHash":"The keccak256 hash of the BLS public key."},"returns":{"_0":"The latest operator address associated with the key, or address(0) if none."}},"getOperatorWeight(address)":{"params":{"operator":"The address of the operator"},"returns":{"_0":"The current weight of the operator"}},"getServiceURI()":{"returns":{"_0":"The service URI."}},"getStakeRegistry()":{"returns":{"_0":"The stake registry address."}},"setServiceURI(string)":{"params":{"_serviceURI":"The service URI to update."}},"validate((bytes20,bytes12,bytes),(bytes[],bytes,uint32))":{"params":{"envelope":"The envelope containing the data.","signatureData":"The signature data."}}},"version":1},"userdoc":{"kind":"user","methods":{"getAllocationManager()":{"notice":"Returns the allocation manager address."},"getDelegationManager()":{"notice":"Returns the delegation manager address."},"getLatestOperatorForSigningKey(bytes32)":{"notice":"Returns the latest operator address associated with a BLS signing key hash."},"getOperatorWeight(address)":{"notice":"Gets the operator's current weight"},"getServiceURI()":{"notice":"Returns the service URI"},"getStakeRegistry()":{"notice":"Returns the stake registry address."},"setServiceURI(string)":{"notice":"Sets the service URI"},"validate((bytes20,bytes12,bytes),(bytes[],bytes,uint32))":{"notice":"Validates a signed envelope"}},"version":1}},"settings":{"remappings":["@openzeppelin/=node_modules/@openzeppelin/","forge-std/=node_modules/forge-std/src/","script/=contracts/script/","src/=contracts/src/"],"optimizer":{"enabled":true,"runs":100},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"contracts/src/bls/interfaces/IWavsServiceManager.sol":"IWavsServiceManager"},"evmVersion":"prague","libraries":{},"viaIR":true},"sources":{"contracts/src/bls/interfaces/IWavsServiceHandler.sol":{"keccak256":"0xde638d3bcdec85b9be8c5fbf5914195fd10b3704a6ef4d9150570852310b2e3c","urls":["bzz-raw://9f0c7ab2d9dff148aa83d555b225ef5242560f2a11c1380cfabb2a3dc61c5686","dweb:/ipfs/QmQu8sJYF3SEFTRdqDAshy8F4SaNPR97zQN5NwoAdSgHcw"],"license":"MIT"},"contracts/src/bls/interfaces/IWavsServiceManager.sol":{"keccak256":"0xfdfa0284ca08a3046f8aeaa7f42c17b3c6cf3327fd7a284a51c2ac495d9231b3","urls":["bzz-raw://a7e3871a2ce42c15376416ba8fb57cb2de0659af431b811bbd263be33b1ddb64","dweb:/ipfs/QmYDg1EPkF9QSgrLaVgpmKyAjAPaVsyCuKnoPgMqMyyN7X"],"license":"UNLICENSED"}},"version":1},"id":7}
\ No newline at end of file
diff --git a/packages/types/src/http.rs b/packages/types/src/http.rs
index 80747a94d..3f3375a59 100644
--- a/packages/types/src/http.rs
+++ b/packages/types/src/http.rs
@@ -17,6 +17,12 @@ pub enum SignerResponse {
         /// The evm-style address ("0x" prefixed hex string) derived from the key
         evm_address: String,
     },
+    Bls12381 {
+        /// The derivation index used to create this key from the mnemonic
+        hd_index: u32,
+        /// The 128-byte G1 public key in hex (EIP-2537 uncompressed format)
+        g1_pubkey_hex: String,
+    },
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, ToSchema)]
@@ -128,19 +134,22 @@ pub enum DevTriggerStreamSubscriptionKind {
 pub struct P2pStatus {
     /// Whether P2P networking is enabled
     pub enabled: bool,
-    /// Local peer ID
+    /// Discovery mode: "disabled", "local", "remote", or "unknown"
+    #[serde(default)]
+    pub discovery_mode: String,
+    /// Local peer ID (Ed25519 public key, hex-encoded)
     pub local_peer_id: Option<String>,
-    /// Listen addresses (multiaddrs with peer ID appended, e.g. "/ip4/0.0.0.0/tcp/9000/p2p/12D3KooW...")
+    /// Listen addresses (socket format, e.g. "0.0.0.0:9000")
     pub listen_addresses: Vec<String>,
-    /// External addresses discovered via AutoNAT/Identify (preferred for NAT traversal)
-    /// These are addresses that peers outside NAT can use to reach us.
-    pub external_addresses: Vec<String>,
     /// Number of connected peers
     pub connected_peers: usize,
-    /// List of connected peer IDs
+    /// Connected peer IDs (Ed25519 public keys, hex-encoded)
     pub peer_ids: Vec<String>,
-    /// Topics we're subscribed to
-    pub subscribed_topics: Vec<String>,
-    /// Number of peers subscribed to our topics (topic -> peer count)
-    pub topic_peer_counts: HashMap<String, usize>,
+    /// Services this node is subscribed to (hex-encoded service ID hashes)
+    pub subscribed_services: Vec<String>,
+    /// Per-service peer subscription counts (OBS-01).
+    /// Keys are hex-encoded service_id hashes, values are the number of
+    /// peers that have announced subscription to that service.
+    #[serde(default)]
+    pub peer_subscriptions: HashMap<String, usize>,
 }
diff --git a/packages/types/src/lib.rs b/packages/types/src/lib.rs
index 6adbe817d..ff9cd46fc 100644
--- a/packages/types/src/lib.rs
+++ b/packages/types/src/lib.rs
@@ -23,5 +23,8 @@ pub use service::*;
 pub use service_builder::*;
 pub use signing::*;
 pub use solidity_types::*;
+// Explicit re-export to disambiguate: signing::SignatureData (enum) wins over solidity_types::SignatureData (raw Alloy struct).
+// The raw Alloy type is still accessible as crate::solidity_types::SignatureData.
+pub use signing::SignatureData;
 pub use submission::*;
 pub use time::*;
diff --git a/packages/types/src/service.rs b/packages/types/src/service.rs
index 68a36429c..17555c5e5 100644
--- a/packages/types/src/service.rs
+++ b/packages/types/src/service.rs
@@ -549,6 +549,13 @@ impl SignatureKind {
             prefix: Some(SignaturePrefix::Eip191),
         }
     }
+
+    pub fn bls_default() -> Self {
+        Self {
+            algorithm: SignatureAlgorithm::Bls12381,
+            prefix: None, // BLS uses hash-to-curve with its own DST, no EIP-191 prefix
+        }
+    }
 }
 
 #[cfg_attr(feature = "ts-bindings", derive(TS))]
@@ -557,7 +564,7 @@ impl SignatureKind {
 #[serde(rename_all = "snake_case")]
 pub enum SignatureAlgorithm {
     Secp256k1,
-    // Future: Bls12381, Ed25519, Secp256r1, etc.
+    Bls12381,
 }
 
 #[cfg_attr(feature = "ts-bindings", derive(TS))]
@@ -619,6 +626,24 @@ fn permission_defaults() {
     assert!(!permissions_default.file_system);
 }
 
+#[test]
+fn signature_algorithm_bls12381_serde() {
+    let algo = SignatureAlgorithm::Bls12381;
+    let json = serde_json::to_string(&algo).unwrap();
+    assert_eq!(json, "\"bls12381\"");
+    let decoded: SignatureAlgorithm = serde_json::from_str(&json).unwrap();
+    assert_eq!(decoded, SignatureAlgorithm::Bls12381);
+}
+
+#[test]
+fn signature_kind_bls_default() {
+    let kind = SignatureKind::bls_default();
+    assert_eq!(kind.algorithm, SignatureAlgorithm::Bls12381);
+    assert_eq!(kind.prefix, None);
+    let json = serde_json::to_string(&kind).unwrap();
+    assert!(json.contains("bls12381"));
+}
+
 // TODO: remove / change defaults?
 
 #[cfg_attr(feature = "ts-bindings", derive(TS))]
diff --git a/packages/types/src/signing.rs b/packages/types/src/signing.rs
index 91c6c2f34..ee2857f61 100644
--- a/packages/types/src/signing.rs
+++ b/packages/types/src/signing.rs
@@ -5,10 +5,12 @@ cfg_if::cfg_if! {
     }
 }
 
+use crate::solidity_types::BlsServiceHandler;
 pub use crate::solidity_types::Envelope;
 use crate::{
-    ServiceId, ServiceManagerEnvelope, ServiceManagerSignatureData, SignatureData, SignatureKind,
-    SubmitAction, TriggerAction, TriggerData, WasmResponse, WorkflowId,
+    solidity_types::SignatureData as Secp256k1SignatureData, ServiceId, ServiceManagerEnvelope,
+    ServiceManagerSignatureData, SignatureKind, SubmitAction, TriggerAction, TriggerData,
+    WasmResponse, WorkflowId,
 };
 use alloy_primitives::{eip191_hash_message, keccak256, FixedBytes, SignatureError};
 use alloy_sol_types::SolValue;
@@ -82,21 +84,64 @@ impl From<Envelope> for ServiceManagerEnvelope {
     }
 }
 
+/// Unified signature data enum supporting both secp256k1 and BLS12-381 signature schemes.
+/// Each variant wraps the Alloy-generated type from its respective ABI.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum SignatureData {
+    /// secp256k1 ECDSA: signers (address[]), signatures (bytes[]), referenceBlock (uint32)
+    Secp256k1(Secp256k1SignatureData),
+    /// BLS12-381: signerPubkeys (bytes[]), aggregateSignature (bytes), referenceBlock (uint32)
+    Bls12381(BlsServiceHandler::SignatureData),
+}
+
 impl From<SignatureData> for ServiceManagerSignatureData {
     fn from(signature_data: SignatureData) -> Self {
-        ServiceManagerSignatureData {
-            signers: signature_data.signers,
-            signatures: signature_data.signatures,
-            referenceBlock: signature_data.referenceBlock,
+        match signature_data {
+            SignatureData::Secp256k1(inner) => ServiceManagerSignatureData {
+                signers: inner.signers,
+                signatures: inner.signatures,
+                referenceBlock: inner.referenceBlock,
+            },
+            SignatureData::Bls12381(_) => {
+                panic!(
+                    "BLS SignatureData cannot convert to ServiceManagerSignatureData -- use BLS contract interface directly"
+                )
+            }
         }
     }
 }
 
+/// Operator signature for a submission envelope.
+/// BLS signatures carry the G1 pubkey alongside the G2 signature because BLS is not self-recovering.
+///
+/// NOTE: This is a BREAKING serialization change from the previous struct format.
+/// Old format: {"data": [...], "kind": {...}}
+/// New format: {"algorithm": "secp256k1", "data": [...], "kind": {...}}
+/// There must be no in-flight Submission objects when upgrading.
 #[derive(Serialize, Deserialize, Clone, Debug, ToSchema, PartialEq, Eq, Hash)]
-#[serde(rename_all = "snake_case")]
-pub struct WavsSignature {
-    pub data: Vec<u8>,
-    pub kind: SignatureKind,
+#[serde(rename_all = "snake_case", tag = "algorithm")]
+pub enum WavsSignature {
+    Secp256k1 {
+        data: Vec<u8>,
+        kind: SignatureKind,
+    },
+    Bls12381 {
+        /// 256-byte G2 signature (EIP-2537 uncompressed format)
+        g2_signature: Vec<u8>,
+        /// 128-byte G1 public key (EIP-2537 uncompressed format)
+        g1_pubkey: Vec<u8>,
+        kind: SignatureKind,
+    },
+}
+
+impl WavsSignature {
+    /// Get the SignatureKind regardless of algorithm variant
+    pub fn kind(&self) -> &SignatureKind {
+        match self {
+            WavsSignature::Secp256k1 { kind, .. } => kind,
+            WavsSignature::Bls12381 { kind, .. } => kind,
+        }
+    }
 }
 
 #[derive(
@@ -251,7 +296,7 @@ pub enum SigningError {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::AtProtoAction;
+    use crate::{AtProtoAction, SignatureAlgorithm};
 
     #[test]
     fn atproto_event_id_ignores_seq_and_timestamp() {
@@ -303,4 +348,51 @@ mod tests {
 
         assert_eq!(id1, id2);
     }
+
+    #[test]
+    fn wavs_signature_secp256k1_serde_roundtrip() {
+        let sig = WavsSignature::Secp256k1 {
+            data: vec![1, 2, 3],
+            kind: SignatureKind::evm_default(),
+        };
+        let json = serde_json::to_string(&sig).unwrap();
+        // Verify the tagged format includes "algorithm" field
+        assert!(
+            json.contains("\"algorithm\":\"secp256k1\""),
+            "JSON must contain algorithm tag: {json}"
+        );
+        let decoded: WavsSignature = serde_json::from_str(&json).unwrap();
+        assert_eq!(sig, decoded);
+    }
+
+    #[test]
+    fn wavs_signature_bls12381_serde_roundtrip() {
+        let sig = WavsSignature::Bls12381 {
+            g2_signature: vec![0u8; 256],
+            g1_pubkey: vec![0u8; 128],
+            kind: SignatureKind {
+                algorithm: SignatureAlgorithm::Bls12381,
+                prefix: None,
+            },
+        };
+        let json = serde_json::to_string(&sig).unwrap();
+        assert!(
+            json.contains("\"algorithm\":\"bls12381\""),
+            "JSON must contain algorithm tag: {json}"
+        );
+        let decoded: WavsSignature = serde_json::from_str(&json).unwrap();
+        assert_eq!(sig, decoded);
+    }
+
+    #[test]
+    fn wavs_signature_old_format_does_not_deserialize() {
+        // Document the breaking change: old struct format without "algorithm" tag
+        // will fail to deserialize into the new enum. This is expected.
+        let old_format = r#"{"data":[1,2,3],"kind":{"algorithm":"secp256k1","prefix":"eip191"}}"#;
+        let result = serde_json::from_str::<WavsSignature>(old_format);
+        assert!(
+            result.is_err(),
+            "Old format without 'algorithm' tag must fail: this is a breaking serialization change"
+        );
+    }
 }
diff --git a/packages/types/src/signing/signer.rs b/packages/types/src/signing/signer.rs
index 73ba4c1b1..f80565d82 100644
--- a/packages/types/src/signing/signer.rs
+++ b/packages/types/src/signing/signer.rs
@@ -1,35 +1,201 @@
-pub use crate::solidity_types::Envelope;
+use super::SignatureData;
 use crate::{
-    SignatureAlgorithm, SignatureData, SignatureKind, SignaturePrefix, SigningError, WavsSignable,
-    WavsSignature,
+    solidity_types::SignatureData as Secp256k1SignatureData, SignatureAlgorithm, SignatureKind,
+    SignaturePrefix, SigningError, WavsSignable, WavsSignature,
 };
 use alloy_signer::Signer;
 use alloy_signer_local::PrivateKeySigner;
 use async_trait::async_trait;
 
+#[cfg(feature = "bls")]
+mod bls_helpers {
+    //! BLS signing helpers for the WavsSigner::sign() BLS arm.
+    //!
+    //! These mirror `packages/utils/src/bls_signing.rs` (bls_sign_digest, bls_g1_pubkey_bytes).
+    //! Duplication exists because wavs-types cannot depend on layer-utils (circular dep:
+    //! layer-utils -> wavs-types). If refactoring the dep graph, consolidate these into a
+    //! shared crate and remove this module.
+
+    /// DST matching HashToCurve.sol line 20.
+    /// MUST match packages/utils/src/bls_signing.rs::BLS_SIGNING_DST exactly.
+    const BLS_SIGNING_DST: &[u8] = b"BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_";
+
+    /// Sign a 32-byte digest, returning 256-byte EIP-2537 G2 signature.
+    /// Mirrors utils::bls_signing::bls_sign_digest().
+    pub(crate) fn bls_sign_digest_inner(
+        private_key: &commonware_cryptography::bls12381::PrivateKey,
+        digest: &[u8; 32],
+    ) -> anyhow::Result<[u8; 256]> {
+        use commonware_codec::Encode;
+        let raw_bytes = private_key.encode();
+        let sk = blst::min_pk::SecretKey::from_bytes(&raw_bytes)
+            .map_err(|e| anyhow::anyhow!("Failed to create blst SecretKey: {:?}", e))?;
+
+        let signature = sk.sign(digest, BLS_SIGNING_DST, &[]);
+
+        bls_g2_signature_bytes_inner(&signature)
+    }
+
+    /// Convert blst G2 signature to 256-byte EIP-2537 format.
+    /// Mirrors utils::bls_signing::bls_g2_signature_bytes().
+    ///
+    /// blst (ZCash) serializes G2 as 192 bytes with the imaginary part first:
+    ///   [x_c1(48)] [x_c0(48)] [y_c1(48)] [y_c0(48)]
+    /// EIP-2537 expects the real part first, each Fp padded to 64 bytes:
+    ///   [x_c0(64)] [x_c1(64)] [y_c0(64)] [y_c1(64)]
+    fn bls_g2_signature_bytes_inner(
+        signature: &blst::min_pk::Signature,
+    ) -> anyhow::Result<[u8; 256]> {
+        let uncompressed = signature.serialize(); // 192 bytes: x_c1|x_c0|y_c1|y_c0 (ZCash)
+        let mut eip2537 = [0u8; 256];
+        // blst source offsets for [x_c0, x_c1, y_c0, y_c1] (EIP-2537 order):
+        //   x_c0 is at blst[48..96], x_c1 is at blst[0..48]
+        //   y_c0 is at blst[144..192], y_c1 is at blst[96..144]
+        let blst_src_offsets = [48usize, 0, 144, 96];
+        for (i, &src_offset) in blst_src_offsets.iter().enumerate() {
+            let dst_offset = i * 64 + 16;
+            eip2537[dst_offset..dst_offset + 48]
+                .copy_from_slice(&uncompressed[src_offset..src_offset + 48]);
+        }
+        Ok(eip2537)
+    }
+
+    /// Deserialize a 256-byte EIP-2537 G2 signature back to a blst Signature.
+    /// Strips the 16-byte zero padding and reverses the coordinate swap to get
+    /// 192-byte ZCash/blst uncompressed form, then calls Signature::deserialize().
+    pub(crate) fn deserialize_g2_from_eip2537(
+        eip2537_bytes: &[u8],
+    ) -> anyhow::Result<blst::min_pk::Signature> {
+        if eip2537_bytes.len() != 256 {
+            anyhow::bail!("Expected 256-byte EIP-2537 G2, got {}", eip2537_bytes.len());
+        }
+        let mut uncompressed = [0u8; 192];
+        // EIP-2537 order: [x_c0, x_c1, y_c0, y_c1]; blst ZCash order: [x_c1, x_c0, y_c1, y_c0]
+        // Map EIP-2537 position i to blst destination offset:
+        //   EIP-2537[0]=x_c0 → blst[48..96], EIP-2537[1]=x_c1 → blst[0..48]
+        //   EIP-2537[2]=y_c0 → blst[144..192], EIP-2537[3]=y_c1 → blst[96..144]
+        let blst_dst_offsets = [48usize, 0, 144, 96];
+        for (i, &dst_offset) in blst_dst_offsets.iter().enumerate() {
+            let src_offset = i * 64 + 16;
+            uncompressed[dst_offset..dst_offset + 48]
+                .copy_from_slice(&eip2537_bytes[src_offset..src_offset + 48]);
+        }
+        blst::min_pk::Signature::deserialize(&uncompressed)
+            .map_err(|e| anyhow::anyhow!("Failed to deserialize G2 signature: {:?}", e))
+    }
+
+    /// Serialize a blst AggregateSignature to 256-byte EIP-2537 format.
+    /// Converts 192-byte ZCash/blst uncompressed to 256-byte padded EIP-2537.
+    pub(crate) fn serialize_aggregate_to_eip2537(
+        aggregate: &blst::min_pk::AggregateSignature,
+    ) -> [u8; 256] {
+        let sig = aggregate.to_signature();
+        let uncompressed = sig.serialize(); // 192 bytes: x_c1|x_c0|y_c1|y_c0 (ZCash)
+        let mut eip2537 = [0u8; 256];
+        // Same coordinate swap as bls_g2_signature_bytes_inner
+        let blst_src_offsets = [48usize, 0, 144, 96];
+        for (i, &src_offset) in blst_src_offsets.iter().enumerate() {
+            let dst_offset = i * 64 + 16;
+            eip2537[dst_offset..dst_offset + 48]
+                .copy_from_slice(&uncompressed[src_offset..src_offset + 48]);
+        }
+        eip2537
+    }
+
+    /// Get 128-byte EIP-2537 G1 public key from BLS private key.
+    /// Mirrors utils::bls_signing::bls_g1_pubkey_bytes().
+    pub(crate) fn bls_g1_pubkey_bytes_inner(
+        private_key: &commonware_cryptography::bls12381::PrivateKey,
+    ) -> anyhow::Result<[u8; 128]> {
+        use commonware_cryptography::Signer as _;
+        let pubkey = private_key.public_key();
+        let compressed: &[u8] = &pubkey;
+
+        let mut affine = blst::blst_p1_affine::default();
+        // SAFETY: compressed is a valid 48-byte BLS public key from commonware
+        let result = unsafe { blst::blst_p1_uncompress(&mut affine, compressed.as_ptr()) };
+        if result != blst::BLST_ERROR::BLST_SUCCESS {
+            anyhow::bail!("Failed to uncompress G1 point: {:?}", result);
+        }
+        let mut uncompressed_g1 = [0u8; 96];
+        // SAFETY: affine is a valid P1 affine point, buffer is 96 bytes
+        unsafe {
+            blst::blst_p1_affine_serialize(uncompressed_g1.as_mut_ptr(), &affine);
+        }
+
+        let mut g1_eip2537 = [0u8; 128];
+        g1_eip2537[16..64].copy_from_slice(&uncompressed_g1[0..48]);
+        g1_eip2537[80..128].copy_from_slice(&uncompressed_g1[48..96]);
+
+        Ok(g1_eip2537)
+    }
+}
+
+/// Operator signing key supporting multiple signature algorithms.
+#[derive(Clone)]
+pub enum WavsCryptoSigner {
+    Secp256k1(PrivateKeySigner),
+    #[cfg(feature = "bls")]
+    Bls12381(commonware_cryptography::bls12381::PrivateKey),
+}
+
 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 pub trait WavsSigner: WavsSignable {
     async fn sign(
         &self,
-        signer: &PrivateKeySigner,
+        signer: &WavsCryptoSigner,
         kind: SignatureKind,
     ) -> anyhow::Result<WavsSignature> {
-        let hash = match kind.algorithm {
-            SignatureAlgorithm::Secp256k1 => match kind.prefix {
-                Some(SignaturePrefix::Eip191) => self.prefix_eip191_hash()?,
-                None => self.unprefixed_hash()?,
-            },
-        };
-
-        Ok(signer
-            .sign_hash(&hash)
-            .await
-            .map(|signature| WavsSignature {
-                data: signature.into(),
-                kind,
-            })
-            .map_err(|e| anyhow::anyhow!("Failed to sign data: {e:?}"))?)
+        match signer {
+            WavsCryptoSigner::Secp256k1(pks) => {
+                let hash = match kind.algorithm {
+                    SignatureAlgorithm::Secp256k1 => match kind.prefix {
+                        Some(SignaturePrefix::Eip191) => self.prefix_eip191_hash()?,
+                        None => self.unprefixed_hash()?,
+                    },
+                    SignatureAlgorithm::Bls12381 => {
+                        anyhow::bail!("Cannot sign BLS with a secp256k1 key")
+                    }
+                };
+
+                Ok(pks
+                    .sign_hash(&hash)
+                    .await
+                    .map(|signature| WavsSignature::Secp256k1 {
+                        data: signature.into(),
+                        kind,
+                    })
+                    .map_err(|e| anyhow::anyhow!("Failed to sign data: {e:?}"))?)
+            }
+            #[cfg(feature = "bls")]
+            WavsCryptoSigner::Bls12381(ref bls_key) => {
+                let hash = match kind.algorithm {
+                    SignatureAlgorithm::Bls12381 => self.unprefixed_hash()?,
+                    SignatureAlgorithm::Secp256k1 => {
+                        anyhow::bail!("Cannot sign secp256k1 with a BLS key")
+                    }
+                };
+
+                let digest: [u8; 32] = hash.into();
+                let key = bls_key.clone();
+                let kind = kind.clone();
+
+                let (g2_sig, g1_pub) = tokio::task::spawn_blocking(move || {
+                    let g2 = bls_helpers::bls_sign_digest_inner(&key, &digest)?;
+                    let g1 = bls_helpers::bls_g1_pubkey_bytes_inner(&key)?;
+                    Ok::<_, anyhow::Error>((g2, g1))
+                })
+                .await
+                .map_err(|e| anyhow::anyhow!("BLS signing task failed: {e}"))??;
+
+                Ok(WavsSignature::Bls12381 {
+                    g2_signature: g2_sig.to_vec(),
+                    g1_pubkey: g1_pub.to_vec(),
+                    kind,
+                })
+            }
+        }
     }
 
     fn signature_data(
@@ -37,27 +203,96 @@ pub trait WavsSigner: WavsSignable {
         signatures: Vec<WavsSignature>,
         block_height: u64,
     ) -> std::result::Result<SignatureData, SigningError> {
-        let mut signers_and_signatures: Vec<(alloy_primitives::Address, alloy_primitives::Bytes)> =
-            signatures
-                .into_iter()
-                .map(|sig| {
-                    sig.evm_signer_address(self)
-                        .map(|addr| (addr, sig.data.into()))
-                })
-                .collect::<Result<_, _>>()?;
+        // All signatures must be the same algorithm
+        if signatures.is_empty() {
+            return Err(SigningError::DataHash(anyhow::anyhow!(
+                "No signatures provided"
+            )));
+        }
+
+        // Check the first signature to determine algorithm
+        match &signatures[0] {
+            WavsSignature::Secp256k1 { .. } => {
+                let mut signers_and_signatures: Vec<(
+                    alloy_primitives::Address,
+                    alloy_primitives::Bytes,
+                )> = signatures
+                    .into_iter()
+                    .map(|sig| match sig {
+                        WavsSignature::Secp256k1 { ref data, .. } => sig
+                            .evm_signer_address(self)
+                            .map(|addr| (addr, data.clone().into())),
+                        WavsSignature::Bls12381 { .. } => Err(SigningError::DataHash(
+                            anyhow::anyhow!("Mixed signature algorithms"),
+                        )),
+                    })
+                    .collect::<Result<_, _>>()?;
 
-        // Solidity‑compatible ascending order (lexicographic / numeric)
-        signers_and_signatures.sort_by_key(|(addr, _)| *addr);
+                signers_and_signatures.sort_by_key(|(addr, _)| *addr);
 
-        // unzip back into two parallel, sorted vectors
-        let (signers, signatures): (Vec<alloy_primitives::Address>, Vec<alloy_primitives::Bytes>) =
-            signers_and_signatures.into_iter().unzip();
+                let (signers, signatures): (
+                    Vec<alloy_primitives::Address>,
+                    Vec<alloy_primitives::Bytes>,
+                ) = signers_and_signatures.into_iter().unzip();
+
+                Ok(SignatureData::Secp256k1(Secp256k1SignatureData {
+                    signers,
+                    signatures,
+                    referenceBlock: block_height as u32,
+                }))
+            }
+            #[cfg(feature = "bls")]
+            WavsSignature::Bls12381 { .. } => {
+                use crate::solidity_types::BlsServiceHandler;
+                use alloy_primitives::{keccak256, Bytes, FixedBytes};
 
-        Ok(SignatureData {
-            signers,
-            signatures,
-            referenceBlock: block_height as u32,
-        })
+                // Collect (keccak256_hash, g1_pubkey_bytes, deserialized_g2_sig) per operator
+                let mut entries: Vec<(FixedBytes<32>, Bytes, blst::min_pk::Signature)> = signatures
+                    .into_iter()
+                    .map(|sig| match sig {
+                        WavsSignature::Bls12381 {
+                            g2_signature,
+                            g1_pubkey,
+                            ..
+                        } => {
+                            let key_hash = keccak256(&g1_pubkey);
+                            let g2_sig = bls_helpers::deserialize_g2_from_eip2537(&g2_signature)
+                                .map_err(SigningError::DataHash)?;
+                            Ok((key_hash, Bytes::from(g1_pubkey), g2_sig))
+                        }
+                        WavsSignature::Secp256k1 { .. } => {
+                            Err(SigningError::DataHash(anyhow::anyhow!(
+                                "Mixed signature algorithms: expected BLS, got secp256k1"
+                            )))
+                        }
+                    })
+                    .collect::<Result<_, _>>()?;
+
+                // Sort by keccak256(pubkey) ascending -- contract enforces lastKeyHash < keyHash
+                entries.sort_by_key(|(hash, _, _)| *hash);
+
+                // Aggregate G2 signatures via blst point addition
+                let sig_refs: Vec<&blst::min_pk::Signature> =
+                    entries.iter().map(|(_, _, s)| s).collect();
+                let aggregate = blst::min_pk::AggregateSignature::aggregate(&sig_refs, true)
+                    .map_err(|e| {
+                        SigningError::DataHash(anyhow::anyhow!("BLS aggregate failed: {:?}", e))
+                    })?;
+                let agg_sig_bytes = bls_helpers::serialize_aggregate_to_eip2537(&aggregate);
+
+                let signer_pubkeys: Vec<Bytes> = entries.into_iter().map(|(_, pk, _)| pk).collect();
+
+                Ok(SignatureData::Bls12381(BlsServiceHandler::SignatureData {
+                    signerPubkeys: signer_pubkeys,
+                    aggregateSignature: Bytes::from(agg_sig_bytes.to_vec()),
+                    referenceBlock: block_height as u32,
+                }))
+            }
+            #[cfg(not(feature = "bls"))]
+            WavsSignature::Bls12381 { .. } => Err(SigningError::DataHash(anyhow::anyhow!(
+                "BLS aggregation requires the 'bls' feature"
+            ))),
+        }
     }
 }
 
@@ -68,12 +303,12 @@ impl WavsSignature {
         &self,
         signable: &T,
     ) -> std::result::Result<alloy_primitives::Address, SigningError> {
-        match self.kind.algorithm {
-            SignatureAlgorithm::Secp256k1 => {
-                let signature = alloy_primitives::Signature::from_raw(&self.data)
+        match self {
+            WavsSignature::Secp256k1 { data, kind } => {
+                let signature = alloy_primitives::Signature::from_raw(data)
                     .map_err(SigningError::RecoverSignerAddress)?;
 
-                match self.kind.prefix {
+                match kind.prefix {
                     Some(SignaturePrefix::Eip191) => signature
                         .recover_address_from_prehash(
                             &signable
@@ -88,6 +323,149 @@ impl WavsSignature {
                         .map_err(SigningError::RecoverSignerAddress),
                 }
             }
+            WavsSignature::Bls12381 { .. } => Err(SigningError::DataHash(anyhow::anyhow!(
+                "BLS signatures do not have EVM signer addresses"
+            ))),
+        }
+    }
+}
+
+#[cfg(all(test, feature = "bls"))]
+mod tests {
+    use super::*;
+    use crate::{SignatureAlgorithm, WavsSignable};
+    use alloy_primitives::keccak256;
+
+    /// Minimal signable for tests -- just wraps raw bytes.
+    struct TestSignable(Vec<u8>);
+    impl WavsSignable for TestSignable {
+        fn encode_data(&self) -> anyhow::Result<Vec<u8>> {
+            Ok(self.0.clone())
         }
     }
+
+    /// Helper: generate a BLS key pair, sign a digest, return (g2_sig_bytes, g1_pubkey_bytes).
+    fn make_bls_signature(seed: u64) -> (Vec<u8>, Vec<u8>) {
+        use commonware_math::algebra::Random;
+        use rand_chacha::rand_core::SeedableRng;
+        // Create deterministic key from seed -- need rand_core 0.6 RNG for commonware
+        let mut seed_bytes = [0u8; 32];
+        seed_bytes[..8].copy_from_slice(&seed.to_le_bytes());
+        let mut rng = rand_chacha::ChaCha20Rng::from_seed(seed_bytes);
+        let key = commonware_cryptography::bls12381::PrivateKey::random(&mut rng);
+
+        let digest = [0xabu8; 32]; // fixed test digest
+        let g2_sig = bls_helpers::bls_sign_digest_inner(&key, &digest).unwrap();
+        let g1_pub = bls_helpers::bls_g1_pubkey_bytes_inner(&key).unwrap();
+        (g2_sig.to_vec(), g1_pub.to_vec())
+    }
+
+    fn bls_kind() -> SignatureKind {
+        SignatureKind {
+            algorithm: SignatureAlgorithm::Bls12381,
+            prefix: None,
+        }
+    }
+
+    #[test]
+    fn bls_signature_data_aggregates_g2() {
+        let signable = TestSignable(vec![1, 2, 3]);
+        let sigs: Vec<WavsSignature> = (1..=3u64)
+            .map(|seed| {
+                let (g2, g1) = make_bls_signature(seed);
+                WavsSignature::Bls12381 {
+                    g2_signature: g2,
+                    g1_pubkey: g1,
+                    kind: bls_kind(),
+                }
+            })
+            .collect();
+
+        let result = signable.signature_data(sigs, 42);
+        assert!(
+            result.is_ok(),
+            "signature_data must succeed: {:?}",
+            result.err()
+        );
+        match result.unwrap() {
+            SignatureData::Bls12381(data) => {
+                assert_eq!(
+                    data.aggregateSignature.len(),
+                    256,
+                    "Aggregate sig must be 256 bytes (EIP-2537)"
+                );
+                assert_eq!(data.signerPubkeys.len(), 3, "Must have 3 signer pubkeys");
+                for pk in &data.signerPubkeys {
+                    assert_eq!(pk.len(), 128, "Each G1 pubkey must be 128 bytes (EIP-2537)");
+                }
+                assert_eq!(data.referenceBlock, 42);
+            }
+            _ => panic!("Expected Bls12381 variant"),
+        }
+    }
+
+    #[test]
+    fn bls_signature_data_sorts_by_keccak() {
+        let signable = TestSignable(vec![1, 2, 3]);
+        let sigs: Vec<WavsSignature> = (1..=3u64)
+            .map(|seed| {
+                let (g2, g1) = make_bls_signature(seed);
+                WavsSignature::Bls12381 {
+                    g2_signature: g2,
+                    g1_pubkey: g1,
+                    kind: bls_kind(),
+                }
+            })
+            .collect();
+
+        let result = signable.signature_data(sigs, 100).unwrap();
+        match result {
+            SignatureData::Bls12381(data) => {
+                // Verify pubkeys are sorted by keccak256(pubkey) ascending
+                let hashes: Vec<_> = data
+                    .signerPubkeys
+                    .iter()
+                    .map(|pk| keccak256(pk.as_ref()))
+                    .collect();
+                for i in 1..hashes.len() {
+                    assert!(
+                        hashes[i - 1] < hashes[i],
+                        "Pubkeys must be sorted by keccak256 ascending: {:?} >= {:?}",
+                        hashes[i - 1],
+                        hashes[i]
+                    );
+                }
+            }
+            _ => panic!("Expected Bls12381 variant"),
+        }
+    }
+
+    #[test]
+    fn bls_signature_data_rejects_mixed() {
+        let signable = TestSignable(vec![1, 2, 3]);
+        let (g2, g1) = make_bls_signature(1);
+        let sigs = vec![
+            WavsSignature::Bls12381 {
+                g2_signature: g2,
+                g1_pubkey: g1,
+                kind: bls_kind(),
+            },
+            WavsSignature::Secp256k1 {
+                data: vec![0u8; 65],
+                kind: SignatureKind::evm_default(),
+            },
+        ];
+
+        let result = signable.signature_data(sigs, 50);
+        assert!(result.is_err(), "Mixed algorithms must fail");
+    }
+
+    #[test]
+    fn bls_signature_data_empty_rejects() {
+        let signable = TestSignable(vec![1, 2, 3]);
+        let result = signable.signature_data(vec![], 50);
+        assert!(result.is_err(), "Empty signatures must fail");
+    }
+
+    // bls_rpc_bindings_compile test is in bls.rs tests module (requires solidity-rpc feature)
 }
diff --git a/packages/types/src/solidity_types/bls.rs b/packages/types/src/solidity_types/bls.rs
new file mode 100644
index 000000000..3858ef545
--- /dev/null
+++ b/packages/types/src/solidity_types/bls.rs
@@ -0,0 +1,108 @@
+// BLS12-381 Solidity ABI bindings
+// These are separate from the secp256k1 bindings because the IWavsServiceHandler
+// interfaces have different SignatureData structs:
+// - secp256k1: signers (address[]), signatures (bytes[]), referenceBlock (uint32)
+// - BLS: signerPubkeys (bytes[]), aggregateSignature (bytes), referenceBlock (uint32)
+
+mod bls_service_handler {
+    alloy_sol_macro::sol!(
+        #[allow(missing_docs)]
+        #[derive(serde::Deserialize, serde::Serialize, Debug, PartialEq, Eq)]
+        IWavsServiceHandler,
+        "./src/contracts/solidity/abi/bls/IWavsServiceHandler.json"
+    );
+}
+
+mod bls_stake_registry {
+    alloy_sol_macro::sol!(
+        #[allow(missing_docs)]
+        #[derive(serde::Deserialize, serde::Serialize, Debug, PartialEq, Eq)]
+        IPOAStakeRegistry,
+        "./src/contracts/solidity/abi/bls/IPOAStakeRegistry.json"
+    );
+}
+
+mod bls_service_manager {
+    alloy_sol_macro::sol!(
+        #[allow(missing_docs)]
+        #[derive(serde::Deserialize, serde::Serialize, Debug, PartialEq, Eq)]
+        IWavsServiceManager,
+        "./src/contracts/solidity/abi/bls/IWavsServiceManager.json"
+    );
+}
+
+// Re-export with namespaced paths to avoid collision with secp256k1 bindings
+pub use bls_service_handler::IWavsServiceHandler as BlsServiceHandler;
+pub use bls_service_manager::IWavsServiceManager as BlsServiceManager;
+pub use bls_stake_registry::IPOAStakeRegistry as BlsStakeRegistry;
+
+// Feature-gated RPC bindings for on-chain interaction (contract calls).
+// These mirror the pattern in rpc.rs but for BLS-specific contract interfaces.
+cfg_if::cfg_if! {
+    if #[cfg(feature = "solidity-rpc")] {
+        mod bls_service_handler_rpc {
+            alloy_sol_macro::sol!(
+                #[allow(missing_docs)]
+                #[sol(rpc)]
+                #[derive(serde::Deserialize, serde::Serialize, Debug, PartialEq, Eq)]
+                IWavsServiceHandler,
+                "./src/contracts/solidity/abi/bls/IWavsServiceHandler.json"
+            );
+        }
+
+        mod bls_service_manager_rpc {
+            alloy_sol_macro::sol!(
+                #[allow(missing_docs)]
+                #[sol(rpc)]
+                #[derive(Debug)]
+                IWavsServiceManager,
+                "./src/contracts/solidity/abi/bls/IWavsServiceManager.json"
+            );
+        }
+
+        pub use bls_service_handler_rpc::IWavsServiceHandler as BlsServiceHandlerRpc;
+        pub use bls_service_manager_rpc::IWavsServiceManager as BlsServiceManagerRpc;
+        // Re-export BLS service manager's view of handler types (for validate() calls)
+        // Same pattern as rpc.rs ServiceManagerEnvelope/ServiceManagerSignatureData
+        pub use bls_service_manager_rpc::IWavsServiceHandler::Envelope as BlsServiceManagerEnvelope;
+        pub use bls_service_manager_rpc::IWavsServiceHandler::SignatureData as BlsServiceManagerSignatureData;
+
+        pub type BlsServiceHandlerInstance = BlsServiceHandlerRpc::IWavsServiceHandlerInstance<alloy_provider::DynProvider>;
+        pub type BlsServiceManagerInstance = BlsServiceManagerRpc::IWavsServiceManagerInstance<alloy_provider::DynProvider>;
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use alloy_primitives::Bytes;
+
+    #[test]
+    fn bls_service_handler_signature_data_fields() {
+        // Verify the BLS SignatureData struct has the expected fields
+        let sig_data = BlsServiceHandler::SignatureData {
+            signerPubkeys: vec![Bytes::from(vec![0u8; 128])],
+            aggregateSignature: Bytes::from(vec![0u8; 256]),
+            referenceBlock: 42,
+        };
+        assert_eq!(sig_data.signerPubkeys.len(), 1);
+        assert_eq!(sig_data.aggregateSignature.len(), 256);
+        assert_eq!(sig_data.referenceBlock, 42);
+    }
+
+    #[test]
+    fn bls_bindings_compile() {
+        // Just verify the types are accessible -- compilation is the test
+        let _handler_type = std::any::type_name::<BlsServiceHandler::SignatureData>();
+        let _registry_type = std::any::type_name::<BlsStakeRegistry::IPOAStakeRegistryCalls>();
+        let _manager_type = std::any::type_name::<BlsServiceManager::IWavsServiceManagerCalls>();
+    }
+
+    #[cfg(feature = "solidity-rpc")]
+    #[test]
+    fn bls_rpc_bindings_compile() {
+        // Verify the RPC types are accessible when solidity-rpc feature is enabled.
+        let _handler_type = std::any::type_name::<BlsServiceHandlerInstance>();
+        let _manager_type = std::any::type_name::<BlsServiceManagerInstance>();
+    }
+}
diff --git a/packages/types/src/solidity_types/mod.rs b/packages/types/src/solidity_types/mod.rs
index b020fa335..e97ded66c 100644
--- a/packages/types/src/solidity_types/mod.rs
+++ b/packages/types/src/solidity_types/mod.rs
@@ -7,3 +7,6 @@ cfg_if::cfg_if! {
         pub use not_rpc::*;
     }
 }
+
+mod bls;
+pub use bls::*;
diff --git a/packages/types/src/solidity_types/not_rpc.rs b/packages/types/src/solidity_types/not_rpc.rs
index 7c98cec24..873744a17 100644
--- a/packages/types/src/solidity_types/not_rpc.rs
+++ b/packages/types/src/solidity_types/not_rpc.rs
@@ -16,9 +16,10 @@ mod service_handler {
     );
 }
 
-pub use service_handler::{
-    IWavsServiceHandler, IWavsServiceHandler::Envelope, IWavsServiceHandler::SignatureData,
-};
+pub use service_handler::{IWavsServiceHandler, IWavsServiceHandler::Envelope};
+// SignatureData is re-exported under alias to avoid collision with the signing::SignatureData enum.
+// The raw Alloy type is accessible as crate::solidity_types::SignatureData.
+pub(crate) use service_handler::IWavsServiceHandler::SignatureData;
 pub use service_manager::IWavsServiceManager;
 // yup, the service handler interface as seen by the service manager is a different service handler interface
 // even though it's literally a direct import of the same file
diff --git a/packages/types/src/solidity_types/rpc.rs b/packages/types/src/solidity_types/rpc.rs
index 0f5765e00..81bfa8567 100644
--- a/packages/types/src/solidity_types/rpc.rs
+++ b/packages/types/src/solidity_types/rpc.rs
@@ -20,9 +20,10 @@ mod service_handler {
     );
 }
 
-pub use service_handler::{
-    IWavsServiceHandler, IWavsServiceHandler::Envelope, IWavsServiceHandler::SignatureData,
-};
+pub use service_handler::{IWavsServiceHandler, IWavsServiceHandler::Envelope};
+// SignatureData is re-exported under alias to avoid collision with the signing::SignatureData enum.
+// The raw Alloy type is accessible as crate::solidity_types::SignatureData.
+pub(crate) use service_handler::IWavsServiceHandler::SignatureData;
 pub use service_manager::IWavsServiceManager;
 // yup, the service handler interface as seen by the service manager is a different service handler interface
 // even though it's literally a direct import of the same file
diff --git a/packages/utils/Cargo.toml b/packages/utils/Cargo.toml
index f5c58a52c..3c1b0d582 100644
--- a/packages/utils/Cargo.toml
+++ b/packages/utils/Cargo.toml
@@ -10,7 +10,7 @@ license.workspace = true
 publish = false
 
 [features]
-test-utils = ["dep:rand", "dep:bip39", "dep:toml", "dep:cw-wavs-mock-api"]
+test-utils = ["dep:rand", "dep:toml", "dep:cw-wavs-mock-api"]
 
 [dependencies]
 wasm-pkg-client = { workspace = true }
@@ -35,7 +35,7 @@ const-hex = { workspace = true }
 alloy-primitives = { workspace = true }
 alloy-sol-types = { workspace = true }
 alloy-contract = { workspace = true }
-alloy-provider = { workspace = true}
+alloy-provider = { workspace = true, features = ["reqwest", "reqwest-default-tls", "ws", "pubsub"] }
 alloy-node-bindings = { workspace = true }
 alloy-signer = { workspace = true }
 alloy-signer-local = { workspace = true }
@@ -56,8 +56,18 @@ axum = { workspace = true }
 axum-extra = { workspace = true }
 tempfile = { workspace = true }
 rand = { workspace = true, optional = true }
-bip39 = { workspace = true, optional = true }
+bip39 = { workspace = true }
 subtle = { workspace = true }
+
+# BLS key derivation dependencies
+commonware-cryptography = { workspace = true }
+commonware-math = "2026.3.0"
+rand_chacha = "0.3"
+rand_core = "0.6"
+hkdf = "0.12"
+blst = "0.3.16"
+commonware-codec = "2026.3.0"
+sha2 = { workspace = true }
 toml = { workspace = true, optional = true }
 cw-wavs-mock-api = { workspace = true, optional = true }
 
diff --git a/packages/utils/src/bls_signing.rs b/packages/utils/src/bls_signing.rs
new file mode 100644
index 000000000..1089bebdf
--- /dev/null
+++ b/packages/utils/src/bls_signing.rs
@@ -0,0 +1,415 @@
+//! BLS12-381 key derivation from BIP-39 mnemonic.
+//!
+//! Derives deterministic BLS private keys using HKDF-SHA256 to incorporate
+//! the HD index, then seeds ChaCha20Rng for commonware's PrivateKey::random().
+//! This parallels the ed25519 derivation in aggregator/p2p.rs but adds HKDF
+//! to safely derive multiple keys from a single mnemonic.
+
+use commonware_cryptography::{bls12381, Signer as _};
+use hkdf::Hkdf;
+use rand_chacha::ChaCha20Rng;
+use rand_core::SeedableRng;
+use sha2::Sha256;
+
+/// Domain separation label for HKDF info parameter.
+/// Prevents accidental collision with other HKDF usages of the same BIP-39 seed.
+const HKDF_INFO_PREFIX: &[u8] = b"WAVS-BLS-KEY-v1";
+
+/// Derive a BLS12-381 private key deterministically from a BIP-39 mnemonic and HD index.
+///
+/// Algorithm:
+/// 1. Parse BIP-39 mnemonic and derive 64-byte seed (empty passphrase)
+/// 2. HKDF-SHA256(ikm=seed, info=WAVS-BLS-KEY-v1 || hd_index.to_le_bytes()) -> 32-byte RNG seed
+/// 3. ChaCha20Rng::from_seed(rng_seed) -> deterministic PRNG
+/// 4. bls12381::PrivateKey::random(&mut rng) -> BLS private key
+///
+/// # Errors
+/// - Returns error if `mnemonic` starts with "0x" (raw key, not a mnemonic)
+/// - Returns error if mnemonic is invalid BIP-39
+pub fn bls_private_key_from_mnemonic(
+    mnemonic: &str,
+    hd_index: u32,
+) -> anyhow::Result<bls12381::PrivateKey> {
+    // Guard: reject raw private keys
+    if mnemonic.starts_with("0x") {
+        anyhow::bail!("BLS key derivation requires a mnemonic, not a raw key");
+    }
+
+    // Parse BIP-39 mnemonic
+    let mnemonic =
+        bip39::Mnemonic::parse(mnemonic).map_err(|e| anyhow::anyhow!("Invalid mnemonic: {}", e))?;
+
+    // Derive 64-byte BIP-39 seed (empty passphrase)
+    let seed = mnemonic.to_seed("");
+
+    // HKDF-SHA256: incorporate HD index with domain separation
+    let hk = Hkdf::<Sha256>::new(None, &seed);
+    let mut rng_seed = [0u8; 32];
+    // info = WAVS-BLS-KEY-v1 || hd_index (little-endian)
+    let mut info = Vec::with_capacity(HKDF_INFO_PREFIX.len() + 4);
+    info.extend_from_slice(HKDF_INFO_PREFIX);
+    info.extend_from_slice(&hd_index.to_le_bytes());
+    hk.expand(&info, &mut rng_seed)
+        .map_err(|e| anyhow::anyhow!("HKDF expand failed: {}", e))?;
+
+    // Deterministic RNG seeded from HKDF output
+    let mut rng = ChaCha20Rng::from_seed(rng_seed);
+
+    // Generate BLS private key using commonware's implementation
+    use commonware_math::algebra::Random;
+    Ok(bls12381::PrivateKey::random(&mut rng))
+}
+
+/// Convert a BLS private key's G1 public key to 128-byte EIP-2537 uncompressed format.
+///
+/// The commonware PublicKey is 48-byte ZCash compressed G1. This function:
+/// 1. Decompresses to affine point via blst FFI
+/// 2. Serializes to 96 bytes (x || y, each 48 bytes big-endian)
+/// 3. Pads each 48-byte coordinate to 64 bytes with leading zeros (EIP-2537 format)
+///
+/// The output matches `BLS12381.G1_POINT_SIZE = 128` in the poa-middleware contracts.
+pub fn bls_g1_pubkey_bytes(private_key: &bls12381::PrivateKey) -> anyhow::Result<[u8; 128]> {
+    let pubkey = private_key.public_key();
+    let compressed: &[u8] = &pubkey; // 48-byte ZCash compressed G1
+
+    // Decompress to affine point via blst FFI
+    let mut affine = blst::blst_p1_affine::default();
+    let result = unsafe { blst::blst_p1_uncompress(&mut affine, compressed.as_ptr()) };
+    if result != blst::BLST_ERROR::BLST_SUCCESS {
+        anyhow::bail!("Failed to uncompress G1 point: {:?}", result);
+    }
+
+    // Serialize to 96-byte uncompressed (x || y, each 48 bytes big-endian)
+    let mut uncompressed = [0u8; 96];
+    unsafe {
+        blst::blst_p1_affine_serialize(uncompressed.as_mut_ptr(), &affine);
+    }
+
+    // Pad each 48-byte coordinate to 64 bytes (EIP-2537 format)
+    // x: 16 zero bytes + 48-byte x coordinate
+    // y: 16 zero bytes + 48-byte y coordinate
+    let mut eip2537 = [0u8; 128];
+    eip2537[16..64].copy_from_slice(&uncompressed[0..48]);
+    eip2537[80..128].copy_from_slice(&uncompressed[48..96]);
+
+    Ok(eip2537)
+}
+
+/// DST for BLS signing, matching HashToCurve.sol line 20.
+/// NOTE: This is NOT the same as commonware's G2_MESSAGE DST which has _POP_ suffix.
+pub const BLS_SIGNING_DST: &[u8] = b"BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_";
+
+/// Sign a 32-byte digest with a BLS private key using hash-to-curve.
+/// Returns 256-byte EIP-2537 G2 signature.
+///
+/// The digest is typically `keccak256(abi_encode(envelope))` matching the contract's
+/// `digest = keccak256(abi.encode(envelope))` then `hashToCurveG2(abi.encodePacked(digest))`.
+///
+/// Uses blst directly (not commonware Signer::sign) because:
+/// - commonware uses DST `..._POP_` suffix, contract uses `..._RO_` suffix
+/// - commonware wraps message with union_unique(namespace, message), contract uses raw bytes
+pub fn bls_sign_digest(
+    private_key: &bls12381::PrivateKey,
+    digest: &[u8; 32],
+) -> anyhow::Result<[u8; 256]> {
+    use commonware_codec::Encode;
+    let raw_bytes = private_key.encode();
+    let sk = blst::min_pk::SecretKey::from_bytes(&raw_bytes)
+        .map_err(|e| anyhow::anyhow!("Failed to create blst SecretKey: {:?}", e))?;
+
+    // Sign with contract-matching DST. The message is the raw 32-byte digest.
+    let signature = sk.sign(digest, BLS_SIGNING_DST, &[]);
+
+    bls_g2_signature_bytes(&signature)
+}
+
+/// Convert a blst G2 signature to 256-byte EIP-2537 uncompressed format.
+///
+/// blst (ZCash format) serializes G2 as 192 bytes with the IMAGINARY part first:
+///   [x_c1(48)] [x_c0(48)] [y_c1(48)] [y_c0(48)]
+///
+/// EIP-2537 format uses the REAL part first, each Fp padded to 64 bytes:
+///   [x_c0(64)] [x_c1(64)] [y_c0(64)] [y_c1(64)]
+///
+/// The coordinate swap (c1 ↔ c0) is required because ZCash/blst puts c1 before c0
+/// while EIP-2537 puts c0 before c1.
+///
+/// Matches `BLS12381.G2_POINT_SIZE = 256` in poa-middleware contracts.
+pub fn bls_g2_signature_bytes(signature: &blst::min_pk::Signature) -> anyhow::Result<[u8; 256]> {
+    let uncompressed = signature.serialize(); // 192 bytes: x_c1|x_c0|y_c1|y_c0 (ZCash order)
+    let mut eip2537 = [0u8; 256];
+
+    // blst ZCash offsets for [x_c0, x_c1, y_c0, y_c1] (EIP-2537 order):
+    //   x_c0 is at blst[48..96], x_c1 is at blst[0..48]
+    //   y_c0 is at blst[144..192], y_c1 is at blst[96..144]
+    let blst_src_offsets = [48usize, 0, 144, 96];
+    for (i, &src_offset) in blst_src_offsets.iter().enumerate() {
+        let dst_offset = i * 64 + 16; // 16-byte zero prefix in EIP-2537 Fp element
+        eip2537[dst_offset..dst_offset + 48]
+            .copy_from_slice(&uncompressed[src_offset..src_offset + 48]);
+    }
+
+    Ok(eip2537)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use commonware_codec::Encode;
+
+    const TEST_MNEMONIC: &str = "test test test test test test test test test test test junk";
+
+    /// Helper to extract compressed pubkey bytes (48 bytes) for comparison.
+    fn pubkey_bytes(key: &bls12381::PrivateKey) -> Vec<u8> {
+        let pk = key.public_key();
+        // Use Deref<Target=[u8]> to get the raw bytes
+        let bytes: &[u8] = &pk;
+        bytes.to_vec()
+    }
+
+    #[test]
+    fn deterministic_key_derivation() {
+        let key1 = bls_private_key_from_mnemonic(TEST_MNEMONIC, 0).unwrap();
+        let key2 = bls_private_key_from_mnemonic(TEST_MNEMONIC, 0).unwrap();
+        // Same mnemonic + same index -> identical keys
+        assert_eq!(
+            pubkey_bytes(&key1),
+            pubkey_bytes(&key2),
+            "Same mnemonic + index must produce identical keys"
+        );
+    }
+
+    #[test]
+    fn different_hd_index_produces_different_key() {
+        let key0 = bls_private_key_from_mnemonic(TEST_MNEMONIC, 0).unwrap();
+        let key1 = bls_private_key_from_mnemonic(TEST_MNEMONIC, 1).unwrap();
+        let key2 = bls_private_key_from_mnemonic(TEST_MNEMONIC, 2).unwrap();
+        // Different indices -> different keys
+        assert_ne!(
+            pubkey_bytes(&key0),
+            pubkey_bytes(&key1),
+            "Different HD indices must produce different keys"
+        );
+        assert_ne!(
+            pubkey_bytes(&key1),
+            pubkey_bytes(&key2),
+            "Different HD indices must produce different keys"
+        );
+    }
+
+    #[test]
+    fn rejects_raw_key() {
+        let result = bls_private_key_from_mnemonic(
+            "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
+            0,
+        );
+        assert!(result.is_err());
+        let err_msg = result.unwrap_err().to_string();
+        assert!(
+            err_msg.contains("mnemonic, not a raw key"),
+            "Error should mention mnemonic: {err_msg}"
+        );
+    }
+
+    #[test]
+    fn rejects_invalid_mnemonic() {
+        let result = bls_private_key_from_mnemonic("not a valid mnemonic phrase", 0);
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn g1_pubkey_is_128_bytes() {
+        let key = bls_private_key_from_mnemonic(TEST_MNEMONIC, 0).unwrap();
+        let pubkey = bls_g1_pubkey_bytes(&key).unwrap();
+        assert_eq!(pubkey.len(), 128, "EIP-2537 G1 point must be 128 bytes");
+    }
+
+    #[test]
+    fn g1_pubkey_deterministic() {
+        let key = bls_private_key_from_mnemonic(TEST_MNEMONIC, 0).unwrap();
+        let pubkey1 = bls_g1_pubkey_bytes(&key).unwrap();
+        let pubkey2 = bls_g1_pubkey_bytes(&key).unwrap();
+        assert_eq!(pubkey1, pubkey2, "G1 pubkey must be deterministic");
+    }
+
+    #[test]
+    fn g1_pubkey_eip2537_padding() {
+        let key = bls_private_key_from_mnemonic(TEST_MNEMONIC, 0).unwrap();
+        let pubkey = bls_g1_pubkey_bytes(&key).unwrap();
+
+        // EIP-2537 format: each Fp element is 64 bytes (16 zero padding + 48 data)
+        // x coordinate: bytes[0..16] must be zero padding
+        assert!(
+            pubkey[0..16].iter().all(|&b| b == 0),
+            "First 16 bytes must be zero padding for x coordinate"
+        );
+        // y coordinate: bytes[64..80] must be zero padding
+        assert!(
+            pubkey[64..80].iter().all(|&b| b == 0),
+            "Bytes 64..80 must be zero padding for y coordinate"
+        );
+        // Data portions must not be all zeros (point is not identity for a valid key)
+        assert!(
+            pubkey[16..64].iter().any(|&b| b != 0),
+            "x coordinate data must not be all zeros"
+        );
+        assert!(
+            pubkey[80..128].iter().any(|&b| b != 0),
+            "y coordinate data must not be all zeros"
+        );
+    }
+
+    #[test]
+    fn different_keys_different_pubkeys() {
+        let key0 = bls_private_key_from_mnemonic(TEST_MNEMONIC, 0).unwrap();
+        let key1 = bls_private_key_from_mnemonic(TEST_MNEMONIC, 1).unwrap();
+        let pubkey0 = bls_g1_pubkey_bytes(&key0).unwrap();
+        let pubkey1 = bls_g1_pubkey_bytes(&key1).unwrap();
+        assert_ne!(
+            pubkey0, pubkey1,
+            "Different keys must produce different pubkeys"
+        );
+    }
+
+    #[test]
+    fn bls_sign_digest_produces_256_bytes() {
+        let key = bls_private_key_from_mnemonic(TEST_MNEMONIC, 0).unwrap();
+        let digest = [0xab_u8; 32]; // arbitrary 32-byte digest
+        let sig = bls_sign_digest(&key, &digest).unwrap();
+        assert_eq!(sig.len(), 256, "G2 EIP-2537 signature must be 256 bytes");
+    }
+
+    #[test]
+    fn bls_g2_signature_eip2537_padding() {
+        let key = bls_private_key_from_mnemonic(TEST_MNEMONIC, 0).unwrap();
+        let digest = [0xab_u8; 32];
+        let sig = bls_sign_digest(&key, &digest).unwrap();
+        // Each Fp element: 16 zero padding + 48 data = 64 bytes, 4 elements = 256 bytes
+        // Zero padding regions:
+        assert!(
+            sig[0..16].iter().all(|&b| b == 0),
+            "x.c0 padding must be zeros"
+        );
+        assert!(
+            sig[64..80].iter().all(|&b| b == 0),
+            "x.c1 padding must be zeros"
+        );
+        assert!(
+            sig[128..144].iter().all(|&b| b == 0),
+            "y.c0 padding must be zeros"
+        );
+        assert!(
+            sig[192..208].iter().all(|&b| b == 0),
+            "y.c1 padding must be zeros"
+        );
+        // Data regions must not be all zeros:
+        assert!(
+            sig[16..64].iter().any(|&b| b != 0),
+            "x.c0 data must not be all zeros"
+        );
+        assert!(
+            sig[80..128].iter().any(|&b| b != 0),
+            "x.c1 data must not be all zeros"
+        );
+    }
+
+    /// Verify that bls_g2_signature_bytes correctly converts from ZCash/blst format
+    /// to EIP-2537 format by checking the G2 generator encoding.
+    ///
+    /// The G2 generator's x coordinate (from EIP-2537 spec) in Fp2 is:
+    ///   c0 (real)      = 024aa2b2f...bdb8
+    ///   c1 (imaginary) = 13e02b605...b7e
+    ///
+    /// blst serializes as: [x_c1(48)] [x_c0(48)] [y_c1(48)] [y_c0(48)]  (ZCash: c1 first)
+    /// EIP-2537 expects:   [x_c0(64)] [x_c1(64)] [y_c0(64)] [y_c1(64)]  (c0 first, 16-byte padded)
+    #[test]
+    fn bls_g2_generator_eip2537_coordinate_order() {
+        use commonware_codec::Encode;
+        // Secret key = 1 → public key = G1 generator, sign(H(msg)) = G2 hash point
+        // Actually sign with sk=1 so we can verify against G1 generator
+        // But we can't easily get sk=1 from blst via commonware. Instead, verify that
+        // `bls_g2_signature_bytes` output matches what we'd expect from the EIP-2537 G2 generator
+        // by signing with the G2MSM precompile (sk=1).
+        //
+        // A simpler approach: verify the G2 serialization coordinate order by checking
+        // that blst's raw serialize() has c1 before c0 (ZCash format).
+        let key = bls_private_key_from_mnemonic(TEST_MNEMONIC, 0).unwrap();
+        let raw_bytes = key.encode();
+        let sk =
+            blst::min_pk::SecretKey::from_bytes(&raw_bytes).expect("blst SecretKey from bytes");
+
+        // Use a simple digest for signing
+        let digest = [0x42u8; 32];
+        let sig = sk.sign(&digest, BLS_SIGNING_DST, &[]);
+        let raw = sig.serialize(); // 192 bytes: ZCash order x_c1|x_c0|y_c1|y_c0
+
+        let eip = bls_g2_signature_bytes(&sig).unwrap();
+
+        // EIP-2537[16..64] (x_c0 slot) must contain blst's x_c0 = raw[48..96]
+        assert_eq!(
+            &eip[16..64],
+            &raw[48..96],
+            "x.c0 slot must contain blst raw[48..96] (blst x_c0)"
+        );
+        // EIP-2537[80..128] (x_c1 slot) must contain blst's x_c1 = raw[0..48]
+        assert_eq!(
+            &eip[80..128],
+            &raw[0..48],
+            "x.c1 slot must contain blst raw[0..48] (blst x_c1)"
+        );
+        // EIP-2537[144..192] (y_c0 slot) must contain blst's y_c0 = raw[144..192]
+        assert_eq!(
+            &eip[144..192],
+            &raw[144..192],
+            "y.c0 slot must contain blst raw[144..192] (blst y_c0)"
+        );
+        // EIP-2537[208..256] (y_c1 slot) must contain blst's y_c1 = raw[96..144]
+        assert_eq!(
+            &eip[208..256],
+            &raw[96..144],
+            "y.c1 slot must contain blst raw[96..144] (blst y_c1)"
+        );
+    }
+
+    #[test]
+    fn private_key_roundtrip_through_blst() {
+        let key = bls_private_key_from_mnemonic(TEST_MNEMONIC, 0).unwrap();
+        let raw_bytes = key.encode();
+        let sk =
+            blst::min_pk::SecretKey::from_bytes(&raw_bytes).expect("blst SecretKey from bytes");
+        // Derive pubkey from blst SecretKey and compare with commonware pubkey
+        let blst_pk = sk.sk_to_pk();
+        let blst_pk_compressed = blst_pk.compress();
+        let commonware_pk: &[u8] = &key.public_key();
+        assert_eq!(
+            blst_pk_compressed.as_slice(),
+            commonware_pk,
+            "blst and commonware pubkeys must match"
+        );
+    }
+
+    #[test]
+    fn bls_sign_digest_deterministic() {
+        let key = bls_private_key_from_mnemonic(TEST_MNEMONIC, 0).unwrap();
+        let digest = [0xcd_u8; 32];
+        let sig1 = bls_sign_digest(&key, &digest).unwrap();
+        let sig2 = bls_sign_digest(&key, &digest).unwrap();
+        assert_eq!(
+            sig1, sig2,
+            "Same key + digest must produce identical signatures"
+        );
+    }
+
+    #[test]
+    fn bls_sign_digest_different_digests() {
+        let key = bls_private_key_from_mnemonic(TEST_MNEMONIC, 0).unwrap();
+        let digest_a = [0x01_u8; 32];
+        let digest_b = [0x02_u8; 32];
+        let sig_a = bls_sign_digest(&key, &digest_a).unwrap();
+        let sig_b = bls_sign_digest(&key, &digest_b).unwrap();
+        assert_ne!(
+            sig_a, sig_b,
+            "Different digests must produce different signatures"
+        );
+    }
+}
diff --git a/packages/utils/src/evm_client/contracts.rs b/packages/utils/src/evm_client/contracts.rs
index e47e7821e..a84bce51b 100644
--- a/packages/utils/src/evm_client/contracts.rs
+++ b/packages/utils/src/evm_client/contracts.rs
@@ -1,7 +1,9 @@
 use alloy_primitives::Address;
 use wavs_types::{
-    IWavsServiceHandler, IWavsServiceHandlerQueryT, IWavsServiceHandlerSigningT,
-    IWavsServiceManager, IWavsServiceManagerQueryT, IWavsServiceManagerSigningT,
+    BlsServiceHandlerInstance, BlsServiceHandlerRpc, BlsServiceManagerInstance,
+    BlsServiceManagerRpc, IWavsServiceHandler, IWavsServiceHandlerQueryT,
+    IWavsServiceHandlerSigningT, IWavsServiceManager, IWavsServiceManagerQueryT,
+    IWavsServiceManagerSigningT,
 };
 
 use super::{EvmQueryClient, EvmSigningClient};
@@ -14,6 +16,14 @@ impl EvmSigningClient {
     pub fn service_manager(&self, address: Address) -> IWavsServiceManagerSigningT {
         IWavsServiceManager::new(address, self.provider.clone())
     }
+
+    pub fn bls_service_handler(&self, address: Address) -> BlsServiceHandlerInstance {
+        BlsServiceHandlerRpc::new(address, self.provider.clone())
+    }
+
+    pub fn bls_service_manager(&self, address: Address) -> BlsServiceManagerInstance {
+        BlsServiceManagerRpc::new(address, self.provider.clone())
+    }
 }
 
 impl EvmQueryClient {
@@ -24,4 +34,12 @@ impl EvmQueryClient {
     pub fn service_manager(&self, address: Address) -> IWavsServiceManagerQueryT {
         IWavsServiceManager::new(address, self.provider.clone())
     }
+
+    pub fn bls_service_handler(&self, address: Address) -> BlsServiceHandlerInstance {
+        BlsServiceHandlerRpc::new(address, self.provider.clone())
+    }
+
+    pub fn bls_service_manager(&self, address: Address) -> BlsServiceManagerInstance {
+        BlsServiceManagerRpc::new(address, self.provider.clone())
+    }
 }
diff --git a/packages/utils/src/evm_client/signing.rs b/packages/utils/src/evm_client/signing.rs
index c7a513c55..1dbfc8468 100644
--- a/packages/utils/src/evm_client/signing.rs
+++ b/packages/utils/src/evm_client/signing.rs
@@ -5,7 +5,7 @@ use alloy_signer::k256::SecretKey;
 use alloy_signer_local::{coins_bip39::English, MnemonicBuilder, PrivateKeySigner};
 use std::time::Duration;
 use tokio::time::sleep;
-use wavs_types::{Credential, Envelope, SignatureData};
+use wavs_types::{BlsServiceHandlerRpc, Credential, Envelope, SignatureData};
 
 use crate::{error::EvmClientError, evm_client::AnyNonceManager};
 
@@ -48,6 +48,17 @@ impl EvmSigningClient {
         max_gas: Option<u64>,
         gas_price: Option<u128>,
     ) -> Result<TransactionReceipt, EvmClientError> {
+        // Extract secp256k1 inner type for the EVM contract call
+        let inner_sig_data = match signature_data {
+            SignatureData::Secp256k1(inner) => inner,
+            SignatureData::Bls12381(_) => {
+                // BLS uses a different contract interface -- call send_bls_envelope_signatures() instead
+                return Err(EvmClientError::SendTransaction(anyhow::anyhow!(
+                    "Use send_bls_envelope_signatures() for BLS submissions"
+                )));
+            }
+        };
+
         if self
             .provider
             .get_code_at(service_handler)
@@ -62,7 +73,7 @@ impl EvmSigningClient {
             None => {
                 let gas_estimate = self
                     .service_handler(service_handler)
-                    .handleSignedEnvelope(envelope.clone(), signature_data.clone())
+                    .handleSignedEnvelope(envelope.clone(), inner_sig_data.clone())
                     .estimate_gas()
                     .await
                     .map_err(|e| EvmClientError::TransactionWithoutReceipt(e.into()))?;
@@ -80,7 +91,7 @@ impl EvmSigningClient {
 
         let service_handler_instance = self.service_handler(service_handler);
         let mut tx_builder = service_handler_instance
-            .handleSignedEnvelope(envelope, signature_data)
+            .handleSignedEnvelope(envelope, inner_sig_data)
             .gas(gas);
 
         // Set gas price if provided
@@ -152,6 +163,123 @@ impl EvmSigningClient {
             false => Err(EvmClientError::TransactionWithReceipt(Box::new(receipt))),
         }
     }
+
+    pub async fn send_bls_envelope_signatures(
+        &self,
+        envelope: Envelope,
+        signature_data: wavs_types::BlsServiceHandler::SignatureData,
+        service_handler: Address,
+        max_gas: Option<u64>,
+        gas_price: Option<u128>,
+    ) -> Result<TransactionReceipt, EvmClientError> {
+        if self
+            .provider
+            .get_code_at(service_handler)
+            .await
+            .map_err(|e| EvmClientError::FailedGetCode(service_handler, e.into()))?
+            .is_empty()
+        {
+            return Err(EvmClientError::NotContract(service_handler));
+        }
+
+        // Convert secp256k1 Envelope to BLS Envelope (same fields, different Alloy-generated type)
+        let bls_envelope = BlsServiceHandlerRpc::Envelope {
+            eventId: envelope.eventId,
+            ordering: envelope.ordering,
+            payload: envelope.payload,
+        };
+
+        // Convert non-rpc SignatureData to rpc SignatureData (same fields, different Alloy macro output)
+        let rpc_signature_data = BlsServiceHandlerRpc::SignatureData {
+            signerPubkeys: signature_data.signerPubkeys,
+            aggregateSignature: signature_data.aggregateSignature,
+            referenceBlock: signature_data.referenceBlock,
+        };
+
+        let bls_handler = self.bls_service_handler(service_handler);
+
+        let gas = match max_gas {
+            None => {
+                let gas_estimate = bls_handler
+                    .handleSignedEnvelope(bls_envelope.clone(), rpc_signature_data.clone())
+                    .estimate_gas()
+                    .await
+                    .map_err(|e| EvmClientError::TransactionWithoutReceipt(e.into()))?;
+
+                ((gas_estimate as f32) * self.gas_estimate_multiplier()) as u64
+            }
+            Some(gas) => gas.min(30_000_000),
+        };
+
+        let mut tx_builder = bls_handler
+            .handleSignedEnvelope(bls_envelope, rpc_signature_data)
+            .gas(gas);
+
+        if let Some(price) = gas_price {
+            tx_builder = tx_builder.gas_price(price);
+        }
+
+        let mut retry_count = 0;
+
+        let receipt = loop {
+            let send_result = tx_builder.send().await;
+
+            match send_result {
+                Ok(pending_tx) => {
+                    break pending_tx
+                        .get_receipt()
+                        .await
+                        .map_err(|e| EvmClientError::TransactionWithoutReceipt(e.into()))?;
+                }
+                Err(e) => {
+                    if retry_count >= MAX_RETRIES {
+                        return Err(EvmClientError::SendTransaction(e.into()));
+                    }
+
+                    retry_count += 1;
+
+                    let error_msg = e.to_string().to_lowercase();
+                    let is_nonce_error = error_msg.contains("replacement transaction underpriced")
+                        || error_msg.contains("nonce");
+
+                    if is_nonce_error {
+                        tracing::warn!(
+                            "Nonce error detected (attempt {}/{}), refreshing nonce and retrying: {}",
+                            retry_count, MAX_RETRIES, e
+                        );
+
+                        if let AnyNonceManager::Fast(fast_nonce_manager) = &self.nonce_manager {
+                            if fast_nonce_manager
+                                .set_current_nonce(&self.provider)
+                                .await
+                                .is_ok()
+                            {
+                                let delay_ms = BASE_RETRY_DELAY_MS * (1 << (retry_count - 1));
+                                sleep(Duration::from_millis(delay_ms)).await;
+                                continue;
+                            }
+                        }
+                    } else {
+                        tracing::warn!(
+                            "Transaction failed (attempt {}/{}), retrying: {}",
+                            retry_count,
+                            MAX_RETRIES,
+                            e
+                        );
+
+                        let delay_ms = BASE_RETRY_DELAY_MS * (1 << (retry_count - 1));
+                        sleep(Duration::from_millis(delay_ms)).await;
+                        continue;
+                    }
+                }
+            }
+        };
+
+        match receipt.status() {
+            true => Ok(receipt),
+            false => Err(EvmClientError::TransactionWithReceipt(Box::new(receipt))),
+        }
+    }
 }
 
 #[cfg(test)]
@@ -160,7 +288,7 @@ mod test {
     use alloy_provider::Provider;
     use alloy_rpc_types_eth::TransactionTrait;
     use alloy_signer_local::{coins_bip39::English, MnemonicBuilder, PrivateKeySigner};
-    use wavs_types::{Credential, Envelope, SignatureKind, WavsSigner};
+    use wavs_types::{Credential, Envelope, SignatureKind, WavsCryptoSigner, WavsSigner};
 
     use crate::{
         evm_client::{AnyNonceManager, EvmSigningClient, EvmSigningClientConfig},
@@ -196,10 +324,11 @@ mod test {
     #[tokio::test]
     async fn signature_validation() {
         let signer = mock_signer();
+        let crypto_signer = WavsCryptoSigner::Secp256k1(signer.clone());
         let envelope = mock_envelope();
 
         let signature = envelope
-            .sign(&signer, SignatureKind::evm_default())
+            .sign(&crypto_signer, SignatureKind::evm_default())
             .await
             .unwrap();
 
@@ -211,7 +340,7 @@ mod test {
         // also see that we can recover with no prefix
         let signature = envelope
             .sign(
-                &signer,
+                &crypto_signer,
                 SignatureKind {
                     algorithm: wavs_types::SignatureAlgorithm::Secp256k1,
                     prefix: None,
@@ -227,11 +356,14 @@ mod test {
 
         // and that it fails if we try the wrong prefix
         let mut signature = envelope
-            .sign(&signer, SignatureKind::evm_default())
+            .sign(&crypto_signer, SignatureKind::evm_default())
             .await
             .unwrap();
 
-        signature.kind.prefix = None;
+        match &mut signature {
+            wavs_types::WavsSignature::Secp256k1 { kind, .. } => kind.prefix = None,
+            _ => unreachable!("expected secp256k1 signature"),
+        }
 
         assert_ne!(
             signature.evm_signer_address(&envelope).unwrap(),
@@ -241,7 +373,7 @@ mod test {
         // in both directions
         let mut signature = envelope
             .sign(
-                &signer,
+                &crypto_signer,
                 SignatureKind {
                     algorithm: wavs_types::SignatureAlgorithm::Secp256k1,
                     prefix: None,
@@ -250,7 +382,12 @@ mod test {
             .await
             .unwrap();
 
-        signature.kind.prefix = Some(wavs_types::SignaturePrefix::Eip191);
+        match &mut signature {
+            wavs_types::WavsSignature::Secp256k1 { kind, .. } => {
+                kind.prefix = Some(wavs_types::SignaturePrefix::Eip191)
+            }
+            _ => unreachable!("expected secp256k1 signature"),
+        }
 
         assert_ne!(
             signature.evm_signer_address(&envelope).unwrap(),
@@ -361,8 +498,9 @@ mod test {
 
         // Build a signed envelope referencing the primary signer.
         let envelope = mock_envelope();
+        let crypto_signer = WavsCryptoSigner::Secp256k1(primary_client.signer.as_ref().clone());
         let signature = envelope
-            .sign(primary_client.signer.as_ref(), SignatureKind::evm_default())
+            .sign(&crypto_signer, SignatureKind::evm_default())
             .await
             .expect("signing envelope should succeed");
         let current_block = primary_client
diff --git a/packages/utils/src/lib.rs b/packages/utils/src/lib.rs
index 789e68299..0404b80f8 100644
--- a/packages/utils/src/lib.rs
+++ b/packages/utils/src/lib.rs
@@ -2,6 +2,7 @@
 
 pub mod alloy_helpers;
 pub mod async_transaction;
+pub mod bls_signing;
 pub mod config;
 pub mod context;
 pub mod error;
diff --git a/packages/utils/src/test_utils/middleware/evm/common.rs b/packages/utils/src/test_utils/middleware/evm/common.rs
index c982096de..abae77148 100644
--- a/packages/utils/src/test_utils/middleware/evm/common.rs
+++ b/packages/utils/src/test_utils/middleware/evm/common.rs
@@ -8,6 +8,7 @@ use crate::test_utils::middleware::operator::AvsOperator;
 
 pub use super::middleware_eigen::EigenlayerMiddleware;
 pub use super::middleware_poa::PoaMiddleware;
+pub use super::middleware_poa_bls::PoaBlsMiddleware;
 
 pub const EVM_EIGENLAYER_MIDDLEWARE_IMAGE: &str = "ghcr.io/lay3rlabs/wavs-middleware:0.5.0-beta.10";
 pub const EVM_POA_MIDDLEWARE_IMAGE: &str = "ghcr.io/lay3rlabs/poa-middleware:1.0.1";
@@ -21,6 +22,7 @@ pub enum EvmMiddlewareType {
     #[default]
     Eigenlayer,
     Poa,
+    PoaBls,
 }
 
 pub fn middleware_config_filename(id: &str) -> String {
@@ -35,6 +37,7 @@ pub fn middleware_deploy_filename(id: &str) -> String {
 pub enum EvmMiddleware {
     Eigenlayer(Arc<EigenlayerMiddleware>),
     Poa(Arc<PoaMiddleware>),
+    PoaBls(Arc<PoaBlsMiddleware>),
 }
 impl EvmMiddleware {
     pub fn new(middleware_type: EvmMiddlewareType) -> Result<Self> {
@@ -43,6 +46,7 @@ impl EvmMiddleware {
                 Ok(Self::Eigenlayer(Arc::new(EigenlayerMiddleware::new()?)))
             }
             EvmMiddlewareType::Poa => Ok(Self::Poa(Arc::new(PoaMiddleware::new()))),
+            EvmMiddlewareType::PoaBls => Ok(Self::PoaBls(Arc::new(PoaBlsMiddleware::new()))),
         }
     }
     pub async fn deploy_service_manager(
@@ -65,6 +69,12 @@ impl EvmMiddleware {
                 })?;
                 m.deploy_service_manager(rpc_url, deployer_key_hex).await
             }
+            Self::PoaBls(m) => {
+                let deployer_key_hex = deployer_key_hex.ok_or_else(|| {
+                    anyhow::anyhow!("Deployer key hex is required for BLS POA middleware")
+                })?;
+                m.deploy_service_manager(rpc_url, deployer_key_hex).await
+            }
         }
     }
 
@@ -76,6 +86,7 @@ impl EvmMiddleware {
         match self {
             Self::Eigenlayer(m) => m.configure_service_manager(service_manager, config).await,
             Self::Poa(m) => m.configure_service_manager(service_manager, config).await,
+            Self::PoaBls(m) => m.configure_service_manager(service_manager, config).await,
         }
     }
 
@@ -93,6 +104,10 @@ impl EvmMiddleware {
                 m.set_service_manager_uri(service_manager, service_uri)
                     .await
             }
+            Self::PoaBls(m) => {
+                m.set_service_manager_uri(service_manager, service_uri)
+                    .await
+            }
         }
     }
 }
diff --git a/packages/utils/src/test_utils/middleware/evm/middleware_poa_bls.rs b/packages/utils/src/test_utils/middleware/evm/middleware_poa_bls.rs
new file mode 100644
index 000000000..ed4f6603a
--- /dev/null
+++ b/packages/utils/src/test_utils/middleware/evm/middleware_poa_bls.rs
@@ -0,0 +1,354 @@
+use std::process::Stdio;
+use std::time::Duration;
+
+use alloy_primitives::Address;
+use anyhow::{bail, Result};
+use serde::Deserialize;
+use tokio::process::Command;
+
+use super::{EvmMiddlewareServiceManager, MiddlewareServiceManagerConfig};
+
+/// PoaBlsMiddleware deploys and configures BLS poa-middleware contracts using
+/// local `forge` and `cast` commands directly from the `contracts/poa-middleware/`
+/// submodule. Unlike `PoaMiddleware` which uses a Docker image, this middleware
+/// avoids Docker entirely and calls forge/cast from the host.
+#[derive(Default)]
+pub struct PoaBlsMiddleware {}
+
+impl PoaBlsMiddleware {
+    pub const DEFAULT_TIMEOUT: Duration = Duration::from_secs(120);
+
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Resolve the path to the `contracts/poa-middleware/` submodule.
+    ///
+    /// `workspace_path()` returns the WAVS crate root (e.g. `/path/to/WAVS`).
+    /// The monorepo is one level up, so `contracts/poa-middleware/` is at
+    /// `workspace_path().parent()/contracts/poa-middleware/`.
+    fn resolve_poa_middleware_path() -> Result<std::path::PathBuf> {
+        let workspace = crate::filesystem::workspace_path();
+        let monorepo_root = workspace.parent().ok_or_else(|| {
+            anyhow::anyhow!(
+                "Cannot find monorepo root from workspace path: {}",
+                workspace.display()
+            )
+        })?;
+        let poa_path = monorepo_root.join("contracts").join("poa-middleware");
+        if !poa_path.exists() {
+            bail!(
+                "poa-middleware submodule not found at {}. \
+                 Ensure contracts/poa-middleware/ submodule is checked out.",
+                poa_path.display()
+            );
+        }
+        Ok(poa_path)
+    }
+
+    pub async fn deploy_service_manager(
+        &self,
+        rpc_url: String,
+        deployer_key_hex: String,
+    ) -> Result<EvmMiddlewareServiceManager> {
+        let poa_middleware_dir = Self::resolve_poa_middleware_path()?;
+
+        tracing::info!(
+            "Building BLS contracts from poa-middleware submodule at {}",
+            poa_middleware_dir.display()
+        );
+
+        // Build BLS contracts (FOUNDRY_PROFILE=bls forge build)
+        let build_status = tokio::time::timeout(
+            Self::DEFAULT_TIMEOUT,
+            Command::new("forge")
+                .arg("build")
+                .env("FOUNDRY_PROFILE", "bls")
+                .current_dir(&poa_middleware_dir)
+                .stdout(Stdio::inherit())
+                .stderr(Stdio::inherit())
+                .spawn()?
+                .wait(),
+        )
+        .await??;
+
+        if !build_status.success() {
+            bail!("Failed to build BLS contracts from poa-middleware submodule");
+        }
+
+        tracing::info!("Deploying BLS POA middleware contracts via forge script");
+
+        // Deploy BLS contracts via forge script
+        // FOUNDRY_PROFILE=bls forge script contracts/script/bls/POAMiddlewareDeployer.s.sol \
+        //   --rpc-url $RPC_URL --private-key $KEY -vvv --broadcast --skip-simulation
+        let deploy_output = tokio::time::timeout(
+            Self::DEFAULT_TIMEOUT,
+            Command::new("forge")
+                .args([
+                    "script",
+                    "contracts/script/bls/POAMiddlewareDeployer.s.sol",
+                    "--rpc-url",
+                    &rpc_url,
+                    "--private-key",
+                    &deployer_key_hex,
+                    "-vvv",
+                    "--broadcast",
+                    "--skip-simulation",
+                ])
+                .env("FOUNDRY_PROFILE", "bls")
+                .current_dir(&poa_middleware_dir)
+                .stdout(Stdio::inherit())
+                .stderr(Stdio::inherit())
+                .spawn()?
+                .wait(),
+        )
+        .await??;
+
+        if !deploy_output.success() {
+            bail!("Failed to deploy BLS POA middleware contracts via forge script");
+        }
+
+        // Parse deployment JSON from poa-middleware/deployments/poa-bls/poa_deploy.json
+        let deploy_json_path = poa_middleware_dir.join("deployments/poa-bls/poa_deploy.json");
+        let deploy_json = tokio::fs::read_to_string(&deploy_json_path)
+            .await
+            .map_err(|e| {
+                anyhow::anyhow!(
+                    "Failed to read BLS deployment JSON at {}: {}. \
+                 Ensure forge script completed successfully.",
+                    deploy_json_path.display(),
+                    e
+                )
+            })?;
+
+        #[derive(Deserialize)]
+        struct PoaDeploymentJson {
+            addresses: PoaAddresses,
+        }
+
+        #[derive(Deserialize)]
+        struct PoaAddresses {
+            #[serde(rename = "POAStakeRegistry")]
+            poa_stake_registry: Address,
+            #[serde(rename = "proxyAdmin")]
+            proxy_admin: Address,
+        }
+
+        let deployment: PoaDeploymentJson = serde_json::from_str(&deploy_json)
+            .map_err(|e| anyhow::anyhow!("Failed to parse BLS deployment JSON: {}", e))?;
+
+        let poa_address = deployment.addresses.poa_stake_registry;
+
+        tracing::info!(
+            "BLS POA middleware deployed: stake_registry={}",
+            poa_address
+        );
+
+        Ok(EvmMiddlewareServiceManager {
+            deployer_key_hex,
+            rpc_url,
+            id: format!("bls-poa-{}", poa_address),
+            container_id: None, // No Docker container -- local forge deployment
+            address: poa_address,
+            proxy_admin: deployment.addresses.proxy_admin,
+            impl_address: poa_address,
+            stake_registry_address: poa_address,
+            stake_registry_impl_address: poa_address,
+        })
+    }
+
+    pub async fn configure_service_manager(
+        &self,
+        service_manager: &EvmMiddlewareServiceManager,
+        config: &MiddlewareServiceManagerConfig,
+    ) -> Result<()> {
+        for i in 0..config.operators.len() {
+            let operator = &config.operators[i];
+            let weight = &config.weights[i];
+            let avs_operator = &config.avs_operators[i];
+
+            // Step 1: Register operator via cast send
+            tracing::info!(
+                "Registering BLS operator {} with weight {}",
+                operator,
+                weight
+            );
+            let status = tokio::time::timeout(
+                Self::DEFAULT_TIMEOUT,
+                Command::new("cast")
+                    .args([
+                        "send",
+                        &format!("{}", service_manager.address),
+                        "registerOperator(address,uint256)",
+                        &format!("{:?}", operator),
+                        &weight.to_string(),
+                        "--private-key",
+                        &service_manager.deployer_key_hex,
+                        "--rpc-url",
+                        &service_manager.rpc_url,
+                    ])
+                    .stdout(Stdio::inherit())
+                    .stderr(Stdio::inherit())
+                    .spawn()?
+                    .wait(),
+            )
+            .await??;
+
+            if !status.success() {
+                bail!("Failed to register BLS operator {}", operator);
+            }
+
+            // Step 2: Update BLS signing key (operator signs with their own key)
+            let operator_key = avs_operator.operator_private_key.as_ref().ok_or_else(|| {
+                anyhow::anyhow!("Operator private key required for BLS middleware")
+            })?;
+
+            let bls_pubkey = avs_operator
+                .bls_pubkey
+                .as_ref()
+                .ok_or_else(|| anyhow::anyhow!("BLS pubkey required for BLS middleware"))?;
+
+            let bls_proof = avs_operator
+                .bls_proof
+                .as_ref()
+                .ok_or_else(|| anyhow::anyhow!("BLS proof required for BLS middleware"))?;
+
+            let bls_pubkey_hex = format!("0x{}", const_hex::encode(bls_pubkey));
+            let bls_proof_hex = format!("0x{}", const_hex::encode(bls_proof));
+
+            // Fund the operator address via anvil_setBalance so it can pay for gas.
+            // The operator key is derived from the test mnemonic and may start with 0 ETH.
+            let operator_addr_hex = format!("{:?}", operator);
+            let fund_status = tokio::time::timeout(
+                Self::DEFAULT_TIMEOUT,
+                Command::new("cast")
+                    .args([
+                        "rpc",
+                        "anvil_setBalance",
+                        &operator_addr_hex,
+                        "0x10000000000000000000000",
+                        "--rpc-url",
+                        &service_manager.rpc_url,
+                    ])
+                    .stdout(Stdio::null())
+                    .stderr(Stdio::null())
+                    .spawn()?
+                    .wait(),
+            )
+            .await??;
+            if !fund_status.success() {
+                bail!(
+                    "Failed to fund operator address {} for BLS key update",
+                    operator
+                );
+            }
+
+            tracing::info!(
+                "Updating BLS signing key for operator {} (pubkey {} bytes, proof {} bytes)",
+                operator,
+                bls_pubkey.len(),
+                bls_proof.len()
+            );
+
+            let status = tokio::time::timeout(
+                Self::DEFAULT_TIMEOUT,
+                Command::new("cast")
+                    .args([
+                        "send",
+                        &format!("{}", service_manager.address),
+                        "updateOperatorSigningKey(bytes,bytes)",
+                        &bls_pubkey_hex,
+                        &bls_proof_hex,
+                        "--private-key",
+                        operator_key,
+                        "--rpc-url",
+                        &service_manager.rpc_url,
+                    ])
+                    .stdout(Stdio::inherit())
+                    .stderr(Stdio::inherit())
+                    .spawn()?
+                    .wait(),
+            )
+            .await??;
+
+            if !status.success() {
+                bail!("Failed to update BLS signing key for operator {}", operator);
+            }
+        }
+
+        // Step 3: Update quorum
+        tracing::info!(
+            "Updating BLS quorum: {}/{}",
+            config.quorum_numerator,
+            config.quorum_denominator
+        );
+
+        let status = tokio::time::timeout(
+            Self::DEFAULT_TIMEOUT,
+            Command::new("cast")
+                .args([
+                    "send",
+                    &format!("{}", service_manager.address),
+                    "updateQuorum(uint256,uint256)",
+                    &config.quorum_numerator.to_string(),
+                    &config.quorum_denominator.to_string(),
+                    "--private-key",
+                    &service_manager.deployer_key_hex,
+                    "--rpc-url",
+                    &service_manager.rpc_url,
+                ])
+                .stdout(Stdio::inherit())
+                .stderr(Stdio::inherit())
+                .spawn()?
+                .wait(),
+        )
+        .await??;
+
+        if !status.success() {
+            bail!("Failed to update BLS quorum");
+        }
+
+        Ok(())
+    }
+
+    pub async fn set_service_manager_uri(
+        &self,
+        service_manager: &EvmMiddlewareServiceManager,
+        service_uri: &str,
+    ) -> Result<()> {
+        tracing::debug!(
+            "Setting service URI for BLS POA: address={}, uri='{}'",
+            service_manager.address,
+            service_uri
+        );
+
+        let status = tokio::time::timeout(
+            Self::DEFAULT_TIMEOUT,
+            Command::new("cast")
+                .args([
+                    "send",
+                    &format!("{}", service_manager.address),
+                    "setServiceURI(string)",
+                    service_uri,
+                    "--private-key",
+                    &service_manager.deployer_key_hex,
+                    "--rpc-url",
+                    &service_manager.rpc_url,
+                ])
+                .stdout(Stdio::inherit())
+                .stderr(Stdio::inherit())
+                .spawn()?
+                .wait(),
+        )
+        .await??;
+
+        if !status.success() {
+            bail!(
+                "Failed to set BLS service URI for {}",
+                service_manager.address
+            );
+        }
+
+        Ok(())
+    }
+}
diff --git a/packages/utils/src/test_utils/middleware/evm/mod.rs b/packages/utils/src/test_utils/middleware/evm/mod.rs
index a3552d778..8775418c3 100644
--- a/packages/utils/src/test_utils/middleware/evm/mod.rs
+++ b/packages/utils/src/test_utils/middleware/evm/mod.rs
@@ -1,5 +1,6 @@
 mod common;
 mod middleware_eigen;
 mod middleware_poa;
+mod middleware_poa_bls;
 
 pub use common::*;
diff --git a/packages/utils/src/test_utils/middleware/operator.rs b/packages/utils/src/test_utils/middleware/operator.rs
index d35862017..2c9da7d57 100644
--- a/packages/utils/src/test_utils/middleware/operator.rs
+++ b/packages/utils/src/test_utils/middleware/operator.rs
@@ -7,6 +7,10 @@ pub struct AvsOperator {
     pub weight: u64,
     pub operator_private_key: Option<String>,
     pub signer_private_key: Option<String>,
+    /// 128-byte G1 public key (EIP-2537 uncompressed format) for BLS operators
+    pub bls_pubkey: Option<Vec<u8>>,
+    /// 256-byte G2 proof-of-possession for BLS operators
+    pub bls_proof: Option<Vec<u8>>,
 }
 
 impl AvsOperator {
@@ -19,6 +23,8 @@ impl AvsOperator {
             weight: Self::DEFAULT_WEIGHT,
             operator_private_key: None,
             signer_private_key: None,
+            bls_pubkey: None,
+            bls_proof: None,
         }
     }
 
@@ -34,6 +40,27 @@ impl AvsOperator {
             weight: Self::DEFAULT_WEIGHT,
             operator_private_key: Some(operator_private_key),
             signer_private_key: Some(signer_private_key),
+            bls_pubkey: None,
+            bls_proof: None,
+        }
+    }
+
+    /// Create an operator with BLS key material for BLS middleware registration.
+    /// BLS operators use G1 pubkey + G2 proof instead of an EVM signer address.
+    pub fn with_bls_keys(
+        operator: Address,
+        operator_private_key: String,
+        bls_pubkey: Vec<u8>,
+        bls_proof: Vec<u8>,
+    ) -> Self {
+        Self {
+            operator,
+            signer: Address::ZERO, // BLS doesn't use EVM signer address
+            weight: Self::DEFAULT_WEIGHT,
+            operator_private_key: Some(operator_private_key),
+            signer_private_key: None,
+            bls_pubkey: Some(bls_pubkey),
+            bls_proof: Some(bls_proof),
         }
     }
 }
diff --git a/packages/utils/src/test_utils/mock_service_manager.rs b/packages/utils/src/test_utils/mock_service_manager.rs
index c759814e7..de78abcf3 100644
--- a/packages/utils/src/test_utils/mock_service_manager.rs
+++ b/packages/utils/src/test_utils/mock_service_manager.rs
@@ -130,26 +130,31 @@ impl MockEvmServiceManager {
             let mut all_valid = true;
 
             for avs_operator in &config.avs_operators {
-                // Check if the signer-to-operator mapping is correctly registered
-                let registered_operator = self
-                    .get_latest_operator_for_signing_key(avs_operator.signer)
-                    .await?;
-                if registered_operator != avs_operator.operator {
-                    if attempt < MAX_RETRIES - 1 {
-                        tracing::debug!(
-                            "Attempt {}: Expected operator {} for signer {}, got {}. Retrying...",
-                            attempt + 1,
-                            avs_operator.operator,
-                            avs_operator.signer,
-                            registered_operator
-                        );
-                        all_valid = false;
-                        break;
-                    } else {
-                        return Err(anyhow::anyhow!(
-                            "Operator registration failed: Expected operator {} for signer {}, got {}",
-                            avs_operator.operator, avs_operator.signer, registered_operator
-                        ));
+                // For ECDSA operators, verify the signer-to-operator mapping.
+                // BLS operators use a G1 pubkey hash as key (bytes32), not an EVM address —
+                // the getLatestOperatorForSigningKey(address) selector doesn't exist on the
+                // BLS contract, so skip this check when signer is zero (BLS path).
+                if avs_operator.signer != Address::ZERO {
+                    let registered_operator = self
+                        .get_latest_operator_for_signing_key(avs_operator.signer)
+                        .await?;
+                    if registered_operator != avs_operator.operator {
+                        if attempt < MAX_RETRIES - 1 {
+                            tracing::debug!(
+                                "Attempt {}: Expected operator {} for signer {}, got {}. Retrying...",
+                                attempt + 1,
+                                avs_operator.operator,
+                                avs_operator.signer,
+                                registered_operator
+                            );
+                            all_valid = false;
+                            break;
+                        } else {
+                            return Err(anyhow::anyhow!(
+                                "Operator registration failed: Expected operator {} for signer {}, got {}",
+                                avs_operator.operator, avs_operator.signer, registered_operator
+                            ));
+                        }
                     }
                 }
 
diff --git a/packages/version-pins/Cargo.toml b/packages/version-pins/Cargo.toml
index 8536d885f..142867332 100644
--- a/packages/version-pins/Cargo.toml
+++ b/packages/version-pins/Cargo.toml
@@ -10,7 +10,7 @@ rust-version.workspace = true
 [dependencies]
 # This package exists solely to pin transitive dependency versions
 # for Rust 1.86 compatibility in our Docker build environment.
-alloy-provider = { workspace = true }
+alloy-provider = { workspace = true, features = ["reqwest", "reqwest-default-tls", "ws", "pubsub"] }
 alloy-network = { workspace = true }
 alloy-rpc-types-eth = { workspace = true }
 alloy-consensus = { workspace = true }
diff --git a/packages/wasi-utils/Cargo.toml b/packages/wasi-utils/Cargo.toml
index 483b914ce..f65ce8e5d 100644
--- a/packages/wasi-utils/Cargo.toml
+++ b/packages/wasi-utils/Cargo.toml
@@ -18,14 +18,16 @@ wstd = { workspace = true }
 alloy-primitives = { workspace = true }
 alloy-sol-types = { workspace = true }
 alloy-json-rpc = { workspace = true }
-alloy-provider = { workspace = true }
-alloy-transport-http = { workspace = true }
+alloy-provider = { workspace = true, default-features = false }
 alloy-transport = { workspace = true }
-alloy-rpc-client = { workspace = true }
+alloy-rpc-client = { workspace = true, default-features = false }
 cfg-if = { workspace = true }
 tower-service = { workspace = true }
 futures-utils-wasm = { workspace = true }
 http = { workspace = true }
 
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+alloy-transport-http = { workspace = true }
+
 [lib]
 crate-type = ["rlib", "cdylib"]
diff --git a/packages/wasi-utils/src/evm/provider.rs b/packages/wasi-utils/src/evm/provider.rs
index 56e78b998..dce17ad73 100644
--- a/packages/wasi-utils/src/evm/provider.rs
+++ b/packages/wasi-utils/src/evm/provider.rs
@@ -19,6 +19,7 @@ use alloy_transport::{
     utils::guess_local_url, BoxTransport, Pbf, TransportConnect, TransportError,
     TransportErrorKind, TransportFut,
 };
+#[cfg(not(target_arch = "wasm32"))]
 use alloy_transport_http::{Http, HttpConnect};
 use futures_utils_wasm::impl_future;
 use tower_service::Service;
diff --git a/packages/wavs-mcp/Cargo.toml b/packages/wavs-mcp/Cargo.toml
index 6a07cf1d6..fe4e1d348 100644
--- a/packages/wavs-mcp/Cargo.toml
+++ b/packages/wavs-mcp/Cargo.toml
@@ -15,7 +15,7 @@ tokio = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 clap = { workspace = true }
-wavs-types = { workspace = true }
+wavs-types = { workspace = true, features = ["full"] }
 anyhow = { workspace = true }
 const-hex = { workspace = true }
 tracing = { workspace = true }
diff --git a/packages/wavs-mcp/src/server.rs b/packages/wavs-mcp/src/server.rs
index 0bbdb0668..dce6551ab 100644
--- a/packages/wavs-mcp/src/server.rs
+++ b/packages/wavs-mcp/src/server.rs
@@ -343,6 +343,12 @@ impl WavsMcpServer {
                     }) => {
                         format!("\nSigning key: HD index {hd_index} ({evm_address})\nCall wavs_register_operator next if using PoA.")
                     }
+                    Ok(wavs_types::SignerResponse::Bls12381 {
+                        hd_index,
+                        g1_pubkey_hex,
+                    }) => {
+                        format!("\nSigning key: HD index {hd_index} (BLS G1: {g1_pubkey_hex})\nCall wavs_register_operator next if using PoA.")
+                    }
                     Err(_) => String::new(),
                 };
                 ok(format!("Service registered successfully.{signer_info}"))
@@ -457,6 +463,12 @@ impl WavsMcpServer {
                         }) => {
                             format!("\nSigning key: HD index {hd_index} ({evm_address})")
                         }
+                        Ok(wavs_types::SignerResponse::Bls12381 {
+                            hd_index,
+                            g1_pubkey_hex,
+                        }) => {
+                            format!("\nSigning key: HD index {hd_index} (BLS G1: {g1_pubkey_hex})")
+                        }
                         Err(_) => String::new(),
                     }
                 } else {
@@ -626,6 +638,15 @@ impl WavsMcpServer {
                 tracing::info!("Service signing key: HD index {hd_index} → {evm_address}");
                 hd_index
             }
+            Ok(wavs_types::SignerResponse::Bls12381 {
+                hd_index,
+                g1_pubkey_hex,
+            }) => {
+                tracing::info!(
+                    "Service signing key: HD index {hd_index} → BLS G1: {g1_pubkey_hex}"
+                );
+                hd_index
+            }
             Err(e) => {
                 return err(format!(
                     "Failed to query service signing key from WAVS node: {e:#}\n\n\
@@ -673,6 +694,12 @@ impl WavsMcpServer {
             }) => ok(format!(
                 "Service signing key:\n  HD index:    {hd_index}\n  EVM address: {evm_address}"
             )),
+            Ok(wavs_types::SignerResponse::Bls12381 {
+                hd_index,
+                g1_pubkey_hex,
+            }) => ok(format!(
+                "Service signing key (BLS):\n  HD index:     {hd_index}\n  G1 pubkey:    {g1_pubkey_hex}"
+            )),
             Err(e) => err(format!("Failed to get service signer: {e:#}")),
         }
     }
@@ -700,6 +727,7 @@ impl WavsMcpServer {
         // Step 2: query the node for the service-specific signing key.
         let hd_index = match self.client.get_service_signer(manager.clone()).await {
             Ok(wavs_types::SignerResponse::Secp256k1 { hd_index, .. }) => hd_index,
+            Ok(wavs_types::SignerResponse::Bls12381 { hd_index, .. }) => hd_index,
             Err(e) => {
                 return err(format!(
                     "Service deployed but could not query signing key: {e:#}\n\
diff --git a/packages/wavs/Cargo.toml b/packages/wavs/Cargo.toml
index 58e1c8167..c77aa4bdc 100644
--- a/packages/wavs/Cargo.toml
+++ b/packages/wavs/Cargo.toml
@@ -10,6 +10,8 @@ license.workspace = true
 publish = false
 
 [features]
+default = ["bls"]
+bls = []
 test-utils = []
 dev = []
 gui = ["dep:tauri", "wavs-gui-shared/backend"]
@@ -47,7 +49,7 @@ alloy-contract = { workspace = true }
 alloy-primitives = { workspace = true }
 alloy-rpc-types-eth = { workspace = true }
 alloy-signer-local = { workspace = true }
-alloy-provider = { workspace = true }
+alloy-provider = { workspace = true, features = ["reqwest", "reqwest-default-tls", "ws", "pubsub"] }
 alloy-sol-types = { workspace = true }
 wasm-pkg-common = { workspace = true }
 chrono = { workspace = true }
@@ -66,7 +68,16 @@ slotmap = { workspace = true }
 async-stream = { workspace = true }
 async-trait = { workspace = true }
 rand = { workspace = true }
-libp2p = { workspace = true }
+bip39 = { workspace = true }
+rand_chacha = "0.3"
+commonware-p2p = "2026.3.0"
+commonware-cryptography = { workspace = true }
+commonware-math = "2026.3.0"
+commonware-runtime = "2026.3.0"
+commonware-utils = "2026.3.0"
+commonware-codec = "2026.3.0"
+commonware-broadcast = "2026.3.0"
+rand_core = "0.6"
 hypercore = { workspace = true }
 hypercore-protocol = { workspace = true }
 hyperswarm = { workspace = true }
@@ -75,11 +86,13 @@ base64 = { workspace = true }
 tauri = {workspace = true, optional = true}
 
 [dev-dependencies]
+toml = { workspace = true }
 criterion = { workspace = true }
 wavs-benchmark-common = { workspace = true }
 utils = { workspace = true, features = ["test-utils"] }
 example-types = { workspace = true }
 alloy-node-bindings = { workspace = true }
+commonware-cryptography = { workspace = true }
 
 
 [[bench]]
diff --git a/packages/wavs/src/dispatcher.rs b/packages/wavs/src/dispatcher.rs
index bdceec886..8dbd5640d 100644
--- a/packages/wavs/src/dispatcher.rs
+++ b/packages/wavs/src/dispatcher.rs
@@ -41,7 +41,7 @@ use wavs_types::contracts::cosmwasm::service_manager::ServiceManagerQueryMessage
 use wavs_types::IWavsServiceManager::IWavsServiceManagerInstance;
 use wavs_types::{
     AnyChainConfig, ChainConfigError, ChainConfigs, ChainKey, ComponentDigest, ServiceManager,
-    Submission, Submit, TriggerData, WorkflowIdError,
+    SignatureAlgorithm, Submission, Submit, TriggerData, WorkflowIdError,
 };
 use wavs_types::{Service, ServiceError, ServiceId, SignerResponse, TriggerAction, WorkflowId};
 
@@ -132,6 +132,13 @@ pub enum DispatcherCommand {
         service_id: ServiceId,
         workflow_id: WorkflowId,
         trigger_data: TriggerData,
+        tx_hash: Option<String>,
+    },
+    SubmissionError {
+        service_id: ServiceId,
+        workflow_id: WorkflowId,
+        trigger_data: TriggerData,
+        error_message: String,
     },
 }
 
@@ -456,12 +463,14 @@ impl<S: CAStorage + 'static> Dispatcher<S> {
                             service_id,
                             workflow_id,
                             trigger_data,
+                            tx_hash,
                         } => {
                             if let Err(err) = _self.tauri_handle.emit_ext(
                                 wavs_gui_shared::event::SubmissionEvent {
                                     service_id,
                                     workflow_id,
                                     trigger_data,
+                                    tx_hash,
                                 },
                             ) {
                                 tracing::error!(
@@ -470,6 +479,26 @@ impl<S: CAStorage + 'static> Dispatcher<S> {
                                 );
                             }
                         }
+                        DispatcherCommand::SubmissionError {
+                            service_id,
+                            workflow_id,
+                            trigger_data,
+                            error_message,
+                        } => {
+                            if let Err(err) = _self.tauri_handle.emit_ext(
+                                wavs_gui_shared::event::SubmissionErrorEvent {
+                                    service_id,
+                                    workflow_id,
+                                    trigger_data,
+                                    error_message,
+                                },
+                            ) {
+                                tracing::error!(
+                                    "Error emitting submission error event to GUI: {:?}",
+                                    err
+                                );
+                            }
+                        }
                     }
                 }
             }
@@ -551,7 +580,21 @@ impl<S: CAStorage + 'static> Dispatcher<S> {
                 // registration to avoid double-registration errors.
                 let already_in_memory = self.services.exists(&service.id()).unwrap_or(false);
 
-                // Always refresh the stored definition with the authoritative on-chain version
+                // Always refresh the stored definition with the authoritative on-chain version,
+                // but preserve the existing pause status — it is local-only state that the
+                // chain doesn't know about.
+                let service = if already_in_memory {
+                    if let Ok(existing) = self.services.get(&service.id()) {
+                        Service {
+                            status: existing.status,
+                            ..service
+                        }
+                    } else {
+                        service
+                    }
+                } else {
+                    service
+                };
                 self.services.save(&service)?;
 
                 // Store components
@@ -767,6 +810,22 @@ impl<S: CAStorage + 'static> Dispatcher<S> {
         Ok(())
     }
 
+    #[instrument(skip(self), fields(subsys = "Dispatcher"))]
+    pub fn pause_service(&self, id: ServiceId) -> Result<(), DispatcherError> {
+        let mut service = self.services.get(&id)?;
+        service.status = wavs_types::ServiceStatus::Paused;
+        self.services.save(&service)?;
+        Ok(())
+    }
+
+    #[instrument(skip(self), fields(subsys = "Dispatcher"))]
+    pub fn resume_service(&self, id: ServiceId) -> Result<(), DispatcherError> {
+        let mut service = self.services.get(&id)?;
+        service.status = wavs_types::ServiceStatus::Active;
+        self.services.save(&service)?;
+        Ok(())
+    }
+
     #[instrument(skip(self), fields(subsys = "Dispatcher"))]
     pub fn remove_service(&self, id: ServiceId) -> Result<(), DispatcherError> {
         // Remove from persistent registry first so an IO failure doesn't leave
@@ -876,9 +935,13 @@ impl<S: CAStorage + 'static> Dispatcher<S> {
             });
         }
 
-        let SignerResponse::Secp256k1 { hd_index, .. } = self
+        let hd_index = match self
             .submission_manager
-            .get_service_signer(service_id.clone())?;
+            .get_service_signer(service_id.clone())?
+        {
+            SignerResponse::Secp256k1 { hd_index, .. } => hd_index,
+            SignerResponse::Bls12381 { hd_index, .. } => hd_index,
+        };
 
         if tracing::enabled!(tracing::Level::INFO) {
             let old_service = self.services.get(&service_id)?;
@@ -1064,7 +1127,17 @@ fn add_service_to_managers(
     aggregator_tx: &crossbeam::channel::Sender<AggregatorCommand>,
     hd_index: Option<u32>,
 ) -> Result<(), DispatcherError> {
-    if let Err(err) = submissions.add_service_key(service.id(), hd_index) {
+    // Determine algorithm from the first workflow's submit configuration
+    let algorithm = service
+        .workflows
+        .values()
+        .find_map(|w| match &w.submit {
+            Submit::Aggregator { signature_kind, .. } => Some(signature_kind.algorithm.clone()),
+            Submit::None => None,
+        })
+        .unwrap_or(SignatureAlgorithm::Secp256k1); // default for backward compat
+
+    if let Err(err) = submissions.add_service_key(service.id(), hd_index, algorithm) {
         tracing::error!("Error adding service to submission manager: {:?}", err);
         return Err(err.into());
     }
diff --git a/packages/wavs/src/http/handlers/info.rs b/packages/wavs/src/http/handlers/info.rs
index 9fb6d0255..3b73e1a2f 100644
--- a/packages/wavs/src/http/handlers/info.rs
+++ b/packages/wavs/src/http/handlers/info.rs
@@ -64,7 +64,15 @@ pub async fn inner_handle_info(state: HttpState) -> HttpResult<InfoResponse> {
         .unwrap_or_default();
 
     // Get P2P status
-    let p2p_status = state.dispatcher.aggregator.get_p2p_status().await;
+    let mut p2p_status = state.dispatcher.aggregator.get_p2p_status().await;
+    // Fill in discovery_mode from config if not already set by the P2P task
+    if p2p_status.discovery_mode.is_empty() {
+        p2p_status.discovery_mode = match &state.config.p2p {
+            P2pConfig::Disabled => "disabled".to_string(),
+            P2pConfig::Local { .. } => "local".to_string(),
+            P2pConfig::Remote { .. } => "remote".to_string(),
+        };
+    }
 
     Ok(InfoResponse {
         has_aggregator_cosmos: state.config.aggregator_cosmos_credential.is_some(),
diff --git a/packages/wavs/src/subsystems/aggregator.rs b/packages/wavs/src/subsystems/aggregator.rs
index 972a819b0..c966eaaa3 100644
--- a/packages/wavs/src/subsystems/aggregator.rs
+++ b/packages/wavs/src/subsystems/aggregator.rs
@@ -4,6 +4,11 @@ pub mod peer;
 mod queue;
 mod submit;
 
+#[cfg(test)]
+mod p2p_config_tests;
+#[cfg(test)]
+mod p2p_status_tests;
+
 use std::{
     collections::HashMap,
     sync::{
@@ -626,10 +631,11 @@ impl Aggregator {
                 self.save_quorum_queue(queue_id, queue).await?;
             }
             Ok(tx_resp) => {
+                let tx_hash_str = tx_resp.tx_hash();
                 tracing::info!(
                     "Aggregator: Successfully submitted on-chain for {}: tx hash: {}",
                     submission.label(),
-                    tx_resp.tx_hash()
+                    tx_hash_str
                 );
                 // Burn queue: Mark as completed to prevent duplicate on-chain submissions
                 self.burn_quorum_queue(queue_id).await?;
@@ -639,6 +645,7 @@ impl Aggregator {
                             service_id: submission.service_id().clone(),
                             workflow_id: submission.workflow_id().clone(),
                             trigger_data: submission.trigger_action.data.clone(),
+                            tx_hash: Some(tx_hash_str),
                         })
                 {
                     tracing::error!("Error sending SubmissionConfirmed to dispatcher: {:?}", e);
@@ -664,6 +671,20 @@ impl Aggregator {
                         err
                     );
                 }
+
+                // Emit error event to GUI
+                if let Err(e) =
+                    self.subsystem_to_dispatcher_tx
+                        .send(DispatcherCommand::SubmissionError {
+                            service_id: submission.service_id().clone(),
+                            workflow_id: submission.workflow_id().clone(),
+                            trigger_data: submission.trigger_action.data.clone(),
+                            error_message: err_str.clone(),
+                        })
+                {
+                    tracing::error!("Error sending SubmissionError to dispatcher: {:?}", e);
+                }
+
                 // IMPORTANT: Always save the queue on error
                 // We appended the current submission above, so failing to save it would lose this submission
                 // When the next submission arrives (from P2P or operator), it will:
diff --git a/packages/wavs/src/subsystems/aggregator/p2p.rs b/packages/wavs/src/subsystems/aggregator/p2p.rs
index 7462246ef..2a3b1f9e5 100644
--- a/packages/wavs/src/subsystems/aggregator/p2p.rs
+++ b/packages/wavs/src/subsystems/aggregator/p2p.rs
@@ -3,40 +3,38 @@
 //! This module provides peer-to-peer networking for multi-operator WAVS deployments,
 //! enabling operators to share submissions and reach quorum consensus.
 //!
-//! # Discovery Modes
+//! # Architecture
 //!
-//! - **Local (mDNS)**: Uses multicast DNS for automatic peer discovery on local networks.
-//!   Best for development and testing. Peers discover each other automatically.
+//! Uses commonware-p2p for authenticated peer networking with two modes:
+//! - **Lookup mode** (`P2pConfig::Local`): Known peer addresses for local dev/testing
+//! - **Discovery mode** (`P2pConfig::Remote`): Bootstrapper-based peer discovery for production
 //!
-//! - **Remote (Kademlia)**: Uses a DHT for peer discovery across networks. Requires
-//!   bootstrap nodes. One node runs as the bootstrap server (empty bootstrap_nodes),
-//!   others connect to it. Periodic DHT queries ensure all peers eventually discover
-//!   each other even if they join at different times.
+//! ## Broadcast Architecture (Two-Channel)
 //!
-//! # Key Components
+//! Each network mode registers **two P2P channels**:
+//! - **Channel 0**: Consumed by the broadcast Engine for message caching and catch-up
+//! - **Channel 1**: Read by an inbound bridge task for real-time forwarding to the Aggregator
 //!
-//! - **GossipSub**: Pub/sub message dissemination per service topic
-//! - **Request/Response**: Catch-up protocol for missed messages when peers reconnect
-//! - **Identify**: Peer identification and address exchange
-//! - **AutoNAT**: External address discovery for NAT traversal
-
-use std::{
-    collections::{hash_map::DefaultHasher, HashMap, HashSet, VecDeque},
-    hash::{Hash, Hasher},
-    io, iter,
-    time::{Duration, Instant},
-};
-
-use async_trait::async_trait;
-use futures::{AsyncWriteExt, StreamExt};
-use libp2p::{
-    autonat,
-    gossipsub::{self, IdentTopic, MessageAuthenticity, MessageId, ValidationMode},
-    identify, kad, mdns,
-    request_response::{self, Codec, ProtocolSupport},
-    swarm::{behaviour::toggle::Toggle, NetworkBehaviour, SwarmEvent},
-    Multiaddr, PeerId, StreamProtocol, Swarm, SwarmBuilder,
+//! On outbound publish: messages are broadcast via both the Engine (channel 0) and the direct
+//! sender (channel 1, encoded to bytes via `Encode::encode()`).
+//!
+//! On inbound receive: channel 1 messages arrive via a Tokio mpsc bridge (commonware Receiver
+//! bridged to Tokio), are deduplicated by SHA-256 digest, filtered by ServiceRouter, and
+//! forwarded to the Aggregator as `AggregatorCommand::Receive`.
+
+use std::collections::{HashMap, HashSet, VecDeque};
+use std::sync::{Arc, RwLock};
+use std::time::Duration;
+
+use commonware_broadcast::buffered::{Config as BroadcastConfig, Engine};
+use commonware_broadcast::Broadcaster;
+use commonware_codec::{
+    Decode, Encode, EncodeSize, Error as CodecError, RangeCfg, Read as CodecRead, ReadRangeExt,
+    Write as CodecWrite,
 };
+use commonware_cryptography::{ed25519, sha256, Digestible, Hasher, Sha256};
+use commonware_p2p::{Recipients, Sender as P2pSender};
+use commonware_runtime::{Buf, BufMut};
 use serde::{Deserialize, Serialize};
 use tokio::sync::mpsc;
 use utils::context::AppContext;
@@ -44,1796 +42,3098 @@ use wavs_types::{P2pStatus, ServiceId, Submission};
 
 use super::{error::AggregatorError, peer::Peer, AggregatorCommand};
 
-const PROTOCOL_VERSION: &str = "/wavs/1.0.0";
-const CATCHUP_PROTOCOL: &str = "/wavs/catchup/1.0.0";
-
-/// Pending publish entry for retry queue
-struct PendingPublish {
-    topic_name: String,
-    data: Vec<u8>,
-    created_at: Instant,
-    retries: u32,
-}
-
-/// Stored submission for catch-up responses
-struct StoredSubmission {
-    submission: Submission,
-    created_at: Instant,
-}
+// ============================================================================
+// P2P Configuration
+// ============================================================================
 
+/// P2P networking configuration.
+///
+/// - `Disabled`: No P2P networking (single-operator setups).
+/// - `Local`: Lookup mode with known peer addresses (local dev / testing).
+/// - `Remote`: Discovery mode with bootstrapper nodes (production).
 #[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
 pub enum P2pConfig {
-    /// Disabled - no P2P networking (for single-operator setups)
     #[default]
     Disabled,
-    /// Local development - use mDNS for peer discovery with test-friendly defaults
+    /// Local development -- lookup mode with known peer addresses.
     Local {
-        /// Port to listen on for P2P connections (0 for random)
+        /// Port to listen on for P2P connections.
         listen_port: u16,
-        max_retry_duration_secs: Option<u64>,
-        retry_interval_ms: Option<u64>,
-        submission_ttl_secs: Option<u64>,
-        max_catchup_submissions: Option<usize>,
-        cleanup_interval_secs: Option<u64>,
-        max_pending_publishes: Option<usize>,
-        max_stored_submissions_per_service: Option<usize>,
-        catchup_request_timeout_secs: Option<u64>,
-        max_concurrent_catchup_requests_per_service: Option<usize>,
+        /// Known peer addresses for lookup mode: ["<hex_pubkey>@<host>:<port>", ...]
+        #[serde(default)]
+        peer_addresses: Vec<String>,
+        /// Authorized peer Ed25519 public keys (hex-encoded).
+        /// The local node's own pubkey is implicitly trusted.
+        #[serde(default)]
+        authorized_peers: Vec<String>,
+        /// Max message size in bytes (default: 65536 = 64KB)
+        #[serde(default)]
+        max_message_size: Option<u32>,
+        /// Broadcast Engine deque size per peer for catch-up (default: 128)
+        #[serde(default)]
+        deque_size: Option<usize>,
     },
-    /// Remote/production - use Kademlia DHT for peer discovery with bootstrap nodes
+    /// Remote / production -- discovery mode with bootstrapper nodes.
     Remote {
-        /// Port to listen on for P2P connections
+        /// Port to listen on for P2P connections.
         listen_port: u16,
-        /// Bootstrap node addresses (multiaddr format). Empty = this node is a bootstrap server.
-        bootstrap_nodes: Vec<String>,
-        max_retry_duration_secs: Option<u64>,
-        retry_interval_ms: Option<u64>,
-        submission_ttl_secs: Option<u64>,
-        max_catchup_submissions: Option<usize>,
-        cleanup_interval_secs: Option<u64>,
-        kademlia_discovery_interval_secs: Option<u64>,
-        max_pending_publishes: Option<usize>,
-        max_stored_submissions_per_service: Option<usize>,
-        catchup_request_timeout_secs: Option<u64>,
-        max_concurrent_catchup_requests_per_service: Option<usize>,
+        /// Bootstrapper addresses: ["<hex_pubkey>@<host>:<port>", ...]
+        #[serde(default)]
+        bootstrappers: Vec<String>,
+        /// Authorized peer Ed25519 public keys (hex-encoded).
+        /// The local node's own pubkey is implicitly trusted.
+        #[serde(default)]
+        authorized_peers: Vec<String>,
+        /// Max message size in bytes (default: 65536 = 64KB)
+        #[serde(default)]
+        max_message_size: Option<u32>,
+        /// Broadcast Engine deque size per peer for catch-up (default: 128)
+        #[serde(default)]
+        deque_size: Option<usize>,
     },
 }
 
 impl P2pConfig {
-    const DEFAULT_MAX_RETRY_DURATION_SECS: u64 = 10;
-    const DEFAULT_RETRY_INTERVAL_MS: u64 = 200;
-    /// How long to keep submissions in memory for catch-up responses
-    const DEFAULT_SUBMISSION_TTL_SECS: u64 = 300; // 5 minutes
-    /// Maximum submissions to return in a catch-up response
-    const DEFAULT_MAX_CATCHUP_SUBMISSIONS: usize = 100;
-    /// This ensures peers eventually discover each other even if they join at different times.
-    const DEFAULT_KADEMLIA_DISCOVERY_INTERVAL_SECS: u64 = 60;
-    /// Interval between cleanup of expired stored submissions
-    const DEFAULT_CLEANUP_INTERVAL_SECS: u64 = 60;
-    /// Maximum pending publishes in retry queue.
-    /// Prevents memory exhaustion during prolonged network partitions.
-    const DEFAULT_MAX_PENDING_PUBLISHES: usize = 1000;
-    /// Maximum submissions stored per service for catch-up responses.
-    /// Prevents memory growth when receiving many submissions within the TTL window.
-    const DEFAULT_MAX_STORED_SUBMISSIONS_PER_SERVICE: usize = 500;
-    /// Timeout for catch-up request/response protocol.
-    const DEFAULT_CATCHUP_REQUEST_TIMEOUT_SECS: u64 = 30;
-    /// Maximum concurrent outstanding catch-up requests per service.
-    /// Prevents overwhelming peers/network when many peers connect simultaneously.
-    const DEFAULT_MAX_CONCURRENT_CATCHUP_REQUESTS_PER_SERVICE: usize = 3;
-
-    pub fn cleanup_interval_secs(&self) -> u64 {
-        match self {
-            P2pConfig::Local {
-                cleanup_interval_secs,
-                ..
-            } => cleanup_interval_secs.unwrap_or(Self::DEFAULT_CLEANUP_INTERVAL_SECS),
-            P2pConfig::Remote {
-                cleanup_interval_secs,
-                ..
-            } => cleanup_interval_secs.unwrap_or(Self::DEFAULT_CLEANUP_INTERVAL_SECS),
-            P2pConfig::Disabled => Self::DEFAULT_CLEANUP_INTERVAL_SECS,
-        }
-    }
-
-    pub fn kademlia_discovery_interval_secs(&self) -> u64 {
+    /// Returns the listen port, or None if disabled.
+    pub fn listen_port(&self) -> Option<u16> {
         match self {
-            P2pConfig::Remote {
-                kademlia_discovery_interval_secs,
-                ..
-            } => kademlia_discovery_interval_secs
-                .unwrap_or(Self::DEFAULT_KADEMLIA_DISCOVERY_INTERVAL_SECS),
-            P2pConfig::Local { .. } | P2pConfig::Disabled => {
-                Self::DEFAULT_KADEMLIA_DISCOVERY_INTERVAL_SECS
-            }
+            P2pConfig::Local { listen_port, .. } => Some(*listen_port),
+            P2pConfig::Remote { listen_port, .. } => Some(*listen_port),
+            P2pConfig::Disabled => None,
         }
     }
 
-    pub fn max_retry_duration_secs(&self) -> u64 {
+    /// Returns the authorized peer hex pubkeys.
+    pub fn authorized_peers(&self) -> &[String] {
         match self {
             P2pConfig::Local {
-                max_retry_duration_secs,
-                ..
-            } => max_retry_duration_secs.unwrap_or(Self::DEFAULT_MAX_RETRY_DURATION_SECS),
+                authorized_peers, ..
+            } => authorized_peers,
             P2pConfig::Remote {
-                max_retry_duration_secs,
-                ..
-            } => max_retry_duration_secs.unwrap_or(Self::DEFAULT_MAX_RETRY_DURATION_SECS),
-            P2pConfig::Disabled => Self::DEFAULT_MAX_RETRY_DURATION_SECS,
+                authorized_peers, ..
+            } => authorized_peers,
+            P2pConfig::Disabled => &[],
         }
     }
 
-    pub fn retry_interval_ms(&self) -> u64 {
+    /// Returns the configured max_message_size, or the default (65536 = 64KB).
+    pub fn max_message_size(&self) -> u32 {
         match self {
             P2pConfig::Local {
-                retry_interval_ms, ..
-            } => retry_interval_ms.unwrap_or(Self::DEFAULT_RETRY_INTERVAL_MS),
+                max_message_size, ..
+            } => max_message_size.unwrap_or(65536),
             P2pConfig::Remote {
-                retry_interval_ms, ..
-            } => retry_interval_ms.unwrap_or(Self::DEFAULT_RETRY_INTERVAL_MS),
-            P2pConfig::Disabled => Self::DEFAULT_RETRY_INTERVAL_MS,
+                max_message_size, ..
+            } => max_message_size.unwrap_or(65536),
+            P2pConfig::Disabled => 65536,
         }
     }
 
-    pub fn submission_ttl_secs(&self) -> u64 {
+    /// Returns the configured deque_size for the broadcast Engine, or the default (128).
+    pub fn deque_size(&self) -> usize {
         match self {
-            P2pConfig::Local {
-                submission_ttl_secs,
-                ..
-            } => submission_ttl_secs.unwrap_or(Self::DEFAULT_SUBMISSION_TTL_SECS),
-            P2pConfig::Remote {
-                submission_ttl_secs,
-                ..
-            } => submission_ttl_secs.unwrap_or(Self::DEFAULT_SUBMISSION_TTL_SECS),
-            P2pConfig::Disabled => Self::DEFAULT_SUBMISSION_TTL_SECS,
+            P2pConfig::Local { deque_size, .. } => deque_size.unwrap_or(128),
+            P2pConfig::Remote { deque_size, .. } => deque_size.unwrap_or(128),
+            P2pConfig::Disabled => 128,
         }
     }
+}
 
-    pub fn max_catchup_submissions(&self) -> usize {
-        match self {
-            P2pConfig::Local {
-                max_catchup_submissions,
-                ..
-            } => max_catchup_submissions.unwrap_or(Self::DEFAULT_MAX_CATCHUP_SUBMISSIONS),
-            P2pConfig::Remote {
-                max_catchup_submissions,
-                ..
-            } => max_catchup_submissions.unwrap_or(Self::DEFAULT_MAX_CATCHUP_SUBMISSIONS),
-            P2pConfig::Disabled => Self::DEFAULT_MAX_CATCHUP_SUBMISSIONS,
-        }
+// ============================================================================
+// P2P Message Envelope (Codec + Digestible)
+// ============================================================================
+
+/// P2P message envelope for broadcast.
+/// Wraps a ServiceId (32 bytes) and serialized Submission for transmission
+/// over commonware-broadcast. The Digestible impl produces a SHA-256 digest
+/// used by the broadcast Engine for deduplication (BCAST-02).
+#[derive(Clone, Debug)]
+pub struct P2pMessage {
+    /// Service ID bytes (raw 32-byte hash from ServiceId::inner())
+    pub service_id_bytes: [u8; 32],
+    /// JSON-serialized Submission payload
+    pub payload: Vec<u8>,
+}
+
+impl P2pMessage {
+    /// Create a P2pMessage from a ServiceId and Submission.
+    ///
+    /// The Submission is JSON-serialized into the payload field.
+    pub fn from_submission(
+        service_id: &ServiceId,
+        submission: &Submission,
+    ) -> Result<Self, AggregatorError> {
+        let payload = serde_json::to_vec(submission)
+            .map_err(|e| AggregatorError::P2p(format!("Failed to serialize submission: {}", e)))?;
+        Ok(Self {
+            service_id_bytes: service_id.inner(),
+            payload,
+        })
     }
 
-    /// GossipSub heartbeat interval - how often peers exchange mesh state
-    pub fn heartbeat_interval(&self) -> Duration {
-        match self {
-            // Faster heartbeat for local testing to speed up mesh formation
-            P2pConfig::Local { .. } => Duration::from_millis(100),
-            // Production defaults
-            P2pConfig::Remote { .. } | P2pConfig::Disabled => Duration::from_secs(1),
-        }
+    /// Deserialize this P2pMessage back into a (ServiceId, Submission) pair.
+    pub fn to_submission(&self) -> Result<(ServiceId, Submission), AggregatorError> {
+        let service_id = ServiceId::from(self.service_id_bytes);
+        let submission: Submission = serde_json::from_slice(&self.payload).map_err(|e| {
+            AggregatorError::P2p(format!("Failed to deserialize submission: {}", e))
+        })?;
+        Ok((service_id, submission))
     }
+}
 
-    /// Minimum number of peers in mesh before gossipsub considers it "low"
-    /// When below this threshold, gossipsub will try to add more peers
-    pub fn mesh_n_low(&self) -> usize {
-        match self {
-            // For local testing with 3 nodes, set to 0 to avoid "Mesh low" warnings
-            // during dynamic topic subscription. Messages still propagate via flooding.
-            P2pConfig::Local { .. } => 0,
-            // Production default (D_lo)
-            P2pConfig::Remote { .. } => 4,
-            P2pConfig::Disabled => 2,
-        }
+impl Digestible for P2pMessage {
+    type Digest = sha256::Digest;
+
+    fn digest(&self) -> sha256::Digest {
+        let mut data = Vec::with_capacity(32 + self.payload.len());
+        data.extend_from_slice(&self.service_id_bytes);
+        data.extend_from_slice(&self.payload);
+        Sha256::hash(&data)
     }
+}
 
-    /// Target number of peers in mesh
-    pub fn mesh_n(&self) -> usize {
-        match self {
-            // For local testing with 3 nodes, max possible mesh is 2 peers
-            // Setting target to 1 is achievable even with just 2 connected nodes
-            P2pConfig::Local { .. } => 1,
-            // Production default (D)
-            P2pConfig::Remote { .. } => 6,
-            P2pConfig::Disabled => 6,
-        }
+impl CodecWrite for P2pMessage {
+    fn write(&self, buf: &mut impl BufMut) {
+        // Write service_id_bytes as fixed 32 bytes (no length prefix)
+        buf.put_slice(&self.service_id_bytes);
+        // Write payload as Vec<u8> (length-prefixed via commonware codec)
+        self.payload.write(buf);
     }
+}
 
-    /// Maximum number of peers in mesh
-    pub fn mesh_n_high(&self) -> usize {
-        match self {
-            // For 3-node local testing, cap at 2 (max possible)
-            P2pConfig::Local { .. } => 2,
-            // Production default (D_hi)
-            P2pConfig::Remote { .. } => 12,
-            P2pConfig::Disabled => 12,
-        }
+impl EncodeSize for P2pMessage {
+    fn encode_size(&self) -> usize {
+        // Fixed 32 bytes for service_id + Vec<u8> encode size for payload
+        32 + self.payload.encode_size()
     }
+}
 
-    /// How long to keep messages in cache for deduplication
-    pub fn duplicate_cache_time(&self) -> Duration {
-        match self {
-            P2pConfig::Local { .. } => Duration::from_secs(30),
-            P2pConfig::Remote { .. } | P2pConfig::Disabled => Duration::from_secs(60),
+impl CodecRead for P2pMessage {
+    /// Cfg is `(RangeCfg<usize>, ())` to match Vec<u8>'s Cfg pattern and allow
+    /// use of ReadRangeExt::read_range for ergonomic deserialization.
+    type Cfg = (RangeCfg<usize>, ());
+
+    fn read_cfg(buf: &mut impl Buf, (range, _): &Self::Cfg) -> Result<Self, CodecError> {
+        // Read fixed 32 bytes for service_id_bytes
+        if buf.remaining() < 32 {
+            return Err(CodecError::EndOfBuffer);
         }
+        let mut service_id_bytes = [0u8; 32];
+        buf.copy_to_slice(&mut service_id_bytes);
+        // Read payload as Vec<u8> using range config for length validation
+        let payload = <Vec<u8>>::read_range(buf, *range)?;
+        Ok(Self {
+            service_id_bytes,
+            payload,
+        })
     }
+}
 
-    /// History length for gossip (number of heartbeats)
-    pub fn history_length(&self) -> usize {
-        match self {
-            P2pConfig::Local { .. } => 3,
-            P2pConfig::Remote { .. } | P2pConfig::Disabled => 5,
+// ============================================================================
+// Service Routing (Application-Level Filtering)
+// ============================================================================
+
+/// Application-level message filter for per-service isolation (BCAST-05).
+///
+/// All messages arrive on a single broadcast channel. The ServiceRouter
+/// determines which messages to forward to the Aggregator based on
+/// which services this node is subscribed to.
+pub(crate) struct ServiceRouter {
+    subscribed_services: HashSet<[u8; 32]>,
+}
+
+impl ServiceRouter {
+    pub fn new() -> Self {
+        Self {
+            subscribed_services: HashSet::new(),
         }
     }
 
-    /// History gossip length (how many heartbeats of history to include)
-    pub fn history_gossip(&self) -> usize {
-        match self {
-            P2pConfig::Local { .. } => 2,
-            P2pConfig::Remote { .. } | P2pConfig::Disabled => 3,
-        }
+    pub fn subscribe(&mut self, service_id: &ServiceId) {
+        self.subscribed_services.insert(service_id.inner());
     }
 
-    /// Maximum pending publishes in retry queue
-    pub fn max_pending_publishes(&self) -> usize {
-        match self {
-            P2pConfig::Local {
-                max_pending_publishes,
-                ..
-            } => max_pending_publishes.unwrap_or(Self::DEFAULT_MAX_PENDING_PUBLISHES),
-            P2pConfig::Remote {
-                max_pending_publishes,
-                ..
-            } => max_pending_publishes.unwrap_or(Self::DEFAULT_MAX_PENDING_PUBLISHES),
-            P2pConfig::Disabled => Self::DEFAULT_MAX_PENDING_PUBLISHES,
-        }
+    pub fn unsubscribe(&mut self, service_id: &ServiceId) {
+        self.subscribed_services.remove(&service_id.inner());
     }
 
-    /// Maximum submissions stored per service for catch-up responses
-    pub fn max_stored_submissions_per_service(&self) -> usize {
-        match self {
-            P2pConfig::Local {
-                max_stored_submissions_per_service,
-                ..
-            } => max_stored_submissions_per_service
-                .unwrap_or(Self::DEFAULT_MAX_STORED_SUBMISSIONS_PER_SERVICE),
-            P2pConfig::Remote {
-                max_stored_submissions_per_service,
-                ..
-            } => max_stored_submissions_per_service
-                .unwrap_or(Self::DEFAULT_MAX_STORED_SUBMISSIONS_PER_SERVICE),
-            P2pConfig::Disabled => Self::DEFAULT_MAX_STORED_SUBMISSIONS_PER_SERVICE,
-        }
+    /// Check whether an inbound P2pMessage is for a subscribed service.
+    pub fn should_accept(&self, msg: &P2pMessage) -> bool {
+        self.subscribed_services.contains(&msg.service_id_bytes)
     }
 
-    /// Timeout for catch-up request/response protocol
-    pub fn catchup_request_timeout(&self) -> Duration {
-        let secs = match self {
-            P2pConfig::Local {
-                catchup_request_timeout_secs,
-                ..
-            } => catchup_request_timeout_secs.unwrap_or(Self::DEFAULT_CATCHUP_REQUEST_TIMEOUT_SECS),
-            P2pConfig::Remote {
-                catchup_request_timeout_secs,
-                ..
-            } => catchup_request_timeout_secs.unwrap_or(Self::DEFAULT_CATCHUP_REQUEST_TIMEOUT_SECS),
-            P2pConfig::Disabled => Self::DEFAULT_CATCHUP_REQUEST_TIMEOUT_SECS,
-        };
-        Duration::from_secs(secs)
+    /// Return hex-encoded list of subscribed service IDs for status reporting.
+    pub fn subscribed_services(&self) -> Vec<String> {
+        self.subscribed_services
+            .iter()
+            .map(const_hex::encode)
+            .collect()
     }
 
-    /// Maximum concurrent outstanding catch-up requests per service
-    pub fn max_concurrent_catchup_requests_per_service(&self) -> usize {
-        match self {
-            P2pConfig::Local {
-                max_concurrent_catchup_requests_per_service,
-                ..
-            } => max_concurrent_catchup_requests_per_service
-                .unwrap_or(Self::DEFAULT_MAX_CONCURRENT_CATCHUP_REQUESTS_PER_SERVICE),
-            P2pConfig::Remote {
-                max_concurrent_catchup_requests_per_service,
-                ..
-            } => max_concurrent_catchup_requests_per_service
-                .unwrap_or(Self::DEFAULT_MAX_CONCURRENT_CATCHUP_REQUESTS_PER_SERVICE),
-            P2pConfig::Disabled => Self::DEFAULT_MAX_CONCURRENT_CATCHUP_REQUESTS_PER_SERVICE,
-        }
+    /// Return raw bytes of subscribed service IDs (for building subscription announcements).
+    pub fn subscribed_services_raw(&self) -> Vec<[u8; 32]> {
+        self.subscribed_services.iter().copied().collect()
     }
 }
 
 // ============================================================================
-// Catch-up Protocol Types
+// Retry Queue for Failed Publishes
 // ============================================================================
 
-/// Request to catch up on missed submissions for a service
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct CatchUpRequest {
-    /// Service ID to catch up on
-    pub service_id: ServiceId,
-}
+const MAX_RETRY_QUEUE_SIZE: usize = 64;
 
-/// Response containing missed submissions
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct CatchUpResponse {
-    /// Submissions the requester may have missed
-    pub submissions: Vec<Submission>,
+/// Bounded queue for messages that failed to broadcast (no connected peers).
+/// Messages are retried when the next successful broadcast proves peers are available (BCAST-04).
+pub(crate) struct RetryQueue {
+    queue: VecDeque<P2pMessage>,
 }
 
-/// Codec for catch-up request/response protocol
-#[derive(Debug, Clone, Default)]
-pub struct CatchUpCodec;
-
-#[async_trait]
-impl Codec for CatchUpCodec {
-    type Protocol = StreamProtocol;
-    type Request = CatchUpRequest;
-    type Response = CatchUpResponse;
-
-    async fn read_request<T>(
-        &mut self,
-        _protocol: &Self::Protocol,
-        io: &mut T,
-    ) -> io::Result<Self::Request>
-    where
-        T: futures::AsyncRead + Unpin + Send,
-    {
-        use futures::AsyncReadExt;
-        // Limit request size to prevent DoS - requests are small (just a ServiceId)
-        const MAX_REQUEST_SIZE: u64 = 1024; // 1KB
-
-        let mut buf = Vec::new();
-        io.take(MAX_REQUEST_SIZE).read_to_end(&mut buf).await?;
-        serde_json::from_slice(&buf).map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))
+impl RetryQueue {
+    pub fn new() -> Self {
+        Self {
+            queue: VecDeque::with_capacity(MAX_RETRY_QUEUE_SIZE),
+        }
     }
 
-    async fn read_response<T>(
-        &mut self,
-        _protocol: &Self::Protocol,
-        io: &mut T,
-    ) -> io::Result<Self::Response>
-    where
-        T: futures::AsyncRead + Unpin + Send,
-    {
-        use futures::AsyncReadExt;
-        // Limit response size to prevent DoS - responses contain multiple submissions
-        const MAX_RESPONSE_SIZE: u64 = 10 * 1024 * 1024; // 10MB
-
-        let mut buf = Vec::new();
-        io.take(MAX_RESPONSE_SIZE).read_to_end(&mut buf).await?;
-        serde_json::from_slice(&buf).map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))
+    /// Add a message to the retry queue. If full, drops the oldest message.
+    pub fn push(&mut self, msg: P2pMessage) {
+        if self.queue.len() >= MAX_RETRY_QUEUE_SIZE {
+            self.queue.pop_front();
+            tracing::warn!("Retry queue full, dropping oldest message");
+        }
+        self.queue.push_back(msg);
     }
 
-    async fn write_request<T>(
-        &mut self,
-        _protocol: &Self::Protocol,
-        io: &mut T,
-        req: Self::Request,
-    ) -> io::Result<()>
-    where
-        T: futures::AsyncWrite + Unpin + Send,
-    {
-        let data =
-            serde_json::to_vec(&req).map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
-        io.write_all(&data).await?;
-        io.close().await
+    /// Drain all queued messages for retry. Returns them in FIFO order.
+    pub fn drain_all(&mut self) -> Vec<P2pMessage> {
+        self.queue.drain(..).collect()
     }
 
-    async fn write_response<T>(
-        &mut self,
-        _protocol: &Self::Protocol,
-        io: &mut T,
-        res: Self::Response,
-    ) -> io::Result<()>
-    where
-        T: futures::AsyncWrite + Unpin + Send,
-    {
-        let data =
-            serde_json::to_vec(&res).map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
-        io.write_all(&data).await?;
-        io.close().await
+    pub fn is_empty(&self) -> bool {
+        self.queue.is_empty()
     }
 }
 
 // ============================================================================
-// Network Behaviour
+// Subscription Tracking (Per-Service P2P Targeting)
 // ============================================================================
 
-/// libp2p behaviour for WAVS
-#[derive(NetworkBehaviour)]
-struct WavsBehaviour {
-    /// GossipSub for message dissemination
-    gossipsub: gossipsub::Behaviour,
-    /// Request/Response for catch-up protocol
-    catchup: request_response::Behaviour<CatchUpCodec>,
-    /// mDNS for local peer discovery (Local mode only)
-    mdns: Toggle<mdns::tokio::Behaviour>,
-    /// Kademlia DHT for remote peer discovery (Remote mode only)
-    kademlia: Toggle<kad::Behaviour<kad::store::MemoryStore>>,
-    /// Identify protocol for peer identification
-    identify: identify::Behaviour,
-    /// AutoNAT for external address discovery
-    autonat: autonat::Behaviour,
+/// Subscription announcement carried as P2pMessage payload (ANN-05).
+/// The service_id_bytes field of the wrapping P2pMessage is set to SUBSCRIPTION_SENTINEL.
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+pub(crate) struct SubscriptionAnnouncement {
+    /// Services this peer is subscribing to
+    pub subscribe: Vec<[u8; 32]>,
+    /// Services this peer is unsubscribing from
+    pub unsubscribe: Vec<[u8; 32]>,
+    /// If true, `subscribe` is the FULL set of services (replace-not-merge).
+    /// If false, `subscribe`/`unsubscribe` are incremental changes.
+    /// Defaults to false for backward compatibility with Phase 14 announcements.
+    #[serde(default)]
+    pub full_state: bool,
 }
 
-// ============================================================================
-// P2P Handle and Commands
-// ============================================================================
+impl SubscriptionAnnouncement {
+    /// Encode as a P2pMessage with the subscription sentinel.
+    pub fn to_p2p_message(&self) -> Result<P2pMessage, serde_json::Error> {
+        let payload = serde_json::to_vec(self)?;
+        Ok(P2pMessage {
+            service_id_bytes: SUBSCRIPTION_SENTINEL,
+            payload,
+        })
+    }
 
-/// Commands that can be sent to the P2P network
-enum P2pCommand {
-    /// Publish a submission to the network
-    Publish {
-        service_id: ServiceId,
-        submission: Box<Submission>,
-    },
-    /// Subscribe to a service's topic
-    Subscribe { service_id: ServiceId },
-    /// Unsubscribe from a service's topic
-    Unsubscribe { service_id: ServiceId },
-    /// Get the current P2P status
-    GetStatus {
-        response_tx: tokio::sync::oneshot::Sender<P2pStatus>,
-    },
+    /// Decode from a P2pMessage payload (caller must verify sentinel first).
+    pub fn from_payload(payload: &[u8]) -> Result<Self, serde_json::Error> {
+        serde_json::from_slice(payload)
+    }
 }
 
-/// Handle to the P2P network that can be cloned and shared
-#[derive(Clone)]
-pub struct P2pHandle {
-    command_tx: mpsc::UnboundedSender<P2pCommand>,
+/// Bidirectional subscription index tracking which peers subscribe to which services (SUB-01, SUB-02).
+///
+/// Maintains forward (service_id -> Set<PeerPubkey>) and reverse (PeerPubkey -> Set<service_id>)
+/// indexes kept in sync. Single-threaded -- lives inside the bridge loop's tokio::select!.
+pub(crate) struct PeerSubscriptionMap {
+    /// Forward index: service_id -> set of subscribed peers
+    service_to_peers: HashMap<[u8; 32], HashSet<ed25519::PublicKey>>,
+    /// Reverse index: peer -> set of subscribed services (for disconnect cleanup)
+    peer_to_services: HashMap<ed25519::PublicKey, HashSet<[u8; 32]>>,
 }
 
-impl P2pHandle {
-    /// Create a new P2P handle, spawning the network event loop.
-    ///
-    /// Returns None if P2P is disabled.
-    ///
-    /// If `signing_mnemonic` is provided, the P2P identity will be derived from it
-    /// at HD index 0, ensuring a consistent peer ID across restarts.
-    pub async fn new(
-        ctx: AppContext,
-        p2p_config: P2pConfig,
-        signing_mnemonic: Option<&str>,
-        aggregator_tx: crossbeam::channel::Sender<AggregatorCommand>,
-    ) -> Result<Option<Self>, AggregatorError> {
-        if matches!(p2p_config, P2pConfig::Disabled) {
-            tracing::info!("P2P networking is disabled");
-            Ok(None)
-        } else {
-            let handle =
-                Self::create_network(ctx, p2p_config, signing_mnemonic, aggregator_tx).await?;
-            Ok(Some(handle))
+impl PeerSubscriptionMap {
+    pub fn new() -> Self {
+        Self {
+            service_to_peers: HashMap::new(),
+            peer_to_services: HashMap::new(),
         }
     }
 
-    /// Publish a submission to the P2P network
-    pub fn publish(&self, submission: &Submission) -> Result<(), AggregatorError> {
-        let service_id = submission.service_id().clone();
-        self.command_tx
-            .send(P2pCommand::Publish {
-                service_id,
-                submission: Box::new(submission.clone()),
-            })
-            .map_err(|e| AggregatorError::P2p(format!("Failed to send publish command: {}", e)))
+    /// Process a subscription announcement from a peer.
+    /// Idempotent -- duplicate subscriptions are no-ops.
+    pub fn handle_announcement(
+        &mut self,
+        peer: &ed25519::PublicKey,
+        announcement: &SubscriptionAnnouncement,
+    ) {
+        for service_id in &announcement.subscribe {
+            self.service_to_peers
+                .entry(*service_id)
+                .or_default()
+                .insert(peer.clone());
+            self.peer_to_services
+                .entry(peer.clone())
+                .or_default()
+                .insert(*service_id);
+        }
+        for service_id in &announcement.unsubscribe {
+            if let Some(peers) = self.service_to_peers.get_mut(service_id) {
+                peers.remove(peer);
+                if peers.is_empty() {
+                    self.service_to_peers.remove(service_id);
+                }
+            }
+            if let Some(services) = self.peer_to_services.get_mut(peer) {
+                services.remove(service_id);
+                if services.is_empty() {
+                    self.peer_to_services.remove(peer);
+                }
+            }
+        }
     }
 
-    /// Subscribe to a service's P2P topic
-    pub fn subscribe(&self, service_id: &ServiceId) -> Result<(), AggregatorError> {
-        self.command_tx
-            .send(P2pCommand::Subscribe {
-                service_id: service_id.clone(),
-            })
-            .map_err(|e| AggregatorError::P2p(format!("Failed to send subscribe command: {}", e)))
+    /// Remove all subscriptions for a disconnected peer (SUB-03).
+    /// Uses the reverse index for efficient cleanup.
+    pub fn remove_peer(&mut self, peer: &ed25519::PublicKey) {
+        if let Some(services) = self.peer_to_services.remove(peer) {
+            for service_id in services {
+                if let Some(peers) = self.service_to_peers.get_mut(&service_id) {
+                    peers.remove(peer);
+                    if peers.is_empty() {
+                        self.service_to_peers.remove(&service_id);
+                    }
+                }
+            }
+        }
     }
 
-    /// Unsubscribe from a service's P2P topic
-    pub fn unsubscribe(&self, service_id: &ServiceId) -> Result<(), AggregatorError> {
-        self.command_tx
-            .send(P2pCommand::Unsubscribe {
-                service_id: service_id.clone(),
-            })
-            .map_err(|e| AggregatorError::P2p(format!("Failed to send unsubscribe command: {}", e)))
+    /// Returns true if this peer has ever sent a subscription announcement (COMPAT-03).
+    /// Peers that have never announced are treated as subscribed-to-all by callers.
+    pub fn has_announced(&self, peer: &ed25519::PublicKey) -> bool {
+        self.peer_to_services.contains_key(peer)
     }
 
-    /// Get the current P2P network status
-    pub async fn get_status(&self) -> Result<P2pStatus, AggregatorError> {
-        let (response_tx, response_rx) = tokio::sync::oneshot::channel();
-        self.command_tx
-            .send(P2pCommand::GetStatus { response_tx })
-            .map_err(|e| {
-                AggregatorError::P2p(format!("Failed to send get_status command: {}", e))
-            })?;
-
-        response_rx
-            .await
-            .map_err(|e| AggregatorError::P2p(format!("Failed to receive P2P status: {}", e)))
+    /// Returns the set of peers that have subscription entries in this map.
+    /// Used by heartbeat pruning to compare against connected peers (SUB-03).
+    pub fn tracked_peers(&self) -> HashSet<ed25519::PublicKey> {
+        self.peer_to_services.keys().cloned().collect()
     }
 
-    /// Create a P2P network
-    async fn create_network(
-        ctx: AppContext,
-        p2p_config: P2pConfig,
-        signing_mnemonic: Option<&str>,
-        aggregator_tx: crossbeam::channel::Sender<AggregatorCommand>,
-    ) -> Result<Self, AggregatorError> {
-        let swarm = build_swarm(&p2p_config, signing_mnemonic)?;
-        let local_peer_id = *swarm.local_peer_id();
+    /// Replace all subscriptions for a peer with the given set.
+    /// Uses replace-not-merge semantics for heartbeat/hello full state sync.
+    pub fn set_peer_subscriptions(&mut self, peer: &ed25519::PublicKey, services: Vec<[u8; 32]>) {
+        // Remove existing subscriptions first
+        self.remove_peer(peer);
+        // Then set the new full set (if non-empty)
+        if !services.is_empty() {
+            let service_set: HashSet<[u8; 32]> = services.iter().copied().collect();
+            for service_id in &service_set {
+                self.service_to_peers
+                    .entry(*service_id)
+                    .or_default()
+                    .insert(peer.clone());
+            }
+            self.peer_to_services.insert(peer.clone(), service_set);
+        }
+    }
 
-        let mode_name = match p2p_config {
-            P2pConfig::Local { .. } => "Local (mDNS)",
-            P2pConfig::Remote { .. } => "Remote (Kademlia)",
-            P2pConfig::Disabled => "Disabled",
-        };
-        tracing::info!("P2P peer ID: {} (mode: {})", local_peer_id, mode_name);
+    /// Get the recipient set for targeted delivery.
+    /// Includes un-announced connected peers for backward compatibility (COMPAT-03).
+    /// Returns Recipients::Some(peers) if any peers are resolved, or Recipients::All as fallback.
+    pub fn get_recipients(
+        &self,
+        service_id: &[u8; 32],
+        connected_peers: &HashSet<ed25519::PublicKey>,
+    ) -> Recipients<ed25519::PublicKey> {
+        let mut result: HashSet<ed25519::PublicKey> = HashSet::new();
+
+        // Add peers subscribed to this specific service
+        if let Some(peers) = self.service_to_peers.get(service_id) {
+            result.extend(peers.iter().cloned());
+        }
 
-        let (command_tx, command_rx) = mpsc::unbounded_channel();
+        // COMPAT-03: Include connected peers that have never announced.
+        // Pre-v1.3 nodes never send subscription announcements, so they must be
+        // included unconditionally to maintain backward-compatible delivery.
+        for peer in connected_peers {
+            if !self.has_announced(peer) {
+                result.insert(peer.clone());
+            }
+        }
 
-        tokio::spawn(run_event_loop(
-            ctx,
-            p2p_config,
-            swarm,
-            command_rx,
-            aggregator_tx,
-        ));
+        if result.is_empty() {
+            Recipients::All
+        } else {
+            Recipients::Some(result.into_iter().collect())
+        }
+    }
 
-        Ok(P2pHandle { command_tx })
+    /// Returns per-service peer counts for observability (OBS-01).
+    /// Keys are hex-encoded service_id bytes, values are the number of peers
+    /// subscribed to that service.
+    pub fn peer_subscription_counts(&self) -> HashMap<String, usize> {
+        self.service_to_peers
+            .iter()
+            .map(|(service_id, peers)| (const_hex::encode(service_id), peers.len()))
+            .collect()
     }
 }
 
 // ============================================================================
-// Swarm Building
+// Network Management (Commonware Runtime + Lookup Mode)
 // ============================================================================
 
-/// Build the libp2p swarm with all required behaviours
-fn build_swarm(
-    config: &P2pConfig,
-    signing_mnemonic: Option<&str>,
-) -> Result<Swarm<WavsBehaviour>, AggregatorError> {
-    // Message ID function for deduplication
-    // Exclude sequence_number so the same content gets the same ID for proper deduplication
-    let message_id_fn = |message: &gossipsub::Message| {
-        let mut hasher = DefaultHasher::new();
-        message.data.hash(&mut hasher);
-        message.source.hash(&mut hasher);
-        message.topic.hash(&mut hasher);
-        MessageId::from(hasher.finish().to_string())
-    };
-
-    // GossipSub configuration - use config-specific values for test vs production
-    let gossipsub_config = gossipsub::ConfigBuilder::default()
-        .heartbeat_interval(config.heartbeat_interval())
-        .validation_mode(ValidationMode::Strict)
-        .message_id_fn(message_id_fn)
-        .mesh_n_low(config.mesh_n_low())
-        .mesh_n(config.mesh_n())
-        .mesh_n_high(config.mesh_n_high())
-        .duplicate_cache_time(config.duplicate_cache_time())
-        .history_length(config.history_length())
-        .history_gossip(config.history_gossip())
-        .build()
-        .map_err(|e| AggregatorError::P2p(format!("Failed to build gossipsub config: {}", e)))?;
-
-    let is_local = matches!(config, P2pConfig::Local { .. });
-    let catchup_request_timeout = config.catchup_request_timeout();
-
-    // Build swarm with identity derived from signing_mnemonic (if provided) or new random identity
-    let swarm_builder = if let Some(mnemonic) = signing_mnemonic {
-        let keypair = keypair_from_mnemonic(mnemonic)?;
-        tracing::info!(
-            "Using P2P identity derived from signing_mnemonic (peer_id: {})",
-            keypair.public().to_peer_id()
-        );
-        SwarmBuilder::with_existing_identity(keypair)
-    } else {
-        tracing::info!("Generating new random P2P identity (will change on restart)");
-        SwarmBuilder::with_new_identity()
-    };
-
-    let swarm = swarm_builder
-        .with_tokio()
-        .with_tcp(
-            libp2p::tcp::Config::default(),
-            libp2p::noise::Config::new,
-            libp2p::yamux::Config::default,
-        )
-        .map_err(|e| AggregatorError::P2p(format!("Failed to configure TCP: {}", e)))?
-        .with_behaviour(|key| {
-            let peer_id = key.public().to_peer_id();
-
-            let gossipsub = gossipsub::Behaviour::new(
-                MessageAuthenticity::Signed(key.clone()),
-                gossipsub_config,
-            )
-            .map_err(|e| format!("Failed to create gossipsub: {}", e))?;
-
-            // Catch-up request/response protocol with explicit timeout
-            let catchup = request_response::Behaviour::new(
-                iter::once((StreamProtocol::new(CATCHUP_PROTOCOL), ProtocolSupport::Full)),
-                request_response::Config::default().with_request_timeout(catchup_request_timeout),
-            );
+use commonware_cryptography::Signer;
+use commonware_p2p::authenticated::{discovery, lookup};
+use commonware_p2p::{Address, AddressableManager, Blocker, Ingress, Manager};
+use commonware_runtime::Quota;
+use commonware_utils::NZU32;
+
+/// Parse a peer address string of format "<hex_pubkey>@<host>:<port>"
+/// into an Ed25519 public key and socket address.
+fn parse_peer_address(
+    addr: &str,
+) -> Result<(ed25519::PublicKey, std::net::SocketAddr), AggregatorError> {
+    let parts: Vec<&str> = addr.splitn(2, '@').collect();
+    if parts.len() != 2 {
+        return Err(AggregatorError::P2p(format!(
+            "Invalid peer address format '{}', expected '<hex_pubkey>@<host>:<port>'",
+            addr
+        )));
+    }
+    let pubkey_bytes = const_hex::decode(parts[0])
+        .map_err(|e| AggregatorError::P2p(format!("Invalid hex pubkey in '{}': {}", addr, e)))?;
+    let pubkey = pubkey_from_bytes(&pubkey_bytes).map_err(|e| {
+        AggregatorError::P2p(format!("Invalid Ed25519 pubkey in '{}': {}", addr, e))
+    })?;
+    let socket_addr: std::net::SocketAddr = parts[1].parse().map_err(|e| {
+        AggregatorError::P2p(format!("Invalid socket address in '{}': {}", addr, e))
+    })?;
+    Ok((pubkey, socket_addr))
+}
 
-            // Discovery: mDNS for Local mode, Kademlia for Remote mode
-            let (mdns, kademlia) = if is_local {
-                let mdns = mdns::tokio::Behaviour::new(mdns::Config::default(), peer_id)
-                    .map_err(|e| format!("Failed to create mDNS: {}", e))?;
-                (Toggle::from(Some(mdns)), Toggle::from(None))
-            } else {
-                // Remote mode: use Kademlia DHT
-                let store = kad::store::MemoryStore::new(peer_id);
-                let kademlia = kad::Behaviour::new(peer_id, store);
-                (Toggle::from(None), Toggle::from(Some(kademlia)))
-            };
-
-            let identify = identify::Behaviour::new(identify::Config::new(
-                PROTOCOL_VERSION.to_string(),
-                key.public(),
-            ));
-
-            let autonat = autonat::Behaviour::new(peer_id, autonat::Config::default());
-
-            Ok(WavsBehaviour {
-                gossipsub,
-                catchup,
-                mdns,
-                kademlia,
-                identify,
-                autonat,
+/// Parse hex-encoded Ed25519 public key strings into PublicKey values.
+fn parse_authorized_peers(hex_keys: &[String]) -> Result<Vec<ed25519::PublicKey>, AggregatorError> {
+    hex_keys
+        .iter()
+        .map(|hex| {
+            let bytes = const_hex::decode(hex).map_err(|e| {
+                AggregatorError::P2p(format!("Invalid hex pubkey '{}': {}", hex, e))
+            })?;
+            pubkey_from_bytes(&bytes).map_err(|e| {
+                AggregatorError::P2p(format!("Invalid Ed25519 pubkey '{}': {}", hex, e))
             })
         })
-        .map_err(|e| AggregatorError::P2p(format!("Failed to build behaviour: {}", e)))?
-        .build();
-
-    Ok(swarm)
+        .collect()
 }
 
-// ============================================================================
-// Event Loop
-// ============================================================================
-
-/// State for the P2P event loop
-struct EventLoopState {
-    /// Topics we're subscribed to
-    subscribed_topics: HashSet<String>,
-    /// Service IDs we're subscribed to (for catch-up requests)
-    subscribed_services: HashSet<ServiceId>,
-    /// Pending publishes waiting for peers
-    pending_publishes: VecDeque<PendingPublish>,
-    /// Recent submissions stored for catch-up responses (service_id -> submissions)
-    stored_submissions: HashMap<ServiceId, Vec<StoredSubmission>>,
-    /// Peers we've already requested catch-up from, tracked per service
-    catchup_requested_peers: HashMap<ServiceId, HashSet<PeerId>>,
-    config: P2pConfig,
-    /// Actual listen addresses (from NewListenAddr events, filtered for usable addresses)
-    listen_addresses: Vec<Multiaddr>,
-    /// Whether Kademlia bootstrap has completed successfully (for retry logic)
-    kademlia_bootstrap_complete: bool,
-    /// Bootstrap node addresses (for reconnection when all peers disconnect)
-    bootstrap_nodes: Vec<Multiaddr>,
+/// Parse a bootstrapper address string of format "<hex_pubkey>@<host>:<port>"
+/// into a Bootstrapper tuple (PublicKey, Ingress).
+///
+/// Bootstrappers in discovery mode need their public key and a dialable address.
+fn parse_bootstrapper(addr: &str) -> Result<(ed25519::PublicKey, Ingress), AggregatorError> {
+    let (pubkey, socket_addr) = parse_peer_address(addr)?;
+    Ok((pubkey, Ingress::from(socket_addr)))
 }
 
-impl EventLoopState {
-    fn new(config: P2pConfig, bootstrap_nodes: Vec<Multiaddr>) -> Self {
-        Self {
-            subscribed_topics: HashSet::new(),
-            subscribed_services: HashSet::new(),
-            pending_publishes: VecDeque::new(),
-            stored_submissions: HashMap::new(),
-            catchup_requested_peers: HashMap::new(),
-            listen_addresses: Vec::new(),
-            config,
-            kademlia_bootstrap_complete: false,
-            bootstrap_nodes,
-        }
-    }
-
-    /// Store a submission for catch-up responses.
-    /// Deduplicates by event ID and signer address, and enforces per-service storage limits.
-    fn store_submission(&mut self, submission: Submission) {
-        let service_id = submission.service_id().clone();
-
-        // Extract signer address - reject submissions with invalid signatures
-        let signer_addr = match submission
-            .envelope_signature
-            .evm_signer_address(&submission.envelope)
-        {
-            Ok(addr) => addr,
-            Err(e) => {
-                tracing::warn!("Rejecting submission with invalid signature: {}", e);
-                return;
-            }
-        };
-
-        let subs = self.stored_submissions.entry(service_id).or_default();
+/// Construct an Ed25519 PublicKey from raw bytes using commonware's codec.
+fn pubkey_from_bytes(bytes: &[u8]) -> Result<ed25519::PublicKey, String> {
+    use commonware_codec::ReadExt;
+    let mut buf = bytes;
+    ed25519::PublicKey::read(&mut buf).map_err(|e| format!("{}", e))
+}
 
-        // Skip if we already have a submission from this signer for this event
-        let already_exists = subs.iter().any(|s| {
-            s.submission.event_id == submission.event_id
-                && s.submission
-                    .envelope_signature
-                    .evm_signer_address(&s.submission.envelope)
-                    .map(|a| a == signer_addr)
-                    .unwrap_or(false)
-        });
-        if already_exists {
-            tracing::debug!(
-                "Skipping duplicate submission from signer {} for event {}",
-                signer_addr,
-                submission.event_id
+/// Spawn the commonware P2P runtime on a dedicated OS thread.
+///
+/// Returns a JoinHandle for the OS thread and accepts an mpsc receiver for P2pCommands.
+///
+/// CRITICAL: Must use std::thread::spawn (NOT tokio::spawn or spawn_blocking)
+/// because commonware's Runner creates its own Tokio runtime internally.
+/// Nesting Tokio runtimes causes a panic.
+fn spawn_commonware_runtime(
+    private_key: ed25519::PrivateKey,
+    p2p_config: P2pConfig,
+    command_rx: mpsc::UnboundedReceiver<P2pCommand>,
+    aggregator_tx: crossbeam::channel::Sender<AggregatorCommand>,
+) -> Result<std::thread::JoinHandle<()>, AggregatorError> {
+    let handle = std::thread::Builder::new()
+        .name("wavs-p2p-commonware".into())
+        .spawn(move || {
+            use commonware_runtime::{tokio::Config as RuntimeConfig, Runner};
+            let runner = commonware_runtime::tokio::Runner::new(
+                RuntimeConfig::new()
+                    .with_worker_threads(2)
+                    .with_max_blocking_threads(4)
+                    .with_tcp_nodelay(Some(true)),
             );
-            return;
-        }
-
-        // Enforce per-service storage limit by removing oldest entries
-        let max_stored = self.config.max_stored_submissions_per_service();
-        while subs.len() >= max_stored {
-            subs.remove(0);
-            tracing::debug!("Removed oldest stored submission due to storage limit");
-        }
-
-        let stored = StoredSubmission {
-            submission,
-            created_at: Instant::now(),
-        };
-        subs.push(stored);
-    }
-
-    /// Get submissions for a service (for catch-up response)
-    fn get_submissions_for_catchup(&self, service_id: &ServiceId) -> Vec<Submission> {
-        let now = Instant::now();
-        let ttl = Duration::from_secs(self.config.submission_ttl_secs());
-
-        self.stored_submissions
-            .get(service_id)
-            .map(|subs| {
-                subs.iter()
-                    .filter(|s| now.duration_since(s.created_at) < ttl)
-                    .take(self.config.max_catchup_submissions())
-                    .map(|s| s.submission.clone())
-                    .collect()
-            })
-            .unwrap_or_default()
-    }
+            runner.start(|context| async move {
+                match p2p_config {
+                    P2pConfig::Local {
+                        listen_port,
+                        ref peer_addresses,
+                        ref authorized_peers,
+                        max_message_size,
+                        deque_size,
+                    } => {
+                        let max_msg_size = max_message_size.unwrap_or(65536);
+                        let deq_size = deque_size.unwrap_or(128);
+                        run_lookup_network(
+                            context,
+                            &private_key,
+                            listen_port,
+                            peer_addresses,
+                            authorized_peers,
+                            command_rx,
+                            aggregator_tx,
+                            max_msg_size,
+                            deq_size,
+                        )
+                        .await;
+                    }
+                    P2pConfig::Remote {
+                        listen_port,
+                        ref bootstrappers,
+                        ref authorized_peers,
+                        max_message_size,
+                        deque_size,
+                    } => {
+                        let max_msg_size = max_message_size.unwrap_or(65536);
+                        let deq_size = deque_size.unwrap_or(128);
+                        run_discovery_network(
+                            context,
+                            &private_key,
+                            listen_port,
+                            bootstrappers,
+                            authorized_peers,
+                            command_rx,
+                            aggregator_tx,
+                            max_msg_size,
+                            deq_size,
+                        )
+                        .await;
+                    }
+                    P2pConfig::Disabled => {
+                        // Should not reach here; handled before spawn
+                    }
+                }
+            });
+        })
+        .map_err(|e| AggregatorError::P2p(format!("Failed to spawn P2P thread: {}", e)))?;
+    Ok(handle)
+}
 
-    /// Clean up expired submissions
-    fn cleanup_expired_submissions(&mut self) {
-        let now = Instant::now();
-        let ttl = Duration::from_secs(self.config.submission_ttl_secs());
+/// Reserved service ID used by heartbeat probes to discover connected peers.
+/// No real service uses all-zeros service ID, so ServiceRouter filters these out.
+const HEARTBEAT_SERVICE_ID: [u8; 32] = [0u8; 32];
 
-        for subs in self.stored_submissions.values_mut() {
-            subs.retain(|s| now.duration_since(s.created_at) < ttl);
-        }
+/// Sentinel service_id for subscription announcement messages (ANN-05).
+/// Distinguished from HEARTBEAT_SERVICE_ID ([0x00; 32]) and real service_id SHA-256 hashes.
+/// A valid SHA-256 hash producing all-0xFF is astronomically unlikely (~1/2^256).
+pub(crate) const SUBSCRIPTION_SENTINEL: [u8; 32] = [0xFF; 32];
 
-        // Remove empty service entries
-        self.stored_submissions.retain(|_, subs| !subs.is_empty());
-    }
+/// Check if a P2pMessage is a subscription announcement by its sentinel service_id.
+fn is_subscription_announcement(msg: &P2pMessage) -> bool {
+    msg.service_id_bytes == SUBSCRIPTION_SENTINEL
 }
 
-/// Run the P2P event loop
-async fn run_event_loop(
-    ctx: AppContext,
-    p2p_config: P2pConfig,
-    mut swarm: Swarm<WavsBehaviour>,
+/// Run a lookup-mode P2P network inside the commonware runtime.
+///
+/// This function:
+/// 1. Creates a lookup::Network with the node's Ed25519 identity
+/// 2. Configures the Oracle with authorized peers + own pubkey
+/// 3. Registers two broadcast channels (Engine + direct forwarding)
+/// 4. Creates the broadcast Engine for message caching and catch-up
+/// 5. Spawns an inbound bridge task (commonware Receiver -> tokio mpsc)
+/// 6. Starts the network and Engine
+/// 7. Runs a bridge loop handling P2pCommands and inbound messages
+///
+/// SEC-02: Rate limiting is active via lookup::Config::local() which sets:
+/// - allowed_connection_rate_per_peer: Quota::per_second(1)
+/// - allowed_handshake_rate_per_ip: Quota::per_second(16)
+/// - allowed_handshake_rate_per_subnet: Quota::per_second(128)
+///
+/// These are non-zero defaults confirmed from the Config::local() source.
+#[allow(clippy::too_many_arguments)]
+async fn run_lookup_network(
+    context: impl commonware_runtime::Spawner
+        + commonware_runtime::Clock
+        + commonware_runtime::Network
+        + commonware_runtime::Metrics
+        + commonware_runtime::BufferPooler
+        + commonware_runtime::Resolver
+        + rand_core::CryptoRngCore,
+    private_key: &ed25519::PrivateKey,
+    listen_port: u16,
+    peer_addresses: &[String],
+    authorized_peer_hexes: &[String],
     mut command_rx: mpsc::UnboundedReceiver<P2pCommand>,
     aggregator_tx: crossbeam::channel::Sender<AggregatorCommand>,
+    max_message_size: u32,
+    deque_size_param: usize,
 ) {
-    let listen_port = match &p2p_config {
-        P2pConfig::Local { listen_port, .. } => *listen_port,
-        P2pConfig::Remote { listen_port, .. } => *listen_port,
-        P2pConfig::Disabled => {
-            tracing::error!("P2P is disabled, cannot run event loop");
-            return;
-        }
-    };
+    let listen_addr = std::net::SocketAddr::from(([0, 0, 0, 0], listen_port));
+
+    // Create lookup network config with rate limiting active (Config::local defaults).
+    // SEC-02 verified: Config::local() sets allowed_connection_rate_per_peer = per_second(1),
+    // allowed_handshake_rate_per_ip = per_second(16), allowed_handshake_rate_per_subnet = per_second(128).
+    let config = lookup::Config::local(
+        private_key.clone(),
+        b"wavs-p2p", // namespace for replay protection
+        listen_addr,
+        max_message_size, // configurable max_message_size (default: 64KB)
+    );
 
-    // Try the preferred port first, fall back to OS-assigned if it fails
-    let listen_addr: Multiaddr = format!("/ip4/0.0.0.0/tcp/{}", listen_port)
-        .parse()
-        .expect("Valid multiaddr");
+    tracing::debug!(
+        "P2P lookup config: rate limiting active (connection_rate_per_peer=1/s, handshake_rate_per_ip=16/s, handshake_rate_per_subnet=128/s)"
+    );
 
-    if let Err(e) = swarm.listen_on(listen_addr.clone()) {
-        tracing::warn!(
-            "Failed to listen on preferred port {}: {}, falling back to OS-assigned port",
-            listen_addr,
-            e
-        );
-        let fallback_addr: Multiaddr = "/ip4/0.0.0.0/tcp/0".parse().expect("Valid multiaddr");
-        if let Err(e) = swarm.listen_on(fallback_addr.clone()) {
-            tracing::error!("Failed to listen on fallback address: {}", e);
-            return;
-        }
-        tracing::info!("P2P listening on {}", fallback_addr);
-    } else {
-        tracing::info!("P2P listening on {}", listen_addr);
-    }
+    let (mut network, mut oracle) = lookup::Network::new(context.with_label("p2p_network"), config);
 
-    // Parse bootstrap node addresses (for Remote mode)
-    let bootstrap_node_strs = match &p2p_config {
-        P2pConfig::Remote {
-            bootstrap_nodes, ..
-        } => bootstrap_nodes.clone(),
-        _ => vec![],
+    // Build Oracle peer map: Map<PublicKey, Address>
+    // Include own pubkey (implicitly trusted per user decision)
+    let own_pubkey = private_key.public_key();
+
+    let mut peer_entries: Vec<(ed25519::PublicKey, Address)> = Vec::new();
+
+    // Add own pubkey to Oracle so other peers can verify us
+    peer_entries.push((own_pubkey.clone(), listen_addr.into()));
+
+    // Parse and add known peer addresses
+    for addr_str in peer_addresses {
+        match parse_peer_address(addr_str) {
+            Ok((pubkey, socket_addr)) => {
+                peer_entries.push((pubkey, socket_addr.into()));
+            }
+            Err(e) => {
+                tracing::error!("Skipping invalid peer address '{}': {}", addr_str, e);
+            }
+        }
+    }
+
+    // Parse and add authorized peers (these may not have addresses in lookup mode,
+    // but they need to be in the Oracle for authorization).
+    // NOTE: In lookup mode, peers without addresses cannot be connected to,
+    // but authorized_peers without addresses are still recognized if they connect to us.
+    for hex_key in authorized_peer_hexes {
+        match parse_authorized_peers(std::slice::from_ref(hex_key)) {
+            Ok(keys) => {
+                for key in keys {
+                    if !peer_entries.iter().any(|(k, _)| k == &key) {
+                        // Add with placeholder address -- they connect to us, we don't need their address
+                        peer_entries
+                            .push((key, std::net::SocketAddr::from(([0, 0, 0, 0], 0)).into()));
+                    }
+                }
+            }
+            Err(e) => {
+                tracing::error!("Skipping invalid authorized peer '{}': {}", hex_key, e);
+            }
+        }
+    }
+
+    // Build the ordered Map for Oracle.track()
+    // Map requires TryFrom<Vec<(K, V)>> which requires sorted, unique keys
+    let peer_map: commonware_utils::ordered::Map<ed25519::PublicKey, Address> =
+        commonware_utils::ordered::Map::from_iter_dedup(peer_entries);
+
+    // Register peer set with Oracle at index 0
+    oracle.track(0, peer_map).await;
+
+    tracing::info!(
+        "P2P lookup network: listening on {}, {} peers configured",
+        listen_addr,
+        peer_addresses.len()
+    );
+
+    // Register TWO channels before network.start():
+    // Channel 0: for broadcast Engine (caching + catch-up via push-based re-broadcast)
+    let (engine_sender, engine_receiver) = network.register(
+        0u64,
+        Quota::per_second(NZU32!(100)),
+        1024, // backlog
+    );
+
+    // Channel 1: for direct message forwarding to Aggregator
+    let (mut direct_sender, direct_receiver) = network.register(
+        1u64,
+        Quota::per_second(NZU32!(100)),
+        1024, // backlog
+    );
+
+    // Create the broadcast Engine for message caching and catch-up.
+    // CATCH-01: The Engine caches broadcast messages in per-peer deques (bounded by deque_size).
+    // When a peer reconnects, the Engine's internal relay delivers cached messages from
+    // connected peers' deques to the newly connected peer. This is push-based -- the Engine
+    // automatically re-broadcasts cached content when peers reconnect. No application-level
+    // pull mechanism (mailbox.subscribe(digest)) is needed for catch-up.
+    // CATCH-02: deque_size bounds per-peer message storage. When full, oldest messages
+    // are evicted. This prevents unbounded memory growth.
+    let broadcast_config = BroadcastConfig {
+        public_key: own_pubkey.clone(),
+        mailbox_size: 256,
+        deque_size: deque_size_param, // CATCH-02: bounded message storage per peer (configurable)
+        priority: false,
+        codec_config: (RangeCfg::new(0..=(max_message_size as usize)), ()), // P2pMessage::Cfg = (RangeCfg<usize>, ())
+        peer_provider: oracle.clone(),
     };
+    let (engine, mailbox) =
+        Engine::<_, _, P2pMessage, _>::new(context.with_label("p2p_broadcast"), broadcast_config);
+
+    // Start the network (consumes self, returns a handle)
+    let _net_handle = network.start();
+
+    // Start the broadcast Engine (consumes engine_sender/receiver for channel 0)
+    let _engine_handle = engine.start((engine_sender, engine_receiver));
+
+    // Bridge commonware Receiver (channel 1) -> Tokio mpsc channel.
+    // The direct_receiver runs in the commonware runtime and may not be directly
+    // compatible with tokio::select!. This dedicated bridge task reads from the
+    // commonware Receiver and forwards to a Tokio mpsc channel.
+    let (inbound_tx, mut inbound_rx) =
+        tokio::sync::mpsc::channel::<(ed25519::PublicKey, commonware_runtime::IoBuf)>(256);
+    {
+        let inbound_tx = inbound_tx.clone();
+        let mut direct_receiver = direct_receiver;
+        context.clone().spawn(move |_ctx| async move {
+            use commonware_p2p::Receiver as P2pReceiver;
+            loop {
+                match direct_receiver.recv().await {
+                    Ok((peer_pubkey, raw_bytes)) => {
+                        if inbound_tx.send((peer_pubkey, raw_bytes)).await.is_err() {
+                            break; // Bridge loop shut down
+                        }
+                    }
+                    Err(e) => {
+                        tracing::error!("Direct receiver error: {:?}", e);
+                        break;
+                    }
+                }
+            }
+        });
+    }
+
+    tracing::info!(
+        "P2P network started (peer_id: {})",
+        const_hex::encode(own_pubkey.as_ref())
+    );
 
-    let mut parsed_bootstrap_nodes: Vec<Multiaddr> = Vec::new();
-
-    // For Remote mode: dial bootstrap nodes and trigger Kademlia bootstrap
-    if !bootstrap_node_strs.is_empty() {
-        for addr_str in &bootstrap_node_strs {
-            match addr_str.parse::<Multiaddr>() {
-                Ok(addr) => {
-                    parsed_bootstrap_nodes.push(addr.clone());
-
-                    // Extract peer ID from the multiaddr (e.g., /ip4/.../tcp/.../p2p/<peer_id>)
-                    // and add to Kademlia BEFORE dialing so bootstrap has peers to contact
-                    if let Some(peer_id) = extract_peer_id(&addr) {
-                        if let Some(kademlia) = swarm.behaviour_mut().kademlia.as_mut() {
-                            // Add address without the /p2p/ suffix for Kademlia
-                            let addr_without_peer_id = remove_peer_id_suffix(&addr);
-                            kademlia.add_address(&peer_id, addr_without_peer_id);
+    // Bridge loop state
+    let mut service_router = ServiceRouter::new();
+    let mut retry_queue = RetryQueue::new();
+    // BCAST-02: Application-level deduplication by message digest.
+    // The Engine deduplicates on channel 0 internally, but channel 1
+    // (direct) has no built-in dedup. This set ensures exactly-once
+    // delivery to the Aggregator regardless of channel.
+    let mut seen_digests: HashSet<sha256::Digest> = HashSet::new();
+    const MAX_SEEN_DIGESTS: usize = 1024;
+
+    // Phase 15: Peer subscription tracking
+    let mut peer_subscriptions = PeerSubscriptionMap::new();
+    // Track peers we have received any message from (for hello on first contact, ANN-04)
+    let mut known_peers: HashSet<ed25519::PublicKey> = HashSet::new();
+    // COMPAT-03: Connected peer set (PublicKey form) for backward-compat recipient resolution.
+    // Updated from heartbeat and broadcast ack results.
+    let mut connected_peer_set: HashSet<ed25519::PublicKey> = HashSet::new();
+
+    // Connected peer tracking for OBS-01.
+    // Updated from broadcast acknowledgment results and inbound message senders.
+    // Starts at empty (truthful -- no peers confirmed until message exchange).
+    let connected_peers_tracker: Arc<RwLock<Vec<String>>> = Arc::new(RwLock::new(Vec::new()));
+
+    // Heartbeat timer: probes the P2P mesh every 2 seconds so connected_peers_tracker
+    // is populated before any real trigger fires. Uses HEARTBEAT_SERVICE_ID (all-zeros
+    // sentinel) which ServiceRouter always filters out -- never forwarded to aggregator.
+    let mut heartbeat = tokio::time::interval(Duration::from_secs(2));
+    heartbeat.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Delay);
+    heartbeat.tick().await; // consume the immediate first tick
+
+    // Bridge loop: handle P2pCommands and inbound messages from peers.
+    loop {
+        tokio::select! {
+            cmd = command_rx.recv() => {
+                match cmd {
+                    Some(P2pCommand::Publish { service_id, submission }) => {
+                        match P2pMessage::from_submission(&service_id, &submission) {
+                            Ok(msg) => {
+                                // Broadcast via Engine channel (for caching + catch-up / CATCH-01)
+                                let ack_rx = mailbox.broadcast(Recipients::All, msg.clone()).await;
+
+                                // Channel 1: targeted delivery to subscribed peers only (TGT-01)
+                                // get_recipients() returns Recipients::All as fallback when set is empty (TGT-02)
+                                let direct_recipients = peer_subscriptions.get_recipients(&service_id.inner(), &connected_peer_set);
+                                let encoded_bytes = Encode::encode(&msg);
+                                if let Err(e) = direct_sender.send(direct_recipients, encoded_bytes, false).await {
+                                    tracing::warn!("Direct channel send failed: {:?}", e);
+                                }
+
+                                // Check Engine broadcast acknowledgment
+                                match ack_rx.await {
+                                    Ok(recipients) if recipients.is_empty() => {
+                                        retry_queue.push(msg);
+                                        tracing::warn!("No peers received broadcast, queued for retry");
+                                    }
+                                    Ok(recipients) => {
+                                        // Update connected peer tracking from broadcast results (OBS-01)
+                                        let peer_hexes: Vec<String> = recipients
+                                            .iter()
+                                            .map(|pk| const_hex::encode(pk.as_ref()))
+                                            .collect();
+                                        *connected_peers_tracker.write().unwrap() = peer_hexes;
+                                        connected_peer_set = recipients.iter().cloned().collect();
+
+                                        tracing::debug!("Broadcast delivered to {} peers", recipients.len());
+                                        // Flush retry queue since peers are available
+                                        if !retry_queue.is_empty() {
+                                            let queued = retry_queue.drain_all();
+                                            for queued_msg in queued {
+                                                drop(mailbox.broadcast(Recipients::All, queued_msg.clone()).await);
+                                                // TGT-04: Re-resolve recipients at drain time from current subscription state
+                                                let retry_recipients = peer_subscriptions.get_recipients(&queued_msg.service_id_bytes, &connected_peer_set);
+                                                let queued_bytes = Encode::encode(&queued_msg);
+                                                if let Err(e) = direct_sender.send(retry_recipients, queued_bytes, false).await {
+                                                    tracing::warn!("Direct channel retry send failed: {:?}", e);
+                                                }
+                                            }
+                                        }
+                                    }
+                                    Err(_) => {
+                                        tracing::error!("Broadcast engine shut down");
+                                    }
+                                }
+                            }
+                            Err(e) => {
+                                tracing::error!("Failed to create P2pMessage: {:?}", e);
+                            }
+                        }
+                    }
+                    Some(P2pCommand::Subscribe { service_id }) => {
+                        service_router.subscribe(&service_id);
+                        tracing::info!("Subscribed to service: {}", service_id);
+                        // ANN-01: Announce subscription to all connected peers
+                        let announcement = SubscriptionAnnouncement {
+                            subscribe: vec![service_id.inner()],
+                            unsubscribe: vec![],
+                            full_state: false,
+                        };
+                        if let Ok(msg) = announcement.to_p2p_message() {
+                            let encoded = Encode::encode(&msg);
+                            if let Err(e) = direct_sender.send(Recipients::All, encoded, false).await {
+                                tracing::debug!("Subscription announcement send failed: {:?}", e);
+                            }
+                        }
+                    }
+                    Some(P2pCommand::Unsubscribe { service_id }) => {
+                        service_router.unsubscribe(&service_id);
+                        tracing::info!("Unsubscribed from service: {}", service_id);
+                        // ANN-02: Announce unsubscription to all connected peers
+                        let announcement = SubscriptionAnnouncement {
+                            subscribe: vec![],
+                            unsubscribe: vec![service_id.inner()],
+                            full_state: false,
+                        };
+                        if let Ok(msg) = announcement.to_p2p_message() {
+                            let encoded = Encode::encode(&msg);
+                            if let Err(e) = direct_sender.send(Recipients::All, encoded, false).await {
+                                tracing::debug!("Unsubscription announcement send failed: {:?}", e);
+                            }
+                        }
+                    }
+                    Some(P2pCommand::GetStatus { response_tx }) => {
+                        let peers = connected_peers_tracker.read().unwrap().clone();
+                        let status = P2pStatus {
+                            enabled: true,
+                            discovery_mode: "local".to_string(),
+                            local_peer_id: Some(const_hex::encode(own_pubkey.as_ref())),
+                            listen_addresses: vec![listen_addr.to_string()],
+                            connected_peers: peers.len(),
+                            peer_ids: peers,
+                            subscribed_services: service_router.subscribed_services(),
+                            peer_subscriptions: peer_subscriptions.peer_subscription_counts(),
+                        };
+                        let _ = response_tx.send(status);
+                    }
+                    Some(P2pCommand::BlockPeer { pubkey_hex }) => {
+                        match parse_authorized_peers(std::slice::from_ref(&pubkey_hex)) {
+                            Ok(keys) if !keys.is_empty() => {
+                                oracle.block(keys[0].clone()).await;
+                                tracing::info!("Blocked peer: {}", pubkey_hex);
+                            }
+                            _ => {
+                                tracing::error!("Failed to parse pubkey for blocking: {}", pubkey_hex);
+                            }
+                        }
+                    }
+                    None => {
+                        tracing::info!("P2P command channel closed, shutting down");
+                        context.stop(0, None).await.ok();
+                        break;
+                    }
+                }
+            }
+            msg = inbound_rx.recv() => {
+                match msg {
+                    Some((peer_pubkey, raw_bytes)) => {
+                        // Track inbound peer as connected (OBS-01)
+                        {
+                            let sender_hex = const_hex::encode(peer_pubkey.as_ref());
+                            let mut peers = connected_peers_tracker.write().unwrap();
+                            if !peers.contains(&sender_hex) {
+                                peers.push(sender_hex);
+                            }
+                        }
+
+                        // Decode P2pMessage from raw bytes
+                        let p2p_msg: P2pMessage = match P2pMessage::decode_cfg(
+                            raw_bytes, &(RangeCfg::new(0..=(max_message_size as usize)), ())
+                        ) {
+                            Ok(m) => m,
+                            Err(e) => {
+                                tracing::warn!("Failed to decode P2P message: {:?}", e);
+                                continue;
+                            }
+                        };
+
+                        // BCAST-02: Deduplication by digest.
+                        // Compute digest and skip if already seen.
+                        let digest = p2p_msg.digest();
+                        if seen_digests.contains(&digest) {
+                            tracing::trace!("Duplicate message filtered by digest");
+                            continue;
+                        }
+                        // Bound the set: if at capacity, clear to prevent unbounded growth.
+                        if seen_digests.len() >= MAX_SEEN_DIGESTS {
+                            seen_digests.clear();
+                            tracing::debug!("Cleared seen_digests set (reached {} capacity)", MAX_SEEN_DIGESTS);
+                        }
+                        seen_digests.insert(digest);
+
+                        // ANN-04: Send hello on first contact with a new peer
+                        if !known_peers.contains(&peer_pubkey) {
+                            known_peers.insert(peer_pubkey.clone());
+                            let my_services = service_router.subscribed_services_raw();
+                            if !my_services.is_empty() {
+                                let hello = SubscriptionAnnouncement {
+                                    subscribe: my_services,
+                                    unsubscribe: vec![],
+                                    full_state: true,
+                                };
+                                if let Ok(msg) = hello.to_p2p_message() {
+                                    let encoded = Encode::encode(&msg);
+                                    if let Err(e) = direct_sender.send(
+                                        Recipients::One(peer_pubkey.clone()),
+                                        encoded,
+                                        false,
+                                    ).await {
+                                        tracing::debug!("Hello announcement to new peer failed: {:?}", e);
+                                    }
+                                }
+                            }
+                        }
+
+                        // Phase 15: Intercept subscription announcements before service filtering
+                        if is_subscription_announcement(&p2p_msg) {
+                            match SubscriptionAnnouncement::from_payload(&p2p_msg.payload) {
+                                Ok(announcement) => {
+                                    if announcement.full_state {
+                                        // Replace-not-merge for full state updates (heartbeat/hello)
+                                        peer_subscriptions.set_peer_subscriptions(
+                                            &peer_pubkey,
+                                            announcement.subscribe.clone(),
+                                        );
+                                    } else {
+                                        // Incremental for event-driven announcements
+                                        peer_subscriptions.handle_announcement(&peer_pubkey, &announcement);
+                                    }
+                                    tracing::debug!(
+                                        "Subscription update from {}: +{} -{}{}",
+                                        const_hex::encode(peer_pubkey.as_ref()),
+                                        announcement.subscribe.len(),
+                                        announcement.unsubscribe.len(),
+                                        if announcement.full_state { " (full)" } else { "" },
+                                    );
+                                }
+                                Err(e) => {
+                                    tracing::warn!("Invalid subscription announcement: {:?}", e);
+                                }
+                            }
+                            continue; // Do not forward subscription announcements to Aggregator
+                        }
+
+                        // Service filtering (BCAST-05)
+                        if !service_router.should_accept(&p2p_msg) {
+                            tracing::trace!("Filtered message for unsubscribed service");
+                            continue;
+                        }
+
+                        // Deserialize and forward to Aggregator
+                        match p2p_msg.to_submission() {
+                            Ok((_service_id, submission)) => {
+                                let peer_id = const_hex::encode(peer_pubkey.as_ref());
+                                if let Err(e) = aggregator_tx.send(AggregatorCommand::Receive {
+                                    submission,
+                                    peer: Peer::Other(peer_id),
+                                }) {
+                                    tracing::error!("Failed to forward to aggregator: {:?}", e);
+                                }
+                            }
+                            Err(e) => {
+                                tracing::warn!("Failed to deserialize submission: {:?}", e);
+                            }
+                        }
+                    }
+                    None => {
+                        tracing::error!("Inbound bridge channel closed");
+                        break;
+                    }
+                }
+            }
+            _ = heartbeat.tick() => {
+                let probe = P2pMessage {
+                    service_id_bytes: HEARTBEAT_SERVICE_ID,
+                    payload: vec![],
+                };
+                let ack_rx = mailbox.broadcast(Recipients::All, probe.clone()).await;
+                let encoded = Encode::encode(&probe);
+                if let Err(e) = direct_sender.send(Recipients::All, encoded, false).await {
+                    tracing::trace!("Heartbeat direct send failed: {:?}", e);
+                }
+                match ack_rx.await {
+                    Ok(recipients) if !recipients.is_empty() => {
+                        let peer_hexes: Vec<String> = recipients
+                            .iter()
+                            .map(|pk| const_hex::encode(pk.as_ref()))
+                            .collect();
+                        *connected_peers_tracker.write().unwrap() = peer_hexes;
+                        tracing::debug!("Heartbeat: {} peers connected", recipients.len());
+
+                        // Update connected peer set for COMPAT-03 recipient resolution
+                        connected_peer_set = recipients.iter().cloned().collect();
+
+                        // SUB-03: Prune subscription entries for departed peers.
+                        // Heartbeat ack recipients are the authoritative connected peer set.
+                        let tracked = peer_subscriptions.tracked_peers();
+                        for departed in tracked.difference(&connected_peer_set) {
+                            peer_subscriptions.remove_peer(departed);
+                            known_peers.remove(departed);
                             tracing::debug!(
-                                "Added bootstrap node {} to Kademlia routing table",
-                                peer_id
+                                "Pruned departed peer from subscriptions: {}",
+                                const_hex::encode(departed.as_ref()),
                             );
                         }
+
+                        if !retry_queue.is_empty() {
+                            let queued = retry_queue.drain_all();
+                            for queued_msg in queued {
+                                drop(mailbox.broadcast(Recipients::All, queued_msg.clone()).await);
+                                // TGT-04: Re-resolve recipients at drain time from current subscription state
+                                let retry_recipients = peer_subscriptions.get_recipients(&queued_msg.service_id_bytes, &connected_peer_set);
+                                let queued_bytes = Encode::encode(&queued_msg);
+                                if let Err(e) = direct_sender.send(retry_recipients, queued_bytes, false).await {
+                                    tracing::warn!("Retry send failed: {:?}", e);
+                                }
+                            }
+                        }
                     }
+                    Ok(_) => tracing::trace!("Heartbeat: no peers connected yet"),
+                    Err(_) => tracing::error!("Heartbeat: broadcast engine shut down"),
+                }
+                // ANN-03: Piggyback full subscription state for self-healing consistency
+                let my_services = service_router.subscribed_services_raw();
+                if !my_services.is_empty() {
+                    let announcement = SubscriptionAnnouncement {
+                        subscribe: my_services,
+                        unsubscribe: vec![],
+                        full_state: true,
+                    };
+                    if let Ok(msg) = announcement.to_p2p_message() {
+                        let encoded = Encode::encode(&msg);
+                        if let Err(e) = direct_sender.send(Recipients::All, encoded, false).await {
+                            tracing::trace!("Heartbeat subscription announcement failed: {:?}", e);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// Run a discovery-mode P2P network inside the commonware runtime.
+///
+/// This function:
+/// 1. Creates a discovery::Network with the node's Ed25519 identity
+/// 2. Configures the Oracle with authorized peers as a Set<PublicKey>
+/// 3. Registers two broadcast channels (Engine + direct forwarding)
+/// 4. Creates the broadcast Engine for message caching and catch-up
+/// 5. Spawns an inbound bridge task (commonware Receiver -> tokio mpsc)
+/// 6. Starts the network and Engine
+/// 7. Runs a bridge loop handling P2pCommands and inbound messages
+///
+/// Discovery mode uses bootstrapper nodes for peer discovery (production).
+/// Addresses are discovered dynamically through bootstrappers (no upfront addresses needed).
+///
+/// NET-01: Discovery-based peer discovery with bootstrappers
+/// NET-04: Automatic reconnection (built-in to discovery::Network via dial_frequency)
+#[allow(clippy::too_many_arguments)]
+async fn run_discovery_network(
+    context: impl commonware_runtime::Spawner
+        + commonware_runtime::Clock
+        + commonware_runtime::Network
+        + commonware_runtime::Metrics
+        + commonware_runtime::BufferPooler
+        + commonware_runtime::Resolver
+        + rand_core::CryptoRngCore,
+    private_key: &ed25519::PrivateKey,
+    listen_port: u16,
+    bootstrapper_strs: &[String],
+    authorized_peer_hexes: &[String],
+    mut command_rx: mpsc::UnboundedReceiver<P2pCommand>,
+    aggregator_tx: crossbeam::channel::Sender<AggregatorCommand>,
+    max_message_size: u32,
+    deque_size_param: usize,
+) {
+    let listen_addr = std::net::SocketAddr::from(([0, 0, 0, 0], listen_port));
+    let own_pubkey = private_key.public_key();
+
+    // Parse bootstrappers
+    let mut bootstrappers = Vec::new();
+    for bs_str in bootstrapper_strs {
+        match parse_bootstrapper(bs_str) {
+            Ok(bootstrapper) => bootstrappers.push(bootstrapper),
+            Err(e) => {
+                tracing::error!("Skipping invalid bootstrapper '{}': {}", bs_str, e);
+            }
+        }
+    }
+
+    if bootstrappers.is_empty() {
+        tracing::warn!(
+            "No valid bootstrappers configured -- this node will act as a bootstrapper itself"
+        );
+    }
+
+    // Create discovery network config using Config::local() for allow_private_ips=true
+    // (needed for localhost testing). Production deployments should use Config::recommended().
+    // Use the node's listen_addr as its dialable address (assumes public IP or port-forwarded).
+    let config = discovery::Config::local(
+        private_key.clone(),
+        b"wavs-p2p", // namespace for replay protection
+        listen_addr,
+        listen_addr, // dialable_addr -- same as listen for now
+        bootstrappers,
+        max_message_size, // configurable max_message_size (default: 64KB)
+    );
+
+    let (mut network, mut oracle) =
+        discovery::Network::new(context.with_label("p2p_discovery"), config);
+
+    // Build Oracle peer set: Set<PublicKey> (commonware_utils::ordered::Set)
+    // Discovery Oracle takes Set (not Map like lookup) -- addresses are discovered dynamically.
+    let mut peer_keys: Vec<ed25519::PublicKey> = Vec::new();
+
+    // Include own pubkey (implicitly trusted per user decision)
+    peer_keys.push(own_pubkey.clone());
+
+    // Add authorized peers
+    match parse_authorized_peers(authorized_peer_hexes) {
+        Ok(keys) => {
+            for key in keys {
+                peer_keys.push(key);
+            }
+        }
+        Err(e) => {
+            tracing::error!("Failed to parse authorized peers: {}", e);
+        }
+    }
+
+    // Build ordered Set from peer keys (dedup handles any duplicates)
+    let peer_set = commonware_utils::ordered::Set::from_iter_dedup(peer_keys);
+
+    // Register peer set with Oracle at index 0
+    oracle.track(0, peer_set).await;
+
+    tracing::info!(
+        "P2P discovery network: listening on {}, {} bootstrappers, {} authorized peers",
+        listen_addr,
+        bootstrapper_strs.len(),
+        authorized_peer_hexes.len()
+    );
+
+    // Register TWO channels before network.start():
+    // Channel 0: for broadcast Engine (caching + catch-up via push-based re-broadcast)
+    let (engine_sender, engine_receiver) = network.register(
+        0u64,
+        Quota::per_second(NZU32!(100)),
+        1024, // backlog
+    );
+
+    // Channel 1: for direct message forwarding to Aggregator
+    let (mut direct_sender, direct_receiver) = network.register(
+        1u64,
+        Quota::per_second(NZU32!(100)),
+        1024, // backlog
+    );
+
+    // Create the broadcast Engine for message caching and catch-up.
+    // CATCH-01: Engine caches messages per-peer. When a peer reconnects,
+    // cached messages are delivered via the Engine's internal relay (push-based).
+    // No application-level pull mechanism needed.
+    // CATCH-02: deque_size bounds per-peer message storage.
+    let broadcast_config = BroadcastConfig {
+        public_key: own_pubkey.clone(),
+        mailbox_size: 256,
+        deque_size: deque_size_param, // CATCH-02: bounded message storage per peer (configurable)
+        priority: false,
+        codec_config: (RangeCfg::new(0..=(max_message_size as usize)), ()), // P2pMessage::Cfg = (RangeCfg<usize>, ())
+        peer_provider: oracle.clone(),
+    };
+    let (engine, mailbox) = Engine::<_, _, P2pMessage, _>::new(
+        context.with_label("p2p_discovery_broadcast"),
+        broadcast_config,
+    );
+
+    // Start the network (consumes self, returns a handle)
+    let _net_handle = network.start();
+
+    // Start the broadcast Engine (consumes engine_sender/receiver for channel 0)
+    let _engine_handle = engine.start((engine_sender, engine_receiver));
+
+    // Bridge commonware Receiver (channel 1) -> Tokio mpsc channel.
+    let (inbound_tx, mut inbound_rx) =
+        tokio::sync::mpsc::channel::<(ed25519::PublicKey, commonware_runtime::IoBuf)>(256);
+    {
+        let inbound_tx = inbound_tx.clone();
+        let mut direct_receiver = direct_receiver;
+        context.clone().spawn(move |_ctx| async move {
+            use commonware_p2p::Receiver as P2pReceiver;
+            loop {
+                match direct_receiver.recv().await {
+                    Ok((peer_pubkey, raw_bytes)) => {
+                        if inbound_tx.send((peer_pubkey, raw_bytes)).await.is_err() {
+                            break; // Bridge loop shut down
+                        }
+                    }
+                    Err(e) => {
+                        tracing::error!("Discovery direct receiver error: {:?}", e);
+                        break;
+                    }
+                }
+            }
+        });
+    }
+
+    tracing::info!(
+        "P2P discovery network started (peer_id: {})",
+        const_hex::encode(own_pubkey.as_ref())
+    );
+
+    // Bridge loop state
+    let mut service_router = ServiceRouter::new();
+    let mut retry_queue = RetryQueue::new();
+    // BCAST-02: Application-level deduplication by message digest.
+    let mut seen_digests: HashSet<sha256::Digest> = HashSet::new();
+    const MAX_SEEN_DIGESTS: usize = 1024;
+
+    // Phase 15: Peer subscription tracking
+    let mut peer_subscriptions = PeerSubscriptionMap::new();
+    // Track peers we have received any message from (for hello on first contact, ANN-04)
+    let mut known_peers: HashSet<ed25519::PublicKey> = HashSet::new();
+    // COMPAT-03: Connected peer set (PublicKey form) for backward-compat recipient resolution.
+    // Updated from heartbeat and broadcast ack results.
+    let mut connected_peer_set: HashSet<ed25519::PublicKey> = HashSet::new();
+
+    // Connected peer tracking for OBS-01.
+    // Updated from broadcast acknowledgment results and inbound message senders.
+    // Starts at empty (truthful -- no peers confirmed until message exchange).
+    let connected_peers_tracker: Arc<RwLock<Vec<String>>> = Arc::new(RwLock::new(Vec::new()));
+
+    // Heartbeat timer: probes the P2P mesh every 2 seconds so connected_peers_tracker
+    // is populated before any real trigger fires. Uses HEARTBEAT_SERVICE_ID (all-zeros
+    // sentinel) which ServiceRouter always filters out -- never forwarded to aggregator.
+    let mut heartbeat = tokio::time::interval(Duration::from_secs(2));
+    heartbeat.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Delay);
+    heartbeat.tick().await; // consume the immediate first tick
+
+    // Bridge loop: handle P2pCommands and inbound messages from peers.
+    loop {
+        tokio::select! {
+            cmd = command_rx.recv() => {
+                match cmd {
+                    Some(P2pCommand::Publish { service_id, submission }) => {
+                        match P2pMessage::from_submission(&service_id, &submission) {
+                            Ok(msg) => {
+                                let ack_rx = mailbox.broadcast(Recipients::All, msg.clone()).await;
+                                // Channel 1: targeted delivery to subscribed peers only (TGT-01)
+                                // get_recipients() returns Recipients::All as fallback when set is empty (TGT-02)
+                                let direct_recipients = peer_subscriptions.get_recipients(&service_id.inner(), &connected_peer_set);
+                                let encoded_bytes = Encode::encode(&msg);
+                                if let Err(e) = direct_sender.send(direct_recipients, encoded_bytes, false).await {
+                                    tracing::warn!("Discovery direct channel send failed: {:?}", e);
+                                }
+                                match ack_rx.await {
+                                    Ok(recipients) if recipients.is_empty() => {
+                                        retry_queue.push(msg);
+                                        tracing::warn!("No peers received broadcast, queued for retry");
+                                    }
+                                    Ok(recipients) => {
+                                        // Update connected peer tracking from broadcast results (OBS-01)
+                                        let peer_hexes: Vec<String> = recipients
+                                            .iter()
+                                            .map(|pk| const_hex::encode(pk.as_ref()))
+                                            .collect();
+                                        *connected_peers_tracker.write().unwrap() = peer_hexes;
+                                        connected_peer_set = recipients.iter().cloned().collect();
+
+                                        tracing::debug!("Broadcast delivered to {} peers", recipients.len());
+                                        if !retry_queue.is_empty() {
+                                            let queued = retry_queue.drain_all();
+                                            for queued_msg in queued {
+                                                drop(mailbox.broadcast(Recipients::All, queued_msg.clone()).await);
+                                                // TGT-04: Re-resolve recipients at drain time from current subscription state
+                                                let retry_recipients = peer_subscriptions.get_recipients(&queued_msg.service_id_bytes, &connected_peer_set);
+                                                let queued_bytes = Encode::encode(&queued_msg);
+                                                if let Err(e) = direct_sender.send(retry_recipients, queued_bytes, false).await {
+                                                    tracing::warn!("Discovery direct channel retry send failed: {:?}", e);
+                                                }
+                                            }
+                                        }
+                                    }
+                                    Err(_) => {
+                                        tracing::error!("Broadcast engine shut down");
+                                    }
+                                }
+                            }
+                            Err(e) => {
+                                tracing::error!("Failed to create P2pMessage: {:?}", e);
+                            }
+                        }
+                    }
+                    Some(P2pCommand::Subscribe { service_id }) => {
+                        service_router.subscribe(&service_id);
+                        tracing::info!("Subscribed to service: {}", service_id);
+                        // ANN-01: Announce subscription to all connected peers
+                        let announcement = SubscriptionAnnouncement {
+                            subscribe: vec![service_id.inner()],
+                            unsubscribe: vec![],
+                            full_state: false,
+                        };
+                        if let Ok(msg) = announcement.to_p2p_message() {
+                            let encoded = Encode::encode(&msg);
+                            if let Err(e) = direct_sender.send(Recipients::All, encoded, false).await {
+                                tracing::debug!("Subscription announcement send failed: {:?}", e);
+                            }
+                        }
+                    }
+                    Some(P2pCommand::Unsubscribe { service_id }) => {
+                        service_router.unsubscribe(&service_id);
+                        tracing::info!("Unsubscribed from service: {}", service_id);
+                        // ANN-02: Announce unsubscription to all connected peers
+                        let announcement = SubscriptionAnnouncement {
+                            subscribe: vec![],
+                            unsubscribe: vec![service_id.inner()],
+                            full_state: false,
+                        };
+                        if let Ok(msg) = announcement.to_p2p_message() {
+                            let encoded = Encode::encode(&msg);
+                            if let Err(e) = direct_sender.send(Recipients::All, encoded, false).await {
+                                tracing::debug!("Unsubscription announcement send failed: {:?}", e);
+                            }
+                        }
+                    }
+                    Some(P2pCommand::GetStatus { response_tx }) => {
+                        let peers = connected_peers_tracker.read().unwrap().clone();
+                        let status = P2pStatus {
+                            enabled: true,
+                            discovery_mode: "remote".to_string(),
+                            local_peer_id: Some(const_hex::encode(own_pubkey.as_ref())),
+                            listen_addresses: vec![listen_addr.to_string()],
+                            connected_peers: peers.len(),
+                            peer_ids: peers,
+                            subscribed_services: service_router.subscribed_services(),
+                            peer_subscriptions: peer_subscriptions.peer_subscription_counts(),
+                        };
+                        let _ = response_tx.send(status);
+                    }
+                    Some(P2pCommand::BlockPeer { pubkey_hex }) => {
+                        match parse_authorized_peers(std::slice::from_ref(&pubkey_hex)) {
+                            Ok(keys) if !keys.is_empty() => {
+                                oracle.block(keys[0].clone()).await;
+                                tracing::info!("Blocked peer: {}", pubkey_hex);
+                            }
+                            _ => {
+                                tracing::error!("Failed to parse pubkey for blocking: {}", pubkey_hex);
+                            }
+                        }
+                    }
+                    None => {
+                        tracing::info!("P2P command channel closed, shutting down discovery network");
+                        context.stop(0, None).await.ok();
+                        break;
+                    }
+                }
+            }
+            msg = inbound_rx.recv() => {
+                match msg {
+                    Some((peer_pubkey, raw_bytes)) => {
+                        // Track inbound peer as connected (OBS-01)
+                        {
+                            let sender_hex = const_hex::encode(peer_pubkey.as_ref());
+                            let mut peers = connected_peers_tracker.write().unwrap();
+                            if !peers.contains(&sender_hex) {
+                                peers.push(sender_hex);
+                            }
+                        }
+
+                        // Decode P2pMessage from raw bytes
+                        let p2p_msg: P2pMessage = match P2pMessage::decode_cfg(
+                            raw_bytes, &(RangeCfg::new(0..=(max_message_size as usize)), ())
+                        ) {
+                            Ok(m) => m,
+                            Err(e) => {
+                                tracing::warn!("Failed to decode P2P message: {:?}", e);
+                                continue;
+                            }
+                        };
+
+                        // BCAST-02: Deduplication by digest.
+                        let digest = p2p_msg.digest();
+                        if seen_digests.contains(&digest) {
+                            tracing::trace!("Duplicate message filtered by digest");
+                            continue;
+                        }
+                        if seen_digests.len() >= MAX_SEEN_DIGESTS {
+                            seen_digests.clear();
+                            tracing::debug!("Cleared seen_digests set (reached {} capacity)", MAX_SEEN_DIGESTS);
+                        }
+                        seen_digests.insert(digest);
+
+                        // ANN-04: Send hello on first contact with a new peer
+                        if !known_peers.contains(&peer_pubkey) {
+                            known_peers.insert(peer_pubkey.clone());
+                            let my_services = service_router.subscribed_services_raw();
+                            if !my_services.is_empty() {
+                                let hello = SubscriptionAnnouncement {
+                                    subscribe: my_services,
+                                    unsubscribe: vec![],
+                                    full_state: true,
+                                };
+                                if let Ok(msg) = hello.to_p2p_message() {
+                                    let encoded = Encode::encode(&msg);
+                                    if let Err(e) = direct_sender.send(
+                                        Recipients::One(peer_pubkey.clone()),
+                                        encoded,
+                                        false,
+                                    ).await {
+                                        tracing::debug!("Hello announcement to new peer failed: {:?}", e);
+                                    }
+                                }
+                            }
+                        }
+
+                        // Phase 15: Intercept subscription announcements before service filtering
+                        if is_subscription_announcement(&p2p_msg) {
+                            match SubscriptionAnnouncement::from_payload(&p2p_msg.payload) {
+                                Ok(announcement) => {
+                                    if announcement.full_state {
+                                        // Replace-not-merge for full state updates (heartbeat/hello)
+                                        peer_subscriptions.set_peer_subscriptions(
+                                            &peer_pubkey,
+                                            announcement.subscribe.clone(),
+                                        );
+                                    } else {
+                                        // Incremental for event-driven announcements
+                                        peer_subscriptions.handle_announcement(&peer_pubkey, &announcement);
+                                    }
+                                    tracing::debug!(
+                                        "Subscription update from {}: +{} -{}{}",
+                                        const_hex::encode(peer_pubkey.as_ref()),
+                                        announcement.subscribe.len(),
+                                        announcement.unsubscribe.len(),
+                                        if announcement.full_state { " (full)" } else { "" },
+                                    );
+                                }
+                                Err(e) => {
+                                    tracing::warn!("Invalid subscription announcement: {:?}", e);
+                                }
+                            }
+                            continue; // Do not forward subscription announcements to Aggregator
+                        }
+
+                        // Service filtering (BCAST-05)
+                        if !service_router.should_accept(&p2p_msg) {
+                            tracing::trace!("Filtered message for unsubscribed service");
+                            continue;
+                        }
+
+                        // Deserialize and forward to Aggregator
+                        match p2p_msg.to_submission() {
+                            Ok((_service_id, submission)) => {
+                                let peer_id = const_hex::encode(peer_pubkey.as_ref());
+                                if let Err(e) = aggregator_tx.send(AggregatorCommand::Receive {
+                                    submission,
+                                    peer: Peer::Other(peer_id),
+                                }) {
+                                    tracing::error!("Failed to forward to aggregator: {:?}", e);
+                                }
+                            }
+                            Err(e) => {
+                                tracing::warn!("Failed to deserialize submission: {:?}", e);
+                            }
+                        }
+                    }
+                    None => {
+                        tracing::error!("Discovery inbound bridge channel closed");
+                        break;
+                    }
+                }
+            }
+            _ = heartbeat.tick() => {
+                let probe = P2pMessage {
+                    service_id_bytes: HEARTBEAT_SERVICE_ID,
+                    payload: vec![],
+                };
+                let ack_rx = mailbox.broadcast(Recipients::All, probe.clone()).await;
+                let encoded = Encode::encode(&probe);
+                if let Err(e) = direct_sender.send(Recipients::All, encoded, false).await {
+                    tracing::trace!("Heartbeat direct send failed: {:?}", e);
+                }
+                match ack_rx.await {
+                    Ok(recipients) if !recipients.is_empty() => {
+                        let peer_hexes: Vec<String> = recipients
+                            .iter()
+                            .map(|pk| const_hex::encode(pk.as_ref()))
+                            .collect();
+                        *connected_peers_tracker.write().unwrap() = peer_hexes;
+                        tracing::debug!("Heartbeat: {} peers connected", recipients.len());
+
+                        // Update connected peer set for COMPAT-03 recipient resolution
+                        connected_peer_set = recipients.iter().cloned().collect();
+
+                        // SUB-03: Prune subscription entries for departed peers.
+                        // Heartbeat ack recipients are the authoritative connected peer set.
+                        let tracked = peer_subscriptions.tracked_peers();
+                        for departed in tracked.difference(&connected_peer_set) {
+                            peer_subscriptions.remove_peer(departed);
+                            known_peers.remove(departed);
+                            tracing::debug!(
+                                "Pruned departed peer from subscriptions: {}",
+                                const_hex::encode(departed.as_ref()),
+                            );
+                        }
+
+                        if !retry_queue.is_empty() {
+                            let queued = retry_queue.drain_all();
+                            for queued_msg in queued {
+                                drop(mailbox.broadcast(Recipients::All, queued_msg.clone()).await);
+                                // TGT-04: Re-resolve recipients at drain time from current subscription state
+                                let retry_recipients = peer_subscriptions.get_recipients(&queued_msg.service_id_bytes, &connected_peer_set);
+                                let queued_bytes = Encode::encode(&queued_msg);
+                                if let Err(e) = direct_sender.send(retry_recipients, queued_bytes, false).await {
+                                    tracing::warn!("Retry send failed: {:?}", e);
+                                }
+                            }
+                        }
+                    }
+                    Ok(_) => tracing::trace!("Heartbeat: no peers connected yet"),
+                    Err(_) => tracing::error!("Heartbeat: broadcast engine shut down"),
+                }
+                // ANN-03: Piggyback full subscription state for self-healing consistency
+                let my_services = service_router.subscribed_services_raw();
+                if !my_services.is_empty() {
+                    let announcement = SubscriptionAnnouncement {
+                        subscribe: my_services,
+                        unsubscribe: vec![],
+                        full_state: true,
+                    };
+                    if let Ok(msg) = announcement.to_p2p_message() {
+                        let encoded = Encode::encode(&msg);
+                        if let Err(e) = direct_sender.send(Recipients::All, encoded, false).await {
+                            tracing::trace!("Heartbeat subscription announcement failed: {:?}", e);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+// ============================================================================
+// P2P Handle and Commands
+// ============================================================================
+
+/// Commands that can be sent to the P2P network
+enum P2pCommand {
+    /// Publish a submission to the network
+    Publish {
+        service_id: ServiceId,
+        submission: Box<Submission>,
+    },
+    /// Subscribe to a service's topic
+    Subscribe { service_id: ServiceId },
+    /// Unsubscribe from a service's topic
+    Unsubscribe { service_id: ServiceId },
+    /// Get the current P2P status
+    GetStatus {
+        response_tx: tokio::sync::oneshot::Sender<P2pStatus>,
+    },
+    /// Block a peer by their Ed25519 public key (hex-encoded).
+    /// The peer will be disconnected and prevented from reconnecting.
+    BlockPeer { pubkey_hex: String },
+}
+
+/// Handle to the P2P network that can be cloned and shared
+#[derive(Clone)]
+pub struct P2pHandle {
+    command_tx: mpsc::UnboundedSender<P2pCommand>,
+}
+
+impl P2pHandle {
+    /// Create a new P2P handle, spawning the network event loop.
+    ///
+    /// Returns None if P2P is disabled.
+    ///
+    /// If `signing_mnemonic` is provided, the P2P identity will be derived from it
+    /// as a deterministic Ed25519 keypair, ensuring a consistent peer ID across restarts.
+    pub async fn new(
+        _ctx: AppContext,
+        p2p_config: P2pConfig,
+        signing_mnemonic: Option<&str>,
+        aggregator_tx: crossbeam::channel::Sender<AggregatorCommand>,
+    ) -> Result<Option<Self>, AggregatorError> {
+        if matches!(p2p_config, P2pConfig::Disabled) {
+            tracing::info!("P2P networking is disabled");
+            return Ok(None);
+        }
+
+        let mnemonic = signing_mnemonic.ok_or_else(|| {
+            AggregatorError::P2p("signing_mnemonic required for P2P networking".into())
+        })?;
+        let private_key = ed25519_signer_from_mnemonic(mnemonic)?;
+
+        let (command_tx, command_rx) = mpsc::unbounded_channel();
+
+        // Spawn commonware runtime on dedicated OS thread
+        let _thread_handle =
+            spawn_commonware_runtime(private_key, p2p_config, command_rx, aggregator_tx)?;
+
+        // TODO: Store thread_handle for clean shutdown in Phase 3
+
+        Ok(Some(P2pHandle { command_tx }))
+    }
+
+    /// Publish a submission to the P2P network
+    pub fn publish(&self, submission: &Submission) -> Result<(), AggregatorError> {
+        let service_id = submission.service_id().clone();
+        self.command_tx
+            .send(P2pCommand::Publish {
+                service_id,
+                submission: Box::new(submission.clone()),
+            })
+            .map_err(|e| AggregatorError::P2p(format!("Failed to send publish command: {}", e)))
+    }
+
+    /// Subscribe to a service's P2P topic
+    pub fn subscribe(&self, service_id: &ServiceId) -> Result<(), AggregatorError> {
+        self.command_tx
+            .send(P2pCommand::Subscribe {
+                service_id: service_id.clone(),
+            })
+            .map_err(|e| AggregatorError::P2p(format!("Failed to send subscribe command: {}", e)))
+    }
+
+    /// Unsubscribe from a service's P2P topic
+    pub fn unsubscribe(&self, service_id: &ServiceId) -> Result<(), AggregatorError> {
+        self.command_tx
+            .send(P2pCommand::Unsubscribe {
+                service_id: service_id.clone(),
+            })
+            .map_err(|e| AggregatorError::P2p(format!("Failed to send unsubscribe command: {}", e)))
+    }
+
+    /// Block a misbehaving peer by their Ed25519 public key (hex-encoded).
+    /// The peer will be disconnected and prevented from reconnecting.
+    pub fn block_peer(&self, pubkey_hex: &str) -> Result<(), AggregatorError> {
+        self.command_tx
+            .send(P2pCommand::BlockPeer {
+                pubkey_hex: pubkey_hex.to_string(),
+            })
+            .map_err(|e| AggregatorError::P2p(format!("Failed to send block_peer command: {}", e)))
+    }
+
+    /// Get the current P2P network status
+    pub async fn get_status(&self) -> Result<P2pStatus, AggregatorError> {
+        let (response_tx, response_rx) = tokio::sync::oneshot::channel();
+        self.command_tx
+            .send(P2pCommand::GetStatus { response_tx })
+            .map_err(|e| {
+                AggregatorError::P2p(format!("Failed to send get_status command: {}", e))
+            })?;
+
+        response_rx
+            .await
+            .map_err(|e| AggregatorError::P2p(format!("Failed to receive P2P status: {}", e)))
+    }
+}
+
+// ============================================================================
+// Identity Management (Ed25519 via commonware-cryptography)
+// ============================================================================
+
+use commonware_math::algebra::Random;
+use rand_chacha::ChaCha20Rng;
+
+/// Derive a deterministic Ed25519 identity from a BIP-39 mnemonic.
+///
+/// Uses ChaCha20Rng seeded from the first 32 bytes of the BIP-39 seed
+/// (PBKDF2-stretched, empty passphrase) for full 256-bit entropy.
+///
+/// Replaces the previous `keypair_from_mnemonic()` which derived a secp256k1
+/// keypair at HD path m/44'/60'/0'/0/0.
+pub fn ed25519_signer_from_mnemonic(
+    mnemonic: &str,
+) -> Result<ed25519::PrivateKey, AggregatorError> {
+    let mnemonic = bip39::Mnemonic::parse(mnemonic)
+        .map_err(|e| AggregatorError::P2p(format!("Invalid mnemonic: {}", e)))?;
+
+    // BIP-39 seed: 64 bytes, PBKDF2-stretched with empty passphrase
+    let seed = mnemonic.to_seed("");
+
+    // Use first 32 bytes as ChaCha20Rng seed (full 256-bit entropy)
+    let rng_seed: [u8; 32] = seed[..32]
+        .try_into()
+        .map_err(|_| AggregatorError::P2p("BIP-39 seed too short for RNG seed".into()))?;
+
+    use rand_chacha::rand_core::SeedableRng;
+    let mut rng = ChaCha20Rng::from_seed(rng_seed);
+    Ok(ed25519::PrivateKey::random(&mut rng))
+}
+
+/// Get the P2P public key (hex-encoded) that would be derived from a given mnemonic.
+/// Useful for determining the peer identity before starting the node.
+pub fn pubkey_from_mnemonic(mnemonic: &str) -> Result<String, AggregatorError> {
+    let private_key = ed25519_signer_from_mnemonic(mnemonic)?;
+    Ok(const_hex::encode(private_key.public_key().as_ref()))
+}
+
+// ============================================================================
+// Tests: P2P Broadcast Types (Wave 0 stubs)
+// ============================================================================
+
+#[cfg(test)]
+mod p2p_broadcast_tests {
+    use super::*;
+    use commonware_codec::{Encode, ReadRangeExt};
+    use commonware_cryptography::Digestible;
+    use wavs_types::{
+        Envelope, EventId, SignatureKind, Trigger, TriggerAction, TriggerConfig, WasmResponse,
+        WavsSignature, WorkflowId,
+    };
+
+    /// Create a minimal mock Submission for testing.
+    fn mock_submission(service_id: &ServiceId) -> Submission {
+        let trigger_action = TriggerAction {
+            config: TriggerConfig {
+                service_id: service_id.clone(),
+                workflow_id: WorkflowId::new("test-workflow").unwrap(),
+                trigger: Trigger::Manual,
+            },
+            data: wavs_types::TriggerData::default(),
+        };
+        let operator_response = WasmResponse {
+            payload: b"test-payload".to_vec(),
+            event_id_salt: None,
+            ordering: None,
+        };
+        let event_id = EventId::from([1u8; 20]);
+        let envelope = Envelope {
+            payload: alloy_primitives::Bytes::from_static(&[1, 2, 3]),
+            eventId: alloy_primitives::FixedBytes([1; 20]),
+            ordering: alloy_primitives::FixedBytes([0; 12]),
+        };
+        let envelope_signature = WavsSignature::Secp256k1 {
+            data: vec![0u8; 65],
+            kind: SignatureKind::evm_default(),
+        };
+        Submission {
+            trigger_action,
+            operator_response,
+            event_id,
+            envelope,
+            envelope_signature,
+        }
+    }
+
+    // ---- P2pMessage tests ----
+
+    #[test]
+    fn test_p2p_message_from_submission() {
+        // P2pMessage::from_submission() creates message with correct service_id_bytes and payload
+        let service_id = ServiceId::hash(b"test-service-a");
+        let submission = mock_submission(&service_id);
+
+        let msg = P2pMessage::from_submission(&service_id, &submission).unwrap();
+
+        // service_id_bytes should match the ServiceId's inner bytes
+        assert_eq!(msg.service_id_bytes, service_id.inner());
+
+        // payload should be valid JSON that deserializes back to Submission
+        let deserialized: Submission = serde_json::from_slice(&msg.payload).unwrap();
+        assert_eq!(
+            deserialized.service_id(),
+            submission.service_id(),
+            "Deserialized submission should have the same service_id"
+        );
+    }
+
+    #[test]
+    fn test_p2p_message_codec_roundtrip() {
+        // P2pMessage round-trip encode/decode via Write then Read produces identical fields
+        let msg = P2pMessage {
+            service_id_bytes: [42u8; 32],
+            payload: b"hello broadcast world".to_vec(),
+        };
+
+        // Encode using the Encode trait (Write + EncodeSize)
+        let encoded = msg.encode();
+
+        // Decode using Read with a permissive range config
+        let decoded = P2pMessage::read_range(&mut encoded.as_ref(), 0..=65536).unwrap();
+
+        assert_eq!(msg.service_id_bytes, decoded.service_id_bytes);
+        assert_eq!(msg.payload, decoded.payload);
+    }
+
+    #[test]
+    fn test_p2p_message_digest_determinism() {
+        // Two identical P2pMessages produce the same digest;
+        // different messages produce different digests (BCAST-02)
+        let msg_a = P2pMessage {
+            service_id_bytes: [1u8; 32],
+            payload: b"same-payload".to_vec(),
+        };
+        let msg_b = P2pMessage {
+            service_id_bytes: [1u8; 32],
+            payload: b"same-payload".to_vec(),
+        };
+        let msg_c = P2pMessage {
+            service_id_bytes: [2u8; 32],
+            payload: b"different-payload".to_vec(),
+        };
+
+        let digest_a = msg_a.digest();
+        let digest_b = msg_b.digest();
+        let digest_c = msg_c.digest();
+
+        // Identical messages produce the same digest
+        assert_eq!(
+            digest_a, digest_b,
+            "Identical messages must produce same digest"
+        );
+        // Different messages produce different digests
+        assert_ne!(
+            digest_a, digest_c,
+            "Different messages must produce different digests"
+        );
+    }
+
+    #[test]
+    fn test_p2p_message_to_submission_roundtrip() {
+        // P2pMessage::to_submission() deserializes back to original (ServiceId, Submission) pair
+        let service_id = ServiceId::hash(b"roundtrip-service");
+        let original_submission = mock_submission(&service_id);
+
+        let msg = P2pMessage::from_submission(&service_id, &original_submission).unwrap();
+        let (recovered_id, recovered_submission) = msg.to_submission().unwrap();
+
+        assert_eq!(recovered_id.inner(), service_id.inner());
+        assert_eq!(
+            recovered_submission.service_id().inner(),
+            original_submission.service_id().inner()
+        );
+        assert_eq!(
+            recovered_submission.operator_response.payload,
+            original_submission.operator_response.payload
+        );
+    }
+
+    // ---- ServiceRouter tests ----
+
+    #[test]
+    fn test_service_router_empty_rejects_all() {
+        // ServiceRouter::new() creates empty router, should_accept returns false for any message
+        let router = ServiceRouter::new();
+        let msg = P2pMessage {
+            service_id_bytes: [1u8; 32],
+            payload: vec![],
+        };
+        assert!(
+            !router.should_accept(&msg),
+            "Empty router should reject all messages"
+        );
+    }
+
+    #[test]
+    fn test_service_router_subscribe_accept() {
+        // After subscribe(service_id_a), should_accept returns true for matching, false for non-matching
+        let service_id_a = ServiceId::hash(b"test-service-a");
+        let service_id_b = ServiceId::hash(b"test-service-b");
+
+        let mut router = ServiceRouter::new();
+        router.subscribe(&service_id_a);
+
+        let msg_a = P2pMessage {
+            service_id_bytes: service_id_a.inner(),
+            payload: vec![],
+        };
+        let msg_b = P2pMessage {
+            service_id_bytes: service_id_b.inner(),
+            payload: vec![],
+        };
+
+        assert!(
+            router.should_accept(&msg_a),
+            "Should accept messages for subscribed service"
+        );
+        assert!(
+            !router.should_accept(&msg_b),
+            "Should reject messages for unsubscribed service"
+        );
+    }
+
+    #[test]
+    fn test_service_router_unsubscribe() {
+        // After unsubscribe(service_id_a), should_accept returns false again
+        let service_id_a = ServiceId::hash(b"test-service-a");
+
+        let mut router = ServiceRouter::new();
+        router.subscribe(&service_id_a);
+
+        let msg_a = P2pMessage {
+            service_id_bytes: service_id_a.inner(),
+            payload: vec![],
+        };
+
+        assert!(
+            router.should_accept(&msg_a),
+            "Should accept after subscribe"
+        );
+        router.unsubscribe(&service_id_a);
+        assert!(
+            !router.should_accept(&msg_a),
+            "Should reject after unsubscribe"
+        );
+    }
+
+    #[test]
+    fn test_service_router_subscribed_services() {
+        // subscribed_services() returns hex-encoded list of subscribed service IDs
+        let service_id_a = ServiceId::hash(b"test-service-a");
+
+        let mut router = ServiceRouter::new();
+        assert!(router.subscribed_services().is_empty());
+
+        router.subscribe(&service_id_a);
+        let topics = router.subscribed_services();
+        assert_eq!(topics.len(), 1);
+        assert_eq!(topics[0], const_hex::encode(service_id_a.inner()));
+    }
+
+    // ---- RetryQueue tests ----
+
+    #[test]
+    fn test_retry_queue_empty() {
+        // RetryQueue::new() creates empty queue, is_empty() returns true
+        let queue = RetryQueue::new();
+        assert!(queue.is_empty());
+    }
+
+    #[test]
+    fn test_retry_queue_push_drain_fifo() {
+        // push() adds messages, drain_all() returns them in FIFO order
+        let mut queue = RetryQueue::new();
+
+        let msg_a = P2pMessage {
+            service_id_bytes: [1u8; 32],
+            payload: b"first".to_vec(),
+        };
+        let msg_b = P2pMessage {
+            service_id_bytes: [2u8; 32],
+            payload: b"second".to_vec(),
+        };
+
+        queue.push(msg_a);
+        queue.push(msg_b);
+        assert!(!queue.is_empty());
+
+        let drained = queue.drain_all();
+        assert_eq!(drained.len(), 2);
+        assert_eq!(drained[0].payload, b"first");
+        assert_eq!(drained[1].payload, b"second");
+        assert!(queue.is_empty());
+    }
+
+    #[test]
+    fn test_retry_queue_overflow_drops_oldest() {
+        // When queue is full (64 items), push() drops oldest message
+        let mut queue = RetryQueue::new();
+
+        // Fill to capacity (64)
+        for i in 0u8..64 {
+            queue.push(P2pMessage {
+                service_id_bytes: [i; 32],
+                payload: vec![i],
+            });
+        }
+        assert_eq!(queue.drain_all().len(), 64);
+
+        // Refill and then overflow
+        for i in 0u8..64 {
+            queue.push(P2pMessage {
+                service_id_bytes: [i; 32],
+                payload: vec![i],
+            });
+        }
+        // Push one more -- oldest (i=0) should be dropped
+        queue.push(P2pMessage {
+            service_id_bytes: [99u8; 32],
+            payload: vec![99],
+        });
+
+        let drained = queue.drain_all();
+        assert_eq!(drained.len(), 64, "Queue should still hold 64 items");
+        // First item should be i=1 (i=0 was dropped)
+        assert_eq!(drained[0].payload, vec![1]);
+        // Last item should be the overflow item
+        assert_eq!(drained[63].payload, vec![99]);
+    }
+
+    #[test]
+    fn test_retry_queue_drain_empty() {
+        // drain_all() on empty queue returns empty Vec
+        let mut queue = RetryQueue::new();
+        let drained = queue.drain_all();
+        assert!(drained.is_empty());
+    }
+
+    // ---- Subscription test helpers ----
+
+    /// Create a deterministic ed25519 public key from a seed byte (for subscription tests).
+    fn test_pubkey(seed_byte: u8) -> ed25519::PublicKey {
+        use commonware_math::algebra::Random;
+        use rand_chacha::rand_core::SeedableRng;
+        use rand_chacha::ChaCha20Rng;
+        let mut rng = ChaCha20Rng::from_seed([seed_byte; 32]);
+        let private = ed25519::PrivateKey::random(&mut rng);
+        private.public_key()
+    }
+
+    // ---- PeerSubscriptionMap tests ----
+
+    #[test]
+    fn test_peer_subscription_map_forward_index() {
+        // SUB-01: handle_announcement with subscribe list populates forward index
+        let peer_a = test_pubkey(1);
+        let svc_a = [0xAA; 32];
+        let svc_b = [0xBB; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+        let announcement = SubscriptionAnnouncement {
+            subscribe: vec![svc_a, svc_b],
+            unsubscribe: vec![],
+            full_state: false,
+        };
+        map.handle_announcement(&peer_a, &announcement);
+
+        // Forward index: both services should map to peer_a
+        let empty_connected = HashSet::new();
+        match map.get_recipients(&svc_a, &empty_connected) {
+            Recipients::Some(peers) => {
+                assert_eq!(peers.len(), 1);
+                assert!(peers.contains(&peer_a));
+            }
+            other => panic!("Expected Recipients::Some for svc_a, got {:?}", other),
+        }
+        match map.get_recipients(&svc_b, &empty_connected) {
+            Recipients::Some(peers) => {
+                assert_eq!(peers.len(), 1);
+                assert!(peers.contains(&peer_a));
+            }
+            other => panic!("Expected Recipients::Some for svc_b, got {:?}", other),
+        }
+    }
+
+    #[test]
+    fn test_peer_subscription_map_remove_peer() {
+        // SUB-02: remove_peer clears peer from both forward and reverse indexes
+        let peer_a = test_pubkey(1);
+        let svc_a = [0xAA; 32];
+        let svc_b = [0xBB; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+        let announcement = SubscriptionAnnouncement {
+            subscribe: vec![svc_a, svc_b],
+            unsubscribe: vec![],
+            full_state: false,
+        };
+        map.handle_announcement(&peer_a, &announcement);
+
+        // Verify peer is subscribed
+        let empty_connected = HashSet::new();
+        assert!(matches!(
+            map.get_recipients(&svc_a, &empty_connected),
+            Recipients::Some(_)
+        ));
+
+        // Remove peer
+        map.remove_peer(&peer_a);
+
+        // Both services should now fallback to Recipients::All
+        assert!(matches!(
+            map.get_recipients(&svc_a, &empty_connected),
+            Recipients::All
+        ));
+        assert!(matches!(
+            map.get_recipients(&svc_b, &empty_connected),
+            Recipients::All
+        ));
+    }
+
+    #[test]
+    fn test_peer_subscription_map_disconnect_cleanup() {
+        // SUB-03: remove_peer leaves no trace in either map
+        let peer_a = test_pubkey(1);
+        let svc_a = [0xAA; 32];
+        let svc_b = [0xBB; 32];
+        let svc_c = [0xCC; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+        let announcement = SubscriptionAnnouncement {
+            subscribe: vec![svc_a, svc_b, svc_c],
+            unsubscribe: vec![],
+            full_state: false,
+        };
+        map.handle_announcement(&peer_a, &announcement);
+        map.remove_peer(&peer_a);
+
+        // Both internal maps should be completely empty
+        assert!(
+            map.service_to_peers.is_empty(),
+            "Forward index should be empty after remove_peer"
+        );
+        assert!(
+            map.peer_to_services.is_empty(),
+            "Reverse index should be empty after remove_peer"
+        );
+    }
+
+    #[test]
+    fn test_subscription_announcement_roundtrip() {
+        // ANN-05: SubscriptionAnnouncement round-trips through P2pMessage encoding
+        let original = SubscriptionAnnouncement {
+            subscribe: vec![[0xAA; 32], [0xBB; 32]],
+            unsubscribe: vec![[0xCC; 32]],
+            full_state: false,
+        };
+
+        let p2p_msg = original
+            .to_p2p_message()
+            .expect("to_p2p_message should succeed");
+        assert_eq!(
+            p2p_msg.service_id_bytes, SUBSCRIPTION_SENTINEL,
+            "P2pMessage must use sentinel"
+        );
+
+        let recovered = SubscriptionAnnouncement::from_payload(&p2p_msg.payload)
+            .expect("from_payload should succeed");
+        assert_eq!(
+            original, recovered,
+            "Round-trip must produce identical announcement"
+        );
+    }
+
+    #[test]
+    fn test_subscription_sentinel_distinguishable() {
+        // ANN-05: SUBSCRIPTION_SENTINEL is distinct from HEARTBEAT_SERVICE_ID and real service IDs
+        assert_ne!(
+            SUBSCRIPTION_SENTINEL, HEARTBEAT_SERVICE_ID,
+            "Sentinel must differ from heartbeat"
+        );
+
+        // Real service IDs are SHA-256 hashes -- verify sentinel differs from a sample
+        let real_service = ServiceId::hash(b"my-production-service");
+        assert_ne!(
+            SUBSCRIPTION_SENTINEL,
+            real_service.inner(),
+            "Sentinel must differ from real service IDs"
+        );
+
+        // is_subscription_announcement works correctly
+        let sentinel_msg = P2pMessage {
+            service_id_bytes: SUBSCRIPTION_SENTINEL,
+            payload: vec![],
+        };
+        let heartbeat_msg = P2pMessage {
+            service_id_bytes: HEARTBEAT_SERVICE_ID,
+            payload: vec![],
+        };
+        let service_msg = P2pMessage {
+            service_id_bytes: real_service.inner(),
+            payload: vec![],
+        };
+
+        assert!(
+            is_subscription_announcement(&sentinel_msg),
+            "Sentinel message should be detected"
+        );
+        assert!(
+            !is_subscription_announcement(&heartbeat_msg),
+            "Heartbeat should not be detected as subscription"
+        );
+        assert!(
+            !is_subscription_announcement(&service_msg),
+            "Real service should not be detected as subscription"
+        );
+    }
 
-                    tracing::debug!("Dialing bootstrap node: {}", addr);
-                    if let Err(e) = swarm.dial(addr.clone()) {
-                        tracing::warn!("Failed to dial bootstrap node {}: {:?}", addr, e);
-                    }
-                }
-                Err(e) => {
-                    tracing::error!("Invalid bootstrap address '{}': {}", addr_str, e);
-                }
-            }
-        }
+    #[test]
+    fn test_get_recipients_empty_fallback() {
+        // SUB-01 fallback: get_recipients returns Recipients::All when no peers subscribed
+        let map = PeerSubscriptionMap::new();
+        let unknown_svc = [0xDD; 32];
+        let empty_connected = HashSet::new();
+
+        // Unknown service -> Recipients::All
+        assert!(
+            matches!(
+                map.get_recipients(&unknown_svc, &empty_connected),
+                Recipients::All
+            ),
+            "Unknown service must fallback to All"
+        );
 
-        // Trigger Kademlia bootstrap if available
-        if let Some(kademlia) = swarm.behaviour_mut().kademlia.as_mut() {
-            if let Err(e) = kademlia.bootstrap() {
-                tracing::warn!("Kademlia bootstrap failed: {:?}", e);
-            } else {
-                tracing::debug!("Kademlia bootstrap initiated");
-            }
+        // Subscribe then unsubscribe -> Recipients::All
+        let peer_a = test_pubkey(1);
+        let svc_a = [0xAA; 32];
+        let mut map2 = PeerSubscriptionMap::new();
+        map2.handle_announcement(
+            &peer_a,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
+        map2.handle_announcement(
+            &peer_a,
+            &SubscriptionAnnouncement {
+                subscribe: vec![],
+                unsubscribe: vec![svc_a],
+                full_state: false,
+            },
+        );
+        assert!(
+            matches!(
+                map2.get_recipients(&svc_a, &empty_connected),
+                Recipients::All
+            ),
+            "Empty set after unsubscribe must fallback to All"
+        );
+    }
+
+    #[test]
+    fn test_peer_subscription_map_idempotent() {
+        // Duplicate subscribe is a no-op (idempotent)
+        let peer_a = test_pubkey(1);
+        let svc_a = [0xAA; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+        let announcement = SubscriptionAnnouncement {
+            subscribe: vec![svc_a],
+            unsubscribe: vec![],
+            full_state: false,
+        };
+        map.handle_announcement(&peer_a, &announcement);
+        map.handle_announcement(&peer_a, &announcement); // duplicate
+
+        let empty_connected = HashSet::new();
+        match map.get_recipients(&svc_a, &empty_connected) {
+            Recipients::Some(peers) => assert_eq!(
+                peers.len(),
+                1,
+                "Duplicate subscribe should not create duplicates"
+            ),
+            other => panic!("Expected Recipients::Some, got {:?}", other),
         }
-    } else if swarm.behaviour().kademlia.as_ref().is_some() {
-        tracing::info!("Running as bootstrap server (no bootstrap nodes configured)");
     }
 
-    let mut retry_interval =
-        tokio::time::interval(Duration::from_millis(p2p_config.retry_interval_ms()));
-    let mut cleanup_interval =
-        tokio::time::interval(Duration::from_secs(p2p_config.cleanup_interval_secs()));
-    // Periodic peer discovery for Kademlia mode - helps find peers that joined after initial bootstrap
-    let mut discovery_interval = tokio::time::interval(Duration::from_secs(
-        p2p_config.kademlia_discovery_interval_secs(),
-    ));
-    let mut shutdown_signal = ctx.get_kill_receiver();
-    let mut state = EventLoopState::new(p2p_config, parsed_bootstrap_nodes);
+    #[test]
+    fn test_peer_subscription_map_multiple_peers() {
+        // Multiple peers subscribing to the same service
+        let peer_a = test_pubkey(1);
+        let peer_b = test_pubkey(2);
+        let svc_a = [0xAA; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+        map.handle_announcement(
+            &peer_a,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
+        map.handle_announcement(
+            &peer_b,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
 
-    loop {
-        tokio::select! {
-            _ = shutdown_signal.recv() => {
-                tracing::info!("P2P network shutting down");
-                break;
-            }
-            event = swarm.select_next_some() => {
-                handle_swarm_event(&mut swarm, event, &aggregator_tx, &mut state);
-            }
-            Some(command) = command_rx.recv() => {
-                handle_command(&mut swarm, command, &mut state);
-            }
-            _ = retry_interval.tick() => {
-                retry_pending_publishes(&mut swarm, &mut state.pending_publishes, &state.config);
+        let empty_connected = HashSet::new();
+        match map.get_recipients(&svc_a, &empty_connected) {
+            Recipients::Some(peers) => {
+                assert_eq!(peers.len(), 2, "Both peers should be in recipient set");
+                assert!(peers.contains(&peer_a));
+                assert!(peers.contains(&peer_b));
             }
-            _ = cleanup_interval.tick() => {
-                state.cleanup_expired_submissions();
-            }
-            _ = discovery_interval.tick() => {
-                // Periodic peer discovery for Kademlia mode
-                let local_peer_id = *swarm.local_peer_id();
-                let has_peers = swarm.connected_peers().next().is_some();
-
-                if has_peers {
-                    // Normal discovery when we have peers
-                    if let Some(kademlia) = swarm.behaviour_mut().kademlia.as_mut() {
-                        kademlia.get_closest_peers(local_peer_id);
-                    }
-                } else if !state.bootstrap_nodes.is_empty() {
-                    // No peers connected - try to reconnect to bootstrap nodes
-                    tracing::debug!("No peers connected, attempting to reconnect to bootstrap nodes");
-
-                    // First, update Kademlia routing table and trigger bootstrap
-                    if let Some(kademlia) = swarm.behaviour_mut().kademlia.as_mut() {
-                        for addr in &state.bootstrap_nodes {
-                            if let Some(peer_id) = extract_peer_id(addr) {
-                                let addr_without_peer_id = remove_peer_id_suffix(addr);
-                                kademlia.add_address(&peer_id, addr_without_peer_id);
-                            }
-                        }
-                        if let Err(e) = kademlia.bootstrap() {
-                            tracing::debug!("Kademlia bootstrap retry failed: {:?}", e);
-                        }
-                    }
+            other => panic!("Expected Recipients::Some with 2 peers, got {:?}", other),
+        }
 
-                    // Then dial the bootstrap nodes
-                    for addr in &state.bootstrap_nodes {
-                        if let Err(e) = swarm.dial(addr.clone()) {
-                            tracing::debug!("Failed to dial bootstrap node {}: {:?}", addr, e);
-                        }
-                    }
-                }
+        // Remove one peer, other remains
+        map.remove_peer(&peer_a);
+        match map.get_recipients(&svc_a, &empty_connected) {
+            Recipients::Some(peers) => {
+                assert_eq!(peers.len(), 1, "Only peer_b should remain");
+                assert!(peers.contains(&peer_b));
             }
+            other => panic!("Expected Recipients::Some with 1 peer, got {:?}", other),
         }
     }
-}
-
-// ============================================================================
-// Event Handlers
-// ============================================================================
 
-/// Retry any pending publishes in the queue.
-/// Skips retries when no peers are connected to avoid wasting CPU cycles.
-fn retry_pending_publishes(
-    swarm: &mut Swarm<WavsBehaviour>,
-    pending_publishes: &mut VecDeque<PendingPublish>,
-    p2p_config: &P2pConfig,
-) {
-    // Skip retries entirely if no peers are connected - no point burning CPU
-    if swarm.connected_peers().next().is_none() {
-        return;
+    #[test]
+    fn test_peer_subscription_map_remove_unknown_peer() {
+        // remove_peer on unknown peer is a no-op (no panic)
+        let peer_a = test_pubkey(1);
+        let mut map = PeerSubscriptionMap::new();
+        map.remove_peer(&peer_a); // should not panic
+        assert!(map.service_to_peers.is_empty());
+        assert!(map.peer_to_services.is_empty());
     }
 
-    let now = Instant::now();
-    let max_age = Duration::from_secs(p2p_config.max_retry_duration_secs());
+    // ---- ServiceRouter extension tests ----
 
-    let mut items_to_retry: VecDeque<PendingPublish> = std::mem::take(pending_publishes);
+    #[test]
+    fn test_service_router_subscribed_services_raw() {
+        // subscribed_services_raw returns raw [u8; 32] bytes
+        let service_id_a = ServiceId::hash(b"test-service-a");
+        let service_id_b = ServiceId::hash(b"test-service-b");
 
-    while let Some(mut item) = items_to_retry.pop_front() {
-        if now.duration_since(item.created_at) > max_age {
-            tracing::warn!(
-                "P2P publish to {} timed out after {} retries",
-                item.topic_name,
-                item.retries
-            );
-            continue;
-        }
+        let mut router = ServiceRouter::new();
+        assert!(router.subscribed_services_raw().is_empty());
 
-        let topic = IdentTopic::new(&item.topic_name);
-        match swarm
-            .behaviour_mut()
-            .gossipsub
-            .publish(topic, item.data.clone())
-        {
-            Ok(_) => {
-                tracing::debug!(
-                    "Retry #{} successful: published to topic {}",
-                    item.retries,
-                    item.topic_name
-                );
-            }
-            Err(gossipsub::PublishError::NoPeersSubscribedToTopic) => {
-                item.retries += 1;
-                pending_publishes.push_back(item);
-            }
-            Err(e) => {
-                tracing::warn!(
-                    "Retry #{} failed for topic {}: {}",
-                    item.retries,
-                    item.topic_name,
-                    e
-                );
-                item.retries += 1;
-                pending_publishes.push_back(item);
-            }
-        }
+        router.subscribe(&service_id_a);
+        router.subscribe(&service_id_b);
+
+        let raw = router.subscribed_services_raw();
+        assert_eq!(raw.len(), 2, "Should have 2 raw service IDs");
+        assert!(
+            raw.contains(&service_id_a.inner()),
+            "Should contain service_a bytes"
+        );
+        assert!(
+            raw.contains(&service_id_b.inner()),
+            "Should contain service_b bytes"
+        );
     }
-}
 
-/// Handle swarm events
-fn handle_swarm_event(
-    swarm: &mut Swarm<WavsBehaviour>,
-    event: SwarmEvent<WavsBehaviourEvent>,
-    aggregator_tx: &crossbeam::channel::Sender<AggregatorCommand>,
-    state: &mut EventLoopState,
-) {
-    match event {
-        // mDNS discovered new peers
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Mdns(mdns::Event::Discovered(peers))) => {
-            for (peer_id, addr) in peers {
-                tracing::debug!("mDNS discovered peer: {} at {}", peer_id, addr);
-                swarm.behaviour_mut().gossipsub.add_explicit_peer(&peer_id);
-                if let Err(e) = swarm.dial(addr.clone()) {
-                    tracing::debug!("Could not dial peer {} at {}: {:?}", peer_id, addr, e);
-                }
-            }
-        }
-        // mDNS peer expired
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Mdns(mdns::Event::Expired(peers))) => {
-            for (peer_id, _addr) in peers {
-                tracing::debug!("mDNS peer expired: {}", peer_id);
-                swarm
-                    .behaviour_mut()
-                    .gossipsub
-                    .remove_explicit_peer(&peer_id);
-                // Allow re-requesting catch-up if peer reconnects - remove from all services
-                for peer_set in state.catchup_requested_peers.values_mut() {
-                    peer_set.remove(&peer_id);
-                }
-            }
-        }
-        // Received a gossipsub message
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Gossipsub(gossipsub::Event::Message {
-            propagation_source,
-            message,
-            ..
-        })) => {
-            handle_gossip_message(propagation_source, message, aggregator_tx, state);
-        }
-        // Peer subscribed to a topic
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Gossipsub(gossipsub::Event::Subscribed {
-            peer_id,
-            topic,
-        })) => {
-            tracing::debug!("Peer {} subscribed to topic {}", peer_id, topic);
-        }
-        // Peer unsubscribed from a topic
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Gossipsub(gossipsub::Event::Unsubscribed {
-            peer_id,
-            topic,
-        })) => {
-            tracing::debug!("Peer {} unsubscribed from topic {}", peer_id, topic);
-        }
-        // Catch-up request received
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Catchup(request_response::Event::Message {
-            peer,
-            message:
-                request_response::Message::Request {
-                    request, channel, ..
-                },
-            ..
-        })) => {
-            handle_catchup_request(swarm, peer, request, channel, state);
-        }
-        // Catch-up response received
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Catchup(request_response::Event::Message {
-            peer,
-            message: request_response::Message::Response { response, .. },
-            ..
-        })) => {
-            handle_catchup_response(peer, response, aggregator_tx, state);
-            // Clear peer from catchup_requested_peers to free up concurrent request slot
-            for peer_set in state.catchup_requested_peers.values_mut() {
-                peer_set.remove(&peer);
-            }
-        }
-        // Catch-up request/response errors
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Catchup(
-            request_response::Event::OutboundFailure { peer, error, .. },
-        )) => {
-            tracing::warn!("Catch-up request to {} failed: {:?}", peer, error);
-            // Clear peer from catchup_requested_peers to allow retry on next opportunity
-            // (e.g., if the connection is still alive but the request just timed out)
-            for peer_set in state.catchup_requested_peers.values_mut() {
-                peer_set.remove(&peer);
-            }
-        }
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Catchup(
-            request_response::Event::InboundFailure { peer, error, .. },
-        )) => {
-            tracing::warn!("Catch-up request from {} failed: {:?}", peer, error);
-        }
-        // Identify received - add peer addresses to Kademlia if available
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Identify(identify::Event::Received {
-            peer_id,
-            info,
-            ..
-        })) => {
-            tracing::debug!(
-                "Identified peer {}: protocol={}, agent={}, addresses={:?}",
-                peer_id,
-                info.protocol_version,
-                info.agent_version,
-                info.listen_addrs
-            );
-            // Add peer's addresses to Kademlia routing table if in Remote mode
-            if let Some(kademlia) = swarm.behaviour_mut().kademlia.as_mut() {
-                for addr in &info.listen_addrs {
-                    if is_dialable_address(addr) {
-                        kademlia.add_address(&peer_id, addr.clone());
-                    }
-                }
-            }
-        }
-        // Identify sent
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Identify(identify::Event::Sent {
-            peer_id,
-            ..
-        })) => {
-            tracing::debug!("Sent identify info to peer {}", peer_id);
-        }
-        // Identify push received
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Identify(identify::Event::Pushed {
-            peer_id,
-            info,
-            ..
-        })) => {
-            tracing::debug!(
-                "Received identify push from {}: protocol={}",
-                peer_id,
-                info.protocol_version
-            );
-        }
-        // Identify error
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Identify(identify::Event::Error {
-            peer_id,
-            error,
-            ..
-        })) => {
-            tracing::warn!("Identify error with peer {}: {:?}", peer_id, error);
-        }
-        // Kademlia routing table updated - peer discovered via DHT
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Kademlia(kad::Event::RoutingUpdated {
-            peer,
-            is_new_peer,
-            addresses,
-            ..
-        })) => {
-            if is_new_peer {
-                tracing::debug!(
-                    "Kademlia routing updated for peer: {} ({} addresses)",
-                    peer,
-                    addresses.len()
-                );
-                swarm.behaviour_mut().gossipsub.add_explicit_peer(&peer);
+    // ---- Phase 15 Plan 01: full_state, set_peer_subscriptions, has_announced ----
+
+    #[test]
+    fn test_full_state_serde_default() {
+        // Deserialize JSON without full_state key -> defaults to false (backward compat)
+        let json_no_field = r#"{"subscribe":[[170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170]],"unsubscribe":[]}"#;
+        let deserialized: SubscriptionAnnouncement =
+            serde_json::from_str(json_no_field).expect("Should deserialize without full_state");
+        assert!(
+            !deserialized.full_state,
+            "Missing full_state should default to false"
+        );
+        assert_eq!(deserialized.subscribe.len(), 1);
+        assert_eq!(deserialized.subscribe[0], [0xAA; 32]);
+
+        // Explicit full_state=true round-trips
+        let with_true = SubscriptionAnnouncement {
+            subscribe: vec![[0xBB; 32]],
+            unsubscribe: vec![],
+            full_state: true,
+        };
+        let json = serde_json::to_string(&with_true).unwrap();
+        let recovered: SubscriptionAnnouncement = serde_json::from_str(&json).unwrap();
+        assert!(recovered.full_state, "Explicit true must round-trip");
+        assert_eq!(recovered, with_true);
+    }
 
-                // Dial the peer if not already connected
-                if !swarm.is_connected(&peer) {
-                    for addr in addresses.iter() {
-                        if let Err(e) = swarm.dial(addr.clone()) {
-                            tracing::debug!(
-                                "Could not dial Kademlia peer {} at {}: {:?}",
-                                peer,
-                                addr,
-                                e
-                            );
-                        } else {
-                            tracing::debug!("Dialing Kademlia peer {} at {}", peer, addr);
-                            break; // Only need to dial one address
-                        }
-                    }
-                }
-            }
-        }
-        // Kademlia query progress
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Kademlia(
-            kad::Event::OutboundQueryProgressed { id, result, .. },
-        )) => match result {
-            kad::QueryResult::Bootstrap(Ok(kad::BootstrapOk { num_remaining, .. })) => {
-                if num_remaining == 0 {
-                    tracing::info!("Kademlia bootstrap complete");
-                    state.kademlia_bootstrap_complete = true;
-                }
-            }
-            kad::QueryResult::Bootstrap(Err(e)) => {
-                tracing::warn!("Kademlia bootstrap error: {:?}", e);
-            }
-            kad::QueryResult::GetClosestPeers(Ok(kad::GetClosestPeersOk { peers, .. })) => {
-                tracing::debug!("Kademlia found {} closest peers", peers.len());
-                for peer_info in peers {
-                    // Dial the peer if not already connected (RoutingUpdated will handle gossipsub)
-                    if !swarm.is_connected(&peer_info.peer_id) {
-                        for addr in &peer_info.addrs {
-                            if let Err(e) = swarm.dial(addr.clone()) {
-                                tracing::debug!(
-                                    "Could not dial closest peer {} at {}: {:?}",
-                                    peer_info.peer_id,
-                                    addr,
-                                    e
-                                );
-                            } else {
-                                tracing::debug!(
-                                    "Dialing closest peer {} at {}",
-                                    peer_info.peer_id,
-                                    addr
-                                );
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-            _ => {
-                tracing::debug!("Kademlia query {:?} progressed", id);
-            }
-        },
-        // Other Kademlia events - debug level
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Kademlia(event)) => {
-            tracing::debug!("Kademlia event: {:?}", event);
-        }
-        // AutoNAT status changed
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Autonat(autonat::Event::StatusChanged {
-            old,
-            new,
-        })) => {
-            tracing::debug!("AutoNAT status changed: {:?} -> {:?}", old, new);
-        }
-        // AutoNAT inbound/outbound probes - debug level
-        SwarmEvent::Behaviour(WavsBehaviourEvent::Autonat(event)) => {
-            tracing::debug!("AutoNAT event: {:?}", event);
-        }
-        // New listen address - track usable addresses and add as external for Identify
-        SwarmEvent::NewListenAddr { address, .. } => {
-            tracing::debug!("P2P new listen address: {}", address);
-            if is_dialable_address(&address) {
-                state.listen_addresses.push(address.clone());
-                // Add as external address so Identify reports it to other peers
-                swarm.add_external_address(address);
-            }
-        }
-        // Connection established - request catch-up and retry Kademlia bootstrap
-        SwarmEvent::ConnectionEstablished {
-            peer_id, endpoint, ..
-        } => {
-            tracing::debug!("Connection established with {} via {:?}", peer_id, endpoint);
-
-            // Retry Kademlia bootstrap if it hasn't succeeded yet
-            // This handles race conditions where bootstrap was called before connections completed
-            if !state.kademlia_bootstrap_complete {
-                if let Some(kademlia) = swarm.behaviour_mut().kademlia.as_mut() {
-                    match kademlia.bootstrap() {
-                        Ok(_) => {
-                            tracing::debug!(
-                                "Kademlia bootstrap retry initiated after connection to {}",
-                                peer_id
-                            );
-                        }
-                        Err(e) => {
-                            tracing::debug!("Kademlia bootstrap retry failed: {:?}", e);
-                        }
-                    }
-                }
-            }
+    #[test]
+    fn test_set_peer_subscriptions_replaces() {
+        // set_peer_subscriptions replaces (not merges) existing subscriptions
+        let peer_a = test_pubkey(1);
+        let svc_a = [0xAA; 32];
+        let svc_b = [0xBB; 32];
+        let svc_c = [0xCC; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+        // First subscribe to A and B via handle_announcement
+        map.handle_announcement(
+            &peer_a,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a, svc_b],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
+        let empty_connected = HashSet::new();
+        assert!(matches!(
+            map.get_recipients(&svc_a, &empty_connected),
+            Recipients::Some(_)
+        ));
+        assert!(matches!(
+            map.get_recipients(&svc_b, &empty_connected),
+            Recipients::Some(_)
+        ));
 
-            // Request catch-up for all subscribed services
-            request_catchup_from_peer(swarm, peer_id, state);
-        }
-        // Connection closed
-        SwarmEvent::ConnectionClosed {
-            peer_id,
-            cause,
-            num_established,
-            ..
-        } => {
-            tracing::debug!(
-                "Connection closed with {} (remaining: {}): {:?}",
-                peer_id,
-                num_established,
-                cause
-            );
-            // Remove from GossipSub explicit peers to prevent accumulation
-            swarm
-                .behaviour_mut()
-                .gossipsub
-                .remove_explicit_peer(&peer_id);
-            // Allow re-requesting catch-up if peer reconnects - remove from all services
-            for peer_set in state.catchup_requested_peers.values_mut() {
-                peer_set.remove(&peer_id);
+        // Now replace with only C
+        map.set_peer_subscriptions(&peer_a, vec![svc_c]);
+
+        // A and B should be gone (fallback to All)
+        assert!(
+            matches!(
+                map.get_recipients(&svc_a, &empty_connected),
+                Recipients::All
+            ),
+            "svc_a should fallback to All after replace"
+        );
+        assert!(
+            matches!(
+                map.get_recipients(&svc_b, &empty_connected),
+                Recipients::All
+            ),
+            "svc_b should fallback to All after replace"
+        );
+        // C should be present
+        match map.get_recipients(&svc_c, &empty_connected) {
+            Recipients::Some(peers) => {
+                assert_eq!(peers.len(), 1);
+                assert!(peers.contains(&peer_a));
             }
+            other => panic!("Expected Recipients::Some for svc_c, got {:?}", other),
         }
-        // Outgoing connection error
-        SwarmEvent::OutgoingConnectionError {
-            peer_id,
-            error,
-            connection_id,
-            ..
-        } => {
-            tracing::warn!(
-                "Outgoing connection error to {:?} (conn_id={:?}): {:?}",
-                peer_id,
-                connection_id,
-                error
-            );
-        }
-        // Incoming connection error
-        SwarmEvent::IncomingConnectionError {
-            local_addr,
-            send_back_addr,
-            error,
-            ..
-        } => {
-            tracing::warn!(
-                "Incoming connection error from {} to {}: {:?}",
-                send_back_addr,
-                local_addr,
-                error
-            );
-        }
-        // Dialing
-        SwarmEvent::Dialing { peer_id, .. } => {
-            tracing::debug!("Dialing peer: {:?}", peer_id);
-        }
-        // Other events we don't need to handle explicitly
-        _ => {}
     }
-}
 
-/// Request catch-up from a newly connected peer.
-/// Rate-limits requests to avoid overwhelming peers/network.
-fn request_catchup_from_peer(
-    swarm: &mut Swarm<WavsBehaviour>,
-    peer_id: PeerId,
-    state: &mut EventLoopState,
-) {
-    // Request catch-up for each subscribed service (only once per peer per service)
-    for service_id in &state.subscribed_services {
-        let peer_set = state
-            .catchup_requested_peers
-            .entry(service_id.clone())
-            .or_default();
-
-        // Skip if we've already requested from this peer for this service
-        if peer_set.contains(&peer_id) {
-            continue;
-        }
+    #[test]
+    fn test_set_peer_subscriptions_empty_removes() {
+        // set_peer_subscriptions with empty vec removes peer entirely
+        let peer_a = test_pubkey(1);
+        let svc_a = [0xAA; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+        let empty_connected = HashSet::new();
+        map.set_peer_subscriptions(&peer_a, vec![svc_a]);
+        assert!(matches!(
+            map.get_recipients(&svc_a, &empty_connected),
+            Recipients::Some(_)
+        ));
 
-        // Rate limit: don't send too many concurrent requests per service
-        if peer_set.len() >= state.config.max_concurrent_catchup_requests_per_service() {
-            tracing::debug!(
-                "Skipping catch-up request to {} for service {} (rate limited: {} outstanding)",
-                peer_id,
-                service_id,
-                peer_set.len()
-            );
-            continue;
-        }
+        // Set to empty -> peer removed
+        map.set_peer_subscriptions(&peer_a, vec![]);
 
-        tracing::debug!(
-            "Requesting catch-up from {} for service {}",
-            peer_id,
-            service_id
+        assert!(
+            map.service_to_peers.is_empty(),
+            "Forward index should be empty after set_peer_subscriptions([])"
+        );
+        assert!(
+            map.peer_to_services.is_empty(),
+            "Reverse index should be empty after set_peer_subscriptions([])"
         );
-        let request = CatchUpRequest {
-            service_id: service_id.clone(),
-        };
-        swarm
-            .behaviour_mut()
-            .catchup
-            .send_request(&peer_id, request);
-
-        peer_set.insert(peer_id);
     }
-}
 
-/// Handle an incoming catch-up request
-fn handle_catchup_request(
-    swarm: &mut Swarm<WavsBehaviour>,
-    peer: PeerId,
-    request: CatchUpRequest,
-    channel: request_response::ResponseChannel<CatchUpResponse>,
-    state: &EventLoopState,
-) {
-    tracing::debug!(
-        "Received catch-up request from {} for service {}",
-        peer,
-        request.service_id
-    );
+    #[test]
+    fn test_has_announced_compat03() {
+        // COMPAT-03: has_announced tracks whether peer has sent any announcement
+        let peer_a = test_pubkey(1);
+        let svc_a = [0xAA; 32];
 
-    // Check if we're even subscribed to this service
-    let is_subscribed = state.subscribed_services.contains(&request.service_id);
+        let mut map = PeerSubscriptionMap::new();
+        assert!(
+            !map.has_announced(&peer_a),
+            "Unknown peer should return false"
+        );
 
-    let submissions = state.get_submissions_for_catchup(&request.service_id);
-    let count = submissions.len();
+        // After handle_announcement -> true
+        map.handle_announcement(
+            &peer_a,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
+        assert!(
+            map.has_announced(&peer_a),
+            "Peer should be announced after handle_announcement"
+        );
 
-    if count > 0 {
-        tracing::debug!(
-            "Catch-up request from {} for service {} (subscribed: {}): returning {} submissions",
-            peer,
-            request.service_id,
-            is_subscribed,
-            count
+        // After remove_peer -> false
+        map.remove_peer(&peer_a);
+        assert!(
+            !map.has_announced(&peer_a),
+            "Peer should not be announced after remove_peer"
         );
     }
 
-    let response = CatchUpResponse { submissions };
+    #[test]
+    fn test_has_announced_after_set_peer_subscriptions() {
+        // has_announced returns true after set_peer_subscriptions with non-empty services
+        let peer_a = test_pubkey(1);
+        let svc_a = [0xAA; 32];
 
-    if let Err(e) = swarm
-        .behaviour_mut()
-        .catchup
-        .send_response(channel, response)
-    {
-        tracing::warn!("Failed to send catch-up response to {}: {:?}", peer, e);
-    } else if count > 0 {
-        tracing::debug!(
-            "Sent {} submissions in catch-up response to {} for service {}",
-            count,
-            peer,
-            request.service_id
-        );
-    }
-}
+        let mut map = PeerSubscriptionMap::new();
+        assert!(!map.has_announced(&peer_a));
 
-/// Handle an incoming catch-up response
-///
-/// Validates and forwards submissions received during P2P catch-up to the aggregator.
-///
-/// ## Validation
-/// Only processes submissions for services we're actively subscribed to. This prevents:
-/// - Processing stale submissions from previous test runs (e2e tests reuse P2P connections)
-/// - Wasting resources on services we've unsubscribed from
-/// - Race conditions where catch-up delivers submissions before service initialization completes
-///
-/// ## Retry Interaction
-/// Submissions forwarded here may arrive before operators are fully registered on-chain.
-/// The aggregator's retry mechanism (see handle_submit_action) handles this by:
-/// 1. Detecting SignerNotRegistered errors
-/// 2. Saving the queue for retry
-/// 3. Automatically retrying when next submission arrives
-fn handle_catchup_response(
-    peer: PeerId,
-    response: CatchUpResponse,
-    aggregator_tx: &crossbeam::channel::Sender<AggregatorCommand>,
-    state: &EventLoopState,
-) {
-    if response.submissions.is_empty() {
-        tracing::debug!("Received empty catch-up response from {}", peer);
-        return;
+        map.set_peer_subscriptions(&peer_a, vec![svc_a]);
+        assert!(
+            map.has_announced(&peer_a),
+            "Peer should be announced after set_peer_subscriptions"
+        );
     }
 
-    tracing::debug!(
-        "Received catch-up response from {} with {} submissions",
-        peer,
-        response.submissions.len()
-    );
+    #[test]
+    fn test_incremental_vs_full_state_processing() {
+        // Validates data structure behavior for full_state vs incremental semantics.
+        // The dispatch logic (if full_state -> set_peer_subscriptions else handle_announcement)
+        // is a bridge loop concern (Plan 02), but we test the DATA STRUCTURE behavior here.
+        let peer_a = test_pubkey(1);
+        let svc_a = [0xAA; 32];
+        let svc_b = [0xBB; 32];
+        let svc_c = [0xCC; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+        let empty_connected = HashSet::new();
+
+        // Subscribe peer to svc_a via handle_announcement (incremental)
+        map.handle_announcement(
+            &peer_a,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
+        assert!(matches!(
+            map.get_recipients(&svc_a, &empty_connected),
+            Recipients::Some(_)
+        ));
 
-    // Forward each submission to the aggregator, but only for services we're subscribed to
-    let mut accepted = 0;
-    let mut rejected = 0;
-    for submission in response.submissions {
-        // Validate: only accept submissions for services we're subscribed to
-        let service_id = submission.service_id();
-        if !state.subscribed_services.contains(service_id) {
-            tracing::warn!(
-                "Rejecting catch-up submission from {} for unsubscribed service {}",
-                peer,
-                service_id
-            );
-            rejected += 1;
-            continue;
+        // Simulate full_state=true: replace with svc_b only
+        // Bridge loop would call set_peer_subscriptions for full_state=true
+        map.set_peer_subscriptions(&peer_a, vec![svc_b]);
+
+        // svc_a should be gone, svc_b should be present
+        assert!(
+            matches!(
+                map.get_recipients(&svc_a, &empty_connected),
+                Recipients::All
+            ),
+            "svc_a should be gone after full_state replace"
+        );
+        match map.get_recipients(&svc_b, &empty_connected) {
+            Recipients::Some(peers) => assert!(peers.contains(&peer_a)),
+            other => panic!("Expected Recipients::Some for svc_b, got {:?}", other),
         }
 
-        if let Err(e) = aggregator_tx.send(AggregatorCommand::Receive {
-            submission,
-            peer: Peer::Other(format!("catchup:{}", peer)),
-        }) {
-            tracing::error!("Failed to send catch-up submission to aggregator: {}", e);
-        } else {
-            accepted += 1;
+        // Simulate full_state=false: incremental add svc_c
+        // Bridge loop would call handle_announcement for full_state=false
+        map.handle_announcement(
+            &peer_a,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_c],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
+
+        // Both svc_b and svc_c should be present (incremental merge)
+        match map.get_recipients(&svc_b, &empty_connected) {
+            Recipients::Some(peers) => assert!(peers.contains(&peer_a)),
+            other => panic!(
+                "Expected Recipients::Some for svc_b after incremental, got {:?}",
+                other
+            ),
+        }
+        match map.get_recipients(&svc_c, &empty_connected) {
+            Recipients::Some(peers) => assert!(peers.contains(&peer_a)),
+            other => panic!(
+                "Expected Recipients::Some for svc_c after incremental, got {:?}",
+                other
+            ),
         }
     }
 
-    if rejected > 0 {
-        tracing::warn!(
-            "Catch-up from {}: accepted {} submissions, rejected {} for unsubscribed services",
-            peer,
-            accepted,
-            rejected
+    #[test]
+    fn test_heartbeat_subscription_announcement() {
+        // full_state=true announcement round-trips through P2pMessage encoding
+        let svc_a = [0xAA; 32];
+        let svc_b = [0xBB; 32];
+
+        let announcement = SubscriptionAnnouncement {
+            subscribe: vec![svc_a, svc_b],
+            unsubscribe: vec![],
+            full_state: true,
+        };
+
+        let p2p_msg = announcement.to_p2p_message().expect("to_p2p_message");
+        assert_eq!(
+            p2p_msg.service_id_bytes, SUBSCRIPTION_SENTINEL,
+            "Must use sentinel service_id"
         );
+
+        let recovered =
+            SubscriptionAnnouncement::from_payload(&p2p_msg.payload).expect("from_payload");
+        assert!(recovered.full_state, "full_state must survive roundtrip");
+        assert_eq!(recovered.subscribe.len(), 2);
+        assert!(recovered.subscribe.contains(&svc_a));
+        assert!(recovered.subscribe.contains(&svc_b));
+        assert!(recovered.unsubscribe.is_empty());
     }
-}
 
-/// Handle a received gossip message
-fn handle_gossip_message(
-    propagation_source: PeerId,
-    message: gossipsub::Message,
-    aggregator_tx: &crossbeam::channel::Sender<AggregatorCommand>,
-    state: &mut EventLoopState,
-) {
-    let submission: Submission = match serde_json::from_slice(&message.data) {
-        Ok(s) => s,
-        Err(e) => {
-            tracing::warn!(
-                "Failed to deserialize submission from {}: {}",
-                propagation_source,
-                e
-            );
-            return;
-        }
-    };
+    #[test]
+    fn test_subscribe_builds_announcement() {
+        // Basic subscribe announcement: subscribe=[svc_a], unsubscribe=[], full_state=false
+        let svc_a = [0xAA; 32];
+        let announcement = SubscriptionAnnouncement {
+            subscribe: vec![svc_a],
+            unsubscribe: vec![],
+            full_state: false,
+        };
 
-    // Validate that the submission's service_id matches the topic
-    let expected_topic = service_topic_name(submission.service_id());
-    if message.topic.as_str() != expected_topic {
-        tracing::warn!(
-            "Received submission with mismatched service_id from {}: expected topic '{}' but got '{}'",
-            propagation_source,
-            expected_topic,
-            message.topic
+        let p2p_msg = announcement.to_p2p_message().expect("to_p2p_message");
+        assert_eq!(
+            p2p_msg.service_id_bytes, SUBSCRIPTION_SENTINEL,
+            "Subscribe announcement must use sentinel"
         );
-        return;
+
+        let recovered =
+            SubscriptionAnnouncement::from_payload(&p2p_msg.payload).expect("from_payload");
+        assert_eq!(recovered.subscribe, vec![svc_a]);
+        assert!(recovered.unsubscribe.is_empty());
+        assert!(!recovered.full_state);
     }
 
-    tracing::debug!(
-        "Received submission via P2P from {}: {}",
-        propagation_source,
-        submission.label()
-    );
+    #[test]
+    fn test_unsubscribe_builds_announcement() {
+        // ANN-02: Unsubscribe announcement round-trips correctly
+        let svc_a = [0xAA; 32];
+        let announcement = SubscriptionAnnouncement {
+            subscribe: vec![],
+            unsubscribe: vec![svc_a],
+            full_state: false,
+        };
 
-    // Store for catch-up responses
-    state.store_submission(submission.clone());
+        let p2p_msg = announcement.to_p2p_message().expect("to_p2p_message");
+        assert_eq!(
+            p2p_msg.service_id_bytes, SUBSCRIPTION_SENTINEL,
+            "Unsubscribe announcement must use SUBSCRIPTION_SENTINEL (ANN-02)"
+        );
 
-    // Forward to aggregator
-    if let Err(e) = aggregator_tx.send(AggregatorCommand::Receive {
-        submission,
-        peer: Peer::Other(propagation_source.to_string()),
-    }) {
-        tracing::error!("Failed to send P2P submission to aggregator: {}", e);
+        let recovered =
+            SubscriptionAnnouncement::from_payload(&p2p_msg.payload).expect("from_payload");
+        assert!(recovered.subscribe.is_empty());
+        assert_eq!(recovered.unsubscribe, vec![svc_a]);
+        assert!(!recovered.full_state);
     }
-}
 
-/// Handle a command from the application
-fn handle_command(
-    swarm: &mut Swarm<WavsBehaviour>,
-    command: P2pCommand,
-    state: &mut EventLoopState,
-) {
-    match command {
-        P2pCommand::Publish {
-            service_id,
-            submission,
-        } => {
-            let topic_name = service_topic_name(&service_id);
-            let topic = IdentTopic::new(&topic_name);
-
-            // Ensure we're subscribed to the topic
-            if !state.subscribed_topics.contains(&topic_name) {
-                if let Err(e) = swarm.behaviour_mut().gossipsub.subscribe(&topic) {
-                    tracing::error!("Failed to subscribe to topic {}: {}", topic_name, e);
-                    return;
-                }
-                state.subscribed_topics.insert(topic_name.clone());
-                state.subscribed_services.insert(service_id.clone());
-                tracing::debug!("Subscribed to P2P topic: {}", topic_name);
-            }
+    #[test]
+    fn test_hello_on_first_contact() {
+        // ANN-04: Hello-on-first-contact announcement preserves full_state=true and both services
+        let svc_a = [0xAA; 32];
+        let svc_b = [0xBB; 32];
+        let announcement = SubscriptionAnnouncement {
+            subscribe: vec![svc_a, svc_b],
+            unsubscribe: vec![],
+            full_state: true,
+        };
 
-            // Store submission for catch-up responses
-            state.store_submission(*submission.clone());
+        let p2p_msg = announcement.to_p2p_message().expect("to_p2p_message");
+        assert_eq!(
+            p2p_msg.service_id_bytes, SUBSCRIPTION_SENTINEL,
+            "Hello announcement must use SUBSCRIPTION_SENTINEL"
+        );
 
-            // Serialize and publish
-            let data = match serde_json::to_vec(&*submission) {
-                Ok(d) => d,
-                Err(e) => {
-                    tracing::error!("Failed to serialize submission: {}", e);
-                    return;
-                }
-            };
-
-            match swarm
-                .behaviour_mut()
-                .gossipsub
-                .publish(topic.clone(), data.clone())
-            {
-                Ok(_) => {
-                    tracing::debug!("Published submission to topic {}", topic_name);
-                }
-                Err(gossipsub::PublishError::NoPeersSubscribedToTopic) => {
-                    tracing::debug!("No peers subscribed to {}, queueing for retry", topic_name);
-                    // Enforce queue limit to prevent unbounded memory growth during network issues
-                    let max_pending = state.config.max_pending_publishes();
-                    if state.pending_publishes.len() >= max_pending {
-                        tracing::warn!(
-                            "Pending publishes queue full ({}), dropping oldest entry",
-                            max_pending
-                        );
-                        state.pending_publishes.pop_front();
-                    }
-                    state.pending_publishes.push_back(PendingPublish {
-                        topic_name,
-                        data,
-                        created_at: Instant::now(),
-                        retries: 0,
-                    });
-                }
-                Err(e) => {
-                    tracing::warn!("Failed to publish to topic {}: {}", topic_name, e);
-                }
+        let recovered =
+            SubscriptionAnnouncement::from_payload(&p2p_msg.payload).expect("from_payload");
+        assert!(
+            recovered.full_state,
+            "Hello must preserve full_state=true (ANN-04)"
+        );
+        assert_eq!(recovered.subscribe.len(), 2);
+        assert!(recovered.subscribe.contains(&svc_a));
+        assert!(recovered.subscribe.contains(&svc_b));
+        assert!(
+            recovered.unsubscribe.is_empty(),
+            "Hello should have empty unsubscribe"
+        );
+    }
+
+    // TGT-04: Re-resolution returns different results before and after subscription state arrives
+    #[test]
+    fn test_retry_re_resolution() {
+        let peer_a = test_pubkey(1);
+        let svc_a = [0xAA; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+        let empty_connected = HashSet::new();
+
+        // Before any subscription state: get_recipients returns Recipients::All
+        // This is what a message queued at startup would see if it cached recipients
+        assert!(
+            matches!(
+                map.get_recipients(&svc_a, &empty_connected),
+                Recipients::All
+            ),
+            "Before subscription state, must return Recipients::All"
+        );
+
+        // Simulate peer announcing subscription (as if subscription state arrived)
+        map.set_peer_subscriptions(&peer_a, vec![svc_a]);
+
+        // After subscription state: get_recipients returns Recipients::Some with peer_a
+        // This proves re-resolution at drain time sees different results than cached All
+        match map.get_recipients(&svc_a, &empty_connected) {
+            Recipients::Some(peers) => {
+                assert!(
+                    peers.contains(&peer_a),
+                    "After subscription, peers must contain peer_a"
+                );
             }
+            other => panic!(
+                "Expected Recipients::Some after subscription state, got {:?}",
+                other
+            ),
         }
-        P2pCommand::Subscribe { service_id } => {
-            let topic_name = service_topic_name(&service_id);
-            let topic = IdentTopic::new(&topic_name);
+    }
 
-            if state.subscribed_topics.contains(&topic_name) {
-                return;
-            }
+    #[test]
+    fn test_peer_subscription_counts() {
+        let peer_a = test_pubkey(1);
+        let peer_b = test_pubkey(2);
+        let svc_a = [0xAA; 32];
+        let svc_b = [0xBB; 32];
 
-            if let Err(e) = swarm.behaviour_mut().gossipsub.subscribe(&topic) {
-                tracing::error!("Failed to subscribe to topic {}: {}", topic_name, e);
-                return;
-            }
+        let mut map = PeerSubscriptionMap::new();
 
-            state.subscribed_topics.insert(topic_name.clone());
-            state.subscribed_services.insert(service_id.clone());
-            tracing::debug!("Subscribed to P2P topic: {}", topic_name);
-
-            // Request catch-up from already-connected peers for this new service
-            // Rate-limited to avoid overwhelming the network
-            let connected_peers: Vec<PeerId> = swarm.connected_peers().cloned().collect();
-            for peer_id in connected_peers {
-                let peer_set = state
-                    .catchup_requested_peers
-                    .entry(service_id.clone())
-                    .or_default();
-
-                if peer_set.contains(&peer_id) {
-                    continue;
-                }
+        // Empty map returns empty counts
+        assert!(map.peer_subscription_counts().is_empty());
 
-                // Rate limit: don't send too many concurrent requests per service
-                if peer_set.len() >= state.config.max_concurrent_catchup_requests_per_service() {
-                    tracing::debug!(
-                        "Skipping catch-up request to {} for service {} (rate limited)",
-                        peer_id,
-                        service_id
-                    );
-                    continue;
-                }
+        // After subscriptions, counts reflect state
+        map.set_peer_subscriptions(&peer_a, vec![svc_a, svc_b]);
+        map.set_peer_subscriptions(&peer_b, vec![svc_a]);
 
-                tracing::debug!(
-                    "Requesting catch-up from {} for newly subscribed service {}",
-                    peer_id,
-                    service_id
-                );
-                let request = CatchUpRequest {
-                    service_id: service_id.clone(),
-                };
-                swarm
-                    .behaviour_mut()
-                    .catchup
-                    .send_request(&peer_id, request);
-                peer_set.insert(peer_id);
-            }
-        }
-        P2pCommand::Unsubscribe { service_id } => {
-            let topic_name = service_topic_name(&service_id);
-            let topic = IdentTopic::new(&topic_name);
-
-            if !state.subscribed_topics.contains(&topic_name) {
-                tracing::debug!(
-                    "Unsubscribe called for topic {} but not subscribed",
-                    topic_name
-                );
-                return;
-            }
+        let counts = map.peer_subscription_counts();
+        assert_eq!(counts.len(), 2);
+        assert_eq!(*counts.get(&const_hex::encode(svc_a)).unwrap(), 2);
+        assert_eq!(*counts.get(&const_hex::encode(svc_b)).unwrap(), 1);
 
-            if !swarm.behaviour_mut().gossipsub.unsubscribe(&topic) {
-                tracing::warn!("Failed to unsubscribe from topic {}", topic_name);
-                return;
-            }
+        // After removing a peer, counts update
+        map.remove_peer(&peer_b);
+        let counts = map.peer_subscription_counts();
+        assert_eq!(*counts.get(&const_hex::encode(svc_a)).unwrap(), 1);
+        assert_eq!(*counts.get(&const_hex::encode(svc_b)).unwrap(), 1);
+    }
+
+    // ---- Phase 18: SUB-03 tracked_peers and heartbeat prune tests ----
+
+    #[test]
+    fn test_tracked_peers_empty() {
+        // tracked_peers() on a new map returns empty HashSet
+        let map = PeerSubscriptionMap::new();
+        assert!(
+            map.tracked_peers().is_empty(),
+            "New map should have no tracked peers"
+        );
+    }
 
-            state.subscribed_topics.remove(&topic_name);
-            state.subscribed_services.remove(&service_id);
-            // Also clear stored submissions for this service to free memory
-            state.stored_submissions.remove(&service_id);
-            // Clear any pending publishes for this topic to avoid wasted retries
-            state
-                .pending_publishes
-                .retain(|p| p.topic_name != topic_name);
-            // Clear catch-up state for this service to allow fresh requests on resubscribe
-            state.catchup_requested_peers.remove(&service_id);
-            tracing::debug!("Unsubscribed from P2P topic: {}", topic_name);
+    #[test]
+    fn test_tracked_peers_returns_announced_peers() {
+        // After handle_announcement for peer_a and peer_b, tracked_peers() returns both
+        let peer_a = test_pubkey(1);
+        let peer_b = test_pubkey(2);
+        let svc_a = [0xAA; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+        map.handle_announcement(
+            &peer_a,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
+        map.handle_announcement(
+            &peer_b,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
+
+        let tracked = map.tracked_peers();
+        assert_eq!(tracked.len(), 2, "Both peers should be tracked");
+        assert!(tracked.contains(&peer_a));
+        assert!(tracked.contains(&peer_b));
+    }
+
+    #[test]
+    fn test_tracked_peers_after_remove() {
+        // After handle_announcement then remove_peer, tracked_peers() no longer contains removed peer
+        let peer_a = test_pubkey(1);
+        let svc_a = [0xAA; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+        map.handle_announcement(
+            &peer_a,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
+        assert!(map.tracked_peers().contains(&peer_a));
+
+        map.remove_peer(&peer_a);
+        assert!(
+            !map.tracked_peers().contains(&peer_a),
+            "Removed peer should not be tracked"
+        );
+        assert!(map.tracked_peers().is_empty());
+    }
+
+    #[test]
+    fn test_heartbeat_prune_departed_peer() {
+        // SUB-03: Simulates heartbeat-driven pruning of departed peers
+        let peer_a = test_pubkey(1);
+        let peer_b = test_pubkey(2);
+        let svc_a = [0xAA; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+        map.handle_announcement(
+            &peer_a,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
+        map.handle_announcement(
+            &peer_b,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
+
+        // Both peers subscribed
+        let empty_connected = HashSet::new();
+        match map.get_recipients(&svc_a, &empty_connected) {
+            Recipients::Some(peers) => assert_eq!(peers.len(), 2),
+            other => panic!("Expected 2 peers, got {:?}", other),
+        }
+
+        // Heartbeat ack only returns peer_a -- peer_b departed
+        let connected: HashSet<ed25519::PublicKey> = [peer_a.clone()].into_iter().collect();
+        let tracked = map.tracked_peers();
+        for departed in tracked.difference(&connected) {
+            map.remove_peer(departed);
         }
-        P2pCommand::GetStatus { response_tx } => {
-            let local_peer_id = *swarm.local_peer_id();
-            let connected_peers: Vec<PeerId> = swarm.connected_peers().cloned().collect();
-
-            // Listen addresses - use tracked addresses from NewListenAddr events
-            // These are the actual interface addresses (e.g., 127.0.0.1) rather than
-            // the wildcard 0.0.0.0 that was passed to listen_on()
-            let listen_addresses: Vec<String> = state
-                .listen_addresses
-                .iter()
-                .map(|addr| format!("{}/p2p/{}", addr, local_peer_id))
-                .collect();
-
-            // External addresses - discovered via AutoNAT/Identify, preferred for NAT traversal
-            let external_addresses: Vec<String> = swarm
-                .external_addresses()
-                .map(|addr| format!("{}/p2p/{}", addr, local_peer_id))
-                .collect();
-
-            // Get peer counts for each subscribed topic
-            let mut topic_peer_counts = HashMap::new();
-            for topic_name in state.subscribed_topics.iter() {
-                let topic_hash = IdentTopic::new(topic_name).hash();
-                let peer_count = swarm.behaviour().gossipsub.mesh_peers(&topic_hash).count();
-                topic_peer_counts.insert(topic_name.clone(), peer_count);
-            }
 
-            let status = P2pStatus {
-                enabled: true,
-                local_peer_id: Some(local_peer_id.to_string()),
-                listen_addresses,
-                external_addresses,
-                connected_peers: connected_peers.len(),
-                peer_ids: connected_peers.iter().map(|p| p.to_string()).collect(),
-                subscribed_topics: state.subscribed_topics.iter().cloned().collect(),
-                topic_peer_counts,
-            };
-
-            // Ignore send error - the receiver may have been dropped
-            let _ = response_tx.send(status);
+        // After prune: only peer_a remains for svc_a
+        match map.get_recipients(&svc_a, &connected) {
+            Recipients::Some(peers) => {
+                assert_eq!(peers.len(), 1);
+                assert!(peers.contains(&peer_a));
+            }
+            other => panic!("Expected 1 peer, got {:?}", other),
         }
     }
-}
 
-/// Create a GossipSub topic name for a service
-fn service_topic_name(service_id: &ServiceId) -> String {
-    format!("wavs/{}/topic/v1", service_id)
-}
+    #[test]
+    fn test_prune_noop_all_connected() {
+        // Prune is a no-op when all tracked peers are still connected
+        let peer_a = test_pubkey(1);
+        let peer_b = test_pubkey(2);
+        let svc_a = [0xAA; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+        map.handle_announcement(
+            &peer_a,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
+        map.handle_announcement(
+            &peer_b,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
 
-/// Check if a multiaddr is dialable by other peers.
-/// Addresses bound to 0.0.0.0 are not dialable because they represent "all interfaces"
-/// on the local machine, not a specific IP that external peers can connect to.
-fn is_dialable_address(addr: &Multiaddr) -> bool {
-    !addr.to_string().contains("/ip4/0.0.0.0/")
-}
+        // Both peers still connected
+        let connected: HashSet<ed25519::PublicKey> =
+            [peer_a.clone(), peer_b.clone()].into_iter().collect();
+        let tracked = map.tracked_peers();
+        for departed in tracked.difference(&connected) {
+            map.remove_peer(departed);
+        }
+
+        // tracked_peers unchanged
+        let tracked_after = map.tracked_peers();
+        assert_eq!(tracked_after.len(), 2);
+        assert!(tracked_after.contains(&peer_a));
+        assert!(tracked_after.contains(&peer_b));
+    }
 
-/// Extract the peer ID from a multiaddr if present.
-/// Multiaddrs with peer IDs look like: /ip4/1.2.3.4/tcp/9000/p2p/12D3KooW...
-fn extract_peer_id(addr: &Multiaddr) -> Option<PeerId> {
-    use libp2p::multiaddr::Protocol;
+    // ---- Phase 18: COMPAT-03 get_recipients with connected peers tests ----
+
+    #[test]
+    fn test_get_recipients_includes_unannounced_connected_peers() {
+        // COMPAT-03: Un-announced connected peers are included in recipient set
+        let peer_v13 = test_pubkey(1); // v1.3 peer (has announced)
+        let peer_legacy = test_pubkey(2); // pre-v1.3 peer (never announced)
+        let svc_a = [0xAA; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+
+        // peer_v13 subscribes to svc_a
+        map.handle_announcement(
+            &peer_v13,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
 
-    addr.iter().find_map(|p| {
-        if let Protocol::P2p(peer_id) = p {
-            Some(peer_id)
-        } else {
-            None
+        // Both peers are connected
+        let connected: HashSet<ed25519::PublicKey> = [peer_v13.clone(), peer_legacy.clone()]
+            .into_iter()
+            .collect();
+
+        match map.get_recipients(&svc_a, &connected) {
+            Recipients::Some(peers) => {
+                assert!(peers.contains(&peer_v13), "v1.3 peer must be included");
+                assert!(
+                    peers.contains(&peer_legacy),
+                    "Legacy peer must be included (COMPAT-03)"
+                );
+                assert_eq!(peers.len(), 2);
+            }
+            other => panic!("Expected Recipients::Some with 2 peers, got {:?}", other),
         }
-    })
-}
+    }
 
-/// Remove the /p2p/<peer_id> suffix from a multiaddr.
-/// Kademlia expects addresses without the peer ID suffix.
-fn remove_peer_id_suffix(addr: &Multiaddr) -> Multiaddr {
-    use libp2p::multiaddr::Protocol;
+    #[test]
+    fn test_get_recipients_all_announced_no_legacy() {
+        // When all connected peers have announced, only subscribed peers are included
+        let peer_a = test_pubkey(1);
+        let peer_b = test_pubkey(2);
+        let svc_a = [0xAA; 32];
+        let svc_b = [0xBB; 32];
+
+        let mut map = PeerSubscriptionMap::new();
+
+        // peer_a subscribes to svc_a, peer_b subscribes to svc_b
+        map.handle_announcement(
+            &peer_a,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
+        map.handle_announcement(
+            &peer_b,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_b],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
 
-    addr.iter()
-        .filter(|p| !matches!(p, Protocol::P2p(_)))
-        .collect()
-}
+        // Both peers are connected and have announced
+        let connected: HashSet<ed25519::PublicKey> =
+            [peer_a.clone(), peer_b.clone()].into_iter().collect();
 
-// ============================================================================
-// Identity Management
-// ============================================================================
+        match map.get_recipients(&svc_a, &connected) {
+            Recipients::Some(peers) => {
+                assert_eq!(peers.len(), 1, "Only peer_a subscribes to svc_a");
+                assert!(peers.contains(&peer_a));
+            }
+            other => panic!("Expected Recipients::Some with 1 peer, got {:?}", other),
+        }
+    }
 
-/// Derive a libp2p secp256k1 Keypair from a BIP-39 mnemonic at HD index 0.
-/// This uses the same derivation path as EVM wallets (m/44'/60'/0'/0/0).
-fn keypair_from_mnemonic(mnemonic: &str) -> Result<libp2p::identity::Keypair, AggregatorError> {
-    use alloy_signer_local::{coins_bip39::English, MnemonicBuilder};
-
-    // Derive EVM signer at HD index 0 (same path as signing keys)
-    let signer = MnemonicBuilder::<English>::default()
-        .phrase(mnemonic)
-        .index(0)
-        .map_err(|e| AggregatorError::P2p(format!("Invalid mnemonic: {}", e)))?
-        .build()
-        .map_err(|e| {
-            AggregatorError::P2p(format!("Failed to build signer from mnemonic: {}", e))
-        })?;
+    #[test]
+    fn test_get_recipients_empty_connected_set_preserves_old_behavior() {
+        // get_recipients with empty connected set behaves exactly like old signature
+        let peer_a = test_pubkey(1);
+        let svc_a = [0xAA; 32];
+        let unknown_svc = [0xDD; 32];
 
-    // Get the raw 32-byte private key
-    let secret_key_bytes = signer.credential().to_bytes();
+        let mut map = PeerSubscriptionMap::new();
+        let empty_connected = HashSet::new();
 
-    // Create libp2p secp256k1 keypair from the same private key
-    let secret_key = libp2p::identity::secp256k1::SecretKey::try_from_bytes(secret_key_bytes)
-        .map_err(|e| AggregatorError::P2p(format!("Failed to create secp256k1 key: {}", e)))?;
-    let keypair = libp2p::identity::secp256k1::Keypair::from(secret_key);
+        // No subscriptions -> Recipients::All
+        assert!(matches!(
+            map.get_recipients(&unknown_svc, &empty_connected),
+            Recipients::All
+        ));
 
-    Ok(keypair.into())
-}
+        // With subscription -> Recipients::Some with subscribed peer only
+        map.handle_announcement(
+            &peer_a,
+            &SubscriptionAnnouncement {
+                subscribe: vec![svc_a],
+                unsubscribe: vec![],
+                full_state: false,
+            },
+        );
+        match map.get_recipients(&svc_a, &empty_connected) {
+            Recipients::Some(peers) => {
+                assert_eq!(peers.len(), 1);
+                assert!(peers.contains(&peer_a));
+            }
+            other => panic!("Expected Recipients::Some, got {:?}", other),
+        }
 
-/// Get the P2P peer ID that would be derived from a given mnemonic.
-/// Useful for determining the peer ID before starting the node.
-pub fn peer_id_from_mnemonic(mnemonic: &str) -> Result<String, AggregatorError> {
-    let keypair = keypair_from_mnemonic(mnemonic)?;
-    Ok(keypair.public().to_peer_id().to_string())
+        // Unknown service still falls back to All
+        assert!(matches!(
+            map.get_recipients(&unknown_svc, &empty_connected),
+            Recipients::All
+        ));
+    }
 }
diff --git a/packages/wavs/src/subsystems/aggregator/p2p_config_tests.rs b/packages/wavs/src/subsystems/aggregator/p2p_config_tests.rs
new file mode 100644
index 000000000..e1e9890de
--- /dev/null
+++ b/packages/wavs/src/subsystems/aggregator/p2p_config_tests.rs
@@ -0,0 +1,88 @@
+//! Wave 0 test stubs for P2pConfig (CFG-01 and CFG-02).
+//! These verify the current P2pConfig shape including max_message_size and deque_size.
+
+#[cfg(test)]
+mod tests {
+    use super::super::p2p::P2pConfig;
+
+    /// CFG-01: P2pConfig roundtrips through serde correctly and deserializes from TOML.
+    #[test]
+    fn p2p_config_serde() {
+        // Verify Disabled variant deserializes from TOML
+        let disabled_toml = r#""disabled""#;
+        let parsed: P2pConfig = serde_json::from_str(disabled_toml).expect("deserialize Disabled");
+        assert_eq!(parsed, P2pConfig::Disabled);
+
+        // Verify Disabled roundtrips through JSON
+        let json_str = serde_json::to_string(&P2pConfig::Disabled).expect("serialize Disabled");
+        let parsed: P2pConfig = serde_json::from_str(&json_str).expect("roundtrip Disabled");
+        assert_eq!(parsed, P2pConfig::Disabled);
+
+        // Verify Local variant deserializes from TOML
+        let local_toml = r#"
+            [local]
+            listen_port = 9000
+            peer_addresses = ["abc123@127.0.0.1:9001"]
+            max_message_size = 32768
+            deque_size = 256
+        "#;
+        let parsed: P2pConfig = toml::from_str(local_toml).expect("deserialize Local from TOML");
+        assert_eq!(
+            parsed,
+            P2pConfig::Local {
+                listen_port: 9000,
+                peer_addresses: vec!["abc123@127.0.0.1:9001".to_string()],
+                authorized_peers: vec![],
+                max_message_size: Some(32768),
+                deque_size: Some(256),
+            }
+        );
+
+        // Verify Local variant roundtrips through JSON
+        let local = P2pConfig::Local {
+            listen_port: 9000,
+            peer_addresses: vec!["abc123@127.0.0.1:9001".to_string()],
+            authorized_peers: vec![],
+            max_message_size: Some(32768),
+            deque_size: Some(256),
+        };
+        let json_str = serde_json::to_string(&local).expect("serialize Local");
+        let parsed: P2pConfig = serde_json::from_str(&json_str).expect("roundtrip Local");
+        assert_eq!(parsed, local);
+    }
+
+    /// CFG-02: Default values for optional tuning fields.
+    #[test]
+    fn p2p_config_defaults() {
+        // Default is Disabled
+        let default = P2pConfig::default();
+        assert_eq!(default, P2pConfig::Disabled);
+
+        // Local variant with only required fields should deserialize (optional fields default)
+        let toml_str = r#"
+            [local]
+            listen_port = 9000
+        "#;
+        let parsed: P2pConfig = toml::from_str(toml_str).expect("deserialize Local with defaults");
+        match &parsed {
+            P2pConfig::Local {
+                listen_port,
+                peer_addresses,
+                authorized_peers,
+                max_message_size,
+                deque_size,
+            } => {
+                assert_eq!(*listen_port, 9000);
+                assert!(peer_addresses.is_empty());
+                assert!(authorized_peers.is_empty());
+                assert_eq!(*max_message_size, None);
+                assert_eq!(*deque_size, None);
+            }
+            other => panic!("Expected Local, got {:?}", other),
+        }
+
+        // Verify helper methods return correct defaults when None
+        assert_eq!(parsed.max_message_size(), 65536);
+        assert_eq!(parsed.deque_size(), 128);
+    }
+}
diff --git a/packages/wavs/src/subsystems/aggregator/p2p_status_tests.rs b/packages/wavs/src/subsystems/aggregator/p2p_status_tests.rs
new file mode 100644
index 000000000..0f4ce9d17
--- /dev/null
+++ b/packages/wavs/src/subsystems/aggregator/p2p_status_tests.rs
@@ -0,0 +1,43 @@
+//! Wave 0 test stub for P2pStatus format (OBS-02).
+//! This will be expanded by Plan 03-01 when P2pStatus is updated.
+
+#[cfg(test)]
+mod tests {
+    use wavs_types::P2pStatus;
+
+    /// OBS-02: P2pStatus serializes with correct field names and format.
+    /// Stub -- will be expanded in Plan 03-01 to verify no multiaddr fields.
+    #[test]
+    fn p2p_status_format() {
+        let status = P2pStatus::default();
+        let json = serde_json::to_string(&status).expect("serialize P2pStatus");
+
+        // Verify it produces valid JSON
+        let parsed: serde_json::Value = serde_json::from_str(&json).expect("parse JSON");
+        assert!(parsed.is_object());
+
+        // Verify key fields exist
+        let obj = parsed.as_object().unwrap();
+        assert!(obj.contains_key("enabled"), "Missing 'enabled' field");
+        assert!(
+            obj.contains_key("connected_peers"),
+            "Missing 'connected_peers' field"
+        );
+        assert!(
+            obj.contains_key("listen_addresses"),
+            "Missing 'listen_addresses' field"
+        );
+        assert!(
+            obj.contains_key("peer_subscriptions"),
+            "Missing 'peer_subscriptions' field"
+        );
+
+        // OBS-01: peer_subscriptions defaults to empty object
+        let subs = obj.get("peer_subscriptions").unwrap();
+        assert!(subs.is_object(), "peer_subscriptions should be an object");
+        assert!(
+            subs.as_object().unwrap().is_empty(),
+            "default peer_subscriptions should be empty"
+        );
+    }
+}
diff --git a/packages/wavs/src/subsystems/aggregator/queue.rs b/packages/wavs/src/subsystems/aggregator/queue.rs
index 38d1ba776..317f211d7 100644
--- a/packages/wavs/src/subsystems/aggregator/queue.rs
+++ b/packages/wavs/src/subsystems/aggregator/queue.rs
@@ -1,4 +1,5 @@
-use wavs_types::{QuorumQueue, QuorumQueueId, Submission};
+use alloy_primitives::keccak256;
+use wavs_types::{QuorumQueue, QuorumQueueId, Submission, WavsSignable, WavsSignature};
 
 use crate::subsystems::aggregator::{error::AggregatorError, Aggregator};
 
@@ -103,6 +104,21 @@ impl Aggregator {
     }
 }
 
+/// Extract a comparable signer identity from a signature.
+/// For secp256k1: recovers the EVM address (20 bytes) from the signature.
+/// For BLS12-381: uses keccak256(g1_pubkey) (32 bytes) as the identity.
+fn signer_identity<T: WavsSignable + ?Sized>(
+    sig: &WavsSignature,
+    signable: &T,
+) -> Result<Vec<u8>, wavs_types::SigningError> {
+    match sig {
+        WavsSignature::Secp256k1 { .. } => {
+            sig.evm_signer_address(signable).map(|addr| addr.0.to_vec())
+        }
+        WavsSignature::Bls12381 { g1_pubkey, .. } => Ok(keccak256(g1_pubkey).0.to_vec()),
+    }
+}
+
 pub fn append_submission_to_queue(
     queue_id: &QuorumQueueId,
     queue: &mut Vec<Submission>,
@@ -119,19 +135,19 @@ pub fn append_submission_to_queue(
         }
     }
 
-    // In addition to extracting for comparison, this also serves to validate the signature
-    let submission_signer_address = submission
-        .envelope_signature
-        .evm_signer_address(&submission.envelope)?;
+    // Use generic signer identity (EVM address for secp256k1, keccak256(g1_pubkey) for BLS)
+    let submission_identity =
+        signer_identity(&submission.envelope_signature, &submission.envelope)?;
 
     for queued_submission in queue.iter_mut() {
-        let queued_submission_signer_address = queued_submission
-            .envelope_signature
-            .evm_signer_address(&queued_submission.envelope)?;
+        let queued_identity = signer_identity(
+            &queued_submission.envelope_signature,
+            &queued_submission.envelope,
+        )?;
 
         // if the signer is the same as the one in the queue, we can just update it
         // this effectively allows re-trying failed aggregation
-        if submission_signer_address == queued_submission_signer_address {
+        if submission_identity == queued_identity {
             *queued_submission = submission;
 
             return Ok(());
@@ -142,3 +158,141 @@ pub fn append_submission_to_queue(
 
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::str::FromStr;
+    use wavs_types::{
+        ChainKey, Envelope, EventId, EvmSubmitAction, ServiceId, SignatureAlgorithm, SignatureKind,
+        SubmitAction, Trigger, TriggerAction, TriggerConfig, WasmResponse, WavsSignature,
+        WorkflowId,
+    };
+
+    /// Create a test QuorumQueueId.
+    fn test_queue_id() -> QuorumQueueId {
+        QuorumQueueId {
+            event_id: EventId::from([0u8; 20]),
+            action: SubmitAction::Evm(EvmSubmitAction {
+                chain: ChainKey::from_str("evm:31337").unwrap(),
+                address: "0x0000000000000000000000000000000000000000"
+                    .parse()
+                    .unwrap(),
+                gas_price: None,
+            }),
+        }
+    }
+
+    /// Create a mock submission with a specific envelope_signature.
+    fn mock_submission_with_sig(sig: WavsSignature) -> Submission {
+        let service_id = ServiceId::hash(b"test-queue");
+        let trigger_action = TriggerAction {
+            config: TriggerConfig {
+                service_id,
+                workflow_id: WorkflowId::new("test-wf").unwrap(),
+                trigger: Trigger::Manual,
+            },
+            data: wavs_types::TriggerData::default(),
+        };
+        let operator_response = WasmResponse {
+            payload: b"test-payload".to_vec(),
+            event_id_salt: None,
+            ordering: None,
+        };
+        let event_id = EventId::from([1u8; 20]);
+        let envelope = Envelope {
+            payload: alloy_primitives::Bytes::from_static(&[1, 2, 3]),
+            eventId: alloy_primitives::FixedBytes([1; 20]),
+            ordering: alloy_primitives::FixedBytes([0; 12]),
+        };
+        Submission {
+            trigger_action,
+            operator_response,
+            event_id,
+            envelope,
+            envelope_signature: sig,
+        }
+    }
+
+    fn bls_sig_with_pubkey(pubkey: Vec<u8>) -> WavsSignature {
+        WavsSignature::Bls12381 {
+            g2_signature: vec![0u8; 256],
+            g1_pubkey: pubkey,
+            kind: SignatureKind {
+                algorithm: SignatureAlgorithm::Bls12381,
+                prefix: None,
+            },
+        }
+    }
+
+    fn secp_sig() -> WavsSignature {
+        WavsSignature::Secp256k1 {
+            data: vec![0u8; 65],
+            kind: SignatureKind::evm_default(),
+        }
+    }
+
+    #[test]
+    fn bls_submission_enters_queue() {
+        let queue_id = test_queue_id();
+        let mut queue = Vec::new();
+        let sub = mock_submission_with_sig(bls_sig_with_pubkey(vec![1u8; 128]));
+
+        let result = append_submission_to_queue(&queue_id, &mut queue, sub);
+        assert!(
+            result.is_ok(),
+            "BLS submission should enter queue: {:?}",
+            result.err()
+        );
+        assert_eq!(queue.len(), 1);
+    }
+
+    #[test]
+    fn bls_submission_dedup_same_signer() {
+        let queue_id = test_queue_id();
+        let mut queue = Vec::new();
+
+        let sub1 = mock_submission_with_sig(bls_sig_with_pubkey(vec![1u8; 128]));
+        let sub2 = mock_submission_with_sig(bls_sig_with_pubkey(vec![1u8; 128]));
+
+        append_submission_to_queue(&queue_id, &mut queue, sub1).unwrap();
+        append_submission_to_queue(&queue_id, &mut queue, sub2).unwrap();
+        assert_eq!(queue.len(), 1, "Same G1 pubkey should dedup to 1 entry");
+    }
+
+    #[test]
+    fn bls_submission_different_signers() {
+        let queue_id = test_queue_id();
+        let mut queue = Vec::new();
+
+        let sub1 = mock_submission_with_sig(bls_sig_with_pubkey(vec![1u8; 128]));
+        let sub2 = mock_submission_with_sig(bls_sig_with_pubkey(vec![2u8; 128]));
+
+        append_submission_to_queue(&queue_id, &mut queue, sub1).unwrap();
+        append_submission_to_queue(&queue_id, &mut queue, sub2).unwrap();
+        assert_eq!(
+            queue.len(),
+            2,
+            "Different G1 pubkeys should be separate entries"
+        );
+    }
+
+    #[test]
+    fn secp256k1_still_works() {
+        let queue_id = test_queue_id();
+        let mut queue = Vec::new();
+
+        // secp256k1 with dummy sig bytes -- evm_signer_address recovery will fail
+        // but in the old code it failed too. The new code should use signer_identity
+        // which for secp256k1 calls evm_signer_address. Since the test sig is invalid,
+        // both old and new code will error. Let's just verify it doesn't panic.
+        let sub = mock_submission_with_sig(secp_sig());
+        let result = append_submission_to_queue(&queue_id, &mut queue, sub);
+        // With invalid signature data, evm_signer_address will error, but that's expected.
+        // The important thing is it doesn't panic with "BLS signatures do not have EVM signer addresses"
+        assert!(
+            result.is_err(),
+            "Invalid secp256k1 sig should error on address recovery"
+        );
+    }
+}
diff --git a/packages/wavs/src/subsystems/aggregator/submit.rs b/packages/wavs/src/subsystems/aggregator/submit.rs
index 20267843d..02dc46e6a 100644
--- a/packages/wavs/src/subsystems/aggregator/submit.rs
+++ b/packages/wavs/src/subsystems/aggregator/submit.rs
@@ -10,10 +10,12 @@ use wavs_types::{
             error::WavsValidateError, ServiceManagerQueryMessages, WavsValidateResult,
         },
     },
-    CosmosSubmitAction, EvmSubmitAction,
+    BlsServiceHandlerRpc, BlsServiceManagerEnvelope, BlsServiceManagerRpc,
+    BlsServiceManagerSignatureData, CosmosSubmitAction, EvmSubmitAction,
     IWavsServiceHandler::IWavsServiceHandlerInstance,
     IWavsServiceManager::IWavsServiceManagerInstance,
-    ServiceManagerError, Submission, WavsSignature, WavsSigner,
+    ServiceManagerError, ServiceManagerSignatureData, SignatureData, Submission, WavsSignature,
+    WavsSigner,
 };
 
 use crate::subsystems::aggregator::{error::AggregatorError, Aggregator};
@@ -70,72 +72,170 @@ impl Aggregator {
             .envelope
             .signature_data(signatures, block_height_minus_one)?;
 
-        let result = service_manager
-            .validate(
-                queue.first().unwrap().envelope.clone().into(),
-                signature_data.clone().into(),
-            )
-            .call()
-            .await;
-
-        if let Err(err) = result {
-            match err.as_decoded_interface_error::<ServiceManagerError>() {
-                Some(err) => match err {
-                    ServiceManagerError::InsufficientQuorum(info) => {
-                        return Err(AggregatorError::InsufficientQuorum {
-                            signer_weight: info.signerWeight.to_string(),
-                            threshold_weight: info.thresholdWeight.to_string(),
-                            total_weight: info.totalWeight.to_string(),
-                        });
-                    }
-                    err => {
-                        return Err(AggregatorError::EvmServiceManagerValidateKnown(err));
-                    }
-                },
-                None => match err.as_revert_data() {
-                    Some(raw) => {
-                        let raw_str = raw.to_string();
-                        // Detect SignerNotRegistered() error (selector 0x3dda1739)
-                        //
-                        // This is a transient error indicating operators haven't completed registration
-                        // on-chain yet. Common scenarios:
-                        // - P2P catch-up delivers submissions before operator registration completes
-                        // - PoA middleware: Sequential docker exec calls for operator registration are slow
-                        // - EigenLayer middleware: Batch registration is fast but still has a small timing window
-                        //
-                        // The aggregator's retry mechanism will:
-                        // 1. Save the queue when this error is detected
-                        // 2. Retry submission when next submission arrives
-                        // 3. Succeed once operators are registered on-chain
-                        if raw_str == "0x3dda1739" {
-                            tracing::warn!(
-                                "Signer not registered yet for submission {}. Queue will be saved for retry.",
-                                queue.last().unwrap().label()
-                            );
-                            return Err(AggregatorError::EvmServiceManagerValidateAnyRevert(
-                                format!("SignerNotRegistered ({})", raw_str),
-                            ));
-                        }
-                        return Err(AggregatorError::EvmServiceManagerValidateAnyRevert(raw_str));
-                    }
-                    None => {
-                        return Err(AggregatorError::EvmServiceManagerValidateUnknown(err));
+        let envelope = queue.first().unwrap().envelope.clone();
+
+        match signature_data {
+            SignatureData::Secp256k1(ref inner) => {
+                // secp256k1 path: validate via service manager, then submit
+                let result = service_manager
+                    .validate(
+                        envelope.clone().into(),
+                        ServiceManagerSignatureData {
+                            signers: inner.signers.clone(),
+                            signatures: inner.signatures.clone(),
+                            referenceBlock: inner.referenceBlock,
+                        },
+                    )
+                    .call()
+                    .await;
+
+                if let Err(err) = result {
+                    match err.as_decoded_interface_error::<ServiceManagerError>() {
+                        Some(err) => match err {
+                            ServiceManagerError::InsufficientQuorum(info) => {
+                                return Err(AggregatorError::InsufficientQuorum {
+                                    signer_weight: info.signerWeight.to_string(),
+                                    threshold_weight: info.thresholdWeight.to_string(),
+                                    total_weight: info.totalWeight.to_string(),
+                                });
+                            }
+                            err => {
+                                return Err(AggregatorError::EvmServiceManagerValidateKnown(err));
+                            }
+                        },
+                        None => match err.as_revert_data() {
+                            Some(raw) => {
+                                let raw_str = raw.to_string();
+                                // Detect SignerNotRegistered() error (selector 0x3dda1739)
+                                //
+                                // This is a transient error indicating operators haven't completed registration
+                                // on-chain yet. Common scenarios:
+                                // - P2P catch-up delivers submissions before operator registration completes
+                                // - PoA middleware: Sequential docker exec calls for operator registration are slow
+                                // - EigenLayer middleware: Batch registration is fast but still has a small timing window
+                                //
+                                // The aggregator's retry mechanism will:
+                                // 1. Save the queue when this error is detected
+                                // 2. Retry submission when next submission arrives
+                                // 3. Succeed once operators are registered on-chain
+                                if raw_str == "0x3dda1739" {
+                                    tracing::warn!(
+                                        "Signer not registered yet for submission {}. Queue will be saved for retry.",
+                                        queue.last().unwrap().label()
+                                    );
+                                    return Err(
+                                        AggregatorError::EvmServiceManagerValidateAnyRevert(
+                                            format!("SignerNotRegistered ({})", raw_str),
+                                        ),
+                                    );
+                                }
+                                return Err(AggregatorError::EvmServiceManagerValidateAnyRevert(
+                                    raw_str,
+                                ));
+                            }
+                            None => {
+                                return Err(AggregatorError::EvmServiceManagerValidateUnknown(err));
+                            }
+                        },
                     }
-                },
+                };
+
+                let tx_receipt = client
+                    .send_envelope_signatures(
+                        envelope,
+                        signature_data,
+                        contract_address,
+                        None,
+                        action.gas_price,
+                    )
+                    .await?;
+
+                Ok(AnyTransactionReceipt::Evm(Box::new(tx_receipt)))
             }
-        };
+            SignatureData::Bls12381(ref bls_sig_data) => {
+                // BLS path: look up BLS service manager, validate, then submit via BLS handler
+                let bls_service_handler =
+                    BlsServiceHandlerRpc::new(contract_address, client.provider.clone());
+                let bls_sm_address = bls_service_handler
+                    .getServiceManager()
+                    .call()
+                    .await
+                    .map_err(AggregatorError::EvmServiceManagerLookup)?;
+                let bls_service_manager =
+                    BlsServiceManagerRpc::new(bls_sm_address, client.provider.clone());
 
-        let tx_receipt = client
-            .send_envelope_signatures(
-                queue.first().unwrap().envelope.clone(),
-                signature_data,
-                contract_address,
-                None,
-                action.gas_price,
-            )
-            .await?;
+                // Convert to service manager's own Alloy-generated types for validate()
+                // (same fields, yet another distinct Rust type from the sol! macro)
+                let sm_envelope = BlsServiceManagerEnvelope {
+                    eventId: envelope.eventId,
+                    ordering: envelope.ordering,
+                    payload: envelope.payload.clone(),
+                };
+                let sm_sig_data = BlsServiceManagerSignatureData {
+                    signerPubkeys: bls_sig_data.signerPubkeys.clone(),
+                    aggregateSignature: bls_sig_data.aggregateSignature.clone(),
+                    referenceBlock: bls_sig_data.referenceBlock,
+                };
+
+                let result = bls_service_manager
+                    .validate(sm_envelope, sm_sig_data)
+                    .call()
+                    .await;
+
+                if let Err(err) = result {
+                    // Try to decode typed errors first (same error selectors as secp256k1 service manager)
+                    match err.as_decoded_interface_error::<ServiceManagerError>() {
+                        Some(err) => match err {
+                            ServiceManagerError::InsufficientQuorum(info) => {
+                                return Err(AggregatorError::InsufficientQuorum {
+                                    signer_weight: info.signerWeight.to_string(),
+                                    threshold_weight: info.thresholdWeight.to_string(),
+                                    total_weight: info.totalWeight.to_string(),
+                                });
+                            }
+                            err => {
+                                return Err(AggregatorError::EvmServiceManagerValidateKnown(err));
+                            }
+                        },
+                        None => match err.as_revert_data() {
+                            Some(raw) => {
+                                let raw_str = raw.to_string();
+                                // SignerNotRegistered (0x3dda1739)
+                                if raw_str == "0x3dda1739" {
+                                    tracing::warn!(
+                                        "BLS signer not registered yet for submission {}. Queue will be saved for retry.",
+                                        queue.last().unwrap().label()
+                                    );
+                                    return Err(
+                                        AggregatorError::EvmServiceManagerValidateAnyRevert(
+                                            format!("SignerNotRegistered ({})", raw_str),
+                                        ),
+                                    );
+                                }
+                                return Err(AggregatorError::EvmServiceManagerValidateAnyRevert(
+                                    raw_str,
+                                ));
+                            }
+                            None => {
+                                return Err(AggregatorError::EvmServiceManagerValidateUnknown(err));
+                            }
+                        },
+                    }
+                }
+
+                let tx_receipt = client
+                    .send_bls_envelope_signatures(
+                        envelope,
+                        bls_sig_data.clone(),
+                        contract_address,
+                        None,
+                        action.gas_price,
+                    )
+                    .await?;
 
-        Ok(AnyTransactionReceipt::Evm(Box::new(tx_receipt)))
+                Ok(AnyTransactionReceipt::Evm(Box::new(tx_receipt)))
+            }
+        }
     }
 
     pub async fn handle_action_submit_cosmos(
diff --git a/packages/wavs/src/subsystems/submission.rs b/packages/wavs/src/subsystems/submission.rs
index 0d4b053d3..591d9f202 100644
--- a/packages/wavs/src/subsystems/submission.rs
+++ b/packages/wavs/src/subsystems/submission.rs
@@ -11,12 +11,14 @@ use crate::{
     subsystems::submission::data::SubmissionRequest, tracing_service_info, AppContext,
 };
 use alloy_primitives::FixedBytes;
-use alloy_signer_local::PrivateKeySigner;
 use error::SubmissionError;
 use tracing::instrument;
 use utils::{evm_client::signing::make_signer, telemetry::SubmissionMetrics};
 use wavs_types::Submission;
-use wavs_types::{Credential, Envelope, EventOrder, ServiceId, SignerResponse, Submit, WavsSigner};
+use wavs_types::{
+    Credential, Envelope, EventOrder, ServiceId, SignatureAlgorithm, SignerResponse, Submit,
+    WavsCryptoSigner, WavsSigner,
+};
 
 #[derive(Debug)]
 #[allow(clippy::large_enum_variant)]
@@ -42,7 +44,7 @@ pub struct SubmissionManager {
 }
 
 struct SignerInfo {
-    signer: PrivateKeySigner,
+    signer: WavsCryptoSigner,
     hd_index: u32,
 }
 
@@ -240,6 +242,7 @@ impl SubmissionManager {
         &self,
         service_id: ServiceId,
         hd_index: Option<u32>,
+        algorithm: SignatureAlgorithm,
     ) -> Result<(), SubmissionError> {
         let hd_index = hd_index.unwrap_or(
             self.signing_mnemonic_hd_index_count
@@ -255,14 +258,43 @@ impl SubmissionManager {
         self.signing_mnemonic_hd_index_count
             .fetch_max(next_index, std::sync::atomic::Ordering::SeqCst);
 
-        let signer = make_signer(&self.signing_mnemonic, Some(hd_index))
-            .map_err(|e| SubmissionError::FailedToCreateEvmSigner(service_id.clone(), e))?;
+        let signer = match algorithm {
+            SignatureAlgorithm::Secp256k1 => {
+                let pks = make_signer(&self.signing_mnemonic, Some(hd_index))
+                    .map_err(|e| SubmissionError::FailedToCreateEvmSigner(service_id.clone(), e))?;
 
-        tracing::info!(
-            "Created new signing client for service {} -> {}",
-            service_id,
-            signer.address()
-        );
+                tracing::info!(
+                    "Created secp256k1 signing client for service {} -> {}",
+                    service_id,
+                    pks.address()
+                );
+
+                WavsCryptoSigner::Secp256k1(pks)
+            }
+            #[cfg(feature = "bls")]
+            SignatureAlgorithm::Bls12381 => {
+                let bls_key = utils::bls_signing::bls_private_key_from_mnemonic(
+                    self.signing_mnemonic.as_str(),
+                    hd_index,
+                )
+                .map_err(|e| SubmissionError::FailedToCreateEvmSigner(service_id.clone(), e))?;
+
+                tracing::info!(
+                    "Created BLS12-381 signing client for service {} (HD index {})",
+                    service_id,
+                    hd_index
+                );
+
+                WavsCryptoSigner::Bls12381(bls_key)
+            }
+            #[cfg(not(feature = "bls"))]
+            SignatureAlgorithm::Bls12381 => {
+                return Err(SubmissionError::FailedToCreateEvmSigner(
+                    service_id,
+                    anyhow::anyhow!("BLS support not enabled (compile with --features bls)"),
+                ));
+            }
+        };
 
         self.signers
             .write()
@@ -290,16 +322,28 @@ impl SubmissionManager {
             .ok_or_else(|| SubmissionError::MissingServiceKey {
                 service_id: service_id.clone(),
             })
-            .map(
-                |SignerInfo { signer, hd_index }| SignerResponse::Secp256k1 {
+            .and_then(|SignerInfo { signer, hd_index }| match signer {
+                WavsCryptoSigner::Secp256k1(pks) => Ok(SignerResponse::Secp256k1 {
                     hd_index: *hd_index,
-                    evm_address: signer.address().to_string(),
-                },
-            )?;
+                    evm_address: pks.address().to_string(),
+                }),
+                #[cfg(feature = "bls")]
+                WavsCryptoSigner::Bls12381(ref bls_key) => {
+                    let g1_bytes = utils::bls_signing::bls_g1_pubkey_bytes(bls_key)
+                        .map_err(SubmissionError::FailedToSignEnvelope)?;
+                    Ok(SignerResponse::Bls12381 {
+                        hd_index: *hd_index,
+                        g1_pubkey_hex: const_hex::encode(g1_bytes),
+                    })
+                }
+            })?;
 
         if tracing::enabled!(tracing::Level::INFO) {
             let address = match &key {
-                SignerResponse::Secp256k1 { evm_address, .. } => evm_address,
+                SignerResponse::Secp256k1 { evm_address, .. } => evm_address.clone(),
+                SignerResponse::Bls12381 { g1_pubkey_hex, .. } => {
+                    format!("BLS:{}", &g1_pubkey_hex[..16])
+                }
             };
 
             tracing_service_info!(
@@ -313,3 +357,54 @@ impl SubmissionManager {
         Ok(key)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const TEST_MNEMONIC: &str = "test test test test test test test test test test test junk";
+
+    /// Verify that add_service_key with BLS algorithm creates a signer that is
+    /// WavsCryptoSigner::Bls12381 and produces correct byte lengths
+    /// (256-byte G2 sig, 128-byte G1 pubkey).
+    #[cfg(feature = "bls")]
+    #[test]
+    fn submission_bls_signer_produces_correct_signature() {
+        let bls_key = utils::bls_signing::bls_private_key_from_mnemonic(TEST_MNEMONIC, 1).unwrap();
+        let signer = WavsCryptoSigner::Bls12381(bls_key);
+
+        // Verify correct variant
+        match &signer {
+            WavsCryptoSigner::Bls12381(_) => {} // correct variant
+            _ => panic!("Expected Bls12381 signer variant"),
+        }
+
+        // Verify G1 pubkey bytes can be extracted (128 bytes)
+        if let WavsCryptoSigner::Bls12381(ref key) = signer {
+            let g1 = utils::bls_signing::bls_g1_pubkey_bytes(key).unwrap();
+            assert_eq!(g1.len(), 128, "G1 pubkey must be 128 bytes EIP-2537");
+
+            // Verify signing produces 256-byte G2 signature
+            let digest = [0xab_u8; 32];
+            let g2 = utils::bls_signing::bls_sign_digest(key, &digest).unwrap();
+            assert_eq!(g2.len(), 256, "G2 signature must be 256 bytes EIP-2537");
+        }
+    }
+
+    /// Verify that secp256k1 signer creation is unchanged.
+    #[test]
+    fn submission_secp256k1_signer_unchanged() {
+        let cred = wavs_types::Credential::new(TEST_MNEMONIC.to_string());
+        let pks = make_signer(&cred, Some(0)).unwrap();
+        match WavsCryptoSigner::Secp256k1(pks) {
+            WavsCryptoSigner::Secp256k1(ref s) => {
+                // Verify address is deterministic (Anvil account 0 derived at HD index 0)
+                assert!(
+                    !s.address().is_zero(),
+                    "Secp256k1 signer must have non-zero address"
+                );
+            }
+            _ => panic!("Expected Secp256k1 signer variant"),
+        }
+    }
+}
diff --git a/packages/wavs/src/subsystems/trigger/streams/evm_stream/client/subscription.rs b/packages/wavs/src/subsystems/trigger/streams/evm_stream/client/subscription.rs
index 84b9ffa91..7f8f20aa4 100644
--- a/packages/wavs/src/subsystems/trigger/streams/evm_stream/client/subscription.rs
+++ b/packages/wavs/src/subsystems/trigger/streams/evm_stream/client/subscription.rs
@@ -240,28 +240,44 @@ impl SubscriptionsInner {
     }
 
     pub fn enable_logs(&self, address: Vec<Address>, topics: Vec<B256>) {
-        {
+        let filter_changed = {
             let mut lock = self._logs.write().unwrap();
 
-            let lock = lock.get_or_insert_default();
+            let was_none = lock.is_none();
+            let filter = lock.get_or_insert_default();
+
+            let prev_addr_len = filter.addresses.len();
+            let prev_topic_len = filter.topics.len();
 
             for address in address {
-                lock.addresses.insert(address);
+                filter.addresses.insert(address);
             }
 
             for topic in topics {
-                lock.topics.insert(topic);
+                filter.topics.insert(topic);
             }
 
             self.metrics.record_active_log_filters(
                 &self.chain_key,
-                (lock.addresses.len() + lock.topics.len()) as u64,
+                (filter.addresses.len() + filter.topics.len()) as u64,
             );
-        }
-        self.unsubscribe(SubscriptionCategory::AllLogs);
 
-        // logs is different, needs to resubscribe since different filters are different subscriptions
-        self.resubscribe();
+            // The filter changed if we transitioned from no filter (None) to having one,
+            // or if new addresses/topics were actually inserted.
+            was_none
+                || filter.addresses.len() != prev_addr_len
+                || filter.topics.len() != prev_topic_len
+        };
+
+        // Only disrupt the existing subscription when the filter actually changed.
+        // Re-subscribing with an identical filter is unnecessary and creates a brief
+        // window where events can be missed (between unsubscribe and resubscribe
+        // responses landing), causing race conditions in tests.
+        if filter_changed {
+            self.unsubscribe(SubscriptionCategory::AllLogs);
+            // logs is different, needs to resubscribe since different filters are different subscriptions
+            self.resubscribe();
+        }
     }
 
     // disable specific log filters, if no filters remain, it will unsubscribe from all logs
diff --git a/packages/wavs/tests/aggregator_tests.rs b/packages/wavs/tests/aggregator_tests.rs
index 74786fa71..8e439a618 100644
--- a/packages/wavs/tests/aggregator_tests.rs
+++ b/packages/wavs/tests/aggregator_tests.rs
@@ -4,6 +4,7 @@ mod wavs_systems;
 
 use utils::{context::AppContext, init_tracing_tests, telemetry::Metrics};
 use wavs::subsystems::aggregator::AggregatorCommand;
+use wavs_types::SignatureAlgorithm;
 
 use crate::wavs_systems::{
     channels::TestChannels,
@@ -35,7 +36,7 @@ fn send_to_self() {
 
     ctx.rt.block_on(async {
         submission_manager
-            .add_service_key(service.id(), None)
+            .add_service_key(service.id(), None, SignatureAlgorithm::Secp256k1)
             .unwrap();
     });
 
diff --git a/packages/wavs/tests/p2p_broadcast_tests.rs b/packages/wavs/tests/p2p_broadcast_tests.rs
new file mode 100644
index 000000000..ae2eb1197
--- /dev/null
+++ b/packages/wavs/tests/p2p_broadcast_tests.rs
@@ -0,0 +1,705 @@
+//! Integration tests for P2P broadcast, service filtering, deduplication, retry,
+//! catch-up, and API preservation using commonware-broadcast.
+//!
+//! These tests verify:
+//! - BCAST-01: Broadcast signed submission delivered to all connected peers
+//! - BCAST-02: Duplicate messages deduplicated by SHA-256 digest (exactly-once delivery)
+//! - BCAST-04: Failed publishes (no peers) queued and retried
+//! - BCAST-05: Per-service message isolation via ServiceRouter filtering
+//! - CATCH-01: Push-based catch-up after reconnection via subsequent broadcast
+//! - CATCH-02: Message cache bounded by deque_size configuration
+//! - INT-01: P2pHandle API (publish, subscribe, unsubscribe, get_status, block_peer) preserved
+//!
+//! Tests spin up P2P nodes in lookup mode with real crossbeam aggregator channels
+//! to verify end-to-end message delivery.
+
+use std::time::Duration;
+use utils::context::{AnyRuntime, AppContext};
+use wavs::subsystems::aggregator::p2p::{pubkey_from_mnemonic, P2pConfig, P2pHandle};
+use wavs::subsystems::aggregator::AggregatorCommand;
+use wavs_types::{
+    Envelope, EventId, ServiceId, SignatureKind, Submission, Trigger, TriggerAction, TriggerConfig,
+    WasmResponse, WavsSignature, WorkflowId,
+};
+
+/// Test mnemonic for node A
+const MNEMONIC_A: &str =
+    "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about";
+/// Test mnemonic for node B
+const MNEMONIC_B: &str = "zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo wrong";
+
+/// Base port for broadcast tests -- offset from connectivity tests (19000-19041) to avoid conflicts
+const TEST_PORT_BASE: u16 = 19050;
+
+/// Helper to get a unique port for each test to avoid collisions
+fn test_port(offset: u16) -> u16 {
+    TEST_PORT_BASE + offset
+}
+
+/// Create an AppContext suitable for tests.
+fn test_app_context() -> AppContext {
+    AppContext::new_with_runtime(AnyRuntime::TokioHandle(tokio::runtime::Handle::current()))
+}
+
+/// Create a minimal mock Submission for testing.
+fn mock_submission(service_id: &ServiceId) -> Submission {
+    mock_submission_with_payload(service_id, b"test-payload")
+}
+
+/// Create a mock Submission with a specific payload (for creating distinct messages).
+fn mock_submission_with_payload(service_id: &ServiceId, payload: &[u8]) -> Submission {
+    let trigger_action = TriggerAction {
+        config: TriggerConfig {
+            service_id: service_id.clone(),
+            workflow_id: WorkflowId::new("test-workflow").unwrap(),
+            trigger: Trigger::Manual,
+        },
+        data: wavs_types::TriggerData::default(),
+    };
+    let operator_response = WasmResponse {
+        payload: payload.to_vec(),
+        event_id_salt: None,
+        ordering: None,
+    };
+    let event_id = EventId::from([1u8; 20]);
+    let envelope = Envelope {
+        payload: alloy_primitives::Bytes::from_static(&[1, 2, 3]),
+        eventId: alloy_primitives::FixedBytes([1; 20]),
+        ordering: alloy_primitives::FixedBytes([0; 12]),
+    };
+    let envelope_signature = WavsSignature::Secp256k1 {
+        data: vec![0u8; 65],
+        kind: SignatureKind::evm_default(),
+    };
+    Submission {
+        trigger_action,
+        operator_response,
+        event_id,
+        envelope,
+        envelope_signature,
+    }
+}
+
+/// Helper to set up two connected lookup-mode nodes with aggregator channels.
+/// Returns (handle_a, handle_b, agg_rx_a, agg_rx_b) where agg_rx receives
+/// AggregatorCommand::Receive messages forwarded by the P2P layer.
+async fn setup_two_nodes(
+    port_offset: u16,
+) -> (
+    P2pHandle,
+    P2pHandle,
+    crossbeam::channel::Receiver<AggregatorCommand>,
+    crossbeam::channel::Receiver<AggregatorCommand>,
+) {
+    let port_a = test_port(port_offset);
+    let port_b = test_port(port_offset + 1);
+
+    let pubkey_a_hex = pubkey_from_mnemonic(MNEMONIC_A).unwrap();
+    let pubkey_b_hex = pubkey_from_mnemonic(MNEMONIC_B).unwrap();
+
+    let config_a = P2pConfig::Local {
+        listen_port: port_a,
+        peer_addresses: vec![format!("{}@127.0.0.1:{}", pubkey_b_hex, port_b)],
+        authorized_peers: vec![pubkey_b_hex.clone()],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    let config_b = P2pConfig::Local {
+        listen_port: port_b,
+        peer_addresses: vec![format!("{}@127.0.0.1:{}", pubkey_a_hex, port_a)],
+        authorized_peers: vec![pubkey_a_hex.clone()],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    let (agg_tx_a, agg_rx_a) = crossbeam::channel::unbounded::<AggregatorCommand>();
+    let (agg_tx_b, agg_rx_b) = crossbeam::channel::unbounded::<AggregatorCommand>();
+
+    let ctx_a = test_app_context();
+    let ctx_b = test_app_context();
+
+    let handle_a = P2pHandle::new(ctx_a, config_a, Some(MNEMONIC_A), agg_tx_a)
+        .await
+        .expect("Node A should start")
+        .expect("Node A should not be None");
+
+    let handle_b = P2pHandle::new(ctx_b, config_b, Some(MNEMONIC_B), agg_tx_b)
+        .await
+        .expect("Node B should start")
+        .expect("Node B should not be None");
+
+    (handle_a, handle_b, agg_rx_a, agg_rx_b)
+}
+
+/// Count AggregatorCommand::Receive messages on a receiver within a timeout.
+fn count_receives(
+    rx: &crossbeam::channel::Receiver<AggregatorCommand>,
+    timeout: Duration,
+) -> usize {
+    let mut count = 0;
+    let deadline = std::time::Instant::now() + timeout;
+    loop {
+        let remaining = deadline.saturating_duration_since(std::time::Instant::now());
+        if remaining.is_zero() {
+            break;
+        }
+        match rx.recv_timeout(remaining) {
+            Ok(AggregatorCommand::Receive { .. }) => count += 1,
+            Ok(_) => {} // ignore other commands
+            Err(crossbeam::channel::RecvTimeoutError::Timeout) => break,
+            Err(crossbeam::channel::RecvTimeoutError::Disconnected) => break,
+        }
+    }
+    count
+}
+
+/// Drain all AggregatorCommand::Receive messages on a receiver within a timeout.
+fn drain_receives(
+    rx: &crossbeam::channel::Receiver<AggregatorCommand>,
+    timeout: Duration,
+) -> Vec<Submission> {
+    let mut submissions = Vec::new();
+    let deadline = std::time::Instant::now() + timeout;
+    loop {
+        let remaining = deadline.saturating_duration_since(std::time::Instant::now());
+        if remaining.is_zero() {
+            break;
+        }
+        match rx.recv_timeout(remaining) {
+            Ok(AggregatorCommand::Receive { submission, .. }) => submissions.push(submission),
+            Ok(_) => {} // ignore other commands
+            Err(crossbeam::channel::RecvTimeoutError::Timeout) => break,
+            Err(crossbeam::channel::RecvTimeoutError::Disconnected) => break,
+        }
+    }
+    submissions
+}
+
+// ============================================================================
+// BCAST-01: Broadcast to all peers
+// ============================================================================
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_broadcast_to_all_peers() {
+    // BCAST-01: An operator broadcasting a signed submission sees it delivered to all connected peers
+    let service_id_x = ServiceId::hash(b"broadcast-test-service-x");
+
+    let (handle_a, handle_b, _agg_rx_a, agg_rx_b) = setup_two_nodes(0).await;
+
+    // Subscribe both nodes to service_id_x
+    handle_a.subscribe(&service_id_x).expect("Node A subscribe");
+    handle_b.subscribe(&service_id_x).expect("Node B subscribe");
+
+    // Wait for connection to establish
+    tokio::time::sleep(Duration::from_secs(5)).await;
+
+    // Node A publishes a submission
+    let submission = mock_submission(&service_id_x);
+    handle_a
+        .publish(&submission)
+        .expect("Node A publish should succeed");
+
+    // Wait for delivery
+    tokio::time::sleep(Duration::from_secs(3)).await;
+
+    // Verify Node B's aggregator received the submission
+    let received = count_receives(&agg_rx_b, Duration::from_secs(2));
+    assert!(
+        received >= 1,
+        "Node B should have received at least 1 broadcast message, got {}",
+        received
+    );
+}
+
+// ============================================================================
+// BCAST-05: Service filtering
+// ============================================================================
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_service_filtering() {
+    // BCAST-05: An operator subscribed to service X receives only messages for service X, not Y
+    let service_id_x = ServiceId::hash(b"filter-test-service-x");
+    let service_id_y = ServiceId::hash(b"filter-test-service-y");
+
+    let (handle_a, handle_b, _agg_rx_a, agg_rx_b) = setup_two_nodes(2).await;
+
+    // Node B subscribes to service_id_x ONLY
+    handle_a
+        .subscribe(&service_id_x)
+        .expect("Node A subscribe x");
+    handle_a
+        .subscribe(&service_id_y)
+        .expect("Node A subscribe y");
+    handle_b
+        .subscribe(&service_id_x)
+        .expect("Node B subscribe x");
+    // Node B does NOT subscribe to service_id_y
+
+    // Wait for connection
+    tokio::time::sleep(Duration::from_secs(5)).await;
+
+    // Node A publishes one message for service_x and one for service_y
+    let submission_x = mock_submission(&service_id_x);
+    let submission_y = mock_submission(&service_id_y);
+
+    handle_a.publish(&submission_x).expect("Publish service_x");
+    handle_a.publish(&submission_y).expect("Publish service_y");
+
+    // Wait for delivery
+    tokio::time::sleep(Duration::from_secs(3)).await;
+
+    // Node B should only receive the service_x message
+    let received = drain_receives(&agg_rx_b, Duration::from_secs(2));
+    assert_eq!(
+        received.len(),
+        1,
+        "Node B should receive exactly 1 message (service_x only), got {}",
+        received.len()
+    );
+    // Verify it's the right service
+    assert_eq!(
+        received[0].service_id().inner(),
+        service_id_x.inner(),
+        "Received message should be for service_x"
+    );
+}
+
+// ============================================================================
+// INT-01: P2pHandle API preserved
+// ============================================================================
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_p2p_handle_api_preserved() {
+    // INT-01: P2pHandle API (publish, subscribe, unsubscribe, get_status, block_peer) works
+    let port = test_port(4);
+    let pubkey_a_hex = pubkey_from_mnemonic(MNEMONIC_A).unwrap();
+
+    let config = P2pConfig::Local {
+        listen_port: port,
+        peer_addresses: vec![],
+        authorized_peers: vec![],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    let (agg_tx, _agg_rx) = crossbeam::channel::unbounded::<AggregatorCommand>();
+    let ctx = test_app_context();
+
+    let handle = P2pHandle::new(ctx, config, Some(MNEMONIC_A), agg_tx)
+        .await
+        .expect("Node should start")
+        .expect("Node should not be None");
+
+    // Give runtime time to initialize
+    tokio::time::sleep(Duration::from_secs(2)).await;
+
+    let service_id = ServiceId::hash(b"api-test-service");
+
+    // subscribe() should not error
+    handle
+        .subscribe(&service_id)
+        .expect("subscribe should work");
+
+    // get_status() should reflect subscription
+    let status = handle.get_status().await.expect("get_status should work");
+    assert!(status.enabled, "P2P should be enabled");
+    assert_eq!(
+        status.local_peer_id.as_deref(),
+        Some(pubkey_a_hex.as_str()),
+        "Peer ID should match"
+    );
+    assert_eq!(
+        status.subscribed_services.len(),
+        1,
+        "Should have 1 subscribed service"
+    );
+
+    // unsubscribe() should not error
+    handle
+        .unsubscribe(&service_id)
+        .expect("unsubscribe should work");
+
+    // get_status() should reflect unsubscription
+    let status = handle.get_status().await.expect("get_status after unsub");
+    assert_eq!(
+        status.subscribed_services.len(),
+        0,
+        "Should have 0 subscribed services after unsubscribe"
+    );
+
+    // publish() should not panic (message goes to retry queue since no peers)
+    let submission = mock_submission(&service_id);
+    handle
+        .publish(&submission)
+        .expect("publish should not error");
+
+    // block_peer() should not error (even with a made-up key)
+    let fake_pubkey =
+        "0000000000000000000000000000000000000000000000000000000000000000".to_string();
+    handle
+        .block_peer(&fake_pubkey)
+        .expect("block_peer should not error");
+
+    // Give time for commands to process
+    tokio::time::sleep(Duration::from_secs(1)).await;
+
+    // Final status check -- node is still alive
+    let status = handle.get_status().await.expect("final get_status");
+    assert!(
+        status.enabled,
+        "P2P should still be enabled after all API calls"
+    );
+}
+
+// ============================================================================
+// BCAST-04: Retry queue on no peers
+// ============================================================================
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_retry_queue_on_no_peers() {
+    // BCAST-04: Publishing with no peers does not error; message is queued for retry
+    let port = test_port(5);
+
+    let config = P2pConfig::Local {
+        listen_port: port,
+        peer_addresses: vec![], // No peers configured
+        authorized_peers: vec![],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    let (agg_tx, _agg_rx) = crossbeam::channel::unbounded::<AggregatorCommand>();
+    let ctx = test_app_context();
+
+    let handle = P2pHandle::new(ctx, config, Some(MNEMONIC_A), agg_tx)
+        .await
+        .expect("Node should start")
+        .expect("Node should not be None");
+
+    // Give runtime time to initialize
+    tokio::time::sleep(Duration::from_secs(2)).await;
+
+    let service_id = ServiceId::hash(b"retry-test-service");
+    handle.subscribe(&service_id).expect("subscribe");
+
+    // Publish a message -- should not error even with no peers
+    let submission = mock_submission(&service_id);
+    handle
+        .publish(&submission)
+        .expect("publish should succeed (queued for retry)");
+
+    // Give time for command to process
+    tokio::time::sleep(Duration::from_secs(2)).await;
+
+    // Verify node is still alive and responsive
+    let status = handle
+        .get_status()
+        .await
+        .expect("status after publish with no peers");
+    assert!(
+        status.enabled,
+        "Node should be alive after publishing with no peers"
+    );
+}
+
+// ============================================================================
+// BCAST-02: Deduplication by digest
+// ============================================================================
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_deduplication_by_digest() {
+    // BCAST-02: Duplicate messages with the same digest are delivered exactly once
+    let service_id_x = ServiceId::hash(b"dedup-test-service-x");
+
+    let (handle_a, handle_b, _agg_rx_a, agg_rx_b) = setup_two_nodes(6).await;
+
+    // Subscribe both nodes
+    handle_a.subscribe(&service_id_x).expect("Node A subscribe");
+    handle_b.subscribe(&service_id_x).expect("Node B subscribe");
+
+    // Wait for connection
+    tokio::time::sleep(Duration::from_secs(5)).await;
+
+    // Node A publishes the SAME submission twice (identical payload = same digest)
+    let submission = mock_submission(&service_id_x);
+    handle_a.publish(&submission).expect("First publish");
+    handle_a
+        .publish(&submission)
+        .expect("Second publish (duplicate)");
+
+    // Wait for delivery -- give enough time for both messages to arrive
+    tokio::time::sleep(Duration::from_secs(5)).await;
+
+    // Count received messages -- should be exactly 1 due to digest deduplication
+    let count = count_receives(&agg_rx_b, Duration::from_secs(2));
+    assert_eq!(
+        count, 1,
+        "Node B should receive exactly 1 message (dedup filters duplicate), got {}",
+        count
+    );
+}
+
+// ============================================================================
+// CATCH-01: Catch-up after reconnection
+// ============================================================================
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_catchup_after_reconnect() {
+    // CATCH-01: When a peer reconnects, subsequent broadcasts trigger delivery
+    // of messages from the Engine's cache (push-based recovery).
+    //
+    // This test verifies that after Node B disconnects and reconnects, a subsequent
+    // broadcast from Node A triggers delivery (at least the new message, ideally
+    // also cached messages from the Engine).
+    let service_id_x = ServiceId::hash(b"catchup-test-service-x");
+    let port_a = test_port(8);
+    let port_b = test_port(9);
+
+    let pubkey_a_hex = pubkey_from_mnemonic(MNEMONIC_A).unwrap();
+    let pubkey_b_hex = pubkey_from_mnemonic(MNEMONIC_B).unwrap();
+
+    let config_a = P2pConfig::Local {
+        listen_port: port_a,
+        peer_addresses: vec![format!("{}@127.0.0.1:{}", pubkey_b_hex, port_b)],
+        authorized_peers: vec![pubkey_b_hex.clone()],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    let (agg_tx_a, _agg_rx_a) = crossbeam::channel::unbounded::<AggregatorCommand>();
+    let ctx_a = test_app_context();
+
+    let handle_a = P2pHandle::new(ctx_a, config_a, Some(MNEMONIC_A), agg_tx_a)
+        .await
+        .expect("Node A should start")
+        .expect("Node A should not be None");
+
+    handle_a.subscribe(&service_id_x).expect("Node A subscribe");
+
+    // Step 1: Start Node B, connect, verify connection
+    let config_b1 = P2pConfig::Local {
+        listen_port: port_b,
+        peer_addresses: vec![format!("{}@127.0.0.1:{}", pubkey_a_hex, port_a)],
+        authorized_peers: vec![pubkey_a_hex.clone()],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    let (agg_tx_b1, _agg_rx_b1) = crossbeam::channel::unbounded::<AggregatorCommand>();
+    let ctx_b1 = test_app_context();
+
+    let handle_b1 = P2pHandle::new(ctx_b1, config_b1, Some(MNEMONIC_B), agg_tx_b1)
+        .await
+        .expect("Node B should start")
+        .expect("Node B should not be None");
+
+    handle_b1
+        .subscribe(&service_id_x)
+        .expect("Node B subscribe");
+
+    tokio::time::sleep(Duration::from_secs(5)).await;
+
+    // Step 2: Drop Node B (disconnect)
+    drop(handle_b1);
+    tokio::time::sleep(Duration::from_secs(2)).await;
+
+    // Step 3: Node A broadcasts while B is down
+    let submission_while_down = mock_submission_with_payload(&service_id_x, b"while-b-down");
+    handle_a
+        .publish(&submission_while_down)
+        .expect("Publish while B is down");
+
+    tokio::time::sleep(Duration::from_secs(2)).await;
+
+    // Step 4: Restart Node B
+    let config_b2 = P2pConfig::Local {
+        listen_port: port_b,
+        peer_addresses: vec![format!("{}@127.0.0.1:{}", pubkey_a_hex, port_a)],
+        authorized_peers: vec![pubkey_a_hex.clone()],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    let (agg_tx_b2, agg_rx_b2) = crossbeam::channel::unbounded::<AggregatorCommand>();
+    let ctx_b2 = test_app_context();
+
+    let handle_b2 = P2pHandle::new(ctx_b2, config_b2, Some(MNEMONIC_B), agg_tx_b2)
+        .await
+        .expect("Node B should restart")
+        .expect("Node B should not be None");
+
+    handle_b2
+        .subscribe(&service_id_x)
+        .expect("Node B resubscribe");
+
+    // Wait for reconnection
+    tokio::time::sleep(Duration::from_secs(5)).await;
+
+    // Step 5: Node A broadcasts ANOTHER submission (triggers Engine relay of cached content)
+    let submission_after_reconnect =
+        mock_submission_with_payload(&service_id_x, b"after-reconnect");
+    handle_a
+        .publish(&submission_after_reconnect)
+        .expect("Publish after reconnect");
+
+    // Wait for catch-up delivery
+    tokio::time::sleep(Duration::from_secs(5)).await;
+
+    // Verify Node B received at least 1 message (the subsequent broadcast).
+    // Ideally receives 2 (cached + new), but CATCH-01 scope is "missed messages
+    // are recovered when a subsequent broadcast occurs."
+    let count = count_receives(&agg_rx_b2, Duration::from_secs(2));
+    assert!(
+        count >= 1,
+        "Node B should receive at least 1 message after reconnection (subsequent broadcast), got {}",
+        count
+    );
+}
+
+// ============================================================================
+// CATCH-02: Bounded deque size
+// ============================================================================
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_cache_bounded_deque_size() {
+    // CATCH-02: The broadcast Engine's deque_size configuration bounds per-peer message storage.
+    //
+    // We verify this indirectly by checking that:
+    // 1. The BroadcastConfig is constructed with deque_size: 128 (verified via code inspection)
+    // 2. The Engine starts without errors (verified by the node starting successfully)
+    // 3. Publishing many messages does not cause unbounded memory growth (indirect)
+    //
+    // Direct testing of the Engine's internal eviction is covered by commonware-broadcast's
+    // own test suite. We verify the configuration is correct and the Engine is functional.
+    let port = test_port(10);
+
+    let config = P2pConfig::Local {
+        listen_port: port,
+        peer_addresses: vec![],
+        authorized_peers: vec![],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    let (agg_tx, _agg_rx) = crossbeam::channel::unbounded::<AggregatorCommand>();
+    let ctx = test_app_context();
+
+    let handle = P2pHandle::new(ctx, config, Some(MNEMONIC_A), agg_tx)
+        .await
+        .expect("Node should start with bounded deque Engine")
+        .expect("Node should not be None");
+
+    let service_id = ServiceId::hash(b"deque-test-service");
+    handle.subscribe(&service_id).expect("subscribe");
+
+    // Give runtime time to initialize
+    tokio::time::sleep(Duration::from_secs(2)).await;
+
+    // Publish many messages -- more than deque_size (128) to exercise eviction
+    for i in 0u32..200 {
+        let submission = mock_submission_with_payload(&service_id, format!("msg-{}", i).as_bytes());
+        handle.publish(&submission).expect("publish should succeed");
+    }
+
+    // Give time for messages to process
+    tokio::time::sleep(Duration::from_secs(3)).await;
+
+    // Verify node is still alive and responsive (Engine didn't crash)
+    let status = handle
+        .get_status()
+        .await
+        .expect("status after many publishes");
+    assert!(
+        status.enabled,
+        "Node should be alive after publishing 200 messages with bounded deque"
+    );
+}
+
+// ============================================================================
+// OBS-01: GetStatus returns real connected peer data after broadcast exchange
+// ============================================================================
+
+/// OBS-01: Verify GetStatus returns real connected peer data after broadcast exchange
+#[tokio::test(flavor = "multi_thread")]
+async fn test_status_connected_peers_after_broadcast() {
+    let (handle_a, handle_b, _agg_rx_a, agg_rx_b) = setup_two_nodes(20).await;
+
+    // Wait for nodes to connect
+    tokio::time::sleep(Duration::from_secs(3)).await;
+
+    let service_id = ServiceId::hash(b"status-test-service");
+
+    // Subscribe node B so it accepts the message
+    handle_b.subscribe(&service_id).expect("subscribe B");
+
+    // Before any broadcast, status may show 0 connected peers (truthful)
+    // (This is expected -- peer tracking updates after message exchange)
+
+    // Node A broadcasts a submission
+    let submission = mock_submission(&service_id);
+    handle_a.publish(&submission).expect("publish from A");
+
+    // Wait for delivery and peer tracking update
+    tokio::time::sleep(Duration::from_secs(3)).await;
+
+    // Verify message was delivered to B
+    let received = agg_rx_b.try_recv();
+    assert!(
+        received.is_ok(),
+        "Node B should have received the broadcast"
+    );
+
+    // Check status on node A -- should show connected peers from broadcast ack
+    let status_a = handle_a.get_status().await.expect("get_status A");
+    assert!(
+        status_a.connected_peers >= 1,
+        "Node A should report >= 1 connected peer after broadcast, got {}",
+        status_a.connected_peers
+    );
+    assert!(
+        !status_a.peer_ids.is_empty(),
+        "Node A should have peer IDs after broadcast"
+    );
+
+    // Verify peer_ids contain hex-encoded Ed25519 public keys (64 hex chars)
+    for peer_id in &status_a.peer_ids {
+        assert_eq!(
+            peer_id.len(),
+            64,
+            "Peer ID should be 64 hex chars (32-byte Ed25519 pubkey), got {}",
+            peer_id.len()
+        );
+        assert!(
+            peer_id.chars().all(|c| c.is_ascii_hexdigit()),
+            "Peer ID should be hex-encoded: {}",
+            peer_id
+        );
+    }
+
+    // Check that node B's pubkey appears in node A's peer list
+    let pubkey_b_hex = pubkey_from_mnemonic(MNEMONIC_B).unwrap();
+    assert!(
+        status_a.peer_ids.contains(&pubkey_b_hex),
+        "Node A's peer_ids should contain node B's pubkey {}, got {:?}",
+        pubkey_b_hex,
+        status_a.peer_ids
+    );
+
+    // Check status on node B -- should show connected peers from inbound message
+    let status_b = handle_b.get_status().await.expect("get_status B");
+    assert!(
+        status_b.connected_peers >= 1,
+        "Node B should report >= 1 connected peer after receiving, got {}",
+        status_b.connected_peers
+    );
+
+    // Verify node A's pubkey appears in node B's peer list
+    let pubkey_a_hex = pubkey_from_mnemonic(MNEMONIC_A).unwrap();
+    assert!(
+        status_b.peer_ids.contains(&pubkey_a_hex),
+        "Node B's peer_ids should contain node A's pubkey {}, got {:?}",
+        pubkey_a_hex,
+        status_b.peer_ids
+    );
+}
diff --git a/packages/wavs/tests/p2p_connectivity_tests.rs b/packages/wavs/tests/p2p_connectivity_tests.rs
new file mode 100644
index 000000000..a7d8f8f71
--- /dev/null
+++ b/packages/wavs/tests/p2p_connectivity_tests.rs
@@ -0,0 +1,431 @@
+//! Integration tests for P2P connectivity using commonware lookup and discovery modes.
+//!
+//! These tests verify:
+//! - NET-01: Discovery mode connectivity via bootstrappers
+//! - NET-02: Lookup mode connectivity on localhost
+//! - NET-03: Encrypted/authenticated connections (implicit -- commonware-p2p enforces this)
+//! - NET-04: Automatic reconnection when bootstrappers become available
+//! - SEC-01: Oracle rejects unauthorized peers
+//! - SEC-03: BlockPeer API wired end-to-end through P2pHandle -> P2pCommand -> Oracle.block()
+//!
+//! Tests spin up the P2P connection layer in isolation (no Dispatcher or Aggregator)
+//! per the Phase 1 user decision.
+
+use std::time::Duration;
+use utils::context::{AnyRuntime, AppContext};
+use wavs::subsystems::aggregator::p2p::{pubkey_from_mnemonic, P2pConfig, P2pHandle};
+use wavs::subsystems::aggregator::AggregatorCommand;
+
+/// Test mnemonic for node A
+const MNEMONIC_A: &str =
+    "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about";
+/// Test mnemonic for node B
+const MNEMONIC_B: &str = "zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo wrong";
+/// Test mnemonic for unauthorized node C
+const MNEMONIC_C: &str = "test test test test test test test test test test test junk";
+
+/// Base port for P2P tests -- offset from DEFAULT_P2P_BASE_PORT (9000) to avoid conflicts
+const TEST_PORT_BASE: u16 = 19000;
+
+/// Helper to get a unique port for each test to avoid collisions
+fn test_port(offset: u16) -> u16 {
+    TEST_PORT_BASE + offset
+}
+
+/// Create an AppContext suitable for tests.
+/// AppContext::test() does not exist -- use new_with_runtime with the current Tokio handle.
+/// P2pHandle::new takes _ctx as an unused parameter, so any valid AppContext works.
+fn test_app_context() -> AppContext {
+    AppContext::new_with_runtime(AnyRuntime::TokioHandle(tokio::runtime::Handle::current()))
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_lookup_mode_two_nodes_connect() {
+    // NET-02: Two nodes connect via lookup mode on localhost
+    let port_a = test_port(0);
+    let port_b = test_port(1);
+
+    let pubkey_a_hex = pubkey_from_mnemonic(MNEMONIC_A).unwrap();
+    let pubkey_b_hex = pubkey_from_mnemonic(MNEMONIC_B).unwrap();
+
+    // Node A config: knows about node B
+    let config_a = P2pConfig::Local {
+        listen_port: port_a,
+        peer_addresses: vec![format!("{}@127.0.0.1:{}", pubkey_b_hex, port_b)],
+        authorized_peers: vec![pubkey_b_hex.clone()],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    // Node B config: knows about node A
+    let config_b = P2pConfig::Local {
+        listen_port: port_b,
+        peer_addresses: vec![format!("{}@127.0.0.1:{}", pubkey_a_hex, port_a)],
+        authorized_peers: vec![pubkey_a_hex.clone()],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    // Create dummy aggregator channels (not used in Phase 1 tests)
+    let (agg_tx_a, _agg_rx_a) = crossbeam::channel::unbounded::<AggregatorCommand>();
+    let (agg_tx_b, _agg_rx_b) = crossbeam::channel::unbounded::<AggregatorCommand>();
+
+    let ctx_a = test_app_context();
+    let ctx_b = test_app_context();
+
+    // Start both nodes
+    let handle_a = P2pHandle::new(ctx_a, config_a, Some(MNEMONIC_A), agg_tx_a)
+        .await
+        .expect("Node A should start")
+        .expect("Node A should not be None");
+
+    let handle_b = P2pHandle::new(ctx_b, config_b, Some(MNEMONIC_B), agg_tx_b)
+        .await
+        .expect("Node B should start")
+        .expect("Node B should not be None");
+
+    // Give nodes time to discover each other and connect
+    tokio::time::sleep(Duration::from_secs(3)).await;
+
+    // Verify node A can report status
+    let status_a = handle_a.get_status().await.expect("Node A status");
+    assert_eq!(
+        status_a.local_peer_id.as_deref(),
+        Some(pubkey_a_hex.as_str()),
+        "Node A peer_id should match"
+    );
+    assert!(
+        !status_a.listen_addresses.is_empty(),
+        "Node A should have listen addresses"
+    );
+
+    // Verify node B can report status
+    let status_b = handle_b.get_status().await.expect("Node B status");
+    assert_eq!(
+        status_b.local_peer_id.as_deref(),
+        Some(pubkey_b_hex.as_str()),
+        "Node B peer_id should match"
+    );
+
+    // NOTE: connected_peers count may be 0 in Phase 1 since the bridge loop
+    // doesn't yet query the network for connected peer count.
+    // Full connected_peers verification happens in Phase 2.
+    // For Phase 1, we verify that the network started without panicking
+    // and GetStatus works correctly.
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_unauthorized_peer_rejected() {
+    // SEC-01: Oracle configured to exclude unauthorized peers
+    let port_a = test_port(10);
+    let port_c = test_port(11);
+
+    let pubkey_a_hex = pubkey_from_mnemonic(MNEMONIC_A).unwrap();
+    let _pubkey_c_hex = pubkey_from_mnemonic(MNEMONIC_C).unwrap();
+
+    // Node A config: does NOT authorize node C
+    let config_a = P2pConfig::Local {
+        listen_port: port_a,
+        peer_addresses: vec![],
+        authorized_peers: vec![], // Only self is authorized (implicit)
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    // Node C config: tries to connect to node A
+    let config_c = P2pConfig::Local {
+        listen_port: port_c,
+        peer_addresses: vec![format!("{}@127.0.0.1:{}", pubkey_a_hex, port_a)],
+        authorized_peers: vec![pubkey_a_hex.clone()],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    let (agg_tx_a, _) = crossbeam::channel::unbounded::<AggregatorCommand>();
+    let (agg_tx_c, _) = crossbeam::channel::unbounded::<AggregatorCommand>();
+
+    let ctx_a = test_app_context();
+    let ctx_c = test_app_context();
+
+    let handle_a = P2pHandle::new(ctx_a, config_a, Some(MNEMONIC_A), agg_tx_a)
+        .await
+        .expect("Node A should start")
+        .expect("Node A should not be None");
+
+    let _handle_c = P2pHandle::new(ctx_c, config_c, Some(MNEMONIC_C), agg_tx_c)
+        .await
+        .expect("Node C should start")
+        .expect("Node C should not be None");
+
+    // Wait for connection attempt
+    tokio::time::sleep(Duration::from_secs(3)).await;
+
+    // Node A's Oracle does not include node C, so node C should be rejected
+    // at the commonware-p2p connection level.
+    //
+    // Phase 1 verification: Oracle is correctly configured to exclude node C.
+    // The node is alive and no panic occurred. Full rejection observability
+    // (checking connected_peers is empty) requires Phase 2's enhanced status.
+    let status_a = handle_a
+        .get_status()
+        .await
+        .expect("Node A status after rejection attempt");
+    assert_eq!(
+        status_a.local_peer_id.as_deref(),
+        Some(pubkey_a_hex.as_str()),
+        "Node A peer_id should match"
+    );
+
+    // Verify connected_peers is 0 -- node C should NOT appear because
+    // it was not in the Oracle's authorized set
+    assert_eq!(
+        status_a.connected_peers, 0,
+        "Node A should have no connected peers (node C is unauthorized)"
+    );
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_discovery_mode_two_nodes() {
+    // NET-01: Two nodes discover via bootstrappers
+    let port_a = test_port(20);
+    let port_b = test_port(21);
+
+    let pubkey_a_hex = pubkey_from_mnemonic(MNEMONIC_A).unwrap();
+    let pubkey_b_hex = pubkey_from_mnemonic(MNEMONIC_B).unwrap();
+
+    // Node A acts as bootstrapper (empty bootstrappers list)
+    let config_a = P2pConfig::Remote {
+        listen_port: port_a,
+        bootstrappers: vec![], // This node IS the bootstrapper
+        authorized_peers: vec![pubkey_b_hex.clone()],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    // Node B uses node A as bootstrapper
+    let config_b = P2pConfig::Remote {
+        listen_port: port_b,
+        bootstrappers: vec![format!("{}@127.0.0.1:{}", pubkey_a_hex, port_a)],
+        authorized_peers: vec![pubkey_a_hex.clone()],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    let (agg_tx_a, _) = crossbeam::channel::unbounded::<AggregatorCommand>();
+    let (agg_tx_b, _) = crossbeam::channel::unbounded::<AggregatorCommand>();
+
+    let ctx_a = test_app_context();
+    let ctx_b = test_app_context();
+
+    let handle_a = P2pHandle::new(ctx_a, config_a, Some(MNEMONIC_A), agg_tx_a)
+        .await
+        .expect("Bootstrapper node A should start")
+        .expect("Node A should not be None");
+
+    // Small delay so bootstrapper is ready
+    tokio::time::sleep(Duration::from_secs(1)).await;
+
+    let handle_b = P2pHandle::new(ctx_b, config_b, Some(MNEMONIC_B), agg_tx_b)
+        .await
+        .expect("Node B should start")
+        .expect("Node B should not be None");
+
+    // Give time for discovery protocol to find peers
+    // Discovery mode may take longer than lookup mode
+    tokio::time::sleep(Duration::from_secs(5)).await;
+
+    // Verify both nodes are alive and responding
+    let status_a = handle_a.get_status().await.expect("Bootstrapper status");
+    assert_eq!(
+        status_a.local_peer_id.as_deref(),
+        Some(pubkey_a_hex.as_str()),
+        "Node A peer_id should match"
+    );
+    assert!(
+        !status_a.listen_addresses.is_empty(),
+        "Node A should have listen addresses"
+    );
+
+    let status_b = handle_b.get_status().await.expect("Node B status");
+    assert_eq!(
+        status_b.local_peer_id.as_deref(),
+        Some(pubkey_b_hex.as_str()),
+        "Node B peer_id should match"
+    );
+    assert!(
+        !status_b.listen_addresses.is_empty(),
+        "Node B should have listen addresses"
+    );
+
+    // NOTE: Full connected_peers verification requires Phase 2's enhanced status.
+    // For Phase 1, we verify that discovery mode starts without panicking
+    // and both nodes can respond to GetStatus.
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_block_peer() {
+    // SEC-03: Block peer API wired end-to-end from P2pHandle through
+    // P2pCommand::BlockPeer to Oracle.block()
+    let port_a = test_port(30);
+    let port_b = test_port(31);
+
+    let pubkey_a_hex = pubkey_from_mnemonic(MNEMONIC_A).unwrap();
+    let pubkey_b_hex = pubkey_from_mnemonic(MNEMONIC_B).unwrap();
+
+    // Node A authorizes node B
+    let config_a = P2pConfig::Local {
+        listen_port: port_a,
+        peer_addresses: vec![format!("{}@127.0.0.1:{}", pubkey_b_hex, port_b)],
+        authorized_peers: vec![pubkey_b_hex.clone()],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    let config_b = P2pConfig::Local {
+        listen_port: port_b,
+        peer_addresses: vec![format!("{}@127.0.0.1:{}", pubkey_a_hex, port_a)],
+        authorized_peers: vec![pubkey_a_hex.clone()],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    let (agg_tx_a, _) = crossbeam::channel::unbounded::<AggregatorCommand>();
+    let (agg_tx_b, _) = crossbeam::channel::unbounded::<AggregatorCommand>();
+
+    let ctx_a = test_app_context();
+    let ctx_b = test_app_context();
+
+    let handle_a = P2pHandle::new(ctx_a, config_a, Some(MNEMONIC_A), agg_tx_a)
+        .await
+        .expect("Node A should start")
+        .expect("Node A should not be None");
+
+    let _handle_b = P2pHandle::new(ctx_b, config_b, Some(MNEMONIC_B), agg_tx_b)
+        .await
+        .expect("Node B should start")
+        .expect("Node B should not be None");
+
+    // Allow connection
+    tokio::time::sleep(Duration::from_secs(2)).await;
+
+    // Block node B from node A's perspective.
+    // This sends P2pCommand::BlockPeer through the channel to the bridge loop,
+    // which calls oracle.block(pubkey_b) on the commonware Oracle.
+    handle_a
+        .block_peer(&pubkey_b_hex)
+        .expect("block_peer should send command");
+
+    // Allow time for block to take effect
+    tokio::time::sleep(Duration::from_secs(2)).await;
+
+    // Verify node A is still alive after blocking (no panic, no crash)
+    let status_a = handle_a
+        .get_status()
+        .await
+        .expect("Node A status after block");
+    assert_eq!(
+        status_a.local_peer_id.as_deref(),
+        Some(pubkey_a_hex.as_str()),
+        "Node A peer_id should match after blocking"
+    );
+
+    // NOTE: Verifying that node B is actually disconnected and cannot reconnect
+    // requires Phase 2's enhanced status reporting with connected_peers.
+    // For Phase 1, we verify that:
+    // 1. block_peer() does not panic or error
+    // 2. The command is sent through the channel (no SendError)
+    // 3. The node remains alive and responsive after blocking
+    // This proves the API is wired end-to-end: P2pHandle -> P2pCommand -> Oracle.block()
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_auto_reconnect() {
+    // NET-04: Node B retries connection to bootstrapper node A after A
+    // becomes temporarily unavailable. Discovery mode's built-in
+    // dial_frequency and query_frequency ensure automatic retry.
+    let port_a = test_port(40);
+    let port_b = test_port(41);
+
+    let pubkey_a_hex = pubkey_from_mnemonic(MNEMONIC_A).unwrap();
+    let pubkey_b_hex = pubkey_from_mnemonic(MNEMONIC_B).unwrap();
+
+    // Step 1: Start node B FIRST, pointing at node A's address.
+    // Node A is NOT running yet, so B's initial connection attempts will fail.
+    let config_b = P2pConfig::Remote {
+        listen_port: port_b,
+        bootstrappers: vec![format!("{}@127.0.0.1:{}", pubkey_a_hex, port_a)],
+        authorized_peers: vec![pubkey_a_hex.clone()],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    let (agg_tx_b, _) = crossbeam::channel::unbounded::<AggregatorCommand>();
+    let ctx_b = test_app_context();
+
+    let handle_b = P2pHandle::new(ctx_b, config_b, Some(MNEMONIC_B), agg_tx_b)
+        .await
+        .expect("Node B should start even though bootstrapper is unavailable")
+        .expect("Node B should not be None");
+
+    // Node B is running but bootstrapper A is not available yet.
+    // Wait a moment to confirm B doesn't crash when bootstrapper is unreachable.
+    tokio::time::sleep(Duration::from_secs(3)).await;
+
+    let status_b_before = handle_b
+        .get_status()
+        .await
+        .expect("Node B status before A starts");
+    assert_eq!(
+        status_b_before.local_peer_id.as_deref(),
+        Some(pubkey_b_hex.as_str()),
+        "Node B should be alive"
+    );
+
+    // Step 2: Now start node A (the bootstrapper).
+    // Discovery mode's dial_frequency should cause B to retry and connect.
+    let config_a = P2pConfig::Remote {
+        listen_port: port_a,
+        bootstrappers: vec![], // Node A IS the bootstrapper
+        authorized_peers: vec![pubkey_b_hex.clone()],
+        max_message_size: None,
+        deque_size: None,
+    };
+
+    let (agg_tx_a, _) = crossbeam::channel::unbounded::<AggregatorCommand>();
+    let ctx_a = test_app_context();
+
+    let handle_a = P2pHandle::new(ctx_a, config_a, Some(MNEMONIC_A), agg_tx_a)
+        .await
+        .expect("Bootstrapper node A should start")
+        .expect("Node A should not be None");
+
+    // Wait for discovery's automatic retry to connect B to A.
+    // Discovery mode retries at dial_frequency intervals (500ms for Config::local).
+    tokio::time::sleep(Duration::from_secs(8)).await;
+
+    // Verify both nodes are alive and responding after the reconnect window
+    let status_a = handle_a.get_status().await.expect("Node A status");
+    assert_eq!(
+        status_a.local_peer_id.as_deref(),
+        Some(pubkey_a_hex.as_str()),
+        "Node A peer_id should match"
+    );
+
+    let status_b_after = handle_b
+        .get_status()
+        .await
+        .expect("Node B status after A starts");
+    assert_eq!(
+        status_b_after.local_peer_id.as_deref(),
+        Some(pubkey_b_hex.as_str()),
+        "Node B peer_id should match"
+    );
+
+    // NOTE: Full connected_peers verification (proving B actually connected to A)
+    // requires Phase 2's enhanced status. For Phase 1, we verify that:
+    // 1. Node B starts successfully even when bootstrapper is unavailable (no panic)
+    // 2. Node B remains alive and responsive throughout the retry period
+    // 3. Node A starts later and both nodes respond to GetStatus
+    // This proves discovery mode handles bootstrapper unavailability gracefully
+    // and the node's retry loop (dial_frequency) keeps the node alive during retries.
+}
diff --git a/packages/wavs/tests/p2p_identity_tests.rs b/packages/wavs/tests/p2p_identity_tests.rs
new file mode 100644
index 000000000..398cf8f07
--- /dev/null
+++ b/packages/wavs/tests/p2p_identity_tests.rs
@@ -0,0 +1,106 @@
+//! Integration tests for Ed25519 P2P identity derivation.
+//!
+//! These tests verify IDEN-01 and IDEN-02: deterministic Ed25519 keypair
+//! derivation from BIP-39 mnemonics via ChaCha20Rng.
+
+// Use the public API from the wavs crate
+use commonware_cryptography::Signer;
+use wavs::subsystems::aggregator::p2p::{
+    ed25519_signer_from_mnemonic, pubkey_from_mnemonic, P2pConfig,
+};
+
+/// Standard BIP-39 test mnemonic (12 words)
+const TEST_MNEMONIC_1: &str =
+    "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about";
+
+/// Different test mnemonic
+const TEST_MNEMONIC_2: &str = "zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo wrong";
+
+#[test]
+fn test_deterministic_derivation() {
+    // IDEN-01: Same mnemonic always produces the same key
+    let key1 = ed25519_signer_from_mnemonic(TEST_MNEMONIC_1).unwrap();
+    let key2 = ed25519_signer_from_mnemonic(TEST_MNEMONIC_1).unwrap();
+    assert_eq!(
+        key1.public_key().as_ref(),
+        key2.public_key().as_ref(),
+        "Same mnemonic must produce identical Ed25519 public keys"
+    );
+}
+
+#[test]
+fn test_consistent_across_restarts() {
+    // IDEN-02: pubkey_from_mnemonic returns same hex string
+    let hex1 = pubkey_from_mnemonic(TEST_MNEMONIC_1).unwrap();
+    let hex2 = pubkey_from_mnemonic(TEST_MNEMONIC_1).unwrap();
+    assert_eq!(hex1, hex2, "Peer ID must be consistent across invocations");
+    // Verify hex format
+    assert!(
+        hex1.chars().all(|c| c.is_ascii_hexdigit()),
+        "Pubkey must be hex-encoded"
+    );
+    assert!(
+        !hex1.is_empty() && hex1.len().is_multiple_of(2),
+        "Hex string must have even length"
+    );
+}
+
+#[test]
+fn test_different_mnemonics_produce_different_keys() {
+    let pubkey1 = pubkey_from_mnemonic(TEST_MNEMONIC_1).unwrap();
+    let pubkey2 = pubkey_from_mnemonic(TEST_MNEMONIC_2).unwrap();
+    assert_ne!(
+        pubkey1, pubkey2,
+        "Different mnemonics must produce different keys"
+    );
+}
+
+#[test]
+fn test_invalid_mnemonic_returns_error() {
+    let result = ed25519_signer_from_mnemonic("not a valid mnemonic phrase");
+    assert!(result.is_err(), "Invalid mnemonic must return Err");
+}
+
+#[test]
+fn test_p2p_config_default_is_disabled() {
+    let config: P2pConfig = Default::default();
+    assert_eq!(config, P2pConfig::Disabled);
+}
+
+// ============================================================================
+// P2pConfig deserialization tests (Task 2)
+// ============================================================================
+
+#[test]
+fn test_p2p_config_local_deserialization() {
+    let config = P2pConfig::Local {
+        listen_port: 9000,
+        peer_addresses: vec!["aabb@127.0.0.1:9001".to_string()],
+        authorized_peers: vec!["aabbccdd".to_string()],
+        max_message_size: None,
+        deque_size: None,
+    };
+    assert_eq!(config.listen_port(), Some(9000));
+    assert_eq!(config.authorized_peers().len(), 1);
+    assert_eq!(config.authorized_peers()[0], "aabbccdd");
+}
+
+#[test]
+fn test_p2p_config_remote_deserialization() {
+    let config = P2pConfig::Remote {
+        listen_port: 9000,
+        bootstrappers: vec!["aabb@bootstrap.example.com:9000".to_string()],
+        authorized_peers: vec!["aabbccdd".to_string(), "eeff0011".to_string()],
+        max_message_size: None,
+        deque_size: None,
+    };
+    assert_eq!(config.listen_port(), Some(9000));
+    assert_eq!(config.authorized_peers().len(), 2);
+}
+
+#[test]
+fn test_p2p_config_disabled_has_no_port() {
+    let config = P2pConfig::Disabled;
+    assert_eq!(config.listen_port(), None);
+    assert_eq!(config.authorized_peers().len(), 0);
+}
diff --git a/packages/wavs/tests/submission_tests.rs b/packages/wavs/tests/submission_tests.rs
index 0073b403e..668fc9d76 100644
--- a/packages/wavs/tests/submission_tests.rs
+++ b/packages/wavs/tests/submission_tests.rs
@@ -2,6 +2,7 @@
 use std::time::Duration;
 
 use wavs::subsystems::submission::SubmissionCommand;
+use wavs_types::SignatureAlgorithm;
 
 use utils::{context::AppContext, telemetry::Metrics};
 
@@ -30,7 +31,7 @@ fn collect_messages_with_wait() {
 
     ctx.rt.block_on(async {
         submission_manager
-            .add_service_key(service.id(), None)
+            .add_service_key(service.id(), None, SignatureAlgorithm::Secp256k1)
             .unwrap();
     });
 
diff --git a/wavs.toml b/wavs.toml
index 3725eb192..3e41f6b6c 100644
--- a/wavs.toml
+++ b/wavs.toml
@@ -189,47 +189,58 @@ dev_endpoints_enabled = true
 # burned_queue_ttl_secs = 172800
 
 # ----------------------------
-# P2P networking settings
+# P2P networking settings (commonware)
 # ----------------------------
 # P2P is disabled by default (for single-operator setups).
 # Enable for multi-operator deployments to share submissions and reach quorum consensus.
+#
+# Peer identities use Ed25519 public keys derived from signing_mnemonic.
+# Addresses use socket format: "<hex_ed25519_pubkey>@<host>:<port>"
+
+# Option 1 -- Disabled (default, single-operator):
+# p2p = "disabled"
 
-# Option 1 — Local mDNS discovery (development/testing, auto-discovers peers on the LAN):
+# Option 2 -- Local lookup mode (development/testing, known peer addresses):
 # p2p = { local = { listen_port = 9000 } }
 #
-# All local options with defaults shown:
 # [wavs.p2p.local]
 # listen_port = 9000
-# max_retry_duration_secs = 10        # Max seconds to retry a failed publish
-# retry_interval_ms = 200             # Interval between publish retries
-# submission_ttl_secs = 300           # How long to store submissions for catch-up (5 min)
-# max_catchup_submissions = 100       # Max submissions returned in a catch-up response
-# cleanup_interval_secs = 60          # Interval between expired-submission cleanup passes
-# max_pending_publishes = 1000        # Max entries in the retry queue (prevents OOM)
-# max_stored_submissions_per_service = 500   # Max stored submissions per service
-# catchup_request_timeout_secs = 30   # Timeout for the catch-up request/response protocol
-# max_concurrent_catchup_requests_per_service = 3  # Max concurrent catch-up requests per service
-
-# Option 2 — Remote Kademlia DHT discovery (production, connects across the internet):
-# p2p = { remote = { listen_port = 9000, bootstrap_nodes = ["/ip4/1.2.3.4/tcp/9000/p2p/12D3KooW..."] } }
+# peer_addresses = ["<hex_ed25519_pubkey>@127.0.0.1:9001"]
+# authorized_peers = ["<hex_ed25519_pubkey>"]
+# max_message_size = 65536    # Max P2P message size in bytes (default: 64KB)
+# deque_size = 128            # Broadcast cache per peer for catch-up (default: 128 messages)
+
+# Option 3 -- Remote discovery mode (production, bootstrapper-based peer discovery):
+# p2p = { remote = { listen_port = 9000, bootstrappers = ["<hex_ed25519_pubkey>@1.2.3.4:9000"] } }
 #
-# All remote options with defaults shown:
 # [wavs.p2p.remote]
 # listen_port = 9000
-# bootstrap_nodes = []                # Empty = this node acts as the bootstrap server
-# max_retry_duration_secs = 10
-# retry_interval_ms = 200
-# submission_ttl_secs = 300
-# max_catchup_submissions = 100
-# cleanup_interval_secs = 60
-# kademlia_discovery_interval_secs = 60   # Interval for DHT discovery queries (remote only)
-# max_pending_publishes = 1000
-# max_stored_submissions_per_service = 500
-# catchup_request_timeout_secs = 30
-# max_concurrent_catchup_requests_per_service = 3
-
-# Option 3 — Explicitly disabled (default):
-# p2p = "disabled"
+# bootstrappers = []          # Empty = this node acts as a bootstrapper
+# authorized_peers = ["<hex_ed25519_pubkey>"]
+# max_message_size = 65536
+# deque_size = 128
+
+# ----- Local dev preset (multi-operator on localhost) -----
+# Two operators on a single machine for testing. Each needs its own wavs.toml.
+#
+# Node 1 (wavs-node-1.toml):
+#   [wavs]
+#   port = 8041
+#   signing_mnemonic = "<mnemonic_1>"
+#   [wavs.p2p.local]
+#   listen_port = 9000
+#   peer_addresses = ["<node2_ed25519_pubkey>@127.0.0.1:9001"]
+#
+# Node 2 (wavs-node-2.toml):
+#   [wavs]
+#   port = 8042
+#   signing_mnemonic = "<mnemonic_2>"
+#   [wavs.p2p.local]
+#   listen_port = 9001
+#   peer_addresses = ["<node1_ed25519_pubkey>@127.0.0.1:9000"]
+#
+# To get a node's Ed25519 public key from its mnemonic:
+#   wavs-cli p2p identity --mnemonic "your mnemonic words here"
 
 # ----------------------------
 # WAVS-specific chain overrides
diff --git a/wit-definitions/aggregator/wit/deps/wavs-types-2.7.0/package.wit b/wit-definitions/aggregator/wit/deps/wavs-types-2.7.0/package.wit
index a7caabe25..1a9ed2af6 100644
--- a/wit-definitions/aggregator/wit/deps/wavs-types-2.7.0/package.wit
+++ b/wit-definitions/aggregator/wit/deps/wavs-types-2.7.0/package.wit
@@ -279,6 +279,7 @@ interface service {
 
   variant signature-algorithm {
     secp256k1,
+    bls12381,
   }
 
   variant signature-prefix {
diff --git a/wit-definitions/operator/wit/deps/wavs-types-2.7.0/package.wit b/wit-definitions/operator/wit/deps/wavs-types-2.7.0/package.wit
index a7caabe25..1a9ed2af6 100644
--- a/wit-definitions/operator/wit/deps/wavs-types-2.7.0/package.wit
+++ b/wit-definitions/operator/wit/deps/wavs-types-2.7.0/package.wit
@@ -279,6 +279,7 @@ interface service {
 
   variant signature-algorithm {
     secp256k1,
+    bls12381,
   }
 
   variant signature-prefix {
diff --git a/wit-definitions/types/wit/service.wit b/wit-definitions/types/wit/service.wit
index 45df31703..4cc3fb85e 100644
--- a/wit-definitions/types/wit/service.wit
+++ b/wit-definitions/types/wit/service.wit
@@ -151,7 +151,7 @@ interface service {
 
     variant signature-algorithm {
         secp256k1,
-        // Future: Bls12381, Ed25519, Secp256r1, etc.
+        bls12381,
     }
 
     variant signature-prefix {