-
-
Notifications
You must be signed in to change notification settings - Fork 3k
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.
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
Update pubsub and add default validator #9684
Open
vyzo
wants to merge
4
commits into
master
Choose a base branch
from
fix/issue-9665
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,75 @@ | ||
| package libp2p | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
|
|
||
| datastore "github.com/ipfs/go-datastore" | ||
| pubsub "github.com/libp2p/go-libp2p-pubsub" | ||
| "github.com/libp2p/go-libp2p/core/discovery" | ||
| "github.com/libp2p/go-libp2p/core/host" | ||
| "github.com/libp2p/go-libp2p/core/peer" | ||
| "go.uber.org/fx" | ||
|
|
||
| "github.com/ipfs/kubo/core/node/helpers" | ||
| "github.com/ipfs/kubo/repo" | ||
| ) | ||
|
|
||
| type P2PPubSubIn struct { | ||
| fx.In | ||
|
|
||
| Repo repo.Repo | ||
| Host host.Host | ||
| Discovery discovery.Discovery | ||
| } | ||
|
|
||
| func FloodSub(pubsubOptions ...pubsub.Option) interface{} { | ||
| return func(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host, disc discovery.Discovery) (service *pubsub.PubSub, err error) { | ||
| return pubsub.NewFloodSub(helpers.LifecycleCtx(mctx, lc), host, append(pubsubOptions, pubsub.WithDiscovery(disc))...) | ||
| return func(mctx helpers.MetricsCtx, lc fx.Lifecycle, params P2PPubSubIn) (service *pubsub.PubSub, err error) { | ||
| return pubsub.NewFloodSub( | ||
| helpers.LifecycleCtx(mctx, lc), | ||
| params.Host, | ||
| append(pubsubOptions, | ||
| pubsub.WithDiscovery(params.Discovery), | ||
| pubsub.WithDefaultValidator(pubsub.NewBasicSeqnoValidator(makePubSubMetadataStore(params.Repo.Datastore()))))..., | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| func GossipSub(pubsubOptions ...pubsub.Option) interface{} { | ||
| return func(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host, disc discovery.Discovery) (service *pubsub.PubSub, err error) { | ||
| return pubsub.NewGossipSub(helpers.LifecycleCtx(mctx, lc), host, append( | ||
| pubsubOptions, | ||
| pubsub.WithDiscovery(disc), | ||
| pubsub.WithFloodPublish(true))..., | ||
| return func(mctx helpers.MetricsCtx, lc fx.Lifecycle, params P2PPubSubIn) (service *pubsub.PubSub, err error) { | ||
| return pubsub.NewGossipSub( | ||
| helpers.LifecycleCtx(mctx, lc), | ||
| params.Host, | ||
| append( | ||
| pubsubOptions, | ||
| pubsub.WithDiscovery(params.Discovery), | ||
| pubsub.WithFloodPublish(true), | ||
| pubsub.WithDefaultValidator(pubsub.NewBasicSeqnoValidator(makePubSubMetadataStore(params.Repo.Datastore()))))..., | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| func makePubSubMetadataStore(ds datastore.Datastore) pubsub.PeerMetadataStore { | ||
| return &pubsubMetadataStore{ds: ds} | ||
| } | ||
|
|
||
| type pubsubMetadataStore struct { | ||
| ds datastore.Datastore | ||
| } | ||
|
|
||
| func (m *pubsubMetadataStore) Get(ctx context.Context, p peer.ID) ([]byte, error) { | ||
| k := datastore.NewKey(fmt.Sprintf("/pubsub/seqno/%s", p)) | ||
|
|
||
| v, err := m.ds.Get(ctx, k) | ||
| if err != nil && errors.Is(err, datastore.ErrNotFound) { | ||
| return nil, nil | ||
| } | ||
|
|
||
| return v, err | ||
| } | ||
|
|
||
| func (m *pubsubMetadataStore) Put(ctx context.Context, p peer.ID, v []byte) error { | ||
| k := datastore.NewKey(fmt.Sprintf("/pubsub/seqno/%s", p)) | ||
| return m.ds.Put(ctx, k, v) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the point of
P2PPubSubIn? Couldn't you use arguments on the anonymous functions ?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Its 3 of them, this is more tidy and it costs nothing.