Merge branch 'master' into dev/ecip-1099

Author: iquidus

.golangci.yml

@@ -50,3 +50,6 @@ issues:
     - path: cmd/faucet/
       linters:
         - deadcode
+    - path: core/blockchain_af.go
+      linters:
+        - deadcode

cmd/geth/main.go

@@ -167,6 +167,7 @@ var (
 		utils.LegacyGpoPercentileFlag,
 		utils.EWASMInterpreterFlag,
 		utils.EVMInterpreterFlag,
+		utils.ECBP1100Flag,
 		configFileFlag,
 	}
 

cmd/geth/usage.go

@@ -60,6 +60,7 @@ var AppHelpFlagGroups = []flags.FlagGroup{
 			utils.IdentityFlag,
 			utils.LightKDFFlag,
 			utils.WhitelistFlag,
+			utils.ECBP1100Flag,
 		},
 	},
 	{

cmd/utils/flags.go

@@ -756,6 +756,10 @@ var (
 		Usage: "External EVM configuration (default = built-in interpreter)",
 		Value: "",
 	}
+	ECBP1100Flag = cli.Uint64Flag{
+		Name:  "ecbp1100",
+		Usage: "Configure ECBP-1100 (MESS) block activation number",
+	}
 )
 
 // MakeDataDir retrieves the currently requested data directory, terminating
@@ -1699,6 +1703,13 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 	if gen := genesisForCtxChainConfig(ctx); gen != nil {
 		cfg.Genesis = gen
 	}
+	// Handle temporary chain configuration override cases.
+	if ctx.GlobalIsSet(ECBP1100Flag.Name) {
+		n := ctx.GlobalUint64(ECBP1100Flag.Name)
+		if err := cfg.Genesis.Config.SetECBP1100Transition(&n); err != nil {
+			Fatalf("Failed to set ECBP-1100 activation number: %v", err)
+		}
+	}
 
 	// Establish NetworkID.
 	// If dev-mode is used, then NetworkID will be overridden.