Feature/rand grouped consensus

.github/workflows/unit_test.yml

@@ -35,7 +35,7 @@ jobs:
         run: make all
 
       - name: Test
-        run: go test -tags=test -covermode=count -coverprofile=coverage.txt  `go list ./...`
+        run: go run build/ci.go test -coverage
 
       - name: Upload coverage report
         uses: codecov/codecov-action@v1

build/ci.go

@@ -309,7 +309,7 @@ func goTool(subcmd string, args ...string) *exec.Cmd {
 
 func goToolArch(arch string, cc string, subcmd string, args ...string) *exec.Cmd {
 	cmd := build.GoTool(subcmd, args...)
-	cmd.Env = []string{"GOPATH=" + build.GOPATH()}
+	cmd.Env = make([]string, 0)
 	if arch == "" || arch == runtime.GOARCH {
 		cmd.Env = append(cmd.Env, "GOBIN="+GOBIN)
 	} else {
@@ -354,7 +354,7 @@ func doTest(cmdline []string) {
 	// and some tests run into timeouts under load.
 	gotest.Args = append(gotest.Args, "-p", "1")
 	if *coverage {
-		gotest.Args = append(gotest.Args, "-covermode=atomic", "-cover")
+		gotest.Args = append(gotest.Args, "-covermode=count", "-coverprofile=coverage.txt")
 	}
 	gotest.Args = append(gotest.Args, "-tags=test")
 	gotest.Args = append(gotest.Args, packages...)

build/deb/ethereum/deb.control

@@ -11,8 +11,8 @@ Vcs-Browser: https://github.com/ethereum/go-ethereum
 Package: {{.Name}}
 Architecture: any
 Depends: ${misc:Depends}, {{.ExeList}}
-Description: Meta-package to install geth, swarm, and other tools
- Meta-package to install geth, swarm and other tools
+Description: Meta-package to install geth, and other tools
+ Meta-package to install geth and other tools
 
 {{range .Executables}}
 Package: {{$.ExeName .}}

build/update-license.go

@@ -1,3 +1,4 @@
+//go:build none
 // +build none
 
 /*
@@ -56,8 +57,6 @@ var (
 		"internal/jsre/deps",
 		"log/",
 		"common/bitutil/bitutil",
-		// don't license generated files
-		"contracts/chequebook/contract/code.go",
 	}
 
 	// paths with this prefix are licensed as GPL. all other files are LGPL.

cmd/alaya/main.go

@@ -92,6 +92,8 @@ var (
 		utils.MaxPeersFlag,
 		utils.MaxConsensusPeersFlag,
 		utils.MaxPendingPeersFlag,
+		utils.MinimumPeersPerTopic,
+		utils.PubSubTraceHost,
 		utils.MinerGasPriceFlag,
 		utils.NATFlag,
 		utils.NoDiscoverFlag,

cmd/alaya/usage.go

@@ -154,6 +154,8 @@ var AppHelpFlagGroups = []flagGroup{
 			utils.MaxPeersFlag,
 			utils.MaxConsensusPeersFlag,
 			utils.MaxPendingPeersFlag,
+			utils.MinimumPeersPerTopic,
+			utils.PubSubTraceHost,
 			utils.NATFlag,
 			utils.NoDiscoverFlag,
 			//	utils.DiscoveryV5Flag,

cmd/bootnode/main.go

@@ -24,11 +24,12 @@ import (
 	"net"
 	"os"
 
+	"github.com/AlayaNetwork/Alaya-Go/p2p/enode"
+
 	"github.com/AlayaNetwork/Alaya-Go/cmd/utils"
 	"github.com/AlayaNetwork/Alaya-Go/crypto"
 	"github.com/AlayaNetwork/Alaya-Go/log"
 	"github.com/AlayaNetwork/Alaya-Go/p2p/discover"
-	"github.com/AlayaNetwork/Alaya-Go/p2p/discv5"
 	"github.com/AlayaNetwork/Alaya-Go/p2p/nat"
 	"github.com/AlayaNetwork/Alaya-Go/p2p/netutil"
 )
@@ -85,7 +86,7 @@ func main() {
 	}
 
 	if *writeAddr {
-		fmt.Printf("%v\n", discover.PubkeyID(&nodeKey.PublicKey))
+		fmt.Printf("%v\n", enode.PubkeyToIDV4(&nodeKey.PublicKey))
 		os.Exit(0)
 	}
 
@@ -116,18 +117,20 @@ func main() {
 			realaddr = &net.UDPAddr{IP: ext, Port: realaddr.Port}
 		}
 	}
+	db, _ := enode.OpenDB("")
+	ln := enode.NewLocalNode(db, nodeKey)
+	cfg := discover.Config{
+		PrivateKey:  nodeKey,
+		NetRestrict: restrictList,
+	}
 
 	if *runv5 {
-		if _, err := discv5.ListenUDP(nodeKey, conn, realaddr, "", restrictList); err != nil {
+		if _, err := discover.ListenV5(conn, ln, cfg); err != nil {
 			utils.Fatalf("%v", err)
 		}
 	} else {
-		cfg := discover.Config{
-			PrivateKey:   nodeKey,
-			AnnounceAddr: realaddr,
-			NetRestrict:  restrictList,
-		}
-		if _, err := discover.ListenUDP(conn, cfg); err != nil {
+
+		if _, err := discover.ListenUDP(conn, ln, cfg); err != nil {
 			utils.Fatalf("%v", err)
 		}
 	}

cmd/ctool/ppos/reward.go

@@ -19,7 +19,7 @@ package ppos
 import (
 	"gopkg.in/urfave/cli.v1"
 
-	"github.com/AlayaNetwork/Alaya-Go/p2p/discover"
+	"github.com/AlayaNetwork/Alaya-Go/p2p/enode"
 )
 
 var (
@@ -45,9 +45,9 @@ var (
 
 func getDelegateReward(c *cli.Context) error {
 	nodeIDlist := c.StringSlice(nodeList.Name)
-	idlist := make([]discover.NodeID, 0)
+	idlist := make([]enode.IDv0, 0)
 	for _, node := range nodeIDlist {
-		nodeid, err := discover.HexID(node)
+		nodeid, err := enode.HexIDv0(node)
 		if err != nil {
 			return err
 		}

cmd/ctool/ppos/slashing.go

@@ -19,9 +19,9 @@ package ppos
 import (
 	"errors"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/AlayaNetwork/Alaya-Go/p2p/enode"
 
-	"github.com/AlayaNetwork/Alaya-Go/p2p/discover"
+	"gopkg.in/urfave/cli.v1"
 )
 
 var (
@@ -67,7 +67,7 @@ func checkDuplicateSign(c *cli.Context) error {
 	if nodeIDstring == "" {
 		return errors.New("The reported node ID is not set")
 	}
-	nodeid, err := discover.HexID(nodeIDstring)
+	nodeid, err := enode.HexIDv0(nodeIDstring)
 	if err != nil {
 		return err
 	}

cmd/ctool/ppos/staking.go

@@ -19,11 +19,11 @@ package ppos
 import (
 	"errors"
 
+	"github.com/AlayaNetwork/Alaya-Go/p2p/enode"
+
 	"github.com/AlayaNetwork/Alaya-Go/common"
 
 	"gopkg.in/urfave/cli.v1"
-
-	"github.com/AlayaNetwork/Alaya-Go/p2p/discover"
 )
 
 var (
@@ -156,7 +156,7 @@ func getDelegateInfo(c *cli.Context) error {
 	if nodeIDstring == "" {
 		return errors.New("The verifier's node ID is not set")
 	}
-	nodeid, err := discover.HexID(nodeIDstring)
+	nodeid, err := enode.HexIDv0(nodeIDstring)
 	if err != nil {
 		return err
 	}
@@ -169,7 +169,7 @@ func getCandidateInfo(c *cli.Context) error {
 	if nodeIDstring == "" {
 		return errors.New("The verifier's node ID is not set")
 	}
-	nodeid, err := discover.HexID(nodeIDstring)
+	nodeid, err := enode.HexIDv0(nodeIDstring)
 	if err != nil {
 		return err
 	}

cmd/ctool/test/addr.json

@@ -1,12 +1,12 @@
 [
-	"atp1k6cnw7smykrpyrlvwmyvzxr34femahrdu4lt5m",
-	"atp1m7f39g4ad66xazy36ltr7ar2zjad50tfv6ns32",
-	"atp1slmg0p92dup7enhdxp8jqkdjqa9kmjl6y3e3dn",
-	"atp14yvww49quk5ay0m7nfd8pvm0660h3wrx85rm0r",
-	"atp1v2nynex7w6ye5yew2s4v3gy555ts6844cj0gqv",
-	"atp1swayyl7mzmlut46g05dnm4289pw726fshd8u89",
-	"atp1t5exk2apc30jpu8xfjesj9mn573c4x82tz2q0v",
-	"atp12x95r6jjp225zy2s2kgj7gs3qm5q8rwtfthyrc",
-	"atp1kzrjajfarknmywf0zepahe8g0f9pzhae86nn9g",
-	"atp1xsejd4ks0se534xfmd228as3wtj5xzfrfzdftw"
+	"atp1af7ul6nr7y309szlq9c5k6d544pfcmsry9rl02",
+	"atp1yavh2xlkp8chye2pvrdtdjzzsq8wzwlxuve2yj",
+	"atp1lysxaxtptuzslhpcsft8xmaj35hzes5d7uwqnk",
+	"atp1gc2w7f0msfl8kyn5fwtepaa9y5k8y9gkzps7h6",
+	"atp12gct74l3s4a3n8gdhau6qfmsa44ud9harg2jly",
+	"atp13vgvpwnev6l336h9xjv43x6x6wuzu6qu69pyx4",
+	"atp1tsjqlduwqvz7zl3v97h2u5vtnwxku7s4zgxp75",
+	"atp192d8w7awsfczpgmx9l7a7wjzt8uvhzwn23fugk",
+	"atp12ms9epwmxxa2skdy9glj3vd9rrf2g3t5pl7vfw",
+	"atp1lkc77l9vt34wj53308x6qqqa97q95q30dcet9m"
 ]