Skip to content

Commit 36cf8a7

Browse files
authored
Network integration for cardano-node 10.7 (#1819)
This PR: - integrates the Network packages up to the release of `ouroboros-netowork-24` and a little bit beyond. - Integrates `kes-agent-1.1`. Removes the s-r-p on `kes-agent` repository.
2 parents 7b150c8 + ff3072d commit 36cf8a7

File tree

260 files changed

+874
-260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+874
-260
lines changed

asserts.cabal

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,10 @@ package ouroboros-consensus-cardano
3636
package ouroboros-consensus-diffusion
3737
flags: +asserts
3838

39-
package ouroboros-network
40-
flags: +asserts
41-
42-
package ouroboros-network-api
39+
package cardano-diffusion
4340
flags: +asserts
4441

45-
package ouroboros-network-mock
46-
flags: +asserts
47-
48-
package ouroboros-network-protocols
42+
package ouroboros-network
4943
flags: +asserts
5044

5145
package si-timers
@@ -59,4 +53,3 @@ package text-short
5953

6054
package strict-checked-vars
6155
flags: +checktvarinvariants +checkmvarinvariants
62-

cabal.project

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ index-state:
1616
-- Bump this if you need newer packages from Hackage
1717
, hackage.haskell.org 2025-12-03T15:53:31Z
1818
-- Bump this if you need newer packages from CHaP
19-
, cardano-haskell-packages 2025-10-07T11:20:00Z
19+
, cardano-haskell-packages 2026-01-27T13:37:12Z
20+
2021

2122
packages:
2223
ouroboros-consensus
@@ -82,14 +83,13 @@ source-repository-package
8283
eras/byron/ledger/impl
8384
eras/byron/crypto
8485

85-
-- We need this s-r-p until ouroboros-network makes a CHaP release that
86-
-- includes https://github.com/IntersectMBO/ouroboros-network/pull/5161, which
87-
-- the Peras PRs so far merged need.
86+
-- Network main several commits past the o-n-24 release
8887
source-repository-package
8988
type: git
9089
location: https://github.com/IntersectMBO/ouroboros-network
91-
tag: dfcb1f9c578ec8cd5114fea9696e7be6c9001323
92-
--sha256: sha256-omXPdi/T/f3gq9rOH20zX+x3WvaxlB704g07RF/13Nk=
90+
tag: 228bb2045784a9c180651dedeea9af9396140f47
91+
--sha256: sha256-q/93M6+TtnqWiguOiwuUSJljA7nrICOsu+5SLl6jiCc=
9392
subdir:
94-
ouroboros-network-api
9593
ouroboros-network
94+
cardano-diffusion
95+
network-mux

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 22 additions & 0 deletions

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion19/ApplyTxErr_Conway

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion19/ApplyTxErr_Dijkstra

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)