Skip to content

Commit 2fd1498

Browse files
committed
Reintroduce "[Peras 4] Add ObjectDiffusion and PerasCert diffusion (instance of ObjectDiffusion) (#1679)"
This reverts commit 474bfff.
1 parent 13dae9a commit 2fd1498

File tree

22 files changed

+1793
-50
lines changed

22 files changed

+1793
-50
lines changed

cabal.project

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,19 @@ source-repository-package
8080
eras/byron/ledger/impl
8181
eras/byron/crypto
8282

83-
-- Backported version of https://github.com/IntersectMBO/ouroboros-network/pull/5161
83+
allow-newer:
84+
-- https://github.com/phadej/vec/issues/121
85+
, ral:QuickCheck
86+
, fin:QuickCheck
87+
, bin:QuickCheck
88+
89+
-- Using https://github.com/IntersectMBO/ouroboros-network/tree/peras-staging/pr-5202-v2
8490
source-repository-package
85-
type: git
86-
location: https://github.com/IntersectMBO/ouroboros-network
87-
tag: dfcb1f9c578ec8cd5114fea9696e7be6c9001323
88-
--sha256: sha256-omXPdi/T/f3gq9rOH20zX+x3WvaxlB704g07RF/13Nk=
89-
subdir:
90-
ouroboros-network-api
91-
ouroboros-network
91+
type: git
92+
location: https://github.com/IntersectMBO/ouroboros-network
93+
tag: 0db8669b67982cba755e80bf2e413527def41244
94+
--sha256: sha256-vEO721Xab0RTVKFQFKal5VCV5y+OUzELo8+7Z8TETJQ=
95+
subdir:
96+
ouroboros-network-protocols
97+
ouroboros-network-api
98+
ouroboros-network
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!--
2+
A new scriv changelog fragment.
3+
4+
Uncomment the section that is right (remove the HTML comment wrapper).
5+
For top level release notes, leave all the headers commented out.
6+
-->
7+
8+
<!--
9+
### Patch
10+
11+
- A bullet item for the Patch category.
12+
13+
-->
14+
<!--
15+
### Non-Breaking
16+
17+
- A bullet item for the Non-Breaking category.
18+
19+
-->
20+
21+
### Breaking
22+
23+
- Added support for `NodeToNodeV_16`

ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@ instance
430430
Map.fromList $
431431
[ (NodeToNodeV_14, CardanoNodeToNodeVersion2)
432432
, (NodeToNodeV_15, CardanoNodeToNodeVersion2)
433+
, (NodeToNodeV_16, CardanoNodeToNodeVersion2)
433434
]
434435

435436
supportedNodeToClientVersions _ =

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ instance SupportedNetworkProtocolVersion (ShelleyBlock proto era) where
4848
Map.fromList
4949
[ (NodeToNodeV_14, ShelleyNodeToNodeVersion1)
5050
, (NodeToNodeV_15, ShelleyNodeToNodeVersion1)
51+
, (NodeToNodeV_16, ShelleyNodeToNodeVersion1)
5152
]
5253
supportedNodeToClientVersions _ =
5354
Map.fromList
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!--
2+
A new scriv changelog fragment.
3+
4+
Uncomment the section that is right (remove the HTML comment wrapper).
5+
For top level release notes, leave all the headers commented out.
6+
-->
7+
8+
<!--
9+
### Patch
10+
11+
- A bullet item for the Patch category.
12+
13+
-->
14+
<!--
15+
### Non-Breaking
16+
17+
- A bullet item for the Non-Breaking category.
18+
19+
-->
20+
21+
### Breaking
22+
23+
- Modify `Ouroboros.Consensus{.Node,.Node.Tracer,.Network.NodeToNode}` to wire-in PerasCertDiffusion similarly to other mini-protocols (e.g. TX-submission)
24+
25+
### Non-Breaking
26+
27+
- Update `Test.ThreadNet.Network` in `unstable-diffusion-testlib` accordingly to the changes made in `Ouroboros.Consensus.Network.NodeToNode`

0 commit comments

Comments
 (0)