7171 utils .OverrideLorentz ,
7272 utils .OverrideMaxwell ,
7373 utils .OverrideFermi ,
74+ utils .OverrideOsaka ,
75+ utils .OverrideMendel ,
7476 utils .OverrideVerkle ,
75- utils .MultiDataBaseFlag ,
77+ // utils.MultiDataBaseFlag,
7678 }, utils .DatabaseFlags ),
7779 Description : `
7880The init command initializes a new genesis block and definition for the network.
@@ -344,6 +346,14 @@ func initGenesis(ctx *cli.Context) error {
344346 v := ctx .Uint64 (utils .OverrideFermi .Name )
345347 overrides .OverrideFermi = & v
346348 }
349+ if ctx .IsSet (utils .OverrideOsaka .Name ) {
350+ v := ctx .Uint64 (utils .OverrideOsaka .Name )
351+ overrides .OverrideOsaka = & v
352+ }
353+ if ctx .IsSet (utils .OverrideMendel .Name ) {
354+ v := ctx .Uint64 (utils .OverrideMendel .Name )
355+ overrides .OverrideMendel = & v
356+ }
347357 if ctx .IsSet (utils .OverrideVerkle .Name ) {
348358 v := ctx .Uint64 (utils .OverrideVerkle .Name )
349359 overrides .OverrideVerkle = & v
@@ -446,7 +456,7 @@ func createPorts(ipStr string, port int, size int) []int {
446456}
447457
448458// Create config for node i in the cluster
449- func createNodeConfig (baseConfig gethConfig , ip string , port int , enodes []* enode.Node , index int , staticConnect bool ) gethConfig {
459+ func createNodeConfig (baseConfig gethConfig , prefix string , ip string , port int , enodes []* enode.Node , index int ) gethConfig {
450460 baseConfig .Node .HTTPHost = ip
451461 baseConfig .Node .P2P .ListenAddr = fmt .Sprintf (":%d" , port )
452462 connectEnodes := make ([]* enode.Node , 0 , len (enodes )- 1 )
@@ -457,9 +467,10 @@ func createNodeConfig(baseConfig gethConfig, ip string, port int, enodes []*enod
457467 connectEnodes = append (connectEnodes , enodes [j ])
458468 }
459469 // Set the P2P connections between this node and the other nodes
460- if staticConnect {
461- baseConfig .Node .P2P .StaticNodes = connectEnodes
462- } else {
470+ baseConfig .Node .P2P .StaticNodes = connectEnodes
471+ if prefix == "fullnode" {
472+ // Fullnodes may reside in different regions than the `enodes`.
473+ // StaticNodes cannot connect to them directly, but can still discover them.
463474 baseConfig .Node .P2P .BootstrapNodes = connectEnodes
464475 }
465476 return baseConfig
@@ -534,7 +545,7 @@ func initNetwork(ctx *cli.Context) error {
534545 connectOneExtraEnodes = true
535546 }
536547
537- configs , enodes , accounts , err := createConfigs (config , initDir , "node" , ips , ports , sentryEnodes , connectOneExtraEnodes , true )
548+ configs , enodes , accounts , err := createConfigs (config , initDir , "node" , ips , ports , sentryEnodes , connectOneExtraEnodes )
538549 if err != nil {
539550 utils .Fatalf ("Failed to create node configs: %v" , err )
540551 }
@@ -615,7 +626,7 @@ func createSentryNodeConfigs(ctx *cli.Context, baseConfig gethConfig, initDir st
615626 if err != nil {
616627 utils .Fatalf ("Failed to parse ports: %v" , err )
617628 }
618- configs , enodes , _ , err := createConfigs (baseConfig , initDir , "sentry" , ips , ports , nil , false , true )
629+ configs , enodes , _ , err := createConfigs (baseConfig , initDir , "sentry" , ips , ports , nil , false )
619630 if err != nil {
620631 utils .Fatalf ("Failed to create config: %v" , err )
621632 }
@@ -638,7 +649,7 @@ func createAndSaveFullNodeConfigs(ctx *cli.Context, inGenesisFile *os.File, base
638649 utils .Fatalf ("Failed to parse ports: %v" , err )
639650 }
640651
641- configs , enodes , _ , err := createConfigs (baseConfig , initDir , "fullnode" , ips , ports , extraEnodes , false , false )
652+ configs , enodes , _ , err := createConfigs (baseConfig , initDir , "fullnode" , ips , ports , extraEnodes , false )
642653 if err != nil {
643654 utils .Fatalf ("Failed to create config: %v" , err )
644655 }
@@ -653,7 +664,7 @@ func createAndSaveFullNodeConfigs(ctx *cli.Context, inGenesisFile *os.File, base
653664 return configs , enodes , nil
654665}
655666
656- func createConfigs (base gethConfig , initDir string , prefix string , ips []string , ports []int , extraEnodes []* enode.Node , connectOneExtraEnodes bool , staticConnect bool ) ([]gethConfig , []* enode.Node , [][]common.Address , error ) {
667+ func createConfigs (base gethConfig , initDir string , prefix string , ips []string , ports []int , extraEnodes []* enode.Node , connectOneExtraEnodes bool ) ([]gethConfig , []* enode.Node , [][]common.Address , error ) {
657668 if len (ips ) != len (ports ) {
658669 return nil , nil , nil , errors .New ("mismatch of size and length of ports" )
659670 }
@@ -684,7 +695,7 @@ func createConfigs(base gethConfig, initDir string, prefix string, ips []string,
684695 allEnodes = []* enode.Node {enodes [i ], extraEnodes [i ]}
685696 index = 0
686697 }
687- configs [i ] = createNodeConfig (base , ips [i ], ports [i ], allEnodes , index , staticConnect )
698+ configs [i ] = createNodeConfig (base , prefix , ips [i ], ports [i ], allEnodes , index )
688699 }
689700 return configs , enodes , accounts , nil
690701}
0 commit comments