Skip to content

Use CHaP network releases for miniprotocol filtering - #1384

Merged
Jimbo4350 merged 1 commit into
masterfrom
srp/ouroboros-network-5460
Oct 22, 2026
Merged

Jimbo4350 merged 1 commit into
masterfrom
srp/ouroboros-network-5460

Conversation

@Jimbo4350

@Jimbo4350 Jimbo4350 commented Oct 20, 2026 •

Copy link
Copy Markdown
Contributor

Context

Require ouroboros-network 2.0 for miniprotocol filtering from IntersectMBO/ouroboros-network#5460. Advance the CHaP index to 2026-10-22T08:15:23Z and update the CHaP Nix input so the build uses the published ouroboros-network-2.0.0.0, cardano-diffusion-1.3.0.1, and network-mux-1.0.0.0 packages.

The temporary network source-repository-package override is removed. Keep the targeted dependency-bound relaxations for cardano-config, kes-agent, and ouroboros-consensus: their published bounds still exclude the new network releases.

Update the gRPC dependency action to grpc-deps-0.0.2.0 so Windows installs protobuf and snappy for CLANG64, matching the base dependencies action, and adds their executable/DLL directory to PATH. This fixes the missing protoc failure while building proto-lens-protobuf-types.

On Windows, use snappy-c's pkg-config flag and clear the global LIBRARY_PATH/CPATH overrides from the gRPC action. This scopes MSYS2 discovery to Snappy instead of overriding GHC's C++ runtime during Template Haskell compilation. Retain failed Windows Cabal logs as CI artifacts for diagnosis.

How to trust this PR

  • Haskell CI at 2052ab23f: builds and tests pass on Linux with GHC 9.6, 9.10, 9.12 and 9.14, macOS with GHC 9.6, and Windows with GHC 9.12.
  • Windows validation: Plutus Core and the full project build pass; all 630 tests across four suites pass, including all 171 cardano-rpc tests.
  • Verified the Cabal plan selects all three network packages from CHaP tarballs and the Nix lock changes only the CHaP input.
  • actionlint .github/workflows/haskell.yml passes locally and in CI; all PR checks pass.
  • git diff --check passes; the Herald description occupies one physical line.

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • Existing tests pass; no new tests needed for dependency changes
  • Self-reviewed the diff
  • Changelog fragment added in .changes/

Copilot AI balanced review requested due to automatic review settings October 20, 2026 20:01
@Jimbo4350 Jimbo4350 changed the title Pin ouroboros-network PR 5460 for miniprotocol filtering REMOVE SRP BEFORE MERGING: Pin ouroboros-network PR 5460 for miniprotocol filtering Oct 20, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

Compatibility with the pinned networking dependencies still requires CI build and test validation.

No open issues 🎉

What changed in this PR

Temporarily pins networking dependencies to upstream PR 5460 for miniprotocol filtering.

Changes:

  • Pins ouroboros-network and cardano-diffusion to commit 8466558, including a Nix source hash.
  • Adds a maintenance changelog fragment.
File Description
cabal.project Adds the temporary dependency pin and source hash.
.changes/​20261020_cardano-api_ouroboros_network_5460.yml Records the dependency change for cardano-api.

Review effort: Balanced

