Skip to content

feat(f3): remove dynamic manifests and specify full static manifests #13074

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
Kubuxu merged 14 commits into from
May 1, 2025
Merged

feat(f3): remove dynamic manifests and specify full static manifests #13074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a17d6c4
feat(f3): allow specifying full static manifests
Kubuxu Apr 28, 2025
8a29b8b
fix interop ManifestServerID
Kubuxu Apr 28, 2025
404a5d8
cleanup F3BoostrapEpoch
Kubuxu Apr 28, 2025
db454ff
fix butterfly
Kubuxu Apr 29, 2025
003583f
Rip out dynamic manifest handling
Kubuxu May 1, 2025
786934d
Fix itests
Kubuxu May 1, 2025
985db59
fix lint
Kubuxu May 1, 2025
91ceeca
Disable non-relevant linter
Kubuxu May 1, 2025
7a5cf60
fix tests
Kubuxu May 1, 2025
faa6906
Address review
Kubuxu May 1, 2025
f19dbc2
add CHANGELOG
Kubuxu May 1, 2025
4f27d50
Update build/buildconstants/f3manifest_butterfly.json
Kubuxu May 1, 2025
967646e
Update build/buildconstants/f3manifest_interop.json
Kubuxu May 1, 2025
16c0bbb
Update build/buildconstants/f3manifest_2k.json
Kubuxu May 1, 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
2 changes: 0 additions & 2 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ linters:
- gosec
- unconvert
- staticcheck
- exportloopref
- unused

# We don't want to skip builtin/
Expand Down Expand Up @@ -51,7 +50,6 @@ issues:

exclude-use-default: false
exclude-rules:

