Skip to content

Commit 4975e10

Browse files
committed
Upgrade to the latest go-f3 and allow F3 chain exchange topics
Upgrade to the latest `go-f3` and add the F3 chain exchange topics to the allowed topic list for both static and dynamic manifests. Fixes filecoin-project/go-f3#809
1 parent cb1ff81 commit 4975e10

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
github.com/filecoin-project/go-cbor-util v0.0.1
4646
github.com/filecoin-project/go-commp-utils/v2 v2.1.0
4747
github.com/filecoin-project/go-crypto v0.1.0
48-
github.com/filecoin-project/go-f3 v0.7.3
48+
github.com/filecoin-project/go-f3 v0.7.4-0.20250120154023-9c11ba345092
4949
github.com/filecoin-project/go-fil-commcid v0.2.0
5050
github.com/filecoin-project/go-hamt-ipld/v3 v3.4.0
5151
github.com/filecoin-project/go-jsonrpc v0.7.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ github.com/filecoin-project/go-commp-utils/v2 v2.1.0/go.mod h1:NbxJYlhxtWaNhlVCj
279279
github.com/filecoin-project/go-crypto v0.0.0-20191218222705-effae4ea9f03/go.mod h1:+viYnvGtUTgJRdy6oaeF4MTFKAfatX071MPDPBL11EQ=
280280
github.com/filecoin-project/go-crypto v0.1.0 h1:Pob2MphoipMbe/ksxZOMcQvmBHAd3sI/WEqcbpIsGI0=
281281
github.com/filecoin-project/go-crypto v0.1.0/go.mod h1:K9UFXvvoyAVvB+0Le7oGlKiT9mgA5FHOJdYQXEE8IhI=
282-
github.com/filecoin-project/go-f3 v0.7.3 h1:nwRYRKaJs7AV3di/OQyj6tABeixBeL06DkJeoQrr5+0=
283-
github.com/filecoin-project/go-f3 v0.7.3/go.mod h1:wDo5mPi4KXVuA7kvwLpmfVVv2Aw2ZwZk3iqMWr5BOT0=
282+
github.com/filecoin-project/go-f3 v0.7.4-0.20250120154023-9c11ba345092 h1:Yco5dqpG2cgjRGeL0i1T2sL3a3dyqM9ARLRd3zbi9x4=
283+
github.com/filecoin-project/go-f3 v0.7.4-0.20250120154023-9c11ba345092/go.mod h1:zNFGuBM+fYuGXk2fpzl6wW4g2Gyrxgg6z2IVSoGt+60=
284284
github.com/filecoin-project/go-fil-commcid v0.2.0 h1:B+5UX8XGgdg/XsdUpST4pEBviKkFOw+Fvl2bLhSKGpI=
285285
github.com/filecoin-project/go-fil-commcid v0.2.0/go.mod h1:8yigf3JDIil+/WpqR5zoKyP0jBPCOGtEqq/K1CcMy9Q=
286286
github.com/filecoin-project/go-fil-commp-hashhash v0.2.0 h1:HYIUugzjq78YvV3vC6rL95+SfC/aSTVSnZSZiDV5pCk=

node/modules/lp2p/pubsub.go

+9-5
Original file line numberDiff line numberDiff line change
@@ -369,14 +369,18 @@ func GossipSub(in GossipIn) (service *pubsub.PubSub, err error) {
369369

370370
if in.F3Config != nil {
371371
if in.F3Config.StaticManifest != nil {
372-
f3TopicName := manifest.PubSubTopicFromNetworkName(in.F3Config.StaticManifest.NetworkName)
373-
allowTopics = append(allowTopics, f3TopicName)
372+
gpbftTopic := manifest.PubSubTopicFromNetworkName(in.F3Config.StaticManifest.NetworkName)
373+
chainexTopic := manifest.ChainExchangeTopicFromNetworkName(in.F3Config.StaticManifest.NetworkName)
374+
allowTopics = append(allowTopics, gpbftTopic, chainexTopic)
374375
}
375376
if in.F3Config.DynamicManifestProvider != "" {
376-
f3BaseTopicName := manifest.PubSubTopicFromNetworkName(in.F3Config.BaseNetworkName)
377+
gpbftTopicPrefix := manifest.PubSubTopicFromNetworkName(in.F3Config.BaseNetworkName)
378+
chainexTopicPrefix := manifest.ChainExchangeTopicFromNetworkName(in.F3Config.BaseNetworkName)
377379
allowTopics = append(allowTopics, manifest.ManifestPubSubTopicName)
378-
for i := 0; i < lf3.MaxDynamicManifestChangesAllowed; i++ {
379-
allowTopics = append(allowTopics, fmt.Sprintf("%s/%d", f3BaseTopicName, i))
380+
for i := range lf3.MaxDynamicManifestChangesAllowed {
381+
gpbftTopic := fmt.Sprintf("%s/%d", gpbftTopicPrefix, i)
382+
chainexTopic := fmt.Sprintf("%s/%d", chainexTopicPrefix, i)
383+
allowTopics = append(allowTopics, gpbftTopic, chainexTopic)
380384
}
381385
}
382386
}

0 commit comments

Comments
 (0)