Skip to content

Commit

Permalink
For node 10.0 release: Integrate ledger & o-network (#1262)
Browse files Browse the repository at this point in the history
# Description

This PR integrates latest ledger and o-network for node 10.0 release.
Notably, the following changed:
* Support for NodeToNodeV_12 and below was removed from o-network as
these are unable to cross the HF boundary
* NodeToNodeV_14 was added to supported versions to track adoption rate
* o-network does not track pipelining support as this was only necessary
in previous NodeToNode versions. To preserve generality of consensus,
this functionality was moved here.
* Added new GetFuturePParams query
* Account for removal of minVersion in SL.Globals
* o-network and ledger package bumps
  • Loading branch information
amesgen authored Oct 14, 2024
2 parents c1a681d + 770e9a0 commit c8b83a6
Show file tree
Hide file tree
Showing 205 changed files with 315 additions and 140 deletions.
2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ index-state:
-- Bump this if you need newer packages from Hackage
, hackage.haskell.org 2024-08-27T14:57:57Z
-- Bump this if you need newer packages from CHaP
, cardano-haskell-packages 2024-10-03T15:13:19Z
, cardano-haskell-packages 2024-10-11T13:55:09Z

packages:
ouroboros-consensus
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### Breaking

- Add `GetFuturePParams` query.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
### Non-Breaking

- Dropped `NodeToNodeV_12` and below from `supportedNodeToNodeVersion` as they were
removed from o-n-api.
- Added `NodeToNodeV_14` to `supportedNodeToNodeVersions`
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,15 @@ library
cardano-crypto-class,
cardano-crypto-wrapper,
cardano-ledger-allegra ^>=1.6,
cardano-ledger-alonzo ^>=1.10.2,
cardano-ledger-alonzo ^>=1.11,
cardano-ledger-api ^>=1.9.3,
cardano-ledger-babbage ^>=1.9,
cardano-ledger-binary ^>=1.3.4,
cardano-ledger-babbage ^>=1.10,
cardano-ledger-binary ^>=1.4,
cardano-ledger-byron ^>=1.0.1,
cardano-ledger-conway ^>=1.16,
cardano-ledger-core ^>=1.14,
cardano-ledger-conway ^>=1.17,
cardano-ledger-core ^>=1.15,
cardano-ledger-mary ^>=1.7,
cardano-ledger-shelley ^>=1.13.1,
cardano-ledger-shelley ^>=1.14,
cardano-prelude,
cardano-protocol-tpraos ^>=1.2,
cardano-slotting,
Expand All @@ -159,7 +159,7 @@ library
nothunks,
ouroboros-consensus ^>=0.20,
ouroboros-consensus-protocol ^>=0.9,
ouroboros-network-api ^>=0.9,
ouroboros-network-api ^>=0.10,
serialise ^>=0.2,
small-steps,
sop-core ^>=0.5,
Expand Down Expand Up @@ -390,7 +390,7 @@ library unstable-cardano-testlib
cardano-ledger-api,
cardano-ledger-byron,
cardano-ledger-conway:testlib,
cardano-ledger-conway-test ^>=1.2.1,
cardano-ledger-conway-test >=1.2.1,
cardano-ledger-core:{cardano-ledger-core, testlib},
cardano-ledger-shelley,
cardano-protocol-tpraos,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,17 @@ instance HasNetworkProtocolVersion ByronBlock where
type BlockNodeToNodeVersion ByronBlock = ByronNodeToNodeVersion
type BlockNodeToClientVersion ByronBlock = ByronNodeToClientVersion

-- | This instance isn't used apart from tests; we therefore make our life easy
-- below.
instance SupportedNetworkProtocolVersion ByronBlock where
supportedNodeToNodeVersions _ = Map.fromList [
(NodeToNodeV_7, ByronNodeToNodeVersion1)
, (NodeToNodeV_8, ByronNodeToNodeVersion1)
supportedNodeToNodeVersions _ = Map.fromList
[ (v, ByronNodeToNodeVersion2)
| v <- [minBound .. maxBound]
]
supportedNodeToClientVersions _ = Map.fromList [
(NodeToClientV_9, ByronNodeToClientVersion1)
, (NodeToClientV_10, ByronNodeToClientVersion1)
, (NodeToClientV_11, ByronNodeToClientVersion1)
, (NodeToClientV_12, ByronNodeToClientVersion1)

supportedNodeToClientVersions _ = Map.fromList
[ (v, ByronNodeToClientVersion1)
| v <- [minBound .. maxBound]
]

latestReleasedNodeVersion = latestReleasedNodeVersionDefault
Loading

0 comments on commit c8b83a6

Please sign in to comment.