Skip to content

Fix WebRTC to LibP2P propagation #1033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 23, 2025
Merged

Fix WebRTC to LibP2P propagation #1033

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60d28a9
feat(p2p/identity): signing
binier Jan 21, 2025
b5c83e8
feat(p2p/libp2p): rebroadcast gossip messages received on webrtc to l…
binier Jan 22, 2025
144afec
docs(p2p/pubsub): rebroadcast webrtc message to libp2p peers
binier Jan 22, 2025
d8c3cb0
fix(p2p/libp2p/pubsub): duplicate block broadcasted from different se…
binier Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions node/src/transition_frontier/sync/transition_frontier_sync_effects.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,6 @@ impl TransitionFrontierSyncAction {
if !store.dispatch(TransitionFrontierSyncAction::BlocksNextApplyInit) {
store.dispatch(TransitionFrontierSyncAction::BlocksSuccess);
}

// TODO this should be handled by a callback
store.dispatch(P2pNetworkPubsubAction::BroadcastValidatedMessage {
message_id: p2p::BroadcastMessageId::BlockHash { hash: hash.clone() },
});
}
TransitionFrontierSyncAction::BlocksSuccess => {}
// Bootstrap/Catchup is practically complete at this point.
Expand Down
16 changes: 12 additions & 4 deletions node/src/transition_frontier/transition_frontier_effects.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,18 @@ fn synced_effects<S: crate::Service>(
best_tip: best_tip.block.clone(),
});
}
// rebroadcast block if received from webrtc network, otherwise noop.
store.dispatch(P2pNetworkPubsubAction::WebRtcRebroadcast {
message: GossipNetMessageV2::NewState(best_tip.block().clone()),
});
// TODO this should be handled by a callback
// If this get dispatched, we received block from libp2p.
if !store.dispatch(P2pNetworkPubsubAction::BroadcastValidatedMessage {
message_id: p2p::BroadcastMessageId::BlockHash {
hash: best_tip.hash().clone(),
},
}) {
// Otherwise block was received from WebRTC so inject it in libp2p.
store.dispatch(P2pNetworkPubsubAction::WebRtcRebroadcast {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what would happen if we dispatched this one unconditionally? is the conditional check what avoids the duplication of the message? (I ask because we can do this here because the transition frontier still doesn't use queued actions, but once that is implemented we will have to figure out something else here)

Copy link
Contributor Author

@binier binier Jan 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the conditional check what avoids the duplication of the message?

but once that is implemented we will have to figure out something else here)

yes and yes

message: GossipNetMessageV2::NewState(best_tip.block().clone()),
});
}

let best_tip_hash = best_tip.merkle_root_hash().clone();
store.dispatch(ConsensusAction::Prune);
Expand Down
Loading