chore: set calibnet F3InitialPowerTableCID

filecoin-project · Oct 31, 2024 · e819865 · e819865
1 parent f6fbd53
commit e819865
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 12 deletions.
diff --git a/fixtures/networks/butterfly.go b/fixtures/networks/butterfly.go
@@ -75,7 +75,6 @@ func ButterflySnapNet() *NetworkConf {
 			F3Enabled:               true,
 			F3BootstrapEpoch:        1000,
 			ManifestServerID:        "12D3KooWJr9jy4ngtJNR7JC1xgLFra3DjEtyxskRYWvBK9TC3Yn6",
-			F3Consensus:             true,
 			F3InitialPowerTableCID:  cid.Undef,
 		},
 	}

diff --git a/fixtures/networks/calibration.go b/fixtures/networks/calibration.go
@@ -80,8 +80,7 @@ func Calibration() *NetworkConf {
 			AllowableClockDriftSecs: 1,
 			Eip155ChainID:           314159,
 			ActorDebugging:          false,
-			F3Consensus:             true,
-			F3InitialPowerTableCID:  cid.Undef,
+			F3InitialPowerTableCID:  cid.MustParse("bafy2bzaceab236vmmb3n4q4tkvua2n4dphcbzzxerxuey3mot4g3cov5j3r2c"),
 		},
 	}
 

diff --git a/fixtures/networks/forcenet.go b/fixtures/networks/forcenet.go
@@ -77,7 +77,6 @@ func ForceNet() *NetworkConf {
 			F3Enabled:               true,
 			F3BootstrapEpoch:        1000,
 			ManifestServerID:        "12D3KooWHcNBkqXEBrsjoveQvj6zDF3vK5S9tAfqyYaQF1LGSJwG",
-			F3Consensus:             true,
 			F3InitialPowerTableCID:  cid.Undef,
 		},
 	}

diff --git a/fixtures/networks/integrationtestnet.go b/fixtures/networks/integrationtestnet.go
@@ -68,7 +68,6 @@ func IntegrationNet() *NetworkConf {
 			F3Enabled:               false,
 			F3BootstrapEpoch:        -1,
 			ManifestServerID:        "12D3KooWHcNBkqXEBrsjoveQvj6zDF3vK5S9tAfqyYaQF1LGSJwG",
-			F3Consensus:             true,
 			F3InitialPowerTableCID:  cid.Undef,
 		},
 	}

diff --git a/fixtures/networks/interopnet.go b/fixtures/networks/interopnet.go
@@ -76,7 +76,6 @@ func InteropNet() *NetworkConf {
 			F3Enabled:               true,
 			F3BootstrapEpoch:        1000,
 			ManifestServerID:        "12D3KooWQJ2rdVnG4okDUB6yHQhAjNutGNemcM7XzqC9Eo4z9Jce",
-			F3Consensus:             true,
 			F3InitialPowerTableCID:  cid.Undef,
 		},
 	}

diff --git a/fixtures/networks/mainnet.go b/fixtures/networks/mainnet.go
@@ -80,7 +80,6 @@ func Mainnet() *NetworkConf {
 			F3Enabled:               true,
 			F3BootstrapEpoch:        -1,
 			ManifestServerID:        "12D3KooWENMwUF9YxvQxar7uBWJtZkA6amvK4xWmKXfSiHUo2Qq7",
-			F3Consensus:             false,
 			F3InitialPowerTableCID:  cid.Undef,
 		},
 	}

diff --git a/fixtures/networks/net_2k.go b/fixtures/networks/net_2k.go
@@ -71,7 +71,6 @@ func Net2k() *NetworkConf {
 			F3Enabled:               true,
 			F3BootstrapEpoch:        1000,
 			ManifestServerID:        "12D3KooWHcNBkqXEBrsjoveQvj6zDF3vK5S9tAfqyYaQF1LGSJwG",
-			F3Consensus:             true,
 			F3InitialPowerTableCID:  cid.Undef,
 		},
 	}

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -311,9 +311,6 @@ type NetworkParamsConfig struct {
 	F3Enabled        bool           `json:"f3Enabled"`
 	F3BootstrapEpoch abi.ChainEpoch `json:"f3BootstrapEpoch"`
 	ManifestServerID string         `json:"manifestServerID"`
-	// F3Consensus set whether F3 should checkpoint tipsets finalized by F3. This
-	// flag has no effect if F3 is not enabled.
-	F3Consensus bool `json:"f3Consensus"`
 	// The initial F3 power table CID.
 	F3InitialPowerTableCID cid.Cid `json:"f3InitialPowerTableCID"`
 }

diff --git a/pkg/vf3/config.go b/pkg/vf3/config.go
@@ -55,7 +55,7 @@ func NewManifest(
 			Finality:                 int64(finality),
 			DelayMultiplier:          manifest.DefaultEcConfig.DelayMultiplier,
 			BaseDecisionBackoffTable: manifest.DefaultEcConfig.BaseDecisionBackoffTable,
-			HeadLookback:             0,
+			HeadLookback:             4,
 			Finalize:                 true,
 		},
 		CertificateExchange: manifest.CxConfig{