Denali

api/admin/service.go

@@ -11,6 +11,7 @@ import (
 	"github.com/ava-labs/gecko/api"
 	"github.com/ava-labs/gecko/chains"
 	"github.com/ava-labs/gecko/ids"
+	"github.com/ava-labs/gecko/network"
 	"github.com/ava-labs/gecko/snow/engine/common"
 	"github.com/ava-labs/gecko/utils/logging"
 
@@ -22,14 +23,14 @@ type Admin struct {
 	nodeID       ids.ShortID
 	networkID    uint32
 	log          logging.Logger
-	networking   Networking
+	networking   network.Network
 	performance  Performance
 	chainManager chains.Manager
 	httpServer   *api.Server
 }
 
 // NewService returns a new admin API service
-func NewService(nodeID ids.ShortID, networkID uint32, log logging.Logger, chainManager chains.Manager, peers Peerable, httpServer *api.Server) *common.HTTPHandler {
+func NewService(nodeID ids.ShortID, networkID uint32, log logging.Logger, chainManager chains.Manager, peers network.Network, httpServer *api.Server) *common.HTTPHandler {
 	newServer := rpc.NewServer()
 	codec := cjson.NewCodec()
 	newServer.RegisterCodec(codec, "application/json")
@@ -39,10 +40,8 @@ func NewService(nodeID ids.ShortID, networkID uint32, log logging.Logger, chainM
 		networkID:    networkID,
 		log:          log,
 		chainManager: chainManager,
-		networking: Networking{
-			peers: peers,
-		},
-		httpServer: httpServer,
+		networking:   peers,
+		httpServer:   httpServer,
 	}, "admin")
 	return &common.HTTPHandler{Handler: newServer}
 }
@@ -103,16 +102,14 @@ type PeersArgs struct{}
 
 // PeersReply are the results from calling Peers
 type PeersReply struct {
-	Peers []string `json:"peers"`
+	Peers []network.PeerID `json:"peers"`
 }
 
 // Peers returns the list of current validators
 func (service *Admin) Peers(r *http.Request, args *PeersArgs, reply *PeersReply) error {
 	service.log.Debug("Admin: Peers called")
-
-	peers, err := service.networking.Peers()
-	reply.Peers = peers
-	return err
+	reply.Peers = service.networking.Peers()
+	return nil
 }
 
 // StartCPUProfilerArgs are the arguments for calling StartCPUProfiler

chains/manager.go

@@ -20,7 +20,6 @@ import (
 	"github.com/ava-labs/gecko/snow/engine/avalanche/state"
 	"github.com/ava-labs/gecko/snow/engine/common"
 	"github.com/ava-labs/gecko/snow/engine/common/queue"
-	"github.com/ava-labs/gecko/snow/networking/handler"
 	"github.com/ava-labs/gecko/snow/networking/router"
 	"github.com/ava-labs/gecko/snow/networking/sender"
 	"github.com/ava-labs/gecko/snow/networking/timeout"
@@ -41,6 +40,7 @@ const (
 	defaultChannelSize = 1000
 	requestTimeout     = 2 * time.Second
 	gossipFrequency    = 10 * time.Second
+	shutdownTimeout    = 1 * time.Second
 )
 
 // Manager manages the chains running on this node.
@@ -145,7 +145,7 @@ func New(
 	timeoutManager.Initialize(requestTimeout)
 	go log.RecoverAndPanic(timeoutManager.Dispatch)
 
-	router.Initialize(log, &timeoutManager, gossipFrequency)
+	router.Initialize(log, &timeoutManager, gossipFrequency, shutdownTimeout)
 
 	m := &manager{
 		stakingEnabled:  stakingEnabled,
@@ -428,7 +428,7 @@ func (m *manager) createAvalancheChain(
 	})
 
 	// Asynchronously passes messages from the network to the consensus engine
-	handler := &handler.Handler{}
+	handler := &router.Handler{}
 	handler.Initialize(&engine, msgChan, defaultChannelSize)
 
 	// Allows messages to be routed to the new chain
@@ -514,7 +514,7 @@ func (m *manager) createSnowmanChain(
 	})
 
 	// Asynchronously passes messages from the network to the consensus engine
-	handler := &handler.Handler{}
+	handler := &router.Handler{}
 	handler.Initialize(&engine, msgChan, defaultChannelSize)
 
 	// Allow incoming messages to be routed to the new chain

genesis/config.go

@@ -50,6 +50,122 @@ func (c *Config) init() error {
 
 // Hard coded genesis constants
 var (
+	DenaliConfig = Config{
+		MintAddresses: []string{
+			"95YUFjhDG892VePMzpwKF9JzewGKvGRi3",
+		},
+		FundedAddresses: []string{
+			"9uKvvA7E35QCwLvAaohXTCfFejbf3Rv17",
+			"JLrYNMYXANGj43BfWXBxMMAEenUBp1Sbn",
+			"7TUTzwrU6nbZtWHjTHEpdneUvjKBxb3EM",
+			"77mPUXBdQKwQpPoX6rckCZGLGGdkuG1G6",
+			"4gGWdFZ4Gax1B466YKXyKRRpWLb42Afdt",
+			"CKTkzAPsRxCreyiDTnjGxLmjMarxF28fi",
+			"4ABm9gFHVtsNdcKSd1xsacFkGneSgzpaa",
+			"DpL8PTsrjtLzv5J8LL3D2A6YcnCTqrNH9",
+			"ZdhZv6oZrmXLyFDy6ovXAu6VxmbTsT2h",
+			"6cesTteH62Y5mLoDBUASaBvCXuL2AthL",
+		},
+		StakerIDs: []string{
+			"LQwRLm4cbJ7T2kxcxp4uXCU5XD8DFrE1C",
+			"hArafGhY2HFTbwaaVh1CSCUCUCiJ2Vfb",
+			"2m38qc95mhHXtrhjyGbe7r2NhniqHHJRB",
+			"4QBwET5o8kUhvt9xArhir4d3R25CtmZho",
+			"NpagUxt6KQiwPch9Sd4osv8kD1TZnkjdk",
+		},
+		EVMBytes: []byte{
+			0x7b, 0x22, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+			0x22, 0x3a, 0x7b, 0x22, 0x63, 0x68, 0x61, 0x69,
+			0x6e, 0x49, 0x64, 0x22, 0x3a, 0x34, 0x33, 0x31,
+			0x31, 0x30, 0x2c, 0x22, 0x68, 0x6f, 0x6d, 0x65,
+			0x73, 0x74, 0x65, 0x61, 0x64, 0x42, 0x6c, 0x6f,
+			0x63, 0x6b, 0x22, 0x3a, 0x30, 0x2c, 0x22, 0x64,
+			0x61, 0x6f, 0x46, 0x6f, 0x72, 0x6b, 0x42, 0x6c,
+			0x6f, 0x63, 0x6b, 0x22, 0x3a, 0x30, 0x2c, 0x22,
+			0x64, 0x61, 0x6f, 0x46, 0x6f, 0x72, 0x6b, 0x53,
+			0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x3a,
+			0x74, 0x72, 0x75, 0x65, 0x2c, 0x22, 0x65, 0x69,
+			0x70, 0x31, 0x35, 0x30, 0x42, 0x6c, 0x6f, 0x63,
+			0x6b, 0x22, 0x3a, 0x30, 0x2c, 0x22, 0x65, 0x69,
+			0x70, 0x31, 0x35, 0x30, 0x48, 0x61, 0x73, 0x68,
+			0x22, 0x3a, 0x22, 0x30, 0x78, 0x32, 0x30, 0x38,
+			0x36, 0x37, 0x39, 0x39, 0x61, 0x65, 0x65, 0x62,
+			0x65, 0x61, 0x65, 0x31, 0x33, 0x35, 0x63, 0x32,
+			0x34, 0x36, 0x63, 0x36, 0x35, 0x30, 0x32, 0x31,
+			0x63, 0x38, 0x32, 0x62, 0x34, 0x65, 0x31, 0x35,
+			0x61, 0x32, 0x63, 0x34, 0x35, 0x31, 0x33, 0x34,
+			0x30, 0x39, 0x39, 0x33, 0x61, 0x61, 0x63, 0x66,
+			0x64, 0x32, 0x37, 0x35, 0x31, 0x38, 0x38, 0x36,
+			0x35, 0x31, 0x34, 0x66, 0x30, 0x22, 0x2c, 0x22,
+			0x65, 0x69, 0x70, 0x31, 0x35, 0x35, 0x42, 0x6c,
+			0x6f, 0x63, 0x6b, 0x22, 0x3a, 0x30, 0x2c, 0x22,
+			0x65, 0x69, 0x70, 0x31, 0x35, 0x38, 0x42, 0x6c,
+			0x6f, 0x63, 0x6b, 0x22, 0x3a, 0x30, 0x2c, 0x22,
+			0x62, 0x79, 0x7a, 0x61, 0x6e, 0x74, 0x69, 0x75,
+			0x6d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0x3a,
+			0x30, 0x2c, 0x22, 0x63, 0x6f, 0x6e, 0x73, 0x74,
+			0x61, 0x6e, 0x74, 0x69, 0x6e, 0x6f, 0x70, 0x6c,
+			0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0x3a,
+			0x30, 0x2c, 0x22, 0x70, 0x65, 0x74, 0x65, 0x72,
+			0x73, 0x62, 0x75, 0x72, 0x67, 0x42, 0x6c, 0x6f,
+			0x63, 0x6b, 0x22, 0x3a, 0x30, 0x7d, 0x2c, 0x22,
+			0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x22, 0x3a, 0x22,
+			0x30, 0x78, 0x30, 0x22, 0x2c, 0x22, 0x74, 0x69,
+			0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22,
+			0x3a, 0x22, 0x30, 0x78, 0x30, 0x22, 0x2c, 0x22,
+			0x65, 0x78, 0x74, 0x72, 0x61, 0x44, 0x61, 0x74,
+			0x61, 0x22, 0x3a, 0x22, 0x30, 0x78, 0x30, 0x30,
+			0x22, 0x2c, 0x22, 0x67, 0x61, 0x73, 0x4c, 0x69,
+			0x6d, 0x69, 0x74, 0x22, 0x3a, 0x22, 0x30, 0x78,
+			0x35, 0x66, 0x35, 0x65, 0x31, 0x30, 0x30, 0x22,
+			0x2c, 0x22, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63,
+			0x75, 0x6c, 0x74, 0x79, 0x22, 0x3a, 0x22, 0x30,
+			0x78, 0x30, 0x22, 0x2c, 0x22, 0x6d, 0x69, 0x78,
+			0x48, 0x61, 0x73, 0x68, 0x22, 0x3a, 0x22, 0x30,
+			0x78, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x22, 0x2c, 0x22, 0x63, 0x6f, 0x69, 0x6e,
+			0x62, 0x61, 0x73, 0x65, 0x22, 0x3a, 0x22, 0x30,
+			0x78, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x22, 0x2c, 0x22, 0x61, 0x6c, 0x6c, 0x6f,
+			0x63, 0x22, 0x3a, 0x7b, 0x22, 0x35, 0x37, 0x32,
+			0x66, 0x34, 0x64, 0x38, 0x30, 0x66, 0x31, 0x30,
+			0x66, 0x36, 0x36, 0x33, 0x62, 0x35, 0x30, 0x34,
+			0x39, 0x66, 0x37, 0x38, 0x39, 0x35, 0x34, 0x36,
+			0x66, 0x32, 0x35, 0x66, 0x37, 0x30, 0x62, 0x62,
+			0x36, 0x32, 0x61, 0x37, 0x66, 0x22, 0x3a, 0x7b,
+			0x22, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65,
+			0x22, 0x3a, 0x22, 0x30, 0x78, 0x33, 0x33, 0x62,
+			0x32, 0x65, 0x33, 0x63, 0x39, 0x66, 0x64, 0x30,
+			0x38, 0x30, 0x34, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x22, 0x7d, 0x7d, 0x2c,
+			0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22,
+			0x3a, 0x22, 0x30, 0x78, 0x30, 0x22, 0x2c, 0x22,
+			0x67, 0x61, 0x73, 0x55, 0x73, 0x65, 0x64, 0x22,
+			0x3a, 0x22, 0x30, 0x78, 0x30, 0x22, 0x2c, 0x22,
+			0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x48, 0x61,
+			0x73, 0x68, 0x22, 0x3a, 0x22, 0x30, 0x78, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+			0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x22,
+			0x7d,
+		},
+	}
 	CascadeConfig = Config{
 		MintAddresses: []string{
 			"95YUFjhDG892VePMzpwKF9JzewGKvGRi3",
@@ -277,6 +393,8 @@ var (
 // GetConfig ...
 func GetConfig(networkID uint32) *Config {
 	switch networkID {
+	case DenaliID:
+		return &DenaliConfig
 	case CascadeID:
 		return &CascadeConfig
 	default:

genesis/genesis_test.go

@@ -17,12 +17,15 @@ func TestNetworkName(t *testing.T) {
 	if name := NetworkName(MainnetID); name != MainnetName {
 		t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, MainnetName)
 	}
-	if name := NetworkName(TestnetID); name != CascadeName {
-		t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, CascadeName)
-	}
 	if name := NetworkName(CascadeID); name != CascadeName {
 		t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, CascadeName)
 	}
+	if name := NetworkName(DenaliID); name != DenaliName {
+		t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, DenaliName)
+	}
+	if name := NetworkName(TestnetID); name != DenaliName {
+		t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, DenaliName)
+	}
 	if name := NetworkName(4294967295); name != "network-4294967295" {
 		t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, "network-4294967295")
 	}
@@ -37,23 +40,39 @@ func TestNetworkID(t *testing.T) {
 		t.Fatalf("Returned wrong network. Expected: %d ; Returned %d", MainnetID, id)
 	}
 
-	id, err = NetworkID(TestnetName)
+	id, err = NetworkID(CascadeName)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if id != TestnetID {
-		t.Fatalf("Returned wrong network. Expected: %d ; Returned %d", TestnetID, id)
+	if id != CascadeID {
+		t.Fatalf("Returned wrong network. Expected: %d ; Returned %d", CascadeID, id)
 	}
 
-	id, err = NetworkID(CascadeName)
+	id, err = NetworkID("cAsCaDe")
 	if err != nil {
 		t.Fatal(err)
 	}
-	if id != TestnetID {
-		t.Fatalf("Returned wrong network. Expected: %d ; Returned %d", TestnetID, id)
+	if id != CascadeID {
+		t.Fatalf("Returned wrong network. Expected: %d ; Returned %d", CascadeID, id)
 	}
 
-	id, err = NetworkID("cAsCaDe")
+	id, err = NetworkID(DenaliName)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if id != DenaliID {
+		t.Fatalf("Returned wrong network. Expected: %d ; Returned %d", DenaliID, id)
+	}
+
+	id, err = NetworkID("dEnAlI")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if id != DenaliID {
+		t.Fatalf("Returned wrong network. Expected: %d ; Returned %d", DenaliID, id)
+	}
+
+	id, err = NetworkID(TestnetName)
 	if err != nil {
 		t.Fatal(err)
 	}

genesis/network_id.go

@@ -14,24 +14,32 @@ import (
 // Hardcoded network IDs
 var (
 	MainnetID uint32 = 1
-	TestnetID uint32 = 2
 	CascadeID uint32 = 2
+	DenaliID  uint32 = 3
+
+	TestnetID uint32 = 3
 	LocalID   uint32 = 12345
 
 	MainnetName = "mainnet"
-	TestnetName = "testnet"
 	CascadeName = "cascade"
+	DenaliName  = "denali"
+
+	TestnetName = "testnet"
 	LocalName   = "local"
 
 	NetworkIDToNetworkName = map[uint32]string{
 		MainnetID: MainnetName,
-		TestnetID: CascadeName,
-		LocalID:   LocalName,
+		CascadeID: CascadeName,
+		DenaliID:  DenaliName,
+
+		LocalID: LocalName,
 	}
 	NetworkNameToNetworkID = map[string]uint32{
 		MainnetName: MainnetID,
-		TestnetName: TestnetID,
 		CascadeName: CascadeID,
+		DenaliName:  DenaliID,
+
+		TestnetName: TestnetID,
 		LocalName:   LocalID,
 	}
 

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/AppsFlyer/go-sundheit v0.2.0
 	github.com/allegro/bigcache v1.2.1 // indirect
 	github.com/aristanetworks/goarista v0.0.0-20200520141224-0f14e646773f // indirect
-	github.com/ava-labs/coreth v0.1.0 // Added manually; don't delete
+	github.com/ava-labs/coreth v0.2.0 // Added manually; don't delete
 	github.com/ava-labs/go-ethereum v1.9.3 // indirect
 	github.com/deckarep/golang-set v1.7.1 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1 v1.0.3

go.sum

@@ -17,8 +17,8 @@ github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3/go.mod h1:KASm
 github.com/aristanetworks/goarista v0.0.0-20200520141224-0f14e646773f h1:uM6lu1fpmCwf54zb6Ckkvphioq8MLlyFb/TlTgPpCKc=
 github.com/aristanetworks/goarista v0.0.0-20200520141224-0f14e646773f/go.mod h1:QZe5Yh80Hp1b6JxQdpfSEEe8X7hTyTEZSosSrFf/oJE=
 github.com/aristanetworks/splunk-hec-go v0.3.3/go.mod h1:1VHO9r17b0K7WmOlLb9nTk/2YanvOEnLMUgsFrxBROc=
-github.com/ava-labs/coreth v0.1.0 h1:Cx9dkhkQ7Bc7jD07OTbFJRlNTeHbSSLUwsCQlduTupg=
-github.com/ava-labs/coreth v0.1.0/go.mod h1:pGolKipwq5vGIY2IBBcBkMYrqniXMsS5SBn+BBi4+Js=
+github.com/ava-labs/coreth v0.2.0 h1:HjR4RMTnWvXhXlnEbFNGF5pbcxfemVxZeEzC4BTIrIw=
+github.com/ava-labs/coreth v0.2.0/go.mod h1:pGolKipwq5vGIY2IBBcBkMYrqniXMsS5SBn+BBi4+Js=
 github.com/ava-labs/go-ethereum v1.9.3 h1:GmnMZ/dlvVAPFmWBzEpRJX49pUAymPfoASLNRJqR0AY=
 github.com/ava-labs/go-ethereum v1.9.3/go.mod h1:a+agc6fXfZFsPZCylA3ry4Y8CLCqLKg3Rc23NXZ9aw8=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=