Merge branch 'feature/01/puppeth-static-enode-url' into 'release/1.9'

Feature/01/puppeth static enode url

Closes ethereum#1 and ethereum#4

See merge request silesiacoin-dev/go-ethereum!10

Author: eddubbs

cmd/puppeth/module_node.go

@@ -42,7 +42,7 @@ ADD genesis.json /genesis.json
 RUN \
   echo 'geth --cache 512 init /genesis.json' > geth.sh && \{{if .Unlock}}
 	echo 'mkdir -p /root/.ethereum/keystore/ && cp /signer.json /root/.ethereum/keystore/' >> geth.sh && \{{end}}
-	echo $'exec geth --networkid {{.NetworkID}} --cache 512 --port {{.Port}} --nat extip:{{.IP}} --maxpeers {{.Peers}} {{.LightFlag}} --ethstats \'{{.Ethstats}}\' {{if .Bootnodes}}--bootnodes {{.Bootnodes}}{{end}} {{if .Etherbase}}--miner.etherbase {{.Etherbase}} --mine --miner.threads 1{{end}} {{if .Unlock}}--unlock 0 --password /signer.pass --mine{{end}} --miner.gastarget {{.GasTarget}} --miner.gaslimit {{.GasLimit}} --miner.gasprice {{.GasPrice}}' >> geth.sh
+	echo $'exec geth --networkid {{.NetworkID}} --cache 512 --port {{.Port}} --nat extip:{{.IP}} --maxpeers {{.Peers}} {{.LightFlag}} --ethstats \'{{.Ethstats}}\' {{if .Bootnodes}}--bootnodes {{.Bootnodes}}{{end}} {{if .Etherbase}}--miner.etherbase {{.Etherbase}} --mine --miner.threads 1{{end}} {{if .Unlock}}--unlock 0 --password /signer.pass --mine{{end}} --miner.gastarget {{.GasTarget}} --miner.gaslimit {{.GasLimit}} --miner.gasprice {{.GasPrice}} {{if .NodeKeyHex}} --nodekeyhex {{.NodeKeyHex}} {{end}}{{if .Testnet}} --testnet{{end}}' >> geth.sh
 
 ENTRYPOINT ["/bin/sh", "geth.sh"]
 `
@@ -98,18 +98,20 @@ func deployNode(client *sshClient, network string, bootnodes []string, config *n
 	}
 	dockerfile := new(bytes.Buffer)
 	template.Must(template.New("").Parse(nodeDockerfile)).Execute(dockerfile, map[string]interface{}{
-		"NetworkID": config.network,
-		"Port":      config.port,
-		"IP":        client.address,
-		"Peers":     config.peersTotal,
-		"LightFlag": lightFlag,
-		"Bootnodes": strings.Join(bootnodes, ","),
-		"Ethstats":  config.ethstats,
-		"Etherbase": config.etherbase,
-		"GasTarget": uint64(1000000 * config.gasTarget),
-		"GasLimit":  uint64(1000000 * config.gasLimit),
-		"GasPrice":  uint64(1000000000 * config.gasPrice),
-		"Unlock":    config.keyJSON != "",
+		"NetworkID":  config.network,
+		"Port":       config.port,
+		"IP":         client.address,
+		"Peers":      config.peersTotal,
+		"LightFlag":  lightFlag,
+		"Bootnodes":  strings.Join(bootnodes, ","),
+		"Ethstats":   config.ethstats,
+		"Etherbase":  config.etherbase,
+		"GasTarget":  uint64(1000000 * config.gasTarget),
+		"GasLimit":   uint64(1000000 * config.gasLimit),
+		"GasPrice":   uint64(1000000000 * config.gasPrice),
+		"Unlock":     config.keyJSON != "",
+		"NodeKeyHex": config.nodeKeyHex,
+		"Testnet":    config.testNet,
 	})
 	files[filepath.Join(workdir, "Dockerfile")] = dockerfile.Bytes()
 
@@ -167,6 +169,8 @@ type nodeInfos struct {
 	gasTarget  float64
 	gasLimit   float64
 	gasPrice   float64
+	nodeKeyHex string
+	testNet    bool
 }
 
 // Report converts the typed struct into a plain string->string map, containing

cmd/puppeth/module_node_test.go

@@ -0,0 +1,43 @@
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"html/template"
+	"strings"
+	"testing"
+)
+
+func TestParsingNodeTemplate(t *testing.T) {
+	bootnodes := []string{
+		"enode://dummyEnode",
+		"enode://dummyEnode",
+	}
+
+	dockerfile := new(bytes.Buffer)
+	template.Must(template.New("").Parse(nodeDockerfile)).Execute(dockerfile, map[string]interface{}{
+		"NetworkID":  "48",
+		"Port":       "30303",
+		"IP":         "49.34.12.10",
+		"Peers":      "10",
+		"LightFlag":  "",
+		"Bootnodes":  strings.Join(bootnodes, ","),
+		"Ethstats":   "ethstatsDummyUrl",
+		"Etherbase":  "etherbaseDummyUrl",
+		"GasTarget":  uint64(1000000 * 10),
+		"GasLimit":   uint64(1000000 * 10),
+		"GasPrice":   uint64(1000000000 * 10),
+		"Unlock":     true,
+		"NodeKeyHex": "dummyNodeKeyHex",
+		"Testnet":    true,
+	})
+
+	dockerFileString := strings.TrimSpace(fmt.Sprintf("%s", dockerfile))
+
+	// This is only for concrete implementation. If you somehow want to change it do it.
+	// I have not time right now to write better test.
+	if len(dockerFileString) > 751 {
+		t.Error(len(dockerFileString))
+		t.Error("Template parsing has changed. Check if you really want to do it.")
+	}
+}

cmd/puppeth/wizard_node.go

@@ -77,6 +77,19 @@ func (w *wizard) deployNode(boot bool) {
 			infos.ethashdir = w.readDefaultString(infos.ethashdir)
 		}
 	}
+
+	fmt.Println()
+	fmt.Printf("What is the nodekeyhex for node? 'default' will generate random enode address \n")
+	infos.nodeKeyHex = w.readDefaultString("default")
+
+	if "default" == infos.nodeKeyHex {
+		infos.nodeKeyHex = ""
+	}
+
+	fmt.Println()
+	fmt.Printf("Do you want to pass testnet as an argument?. Type 'yes' if so. \n")
+	infos.testNet = w.readDefaultString("no") != "no"
+
 	// Figure out which port to listen on
 	fmt.Println()
 	fmt.Printf("Which TCP/UDP port to listen on? (default = %d)\n", infos.port)