fix(lib/babe): add --babe-lead flag, update epoch handling logic (C…

…hainSafe#1895)

chain/dev/config.toml

@@ -24,6 +24,7 @@ unlock = ""
 roles = 4
 babe-authority = true
 grandpa-authority = true
+babe-lead = true
 
 [network]
 port = 7001

chain/gssmr/config.toml

@@ -30,6 +30,7 @@ port = 7001
 nobootstrap = false
 nomdns = false
 discovery-interval = 10
+min-peers = 1
 
 [rpc]
 enabled = false

chain/gssmr/defaults.go

@@ -81,6 +81,8 @@ var (
 	DefaultNoBootstrap = false
 	// DefaultNoMDNS disables mDNS discovery
 	DefaultNoMDNS = false
+	// DefaultMinPeers is the default minimum desired peer count
+	DefaultMinPeers = 1
 
 	// DefaultDiscoveryInterval is the default interval for searching for DHT peers
 	DefaultDiscoveryInterval = time.Second * 10

cmd/gossamer/config.go

@@ -555,6 +555,7 @@ func setDotCoreConfig(ctx *cli.Context, tomlCfg ctoml.CoreConfig, cfg *dot.CoreC
 	cfg.Roles = tomlCfg.Roles
 	cfg.BabeAuthority = tomlCfg.Roles == types.AuthorityRole
 	cfg.GrandpaAuthority = tomlCfg.Roles == types.AuthorityRole
+	cfg.BABELead = ctx.GlobalBool(BABELeadFlag.Name)
 
 	// check --roles flag and update node configuration
 	if roles := ctx.GlobalString(RolesFlag.Name); roles != "" {

cmd/gossamer/config_test.go

@@ -390,6 +390,7 @@ func TestNetworkConfigFromFlags(t *testing.T) {
 				NoBootstrap:       testCfg.Network.NoBootstrap,
 				NoMDNS:            testCfg.Network.NoMDNS,
 				DiscoveryInterval: time.Second * 10,
+				MinPeers:          testCfg.Network.MinPeers,
 			},
 		},
 		{
@@ -403,6 +404,7 @@ func TestNetworkConfigFromFlags(t *testing.T) {
 				NoBootstrap:       testCfg.Network.NoBootstrap,
 				NoMDNS:            testCfg.Network.NoMDNS,
 				DiscoveryInterval: time.Second * 10,
+				MinPeers:          testCfg.Network.MinPeers,
 			},
 		},
 		{
@@ -416,6 +418,7 @@ func TestNetworkConfigFromFlags(t *testing.T) {
 				NoBootstrap:       testCfg.Network.NoBootstrap,
 				NoMDNS:            testCfg.Network.NoMDNS,
 				DiscoveryInterval: time.Second * 10,
+				MinPeers:          testCfg.Network.MinPeers,
 			},
 		},
 		{
@@ -429,6 +432,7 @@ func TestNetworkConfigFromFlags(t *testing.T) {
 				NoBootstrap:       true,
 				NoMDNS:            testCfg.Network.NoMDNS,
 				DiscoveryInterval: time.Second * 10,
+				MinPeers:          testCfg.Network.MinPeers,
 			},
 		},
 		{
@@ -442,6 +446,7 @@ func TestNetworkConfigFromFlags(t *testing.T) {
 				NoBootstrap:       testCfg.Network.NoBootstrap,
 				NoMDNS:            true,
 				DiscoveryInterval: time.Second * 10,
+				MinPeers:          testCfg.Network.MinPeers,
 			},
 		},
 	}
@@ -816,6 +821,7 @@ func TestUpdateConfigFromGenesisData(t *testing.T) {
 			NoBootstrap:       testCfg.Network.NoBootstrap,
 			NoMDNS:            testCfg.Network.NoMDNS,
 			DiscoveryInterval: testCfg.Network.DiscoveryInterval,
+			MinPeers:          testCfg.Network.MinPeers,
 		},
 		RPC:    testCfg.RPC,
 		System: testCfg.System,

cmd/gossamer/export.go

@@ -122,6 +122,8 @@ func dotConfigToToml(dcfg *dot.Config) *ctoml.Config {
 		NoBootstrap:       dcfg.Network.NoBootstrap,
 		NoMDNS:            dcfg.Network.NoMDNS,
 		DiscoveryInterval: int(dcfg.Network.DiscoveryInterval / time.Second),
+		MinPeers:          dcfg.Network.MinPeers,
+		MaxPeers:          dcfg.Network.MaxPeers,
 	}
 
 	cfg.RPC = ctoml.RPCConfig{

cmd/gossamer/export_test.go

@@ -87,6 +87,7 @@ func TestExportCommand(t *testing.T) {
 					NoBootstrap:       testCfg.Network.NoBootstrap,
 					NoMDNS:            testCfg.Network.NoMDNS,
 					DiscoveryInterval: testCfg.Network.DiscoveryInterval,
+					MinPeers:          testCfg.Network.MinPeers,
 				},
 				RPC: testCfg.RPC,
 			},
@@ -119,6 +120,7 @@ func TestExportCommand(t *testing.T) {
 					NoBootstrap:       testCfg.Network.NoBootstrap,
 					NoMDNS:            testCfg.Network.NoMDNS,
 					DiscoveryInterval: testCfg.Network.DiscoveryInterval,
+					MinPeers:          testCfg.Network.MinPeers,
 				},
 				RPC: testCfg.RPC,
 			},
@@ -151,6 +153,7 @@ func TestExportCommand(t *testing.T) {
 					NoBootstrap:       testCfg.Network.NoBootstrap,
 					NoMDNS:            testCfg.Network.NoMDNS,
 					DiscoveryInterval: testCfg.Network.DiscoveryInterval,
+					MinPeers:          testCfg.Network.MinPeers,
 				},
 				RPC: testCfg.RPC,
 			},

