RC/messnet 1

.golangci.yml

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

cmd/echainspec/main.go

@@ -57,6 +57,7 @@ var defaultChainspecValues = map[string]ctypes.Configurator{
 	"rinkeby":    params.DefaultRinkebyGenesisBlock(),
 	"goerli":     params.DefaultGoerliGenesisBlock(),
 	"yolov1":     params.DefaultYoloV1GenesisBlock(),
+	"messnet":    params.DefaultMessNetGenesisBlock(),
 
 	"social":      params.DefaultSocialGenesisBlock(),
 	"ethersocial": params.DefaultEthersocialGenesisBlock(),

cmd/geth/chaincmd.go

@@ -167,6 +167,7 @@ The export-preimages command export hash preimages to an RLP encoded stream`,
 			utils.SyncModeFlag,
 			utils.FakePoWFlag,
 			utils.ClassicFlag,
+			utils.MessNetFlag,
 			utils.MordorFlag,
 			utils.KottiFlag,
 			utils.SocialFlag,
@@ -221,6 +222,7 @@ Use "ethereum dump 0" to dump the genesis block.`,
 			utils.AncientFlag,
 			utils.CacheFlag,
 			utils.ClassicFlag,
+			utils.MessNetFlag,
 			utils.MordorFlag,
 			utils.KottiFlag,
 			utils.SocialFlag,

cmd/geth/consolecmd.go

@@ -138,6 +138,8 @@ func remoteConsole(ctx *cli.Context) error {
 				path = filepath.Join(path, "kotti")
 			} else if ctx.GlobalBool(utils.ClassicFlag.Name) {
 				path = filepath.Join(path, "classic")
+			} else if ctx.GlobalBool(utils.MessNetFlag.Name) {
+				path = filepath.Join(path, "messnet")
 			} else if ctx.GlobalBool(utils.MordorFlag.Name) {
 				path = filepath.Join(path, "mordor")
 			} else if ctx.GlobalBool(utils.SocialFlag.Name) {

cmd/geth/consolecmd_test.go

@@ -65,6 +65,7 @@ func TestConsoleCmdNetworkIdentities(t *testing.T) {
 		{[]string{"--social"}, 28, 28, params.SocialGenesisHash.Hex()},
 		{[]string{"--ethersocial"}, 1, 31102, params.EthersocialGenesisHash.Hex()},
 		{[]string{"--yolov1"}, 133519467574833, 133519467574833, params.YoloV1GenesisHash.Hex()},
+		{[]string{"--messnet"}, 6161, 6161, "0xb2957ab683ae69176b2eb7858f2baedb93752cb7cb45284529d543eebe20652e"},
 	}
 	for i, p := range chainIdentityCases {
 

cmd/geth/main.go

@@ -145,6 +145,7 @@ var (
 		utils.DeveloperFlag,
 		utils.DeveloperPeriodFlag,
 		utils.ClassicFlag,
+		utils.MessNetFlag,
 		utils.MordorFlag,
 		utils.SocialFlag,
 		utils.MixFlag,
@@ -166,6 +167,7 @@ var (
 		utils.LegacyGpoPercentileFlag,
 		utils.EWASMInterpreterFlag,
 		utils.EVMInterpreterFlag,
+		utils.ECBP1100Flag,
 		configFileFlag,
 	}
 
@@ -313,6 +315,9 @@ func checkMainnet(ctx *cli.Context) bool {
 	case ctx.GlobalIsSet(utils.ClassicFlag.Name):
 		log.Info("Starting Geth on Ethereum Classic...")
 
+	case ctx.GlobalIsSet(utils.MessNetFlag.Name):
+		log.Info("Starting Geth on MessNet...")
+
 	case ctx.GlobalIsSet(utils.MordorFlag.Name):
 		log.Info("Starting Geth on Mordor testnet...")
 

cmd/geth/usage.go

@@ -52,6 +52,7 @@ var AppHelpFlagGroups = []flags.FlagGroup{
 			utils.RinkebyFlag,
 			utils.YoloV1Flag,
 			utils.RopstenFlag,
+			utils.MessNetFlag,
 			utils.SyncModeFlag,
 			utils.ExitWhenSyncedFlag,
 			utils.GCModeFlag,
@@ -60,6 +61,7 @@ var AppHelpFlagGroups = []flags.FlagGroup{
 			utils.IdentityFlag,
 			utils.LightKDFFlag,
 			utils.WhitelistFlag,
+			utils.ECBP1100Flag,
 		},
 	},
 	{

cmd/utils/flags.go

@@ -136,7 +136,7 @@ var (
 	}
 	NetworkIdFlag = cli.Uint64Flag{
 		Name:  "networkid",
-		Usage: "Network identifier (integer, 1=Mainnet, 2=Morden (disused), 3=Ropsten, 4=Rinkeby, 5=Goerli, 6=Kotti, YoloV1=133519467574833, developer=1337)",
+		Usage: "Network identifier (integer, 1=Mainnet, 2=Morden (disused), 3=Ropsten, 4=Rinkeby, 5=Goerli, 6=Kotti, YoloV1=133519467574833, 6161=MessNet, developer=1337)",
 		Value: eth.DefaultConfig.NetworkId,
 	}
 	ClassicFlag = cli.BoolFlag{
@@ -179,6 +179,10 @@ var (
 		Name:  "goerli",
 		Usage: "Görli network: pre-configured proof-of-authority test network",
 	}
+	MessNetFlag = cli.BoolFlag{
+		Name:  "messnet",
+		Usage: "MESS network: temporary dedicated test network for MESS testing",
+	}
 	DeveloperFlag = cli.BoolFlag{
 		Name:  "dev",
 		Usage: "Ephemeral proof-of-authority network with a pre-funded developer account, mining enabled",
@@ -749,6 +753,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
@@ -1295,6 +1303,8 @@ func dataDirPathForCtxChainConfig(ctx *cli.Context, baseDataDirPath string) stri
 		return filepath.Join(baseDataDirPath, "ropsten")
 	case ctx.GlobalBool(ClassicFlag.Name):
 		return filepath.Join(baseDataDirPath, "classic")
+	case ctx.GlobalBool(MessNetFlag.Name):
+		return filepath.Join(baseDataDirPath, "messnet")
 	case ctx.GlobalBool(MordorFlag.Name):
 		return filepath.Join(baseDataDirPath, "mordor")
 	case ctx.GlobalBool(SocialFlag.Name):
@@ -1411,6 +1421,9 @@ func setTxPool(ctx *cli.Context, cfg *core.TxPoolConfig) {
 }
 
 func setEthash(ctx *cli.Context, cfg *eth.Config) {
+	if ctx.GlobalBool(FakePoWFlag.Name) {
+		cfg.Ethash.PowMode = ethash.ModeFake
+	}
 	if ctx.GlobalIsSet(EthashCacheDirFlag.Name) {
 		cfg.Ethash.CacheDir = ctx.GlobalString(EthashCacheDirFlag.Name)
 	}
@@ -1553,7 +1566,7 @@ func SetShhConfig(ctx *cli.Context, stack *node.Node, cfg *whisper.Config) {
 // SetEthConfig applies eth-related command line flags to the config.
 func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 	// Avoid conflicting network flags
-	CheckExclusive(ctx, DeveloperFlag, LegacyTestnetFlag, RopstenFlag, RinkebyFlag, GoerliFlag, YoloV1Flag, ClassicFlag, KottiFlag, MordorFlag, EthersocialFlag, SocialFlag)
+	CheckExclusive(ctx, DeveloperFlag, LegacyTestnetFlag, RopstenFlag, RinkebyFlag, GoerliFlag, YoloV1Flag, ClassicFlag, KottiFlag, MordorFlag, EthersocialFlag, SocialFlag, MessNetFlag)
 	CheckExclusive(ctx, LegacyLightServFlag, LightServeFlag, SyncModeFlag, "light")
 	CheckExclusive(ctx, DeveloperFlag, ExternalSignerFlag) // Can't use both ephemeral unlocked and external signer
 	CheckExclusive(ctx, GCModeFlag, "archive", TxLookupLimitFlag)
@@ -1664,6 +1677,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.
@@ -1894,6 +1914,8 @@ func genesisForCtxChainConfig(ctx *cli.Context) *genesisT.Genesis {
 	switch {
 	case ctx.GlobalBool(ClassicFlag.Name):
 		genesis = params.DefaultClassicGenesisBlock()
+	case ctx.GlobalBool(MessNetFlag.Name):
+		genesis = params.DefaultMessNetGenesisBlock()
 	case ctx.GlobalBool(MordorFlag.Name):
 		genesis = params.DefaultMordorGenesisBlock()
 	case ctx.GlobalBool(SocialFlag.Name):

consensus/ethash/ethash.go

@@ -399,6 +399,22 @@ const (
 	ModeFullFake
 )
 
+func (m Mode) String() string {
+	switch m {
+	case ModeNormal:
+		return "Normal"
+	case ModeShared:
+		return "Shared"
+	case ModeTest:
+		return "Test"
+	case ModeFake:
+		return "Fake"
+	case ModeFullFake:
+		return "FullFake"
+	}
+	return "unknown"
+}
+
 // Config are the configuration parameters of the ethash.
 type Config struct {
 	CacheDir         string

consensus/ethash/sealer.go

@@ -34,6 +34,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/consensus"
 	"github.com/ethereum/go-ethereum/core/types"
+	"gonum.org/v1/gonum/stat/distuv"
 )
 
 const (
@@ -46,18 +47,53 @@ var (
 	errInvalidSealResult = errors.New("invalid or stale proof-of-work solution")
 )
 
+// makeFakeDelay uses the ethash.threads value as a mean time (lambda)
+// for a Poisson distribution, returning a random value from
+// that discrete function. I think a Poisson distribution probably
+// fairly accurately models real world block times.
+// Note that this is a hacky way to use ethash.threads since
+// lower values will yield faster blocks, but it saves having
+// to add or modify any more code than necessary.
+func (ethash *Ethash) makeFakeDelay() float64 {
+	p := distuv.Poisson{
+		Lambda: float64(ethash.Threads()),
+	}
+	return p.Rand()
+}
+
 // Seal implements consensus.Engine, attempting to find a nonce that satisfies
 // the block's difficulty requirements.
 func (ethash *Ethash) Seal(chain consensus.ChainHeaderReader, block *types.Block, results chan<- *types.Block, stop <-chan struct{}) error {
 	// If we're running a fake PoW, simply return a 0 nonce immediately
-	if ethash.config.PowMode == ModeFake || ethash.config.PowMode == ModeFullFake {
-		header := block.Header()
-		header.Nonce, header.MixDigest = types.BlockNonce{}, common.Hash{}
-		select {
-		case results <- block.WithSeal(header):
-		default:
-			ethash.config.Log.Warn("Sealing result is not read by miner", "mode", "fake", "sealhash", ethash.SealHash(block.Header()))
-		}
+	faking := ethash.config.PowMode == ModeFake || ethash.config.PowMode == ModeFullFake
+	if faking {
+		go func(header *types.Header) {
+			// Assign random (but non-zero) values to header nonce and mix.
+			header.Nonce = types.EncodeNonce(uint64(rand.Int63n(math.MaxInt64)))
+			b, _ := header.Nonce.MarshalText()
+			header.MixDigest = common.BytesToHash(b)
+
+			// Wait some amount of time.
+			timeout := time.NewTimer(time.Duration(ethash.makeFakeDelay()) * time.Second)
+			defer timeout.Stop()
+
+			select {
+			case <-stop:
+				return
+			case <-ethash.update:
+				timeout.Stop()
+				if err := ethash.Seal(chain, block, results, stop); err != nil {
+					ethash.config.Log.Error("Failed to restart sealing after update", "err", err)
+				}
+			case <-timeout.C:
+				// Send the results when the timeout expires.
+				select {
+				case results <- block.WithSeal(header):
+				default:
+					ethash.config.Log.Warn("Sealing result is not read by miner", "mode", "fake", "sealhash", ethash.SealHash(block.Header()))
+				}
+			}
+		}(block.Header())
 		return nil
 	}
 	// If we're running a shared PoW, delegate sealing to it

consensus/ethash/sealer_test.go

@@ -22,6 +22,7 @@ import (
 	"math/big"
 	"net/http"
 	"net/http/httptest"
+	"sort"
 	"testing"
 	"time"
 
@@ -31,6 +32,24 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 )
 
+func TestSealFakeDelay(t *testing.T) {
+	cases := []int{
+		3, 10, 19, 33,
+	}
+	for _, c := range cases {
+		e := &Ethash{threads: c} // "threads" is actually the desired MEAN (lambda) of the Poisson distribution
+		got := []float64{}
+		for i := 0; i < 20; i++ {
+			d := e.makeFakeDelay()
+			got = append(got, d)
+		}
+		sort.Slice(got, func(i, j int) bool {
+			return got[i] < got[j]
+		})
+		t.Logf("ethash.threads,lamda=%2d %v", c, got)
+	}
+}
+
 // Tests whether remote HTTP servers are correctly notified of new work.
 func TestRemoteNotify(t *testing.T) {
 	// Start a simple web server to capture notifications.