@Jimbo4350
Jimbo4350 requested a review from a team as a code owner October 20, 2026 20:20
Jimbo4350 added a commit that referenced this pull request Oct 20, 2026
Require ouroboros-network 2.0 and pin cardano-diffusion and network-mux to the same revision, with temporary dependency-bound relaxations. Select matching macOS Command Line Tools for CI and add the maintenance changelog for PR #1384.
@Jimbo4350
Jimbo4350 force-pushed the srp/ouroboros-network-5460 branch from 29fb10c to 17c4c68 Compare October 20, 2026 20:44
Jimbo4350 added a commit that referenced this pull request Oct 22, 2026
Require ouroboros-network 2.0 and advance the CHaP index and Nix input to use the released ouroboros-network, cardano-diffusion and network-mux packages. Retain the dependency-bound relaxations pending upstream updates. Select matching macOS Command Line Tools for CI and add the maintenance changelog for PR #1384.
@Jimbo4350
Jimbo4350 force-pushed the srp/ouroboros-network-5460 branch from 17c4c68 to 75a6661 Compare October 22, 2026 12:30
@Jimbo4350 Jimbo4350 changed the title REMOVE SRP BEFORE MERGING: Pin ouroboros-network PR 5460 for miniprotocol filtering Use CHaP network releases for miniprotocol filtering Oct 22, 2026
Jimbo4350 added a commit that referenced this pull request Oct 22, 2026
Require ouroboros-network 2.0 and advance the CHaP index and Nix input to use the released ouroboros-network, cardano-diffusion and network-mux packages. Retain the dependency-bound relaxations pending upstream updates and add the maintenance changelog for PR #1384.
@Jimbo4350
Jimbo4350 force-pushed the srp/ouroboros-network-5460 branch from 75a6661 to cc6456a Compare October 22, 2026 12:57
Jimbo4350 added a commit that referenced this pull request Oct 22, 2026
Require ouroboros-network 2.0 and advance the CHaP index and Nix input to use the released ouroboros-network, cardano-diffusion and network-mux packages. Retain the dependency-bound relaxations pending upstream updates and add the maintenance changelog for PR #1384.
@Jimbo4350
Jimbo4350 force-pushed the srp/ouroboros-network-5460 branch from cc6456a to f594102 Compare October 22, 2026 14:17
Jimbo4350 added a commit that referenced this pull request Oct 22, 2026
Require ouroboros-network 2.0 and advance the CHaP index and Nix input to use the released ouroboros-network, cardano-diffusion and network-mux packages. Retain the dependency-bound relaxations pending upstream updates and add the maintenance changelog for PR #1384.

Use grpc-deps 0.0.2.0 so Windows installs protobuf and snappy for CLANG64 and exposes protoc and the runtime DLLs through PATH, matching the base dependencies action.
@Jimbo4350
Jimbo4350 force-pushed the srp/ouroboros-network-5460 branch from f594102 to 80aff31 Compare October 22, 2026 15:07
@Jimbo4350
Jimbo4350 enabled auto-merge October 22, 2026 15:23
Jimbo4350 added a commit that referenced this pull request Oct 22, 2026
Require ouroboros-network 2.0 and advance the CHaP index and Nix input to use the released ouroboros-network, cardano-diffusion and network-mux packages. Retain the dependency-bound relaxations pending upstream updates and add the maintenance changelog for PR #1384.

Use grpc-deps 0.0.2.0 so Windows installs protobuf and snappy for CLANG64 and exposes protoc and the runtime DLLs through PATH, matching the base dependencies action.
@Jimbo4350
Jimbo4350 force-pushed the srp/ouroboros-network-5460 branch from 80aff31 to b7b0bac Compare October 22, 2026 15:59
Require ouroboros-network 2.0 and advance the CHaP index and Nix input to use the released ouroboros-network, cardano-diffusion and network-mux packages. Retain the dependency-bound relaxations pending upstream updates and add the maintenance changelog for PR #1384.

Use grpc-deps 0.0.2.0 so Windows installs protobuf and snappy for CLANG64 and exposes protoc and the runtime DLLs through PATH, matching the base dependencies action.
@Jimbo4350
Jimbo4350 force-pushed the srp/ouroboros-network-5460 branch from b7b0bac to 2052ab2 Compare October 22, 2026 16:40
@Jimbo4350
Jimbo4350 added this pull request to the merge queue Oct 22, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 22, 2026
@Jimbo4350
Jimbo4350 added this pull request to the merge queue Oct 22, 2026
Merged via the queue into master with commit 6cb2348 Oct 22, 2026
39 checks passed
@Jimbo4350
Jimbo4350 deleted the srp/ouroboros-network-5460 branch October 22, 2026 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants