From 56f777b2fc77275bc636562b66a08b19afe2ec56 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Thu, 5 Feb 2015 03:16:16 +0100
Subject: cmd/ethereum, cmd/mist, core, eth, javascript, xeth: fixes for new
 p2p API

---
 cmd/mist/main.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'cmd/mist/main.go')

diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index 66872a241..17ab9467a 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -52,13 +52,11 @@ func run() error {
 	config := utils.InitConfig(VmType, ConfigFile, Datadir, "ETH")
 
 	ethereum, err := eth.New(&eth.Config{
-		Name:       ClientIdentifier,
-		Version:    Version,
+		Name:       p2p.MakeName(ClientIdentifier, Version),
 		KeyStore:   KeyStore,
 		DataDir:    Datadir,
 		LogFile:    LogFile,
 		LogLevel:   LogLevel,
-		Identifier: Identifier,
 		MaxPeers:   MaxPeer,
 		Port:       OutboundPort,
 		NATType:    PMPGateway,
@@ -79,7 +77,7 @@ func run() error {
 		utils.StartWebSockets(ethereum, WsPort)
 	}
 
-	gui := NewWindow(ethereum, config, ethereum.ClientIdentity().(*p2p.SimpleClientIdentity), KeyRing, LogLevel)
+	gui := NewWindow(ethereum, config, KeyRing, LogLevel)
 
 	utils.RegisterInterrupt(func(os.Signal) {
 		gui.Stop()
-- 
cgit v1.2.3


From 028775a0863946c1e9ad51fe7b22faa5c59b2605 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Sat, 7 Feb 2015 00:38:36 +0100
Subject: cmd/ethereum, cmd/mist: add flag for discovery bootstrap nodes

---
 cmd/mist/main.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'cmd/mist/main.go')

diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index 17ab9467a..5bae33088 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -59,8 +59,9 @@ func run() error {
 		LogLevel:   LogLevel,
 		MaxPeers:   MaxPeer,
 		Port:       OutboundPort,
-		NATType:    PMPGateway,
+		NATType:    NatType,
 		PMPGateway: PMPGateway,
+		BootNodes:  BootNodes,
 		KeyRing:    KeyRing,
 		Dial:       true,
 	})
@@ -82,7 +83,7 @@ func run() error {
 	utils.RegisterInterrupt(func(os.Signal) {
 		gui.Stop()
 	})
-	go utils.StartEthereum(ethereum, SeedNode)
+	go utils.StartEthereum(ethereum)
 
 	fmt.Println("ETH stack took", time.Since(tstart))
 
-- 
cgit v1.2.3


From a3cd2187194b79cd8b14c4ec4f1abca91a0147e0 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Tue, 10 Feb 2015 12:30:09 +0100
Subject: cmd/mist, cmd/ethereum: add CLI arguments for node key

---
 cmd/mist/main.go | 1 +
 1 file changed, 1 insertion(+)

(limited to 'cmd/mist/main.go')

diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index 5bae33088..4d6bac9b7 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -62,6 +62,7 @@ func run() error {
 		NATType:    NatType,
 		PMPGateway: PMPGateway,
 		BootNodes:  BootNodes,
+		NodeKey:    NodeKey,
 		KeyRing:    KeyRing,
 		Dial:       true,
 	})
-- 
cgit v1.2.3


From d0a2e655c9599f462bb20bd49bc69b8e1e330a21 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 11 Feb 2015 17:19:31 +0100
Subject: cmd/ethereum, cmd/mist, eth, p2p: use package p2p/nat

This deletes the old NAT implementation.
---
 cmd/mist/main.go | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'cmd/mist/main.go')

diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index 4d6bac9b7..52b5e4e94 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -52,19 +52,18 @@ func run() error {
 	config := utils.InitConfig(VmType, ConfigFile, Datadir, "ETH")
 
 	ethereum, err := eth.New(&eth.Config{
-		Name:       p2p.MakeName(ClientIdentifier, Version),
-		KeyStore:   KeyStore,
-		DataDir:    Datadir,
-		LogFile:    LogFile,
-		LogLevel:   LogLevel,
-		MaxPeers:   MaxPeer,
-		Port:       OutboundPort,
-		NATType:    NatType,
-		PMPGateway: PMPGateway,
-		BootNodes:  BootNodes,
-		NodeKey:    NodeKey,
-		KeyRing:    KeyRing,
-		Dial:       true,
+		Name:      p2p.MakeName(ClientIdentifier, Version),
+		KeyStore:  KeyStore,
+		DataDir:   Datadir,
+		LogFile:   LogFile,
+		LogLevel:  LogLevel,
+		MaxPeers:  MaxPeer,
+		Port:      OutboundPort,
+		NAT:       NAT,
+		BootNodes: BootNodes,
+		NodeKey:   NodeKey,
+		KeyRing:   KeyRing,
+		Dial:      true,
 	})
 	if err != nil {
 		mainlogger.Fatalln(err)
-- 
cgit v1.2.3