cmd/gossamer/flags.go

@@ -316,6 +316,14 @@ var (
 	}
 )
 
+// BABE flags
+var (
+	BABELeadFlag = cli.BoolFlag{
+		Name:  "babe-lead",
+		Usage: `specify whether node should build block 1 of the network. only used when starting a new network`,
+	}
+)
+
 // flag sets that are shared by multiple commands
 var (
 	// GlobalFlags are flags that are valid for use with the root command and all subcommands
@@ -366,6 +374,9 @@ var (
 
 		// telemetry flags
 		NoTelemetryFlag,
+
+		// BABE flags
+		BABELeadFlag,
 	}
 )
 

dot/config.go

@@ -98,6 +98,7 @@ type NetworkConfig struct {
 type CoreConfig struct {
 	Roles            byte
 	BabeAuthority    bool
+	BABELead         bool
 	GrandpaAuthority bool
 	WasmInterpreter  string
 }
@@ -183,6 +184,7 @@ func GssmrConfig() *Config {
 			NoBootstrap:       gssmr.DefaultNoBootstrap,
 			NoMDNS:            gssmr.DefaultNoMDNS,
 			DiscoveryInterval: gssmr.DefaultDiscoveryInterval,
+			MinPeers:          gssmr.DefaultMinPeers,
 		},
 		RPC: RPCConfig{
 			Port:    gssmr.DefaultRPCHTTPPort,

dot/config/toml/config.go

@@ -82,6 +82,7 @@ type CoreConfig struct {
 	SlotDuration     uint64 `toml:"slot-duration,omitempty"`
 	EpochLength      uint64 `toml:"epoch-length,omitempty"`
 	WasmInterpreter  string `toml:"wasm-interpreter,omitempty"`
+	BABELead         bool   `toml:"babe-lead,omitempty"`
 }
 
 // RPCConfig is to marshal/unmarshal toml RPC config vars

dot/core/service.go

@@ -248,12 +248,6 @@ func (s *Service) handleBlock(block *types.Block, state *rtstorage.TrieState) er
 		return err
 	}
 
-	// check if block production epoch transitioned
-	if err := s.handleCurrentSlot(&block.Header); err != nil {
-		logger.Warn("failed to handle epoch for block", "block", block.Header.Hash(), "error", err)
-		return err
-	}
-
 	go func() {
 		s.Lock()
 		defer s.Unlock()
@@ -313,29 +307,6 @@ func (s *Service) handleCodeSubstitution(hash common.Hash, state *rtstorage.Trie
 	return nil
 }
 
-func (s *Service) handleCurrentSlot(header *types.Header) error {
-	head := s.blockState.BestBlockHash()
-	if header.Hash() != head {
-		return nil
-	}
-
-	epoch, err := s.epochState.GetEpochForBlock(header)
-	if err != nil {
-		return err
-	}
-
-	currEpoch, err := s.epochState.GetCurrentEpoch()
-	if err != nil {
-		return err
-	}
-
-	if currEpoch == epoch {
-		return nil
-	}
-
-	return s.epochState.SetCurrentEpoch(epoch)
-}
-
 // handleBlocksAsync handles a block asynchronously; the handling performed by this function
 // does not need to be completed before the next block can be imported.
 func (s *Service) handleBlocksAsync() {
@@ -399,7 +370,7 @@ func (s *Service) handleChainReorg(prev, curr common.Hash) error {
 		}
 
 		for _, ext := range *body {
-			logger.Info("validating transaction on re-org chain", "extrinsic", ext)
+			logger.Trace("validating transaction on re-org chain", "extrinsic", ext)
 			encExt, err := scale.Marshal(ext)
 			if err != nil {
 				return err

dot/node.go

@@ -282,12 +282,6 @@ func NewNode(cfg *Config, ks *keystore.GlobalKeystore, stopFunc func()) (*Node,
 	}
 	nodeSrvcs = append(nodeSrvcs, coreSrvc)
 
-	bp, err := createBABEService(cfg, stateSrvc, ks.Babe, coreSrvc)
-	if err != nil {
-		return nil, err
-	}
-	nodeSrvcs = append(nodeSrvcs, bp)
-
 	fg, err := createGRANDPAService(cfg, stateSrvc, dh, ks.Gran, networkSrvc)
 	if err != nil {
 		return nil, err
@@ -305,6 +299,12 @@ func NewNode(cfg *Config, ks *keystore.GlobalKeystore, stopFunc func()) (*Node,
 	}
 	nodeSrvcs = append(nodeSrvcs, syncer)
 
+	bp, err := createBABEService(cfg, stateSrvc, ks.Babe, coreSrvc)
+	if err != nil {
+		return nil, err
+	}
+	nodeSrvcs = append(nodeSrvcs, bp)
+
 	sysSrvc, err := createSystemService(&cfg.System, stateSrvc)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create system service: %s", err)

dot/services.go

@@ -187,6 +187,7 @@ func createBABEService(cfg *Config, st *state.Service, ks keystore.Keystore, cs
 		BlockImportHandler: cs,
 		Authority:          cfg.Core.BabeAuthority,
 		IsDev:              cfg.Global.ID == "dev",
+		Lead:               cfg.Core.BABELead,
 	}
 
 	if cfg.Core.BabeAuthority {