Merge pull request #6400 from filecoin-project/feat/initial-power-tab…

…le-build-param feat(f3): add a build parameter specifying F3's initial power table cid
filecoin-project · Oct 11, 2024 · 04aeefa · 04aeefa
2 parents f0305bd + 9463a09
commit 04aeefa
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 3 deletions.
diff --git a/app/submodule/network/network_submodule.go b/app/submodule/network/network_submodule.go
@@ -174,7 +174,7 @@ func NewNetworkSubmodule(ctx context.Context,
 		return nil, err
 	}
 
-	router, err := makeDHT(ctx, rawHost, config, networkName, bootNodes, cfg.PubsubConfig.Bootstrapper)
+	router, err := makeDHT(ctx, rawHost, config, networkName, cfg.PubsubConfig.Bootstrapper)
 	if err != nil {
 		return nil, err
 	}
@@ -401,7 +401,7 @@ func buildHost(_ context.Context, config networkConfig, libP2pOpts []libp2p.Opti
 	return libp2p.New(opts...)
 }
 
-func makeDHT(ctx context.Context, h types.RawHost, config networkConfig, networkName string, bootNodes []peer.AddrInfo, bootstrapper bool) (routing.Routing, error) {
+func makeDHT(ctx context.Context, h types.RawHost, config networkConfig, networkName string, bootstrapper bool) (routing.Routing, error) {
 	mode := dht.ModeAuto
 	if bootstrapper {
 		mode = dht.ModeServer

diff --git a/fixtures/networks/butterfly.go b/fixtures/networks/butterfly.go
@@ -6,6 +6,7 @@ import (
 	"github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/venus/pkg/config"
 	"github.com/filecoin-project/venus/venus-shared/types"
+	"github.com/ipfs/go-cid"
 )
 
 func ButterflySnapNet() *NetworkConf {
@@ -73,6 +74,7 @@ func ButterflySnapNet() *NetworkConf {
 			F3BootstrapEpoch:        1000,
 			ManifestServerID:        "12D3KooWJr9jy4ngtJNR7JC1xgLFra3DjEtyxskRYWvBK9TC3Yn6",
 			F3Consensus:             true,
+			F3InitialPowerTableCID:  cid.Undef,
 		},
 	}
 

diff --git a/fixtures/networks/calibration.go b/fixtures/networks/calibration.go
@@ -7,6 +7,7 @@ import (
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	"github.com/filecoin-project/venus/pkg/config"
 	"github.com/filecoin-project/venus/venus-shared/types"
+	"github.com/ipfs/go-cid"
 )
 
 type NetworkConf struct {
@@ -76,6 +77,7 @@ func Calibration() *NetworkConf {
 			Eip155ChainID:           314159,
 			ActorDebugging:          false,
 			F3Consensus:             true,
+			F3InitialPowerTableCID:  cid.Undef,
 		},
 	}
 

diff --git a/fixtures/networks/forcenet.go b/fixtures/networks/forcenet.go
@@ -6,6 +6,7 @@ import (
 	"github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/venus/pkg/config"
 	"github.com/filecoin-project/venus/venus-shared/types"
+	"github.com/ipfs/go-cid"
 )
 
 func ForceNet() *NetworkConf {
@@ -75,6 +76,7 @@ func ForceNet() *NetworkConf {
 			F3BootstrapEpoch:        100,
 			ManifestServerID:        "12D3KooWHcNBkqXEBrsjoveQvj6zDF3vK5S9tAfqyYaQF1LGSJwG",
 			F3Consensus:             true,
+			F3InitialPowerTableCID:  cid.Undef,
 		},
 	}
 

diff --git a/fixtures/networks/integrationtestnet.go b/fixtures/networks/integrationtestnet.go
@@ -6,6 +6,7 @@ import (
 	"github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/venus/pkg/config"
 	"github.com/filecoin-project/venus/venus-shared/types"
+	"github.com/ipfs/go-cid"
 )
 
 func IntegrationNet() *NetworkConf {
@@ -67,6 +68,7 @@ func IntegrationNet() *NetworkConf {
 			F3BootstrapEpoch:        -1,
 			ManifestServerID:        "12D3KooWENMwUF9YxvQxar7uBWJtZkA6amvK4xWmKXfSiHUo2Qq7",
 			F3Consensus:             true,
+			F3InitialPowerTableCID:  cid.Undef,
 		},
 	}
 

diff --git a/fixtures/networks/interopnet.go b/fixtures/networks/interopnet.go
@@ -6,6 +6,7 @@ import (
 	"github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/venus/pkg/config"
 	"github.com/filecoin-project/venus/venus-shared/types"
+	"github.com/ipfs/go-cid"
 )
 
 func InteropNet() *NetworkConf {
@@ -73,6 +74,7 @@ func InteropNet() *NetworkConf {
 			F3BootstrapEpoch:        1000,
 			ManifestServerID:        "12D3KooWQJ2rdVnG4okDUB6yHQhAjNutGNemcM7XzqC9Eo4z9Jce",
 			F3Consensus:             true,
+			F3InitialPowerTableCID:  cid.Undef,
 		},
 	}
 

diff --git a/fixtures/networks/mainnet.go b/fixtures/networks/mainnet.go
@@ -7,6 +7,7 @@ import (
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	"github.com/filecoin-project/venus/pkg/config"
 	"github.com/filecoin-project/venus/venus-shared/types"
+	"github.com/ipfs/go-cid"
 )
 
 func Mainnet() *NetworkConf {
@@ -78,6 +79,7 @@ func Mainnet() *NetworkConf {
 			F3BootstrapEpoch:        -1,
 			ManifestServerID:        "12D3KooWENMwUF9YxvQxar7uBWJtZkA6amvK4xWmKXfSiHUo2Qq7",
 			F3Consensus:             false,
+			F3InitialPowerTableCID:  cid.Undef,
 		},
 	}
 

diff --git a/fixtures/networks/net_2k.go b/fixtures/networks/net_2k.go
@@ -6,6 +6,7 @@ import (
 	"github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/venus/pkg/config"
 	"github.com/filecoin-project/venus/venus-shared/types"
+	"github.com/ipfs/go-cid"
 )
 
 func Net2k() *NetworkConf {
@@ -69,6 +70,7 @@ func Net2k() *NetworkConf {
 			F3BootstrapEpoch:        1000,
 			ManifestServerID:        "12D3KooWHcNBkqXEBrsjoveQvj6zDF3vK5S9tAfqyYaQF1LGSJwG",
 			F3Consensus:             true,
+			F3InitialPowerTableCID:  cid.Undef,
 		},
 	}
 

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/filecoin-project/go-state-types/network"
+	"github.com/ipfs/go-cid"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -313,6 +314,8 @@ type NetworkParamsConfig struct {
 	// 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"`
 }
 
 // ForkUpgradeConfig record upgrade parameters

diff --git a/pkg/vf3/config.go b/pkg/vf3/config.go
@@ -92,7 +92,7 @@ func NewConfig(nn string, netCfg *config.NetworkParamsConfig) (*Config, error) {
 			policy.ChainFinality,
 			netCfg.F3BootstrapEpoch,
 			time.Duration(netCfg.BlockDelay)*time.Second,
-			cid.Undef,
+			netCfg.F3InitialPowerTableCID,
 		)
 	}
 	return c, nil