diff --git a/cabal.project b/cabal.project index 7c73cf62f66..bc8652ce884 100644 --- a/cabal.project +++ b/cabal.project @@ -18,7 +18,7 @@ index-state: , hackage.haskell.org 2026-06-29T22:49:53Z -- Bump this if you need newer packages from CHaP - , cardano-haskell-packages 2026-07-02T10:10:00Z + , cardano-haskell-packages 2026-10-05T13:20:29Z active-repositories: , :rest @@ -52,9 +52,6 @@ package network-mux package ouroboros-network flags: +asserts +cddl -package acts - flags: -finitary - if impl (ghc >= 9.14) constraints: , containers > 0.7 diff --git a/flake.lock b/flake.lock index df112ed0381..c877f324722 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1782990451, - "narHash": "sha256-U0o77JuGp6ADqym7TtGV3AwzRn5SFuiTRyCOR6qfxGA=", + "lastModified": 1791209704, + "narHash": "sha256-OfCPHMmoCVn3VV3SguOOp7CzzJTUz/Ng3yJqUfXGJsg=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "def6ba6e0324e451802f5a17b12a00bd64639e14", + "rev": "b0b3231c063261e97896d50d98c531890efa298a", "type": "github" }, "original": { diff --git a/ouroboros-network/CHANGELOG.md b/ouroboros-network/CHANGELOG.md index 39870e382ae..513d3bee103 100644 --- a/ouroboros-network/CHANGELOG.md +++ b/ouroboros-network/CHANGELOG.md @@ -12,6 +12,7 @@ and DataFlow parameters to filter supported set of miniprotocols - connectToNode, connectToNode', connectToNodeWithMux, connectToNodeWithMux', connectToNodeSocket now take a negotiated data flow callback like Simple.with +- `Ouroboros.Network.InboundGovernor.Trace`: added `TrStaleMuxFinished`. ### Non-Breaking @@ -43,6 +44,20 @@ after its peer has disconnected. Apply the peer sharing retry delay only to peers which are still established when the request completes. +- The inbound governor now traces `TrUnexpectedlyFalseAssertion` when a + responder of a registered connection starts or terminates while the + governor no longer tracks that connection's responders. The trace identifies + the connection and mini-protocol; previously this condition was not traced. +- Removed the unused internal `InboundGovernorLoop` constructor from + `IGAssertionLocation` in `Ouroboros.Network.InboundGovernor`. + +- The inbound governor checks `MuxFinished` without blocking. If the event + belongs to an earlier connection with the same `ConnectionId`, and the + currently registered mux has not stopped, the event is ignored and traced + as `TrStaleMuxFinished`. Previously this could stall the entire inbound + governor until the replacement mux stopped, potentially waiting indefinitely, + and then unregister the replacement connection. + ## 1.3.0.0 -- 2026-10-01 diff --git a/ouroboros-network/changelog.d/20261001_160000_coot_ig_mux_finished.md b/ouroboros-network/changelog.d/20261001_160000_coot_ig_mux_finished.md deleted file mode 100644 index 26e5b681a92..00000000000 --- a/ouroboros-network/changelog.d/20261001_160000_coot_ig_mux_finished.md +++ /dev/null @@ -1,26 +0,0 @@ - - -### Breaking - -- `Ouroboros.Network.InboundGovernor.Trace`: added `TrStaleMuxFinished`. - - - -### Patch - -- The inbound governor checks `MuxFinished` without blocking. If the event - belongs to an earlier connection with the same `ConnectionId`, and the - currently registered mux has not stopped, the event is ignored and traced - as `TrStaleMuxFinished`. Previously this could stall the entire inbound - governor until the replacement mux stopped, potentially waiting indefinitely, - and then unregister the replacement connection. diff --git a/ouroboros-network/changelog.d/20261021_coot_ig_assertions.md b/ouroboros-network/changelog.d/20261021_coot_ig_assertions.md deleted file mode 100644 index e8758d25f0f..00000000000 --- a/ouroboros-network/changelog.d/20261021_coot_ig_assertions.md +++ /dev/null @@ -1,8 +0,0 @@ -### Patch - -- The inbound governor now traces `TrUnexpectedlyFalseAssertion` when a - responder of a registered connection starts or terminates while the - governor no longer tracks that connection's responders. The trace identifies - the connection and mini-protocol; previously this condition was not traced. -- Removed the unused internal `InboundGovernorLoop` constructor from - `IGAssertionLocation` in `Ouroboros.Network.InboundGovernor`. diff --git a/scripts/ci/cabal.project.local.Windows b/scripts/ci/cabal.project.local.Windows index 14560888d26..a5392df92d7 100644 --- a/scripts/ci/cabal.project.local.Windows +++ b/scripts/ci/cabal.project.local.Windows @@ -27,3 +27,11 @@ package ouroboros-network package cardano-diffusion flags: +asserts -cddl + +-- +-- finitary is disabled on Windows: it uses GHC plugins, which are not +-- supported in cross compilation ("Plugins require -fno-external-interpreter") +-- + +package acts + flags: -finitary