Extensible Ouroboros Network Diffusion Stack #5016

bolt12 · 2024-11-27T13:10:08Z

Description

This PR refactors ouroboros-network in order to make diffusion layer general/polymorphic and extensible. This will allow us (or 3rd parties) to have access to a flexible network stack which can be extended/configured to ones needs.

For more details about this refactoring, see https://github.com/IntersectMBO/ouroboros-network/wiki/Reusable-Diffusion-Investigation

TODOs:

Better document PRP invariants and refactor/cleanup insertion functions
remove daBlockFetchMode
Consensus uses a entirely different project for Cardano Node consensus layer instantiation, decide what's the best approach for the networking code.

For next steps (e,.g. when developing mithril) this will be in the todo list:

Add tests for the general components: Churn, OG, etc..
Generalise peerChurnGovernor to only have one implementation and not 2
Redesign bootstrap peers as a concept to be general enough to be usable by third party users. Right now it is very cardano-node specific.
Create a sub library that holds all cardano-node specific types and functions, this will be better for organising dependencies and the code overall
Move Cardano specific things from cardano-node, we should think of moving some of the other things to ouroboros-network as well, e.g. topology file format for example. 3rd parties don't need to reimplement it from scratch.

ouroboros-network-api/ouroboros-network-api.cabal

ouroboros-network/ouroboros-network.cabal

ouroboros-network/src/Cardano/Node/PublicRootPeers.hs

ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs

ouroboros-network/src/Cardano/PeerSelection/Churn.hs

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Policies.hs

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Cardano/MockEnvironment.hs

ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs

ouroboros-network/src/Cardano/Network/ArgumentsExtra.hs

ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs

ouroboros-network/src/Ouroboros/Network/PeerSelection/PublicRootPeers.hs

ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs

ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs

ouroboros-network/src/Cardano/Network/PeerSelection/Governor/Types.hs

ouroboros-network/src/Ouroboros/Network/Diffusion/Common.hs

ouroboros-network/src/Ouroboros/Network/Diffusion/MinimalP2P.hs

yihuang · 2024-12-04T13:00:09Z

a step toward haskell blockchain sdk? 😄

bolt12 · 2024-12-05T10:35:57Z

@yihuang as you can see from the PR description this is some interesting step towards a fully polymorphic diffusion that might be used by others to create their own overlay network! Thank you for noticing 😃

ouroboros-network/src/Ouroboros/Network/PeerSelection/PublicRootPeers.hs

coot

I reviewed the first two patches:

git hash	commit title
`bae4f75`	Pull out Cardano specifics to different modules
`cb0da21`	Add extension points to Diffusion data structures

ouroboros-network-api/ouroboros-network-api.cabal

ouroboros-network-api/src/Cardano/Node/Types.hs

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Node.hs

ouroboros-network/src/Ouroboros/Network/PeerSelection/PublicRootPeers.hs

ouroboros-network/src/Cardano/Node/PublicRootPeers.hs

ouroboros-network/src/Cardano/Node/PeerSelection/Governor/PeerSelectionState.hs

ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerSelectionActions.hs

coot · 2025-02-06T14:17:13Z

ouroboros-network/src/Ouroboros/Cardano/Network/ArgumentsExtra.hs

+    -- | For Genesis, this sets the floor for minimum number of
+    --   active big ledger peers we must be connected to in order
+    --   to be able to signal trusted state (OutboundConnectionsState)
+  , numberOfBigLedgerPeers :: NumberOfBigLedgerPeers


I don't think just adding numberOfBigLedgerPeers is enough. If the target for established peers is insufficient, then we won't have a chance to achieve the target of big ledger peers.

I think in main we pass all the targets, not just active ones.

Is this somehow related to genesisPeerTargets from Ouroboros.Cardano.Network.PeerSeledction.Churn.ExtraArguments?

If it is the same, we should organise the code better. E.g. pass genesisPeerTargets through AgumentsExtra here rather than the Churn ones.

It is the same but this one in ArgumentsExtra comes from configuration file which is going to be passed to Churn.ExtraArguments

ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs

ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs

coot · 2025-02-06T14:43:17Z

ouroboros-network/src/Ouroboros/Cardano/Network/PeerSelection/Governor/Types.hs

+       peerconn
+       BootstrapPeersCriticalTimeoutError
+       m
+cardanoPeerSelectionGovernorArgs readUseLedgerPeers peerSharing updateOutboundConnectionsState =


It's something wrong if we need to call it in cardano-node. It seems the arguments in Cardano diffusion are too general. Please investigate how to call this function inside of Cardano diffusion.

coot · 2025-02-06T14:47:45Z

ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs

@@ -366,6 +367,16 @@ data PeerSelectionActions peeraddr peerconn m = PeerSelectionActions {
       --
       peerConnToPeerSharing :: peerconn -> PeerSharing,

+       -- | Public Extra Peers Actions
+       --
+       extraPeersAPI :: PublicExtraPeersAPI extraPeers peeraddr,


I think I confused PeerSelectionActions, with PeerStateActions. It's fine to pass it as part of the former. It's already a mixture of things.

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano/Simulation.hs

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/MiniProtocols/BlockFetch.hs

ouroboros-network/src/Ouroboros/Cardano/Diffusion/Configuration.hs

coot · 2025-02-06T19:04:20Z

ouroboros-network/src/Ouroboros/Network/Diffusion/Common.hs

+
+      -- | Extension point for third party users to be able to add more
+      -- arguments.
+    , daExtraArgs    :: extraArgs


Is this used anywhere? I don't see how it is used inside Ouroboros.Network.Diffusion.P2P.run function. This indicates that it could be removed.

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/P2P/Node.hs

(See CHANGELOG for more details) - Extract Cardano-specific components into separate modules to resolve cyclic dependency issues: - `ConsensusModePeerTargets` and `PeerSelectionTargets` were refactored to avoid circular dependencies. - Introduce extension points in Diffusion data structures: - Split P2P functionality into `P2PCardano` (for Cardano Node specifics) and a more general `P2P` module. - Added `Minimal/Node.hs` as a placeholder for a minimal Node diffusion instantiation example. - Refactor Peer Selection: - Removed redundant `PeerSelectionActionsArgs`. - Reorganized `DNSActions` and `LedgerPeersArgs`. - Improved API for `PeerSelectionActions`. - Rename `Cardano.Node` to `Cardano.Network`. - Generalize and refactor the following components: - `ConsensusModePeerTargets`. - `PeerSelection{Views, Counters}` to allow extensibility for third-party users. - `PublicRootPeers`. - Enhance the Outbound Governor: - Generalize `MinimalP2P` for diffusion initialization. - Update `ArgumentsExtra` with new parameters for a more flexible diffusion setup. - Refactor `PeerSelection.Governor.Monitor` to separate Cardano-specific monitoring actions and support third-party custom actions. - Ensure the `Diffusion` module is fully polymorphic: - Removed `CardanoP2P` dependencies. - Updated the test suite to align with the new structure. - Miscellaneous updates: - Update CHaP and fix build issues. - Remove `daBlockFetchMode`. - Address review feedback. - Fix churn timeout tests and increase `shortDelay` to stabilize tests. - Recover `sigusr1` signal handler. - Make addresses polymorphic. - Refactor `extraDebugState` and introduce `P2PDecisionType`. - Refactor `requestPublicRootPeers` type.

It's not needed.

They are passed as a closure, no need to leak them outside of `Cardano` (or any other 3rd party integration).

Instead of specifying `extraAPI ~ ()` for non-p2p, we can make it polymorphic. This way both p2p & non-p2 `Application` type is using the same type variables, and the wrapper type can be removed. This is more in-line with removal of non-p2p code base.

Also adhere to the convention: first `extraFlags`, then `extraPeers`

We can pass `PeerSelectionInterfaces` to `updateWithState` function to get access to `readUseLedgerPeers`.

testnet: organised imports

Also edit export lists so that we need fewer imports.

coot

LGTM

bolt12 added the diffusion Issues / PRs related to diffusion layer label Nov 27, 2024

bolt12 self-assigned this Nov 27, 2024

bolt12 requested a review from a team as a code owner November 27, 2024 13:10

bolt12 force-pushed the bolt12/reusable-diffusion-3 branch 6 times, most recently from 3cdb9a3 to f00952f Compare November 27, 2024 16:53

bolt12 commented Nov 28, 2024

View reviewed changes

bolt12 commented Nov 29, 2024

View reviewed changes

bolt12 force-pushed the bolt12/reusable-diffusion-3 branch from c14d5cb to 3b30f43 Compare December 2, 2024 16:42

bolt12 requested review from coot and crocodile-dentist December 3, 2024 15:13

bolt12 force-pushed the bolt12/reusable-diffusion-3 branch 6 times, most recently from f922210 to 3cdf98d Compare December 9, 2024 10:09

bolt12 force-pushed the bolt12/reusable-diffusion-3 branch 5 times, most recently from ce99e1d to 5400a7c Compare January 7, 2025 12:07

crocodile-dentist reviewed Jan 7, 2025

View reviewed changes

ouroboros-network/src/Ouroboros/Network/PeerSelection/PublicRootPeers.hs Outdated Show resolved Hide resolved

crocodile-dentist reviewed Jan 7, 2025

View reviewed changes

ouroboros-network/src/Ouroboros/Network/PeerSelection/PublicRootPeers.hs Outdated Show resolved Hide resolved

coot reviewed Jan 17, 2025

View reviewed changes

bolt12 force-pushed the bolt12/reusable-diffusion-3 branch 2 times, most recently from 0935d40 to 9a2980f Compare February 4, 2025 12:02

bolt12 mentioned this pull request Feb 4, 2025

Extensible Network Stack - Next steps #5065

Open

bolt12 force-pushed the bolt12/reusable-diffusion-3 branch from 9a2980f to e1b0745 Compare February 6, 2025 09:43

crocodile-dentist approved these changes Feb 6, 2025

View reviewed changes

bolt12 requested a review from a team as a code owner February 6, 2025 14:44

coot reviewed Feb 6, 2025

View reviewed changes

coot mentioned this pull request Feb 6, 2025

Add a policy to bind mini-protocol threads to a capability #5069

Draft

7 tasks

coot reviewed Feb 6, 2025

View reviewed changes

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Testnet/P2P/Node.hs Outdated Show resolved Hide resolved

bolt12 force-pushed the bolt12/reusable-diffusion-3 branch 2 times, most recently from a84ba63 to 7e02959 Compare February 7, 2025 11:43

bolt12 and others added 10 commits February 11, 2025 14:56

diffusion: removed daExtraArgs from ArgumentsExtra

d0ebe6d

It's not needed.

diffusion: removed extraActions

afe4866

They are passed as a closure, no need to leak them outside of `Cardano` (or any other 3rd party integration).

diffusion: fix confused type variables

23a7971

Also adhere to the convention: first `extraFlags`, then `extraPeers`

diffusion: code formatting

7929423

peer-selection: updateWithState

b0bb7e0

We can pass `PeerSelectionInterfaces` to `updateWithState` function to get access to `readUseLedgerPeers`.

diffusion: moved types back to the Diffusion.P2P module

28cc0f0

Update CHANGELOG

d8f754d

Add 100MB to CI memory limit

87bd453

bolt12 force-pushed the bolt12/reusable-diffusion-3 branch from 1e6f14a to 87bd453 Compare February 11, 2025 15:01

coot mentioned this pull request Feb 12, 2025

Removal of NonP2P Network Components #5007

Open

7 tasks

coot and others added 3 commits February 12, 2025 13:22

testnet: organised imports

1f07e03

Merge pull request #5078 from IntersectMBO/coot/organise-imports

01f9bbf

testnet: organised imports

testnet: move Node module

d0f1f93

Also edit export lists so that we need fewer imports.

coot force-pushed the bolt12/reusable-diffusion-3 branch from 98025d3 to d0f1f93 Compare February 12, 2025 14:03

coot mentioned this pull request Feb 13, 2025

diffusion: IOError rethrow policy #5067

Open

coot reviewed Feb 13, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Extensible Ouroboros Network Diffusion Stack #5016

Extensible Ouroboros Network Diffusion Stack #5016

bolt12 commented Nov 27, 2024 •

edited

Loading

yihuang commented Dec 4, 2024 •

edited

Loading

bolt12 commented Dec 5, 2024

coot left a comment •

edited

Loading

coot Feb 6, 2025

coot Feb 6, 2025

bolt12 Feb 6, 2025

coot Feb 6, 2025

coot Feb 6, 2025

coot Feb 6, 2025

coot left a comment

Extensible Ouroboros Network Diffusion Stack #5016

Are you sure you want to change the base?

Extensible Ouroboros Network Diffusion Stack #5016

Conversation

bolt12 commented Nov 27, 2024 • edited Loading

Description

yihuang commented Dec 4, 2024 • edited Loading

bolt12 commented Dec 5, 2024

coot left a comment • edited Loading

Choose a reason for hiding this comment

coot Feb 6, 2025

Choose a reason for hiding this comment

coot Feb 6, 2025

Choose a reason for hiding this comment

bolt12 Feb 6, 2025

Choose a reason for hiding this comment

coot Feb 6, 2025

Choose a reason for hiding this comment

coot Feb 6, 2025

Choose a reason for hiding this comment

coot Feb 6, 2025

Choose a reason for hiding this comment

coot left a comment

Choose a reason for hiding this comment

bolt12 commented Nov 27, 2024 •

edited

Loading

yihuang commented Dec 4, 2024 •

edited

Loading

coot left a comment •

edited

Loading