- path: .*_test.go
linters:
- gosec
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
- feat: expose `/v2` APIs through Lotus Gateway ([filecoin-project/lotus#13075](https://github.com/filecoin-project/lotus/pull/13075))
- chore: upgrade to go-f3 `v0.8.4` ([filecoin-project/lotus#13084](https://github.com/filecoin-project/lotus/pull/13084))
- fix(f3): limit the concurrency of F3 power table calculation ([filecoin-project/lotus#13085](https://github.com/filecoin-project/lotus/pull/13085))
- feat(f3): remove dynnamic manifest functionality and use static manifest ([filecoin-project/lotus#13074](https://github.com/filecoin-project/lotus/pull/13074))

See https://github.com/filecoin-project/lotus/blob/release/v1.33.0/CHANGELOG.md

Expand Down
61 changes: 61 additions & 0 deletions build/buildconstants/f3manifest_2k.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"Pause": false,
"ProtocolVersion": 7,
"InitialInstance": 0,
"BootstrapEpoch": 1000,
"NetworkName": "2k",
"ExplicitPower": null,
"IgnoreECPower": false,
"InitialPowerTable": null,
"CommitteeLookback": 10,
"CatchUpAlignment": 15000000000,
"Gpbft": {
"Delta": 6000000000,
"DeltaBackOffExponent": 2,
"QualityDeltaMultiplier": 1,
"MaxLookaheadRounds": 5,
"ChainProposedLength": 100,
"RebroadcastBackoffBase": 6000000000,
"RebroadcastBackoffExponent": 1.3,
"RebroadcastBackoffSpread": 0.1,
"RebroadcastBackoffMax": 60000000000
},
"EC": {
"Period": 4000000000,
"Finality": 900,
"DelayMultiplier": 2,
"BaseDecisionBackoffTable": [1.3, 1.69, 2.2, 2.86, 3.71, 4.83, 6.27, 7.5],
"HeadLookback": 4,
"Finalize": true
},
"CertificateExchange": {
"ClientRequestTimeout": 10000000000,
"ServerRequestTimeout": 60000000000,
"MinimumPollInterval": 30000000000,
"MaximumPollInterval": 120000000000
},
"PubSub": {
"CompressionEnabled": true,
"ChainCompressionEnabled": true,
"GMessageSubscriptionBufferSize": 128,
"ValidatedMessageBufferSize": 128
},
"ChainExchange": {
"SubscriptionBufferSize": 32,
"MaxChainLength": 100,
"MaxInstanceLookahead": 10,
"MaxDiscoveredChainsPerInstance": 1000,
"MaxWantedChainsPerInstance": 1000,
"RebroadcastInterval": 2000000000,
"MaxTimestampAge": 8000000000
},
"PartialMessageManager": {
"PendingDiscoveredChainsBufferSize": 100,
"PendingPartialMessagesBufferSize": 100,
"PendingChainBroadcastsBufferSize": 100,
"PendingInstanceRemovalBufferSize": 10,
"CompletedMessagesBufferSize": 100,
"MaxBufferedMessagesPerInstance": 25000,
"MaxCachedValidatedMessagesPerInstance": 25000
}
}
61 changes: 61 additions & 0 deletions build/buildconstants/f3manifest_butterfly.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"Pause": false,
"ProtocolVersion": 7,
"InitialInstance": 0,
"BootstrapEpoch": 1000,
"NetworkName": "butterflynet",
"ExplicitPower": null,
"IgnoreECPower": false,
"InitialPowerTable": null,
"CommitteeLookback": 10,
"CatchUpAlignment": 15000000000,
"Gpbft": {
"Delta": 6000000000,
"DeltaBackOffExponent": 2,
"QualityDeltaMultiplier": 1,
"MaxLookaheadRounds": 5,
"ChainProposedLength": 100,
"RebroadcastBackoffBase": 6000000000,
"RebroadcastBackoffExponent": 1.3,
"RebroadcastBackoffSpread": 0.1,
"RebroadcastBackoffMax": 60000000000
},
"EC": {
"Period": 30000000000,
"Finality": 900,
"DelayMultiplier": 2,
"BaseDecisionBackoffTable": [1.3, 1.69, 2.2, 2.86, 3.71, 4.83, 6.27, 7.5],
"HeadLookback": 4,
"Finalize": true
},
"CertificateExchange": {
"ClientRequestTimeout": 10000000000,
"ServerRequestTimeout": 60000000000,
"MinimumPollInterval": 30000000000,
"MaximumPollInterval": 120000000000
},
"PubSub": {
"CompressionEnabled": true,
"ChainCompressionEnabled": true,
"GMessageSubscriptionBufferSize": 128,
"ValidatedMessageBufferSize": 128
},
"ChainExchange": {
"SubscriptionBufferSize": 32,
"MaxChainLength": 100,
"MaxInstanceLookahead": 10,
"MaxDiscoveredChainsPerInstance": 1000,
"MaxWantedChainsPerInstance": 1000,
"RebroadcastInterval": 2000000000,
"MaxTimestampAge": 8000000000
},
"PartialMessageManager": {
"PendingDiscoveredChainsBufferSize": 100,
"PendingPartialMessagesBufferSize": 100,
"PendingChainBroadcastsBufferSize": 100,
"PendingInstanceRemovalBufferSize": 10,
"CompletedMessagesBufferSize": 100,
"MaxBufferedMessagesPerInstance": 25000,
"MaxCachedValidatedMessagesPerInstance": 25000
}
}
10 changes: 6 additions & 4 deletions ...f3/testdata/contract_manifest_golden.json → ...d/buildconstants/f3manifest_calibnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
"Pause": false,
"ProtocolVersion": 7,
"InitialInstance": 0,
"BootstrapEpoch": 5000000,
"NetworkName": "filecoin",
"BootstrapEpoch": 2081674,
"NetworkName": "calibrationnet",
"ExplicitPower": null,
"IgnoreECPower": false,
"InitialPowerTable": null,
"InitialPowerTable": {
"/": "bafy2bzaceab236vmmb3n4q4tkvua2n4dphcbzzxerxuey3mot4g3cov5j3r2c"
},
"CommitteeLookback": 10,
"CatchUpAlignment": 15000000000,
"Gpbft": {
Expand Down Expand Up @@ -34,7 +36,7 @@
6.27,
7.5
],
"HeadLookback": 0,
"HeadLookback": 4,
"Finalize": true
},
"CertificateExchange": {
Expand Down
61 changes: 61 additions & 0 deletions build/buildconstants/f3manifest_interop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"Pause": false,
"ProtocolVersion": 7,
"InitialInstance": 0,
"BootstrapEpoch": 1000,
"NetworkName": "interopnet",
"ExplicitPower": null,
"IgnoreECPower": false,
"InitialPowerTable": null,
"CommitteeLookback": 10,
"CatchUpAlignment": 15000000000,
"Gpbft": {
"Delta": 6000000000,
"DeltaBackOffExponent": 2,
"QualityDeltaMultiplier": 1,
"MaxLookaheadRounds": 5,
"ChainProposedLength": 100,
"RebroadcastBackoffBase": 6000000000,
"RebroadcastBackoffExponent": 1.3,
"RebroadcastBackoffSpread": 0.1,
"RebroadcastBackoffMax": 60000000000
},
"EC": {
"Period": 30000000000,
"Finality": 900,
"DelayMultiplier": 2,
"BaseDecisionBackoffTable": [1.3, 1.69, 2.2, 2.86, 3.71, 4.83, 6.27, 7.5],
"HeadLookback": 4,
"Finalize": true
},
"CertificateExchange": {
"ClientRequestTimeout": 10000000000,
"ServerRequestTimeout": 60000000000,
"MinimumPollInterval": 30000000000,
"MaximumPollInterval": 120000000000
},
"PubSub": {
"CompressionEnabled": true,
"ChainCompressionEnabled": true,
"GMessageSubscriptionBufferSize": 128,
"ValidatedMessageBufferSize": 128
},
"ChainExchange": {
"SubscriptionBufferSize": 32,
"MaxChainLength": 100,
"MaxInstanceLookahead": 10,
"MaxDiscoveredChainsPerInstance": 1000,
"MaxWantedChainsPerInstance": 1000,
"RebroadcastInterval": 2000000000,
"MaxTimestampAge": 8000000000
},
"PartialMessageManager": {
"PendingDiscoveredChainsBufferSize": 100,
"PendingPartialMessagesBufferSize": 100,
"PendingChainBroadcastsBufferSize": 100,
"PendingInstanceRemovalBufferSize": 10,
"CompletedMessagesBufferSize": 100,
"MaxBufferedMessagesPerInstance": 25000,
"MaxCachedValidatedMessagesPerInstance": 25000
}
}
63 changes: 63 additions & 0 deletions build/buildconstants/f3manifest_mainnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"Pause": false,
"ProtocolVersion": 7,
"InitialInstance": 0,
"BootstrapEpoch": 4920480,
"NetworkName": "filecoin",
"ExplicitPower": null,
"IgnoreECPower": false,
"InitialPowerTable": {
"/": "bafy2bzacecklgxd2eksmodvhgurqvorkg3wamgqkrunir3al2gchv2cikgmbu"
},
"CommitteeLookback": 10,
"CatchUpAlignment": 15000000000,
"Gpbft": {
"Delta": 6000000000,
"DeltaBackOffExponent": 2,
"QualityDeltaMultiplier": 8,
"MaxLookaheadRounds": 5,
"ChainProposedLength": 20,
"RebroadcastBackoffBase": 6000000000,
"RebroadcastBackoffExponent": 1.3,
"RebroadcastBackoffSpread": 0.1,
"RebroadcastBackoffMax": 60000000000
},
"EC": {
"Period": 30000000000,
"Finality": 900,
"DelayMultiplier": 2,
"BaseDecisionBackoffTable": [1.3, 1.69, 2.2, 2.86, 3.71, 4.83, 6.27, 7.5],
"HeadLookback": 4,
"Finalize": true
},
"CertificateExchange": {
"ClientRequestTimeout": 10000000000,
"ServerRequestTimeout": 60000000000,
"MinimumPollInterval": 30000000000,
"MaximumPollInterval": 120000000000
},
"PubSub": {
"CompressionEnabled": true,
"ChainCompressionEnabled": true,
"GMessageSubscriptionBufferSize": 768,
"ValidatedMessageBufferSize": 1024
},
"ChainExchange": {
"SubscriptionBufferSize": 64,
"MaxChainLength": 20,
"MaxInstanceLookahead": 10,
"MaxDiscoveredChainsPerInstance": 1000,
"MaxWantedChainsPerInstance": 1000,
"RebroadcastInterval": 2000000000,
"MaxTimestampAge": 16000000000
},
"PartialMessageManager": {
"PendingDiscoveredChainsBufferSize": 100,
"PendingPartialMessagesBufferSize": 100,
"PendingChainBroadcastsBufferSize": 100,
"PendingInstanceRemovalBufferSize": 10,
"CompletedMessagesBufferSize": 100,
"MaxBufferedMessagesPerInstance": 25000,
"MaxCachedValidatedMessagesPerInstance": 25000
}
}
12 changes: 3 additions & 9 deletions build/buildconstants/params_2k.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package buildconstants

import (
_ "embed"
"os"
"strconv"
"strings"
Expand Down Expand Up @@ -180,7 +181,6 @@ func init() {
}

F3Enabled = getBoolean("LOTUS_F3_ENABLED", F3Enabled)
F3BootstrapEpoch = getUpgradeHeight("LOTUS_F3_BOOTSTRAP_EPOCH", F3BootstrapEpoch)

BuildType |= Build2k

Expand Down Expand Up @@ -211,11 +211,5 @@ var WhitelistedBlock = cid.Undef

var F3Enabled = true

var F3ManifestServerID = MustParseID("12D3KooWHcNBkqXEBrsjoveQvj6zDF3vK5S9tAfqyYaQF1LGSJwG")

// The initial F3 power table CID.
var F3InitialPowerTableCID cid.Cid = cid.Undef

var F3BootstrapEpoch abi.ChainEpoch = 1000

var F3ParamsAddress = ""
//go:embed f3manifest_2k.json
var F3ManifestBytes []byte
11 changes: 4 additions & 7 deletions build/buildconstants/params_butterfly.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
package buildconstants

import (
_ "embed"

"github.com/ipfs/go-cid"

"github.com/filecoin-project/go-address"
Expand Down Expand Up @@ -109,10 +111,5 @@ var WhitelistedBlock = cid.Undef

const F3Enabled = true

var F3ManifestServerID = MustParseID("12D3KooWJr9jy4ngtJNR7JC1xgLFra3DjEtyxskRYWvBK9TC3Yn6")

// The initial F3 power table CID.
var F3InitialPowerTableCID cid.Cid = cid.Undef

const F3BootstrapEpoch abi.ChainEpoch = -1
const F3ParamsAddress = "0x9fd3B2D38EE4C920c9954DA752eDF810887501c1"
//go:embed f3manifest_butterfly.json
var F3ManifestBytes []byte
12 changes: 3 additions & 9 deletions build/buildconstants/params_calibnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package buildconstants

import (
_ "embed"
"os"
"strconv"

Expand Down Expand Up @@ -167,12 +168,5 @@ var WhitelistedBlock = cid.Undef

const F3Enabled = true

var F3ManifestServerID = MustParseID("12D3KooWS9vD9uwm8u2uPyJV32QBAhKAmPYwmziAgr3Xzk2FU1Mr")

// The initial F3 power table CID.
var F3InitialPowerTableCID cid.Cid = cid.MustParse("bafy2bzaceab236vmmb3n4q4tkvua2n4dphcbzzxerxuey3mot4g3cov5j3r2c")

// Calibnet F3 activation epoch is 2024-10-24T13:30:00Z - Epoch 2081674
const F3BootstrapEpoch abi.ChainEpoch = UpgradeTuktukHeight + 2880

var F3ParamsAddress = ""
//go:embed f3manifest_calibnet.json
var F3ManifestBytes []byte
10 changes: 2 additions & 8 deletions build/buildconstants/params_interop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,5 @@ var WhitelistedBlock = cid.Undef

const F3Enabled = true

var F3ManifestServerID = MustParseID("12D3KooWQJ2rdVnG4okDUB6yHQhAjNutGNemcM7XzqC9Eo4z9Jce")

// The initial F3 power table CID.
var F3InitialPowerTableCID cid.Cid = cid.Undef

const F3BootstrapEpoch abi.ChainEpoch = 1000

var F3ParamsAddress = ""
//go:embed f3manifest_interop.json
var F3ManifestBytes []byte
Loading