ShyftNetwork · GregTheGreek · Dec 17, 2018 · Nov 20, 2018 · Nov 28, 2018 · Nov 14, 2018
diff --git a/.gitignore b/.gitignore
@@ -62,3 +62,5 @@ shyftBlockExplorerApi/vendor/**/.git
 shyftBlockExplorerApi/vendor/*
 !shyftBlockExplorerApi/vendor/*.json
 
+build/_workspace/*
+
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,8 @@ language: go
 go_import_path: github.com/ShyftNetwork/go-empyrean
 
 matrix:
+  allow_failures:
+    - os: osx
   include:
   - os: linux
     dist: trusty

diff --git a/README.md b/README.md
@@ -12,6 +12,10 @@ go-empyrean is based on a fork of go-ethereum. Much of the functionality and pro
 
 https://shyftnetwork.github.io/go-empyrean/#setup
 
+#### Tag Release Command
+
+`gren release --tags=v0.8.2 --data-source=prs --override`
+
 #### Dependencies
 
  - go 1.10
@@ -72,6 +76,42 @@ To stop Geth, **`crtl+C`** in the terminal window, if you proceed with the start
 
 To see transactions being submitted on the network see the sendTransactions command in the CLI section of this readme.
 
+#####SHH/Whisper
+The shyft go_empyrean node, unlike go ethereum starts the SHH whisper client by default. This is to facilitate broadcast messaging from the shyft js bridge to each of the mining nodes.
+
+To disable the whisper client a startup flag --disablewhisper is provided, which must be passed into the command line when starting up geth.
+
+```
+geth --disablewhisper
+
+```
+
+To overwrite the default whisper variables, the following flags are also provided:
+
+    --shh.maxmessagesize - sets the maximum message size fir the whisper client (integer) -(default: 1048576)  --shh.maxmessagesize=128
+    --shh.pow - the minimum POW accepted for processing whisper messages (float64 - default: 0.2) --shh.pow=0.3
+    --shh.restrict-light - restrictions connections between two whisper light clients (boolean - default: true) --shh.restrict-light
+
+To authenticate whisper messages a call is made to a smart contract that has a predetermined address on the blockchain.
+Upon starting up a geth node if a user wishes to use this functionality they should ensure 
+that the WhisperSignersContract variable in config.toml contains the contract address for authentication of Whisper Signers.
+
+The authentication of WhisperSigner's broadcast messages relies on automatically generated go contract bindings using the 
+the abigen cmd line utility. Should the contract be changed or modified these bindings will need to be regenerated.
+Steps for regenerating are as follows:
+
+```$xslt
+1. Generate the abi for the subject contract and save it at ./generated_bindings/contract_abis/whispersigner_abi.json.
+
+2. Run the following command to regenerate the contract bindings:
+
+./build/bin/abigen  --sol shyft-cli/web3/validSignersDeploy/ValidSigners.sol  --pkg shyft_contracts --out generated_bindings/whisper_signer_binding.go
+
+```
+
+It should be noted that the authentication currently relies on a smart contract boolean returning function [isValidSigner(bool)], 
+that for a given signature address returns true if the contract or contract owner has a public key matching the signature.
+
 #### Docker Images
 
 Two sets of Docker Images are available for ShyftGeth, the Postgresql Database, and the Shyft Blockchain Explorer, which can be used for local development and testnet connection. The development settings are included in docker-compose.yml, the testnet settings are included in docker-compose.production.yml. To launch these containers you will need to have docker-compose installed on your computer. Installation instructions for docker-compose are available [here](https://docs.docker.com/install/).

diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go
@@ -89,7 +89,7 @@ func runCmd(ctx *cli.Context) error {
 		genesisConfig *core.Genesis
 	)
 	if ctx.GlobalBool(MachineFlag.Name) {
-		tracer = NewJSONLogger(logconfig, os.Stdout)
+		tracer = vm.NewJSONLogger(logconfig, os.Stdout)
 	} else if ctx.GlobalBool(DebugFlag.Name) {
 		debugLogger = vm.NewStructLogger(logconfig)
 		tracer = debugLogger

diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go
@@ -68,7 +68,7 @@ func stateTestCmd(ctx *cli.Context) error {
 	)
 	switch {
 	case ctx.GlobalBool(MachineFlag.Name):
-		tracer = NewJSONLogger(config, os.Stderr)
+		tracer = vm.NewJSONLogger(config, os.Stderr)
 
 	case ctx.GlobalBool(DebugFlag.Name):
 		debugger = vm.NewStructLogger(config)

diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go
@@ -256,7 +256,7 @@ func newFaucet(genesis *core.Genesis, port int, enodes []*discv5.Node, network u
 	}
 	for _, boot := range enodes {
 		old, err := enode.ParseV4(boot.String())
-		if err != nil {
+		if err == nil {
 			stack.Server().AddPeer(old)
 		}
 	}

diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go
@@ -77,7 +77,7 @@ Account #2: {289d485d9771714cce91d3393d764e1311907acc} keystore://{{.Datadir}}/k
 }
 
 func TestAccountNew(t *testing.T) {
-	geth := runGeth(t, "account", "new", "--lightkdf")
+	geth := runGeth(t, "--disablewhisper", "account", "new", "--lightkdf")
 	defer geth.ExpectExit()
 	geth.Expect(`
 Your new account is locked with a password. Please give a password. Do not forget this password.
@@ -89,7 +89,7 @@ Repeat passphrase: {{.InputLine "foobar"}}
 }
 
 func TestAccountNewBadRepeat(t *testing.T) {
-	geth := runGeth(t, "account", "new", "--lightkdf")
+	geth := runGeth(t, "--disablewhisper", "account", "new", "--lightkdf")
 	defer geth.ExpectExit()
 	geth.Expect(`
 Your new account is locked with a password. Please give a password. Do not forget this password.
@@ -102,7 +102,7 @@ Fatal: Passphrases do not match
 
 func TestAccountUpdate(t *testing.T) {
 	datadir := tmpDatadirWithKeystore(t)
-	geth := runGeth(t, "account", "update",
+	geth := runGeth(t, "--disablewhisper", "account", "update",
 		"--datadir", datadir, "--lightkdf",
 		"f466859ead1932d743d622cb74fc058882e8648a")
 	defer geth.ExpectExit()
@@ -117,7 +117,7 @@ Repeat passphrase: {{.InputLine "foobar2"}}
 }
 
 func TestWalletImport(t *testing.T) {
-	geth := runGeth(t, "wallet", "import", "--lightkdf", "testdata/guswallet.json")
+	geth := runGeth(t, "--disablewhisper", "wallet", "import", "--lightkdf", "testdata/guswallet.json")
 	defer geth.ExpectExit()
 	geth.Expect(`
 !! Unsupported terminal, password will be echoed.
@@ -132,7 +132,7 @@ Address: {d4584b5f6229b7be90727b0fc8c6b91bb427821f}
 }
 
 func TestWalletImportBadPassword(t *testing.T) {
-	geth := runGeth(t, "wallet", "import", "--lightkdf", "testdata/guswallet.json")
+	geth := runGeth(t, "--disablewhisper", "wallet", "import", "--lightkdf", "testdata/guswallet.json")
 	defer geth.ExpectExit()
 	geth.Expect(`
 !! Unsupported terminal, password will be echoed.
@@ -144,7 +144,7 @@ Fatal: could not decrypt key with given passphrase
 func TestUnlockFlag(t *testing.T) {
 	datadir := tmpDatadirWithKeystore(t)
 	geth := runGeth(t,
-		"--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0",
+		"--disablewhisper", "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0",
 		"--unlock", "f466859ead1932d743d622cb74fc058882e8648a",
 		"js", "testdata/empty.js")
 	geth.Expect(`
@@ -168,7 +168,7 @@ Passphrase: {{.InputLine "foobar"}}
 func TestUnlockFlagWrongPassword(t *testing.T) {
 	datadir := tmpDatadirWithKeystore(t)
 	geth := runGeth(t,
-		"--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0",
+		"--disablewhisper", "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0",
 		"--unlock", "f466859ead1932d743d622cb74fc058882e8648a")
 	defer geth.ExpectExit()
 	geth.Expect(`
@@ -187,7 +187,7 @@ Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could
 func TestUnlockFlagMultiIndex(t *testing.T) {
 	datadir := tmpDatadirWithKeystore(t)
 	geth := runGeth(t,
-		"--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0",
+		"--disablewhisper", "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0",
 		"--unlock", "0,2", "js", "testdata/empty.js")
 	geth.Expect(`
 Unlocking account 0 | Attempt 1/3
@@ -213,7 +213,7 @@ Passphrase: {{.InputLine "foobar"}}
 func TestUnlockFlagPasswordFile(t *testing.T) {
 	datadir := tmpDatadirWithKeystore(t)
 	geth := runGeth(t,
-		"--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0",
+		"--disablewhisper", "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0",
 		"--password", "testdata/passwords.txt", "--unlock", "0,2",
 		"js", "testdata/empty.js")
 	geth.ExpectExit()
@@ -233,7 +233,7 @@ func TestUnlockFlagPasswordFile(t *testing.T) {
 func TestUnlockFlagPasswordFileWrongPassword(t *testing.T) {
 	datadir := tmpDatadirWithKeystore(t)
 	geth := runGeth(t,
-		"--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0",
+		"--disablewhisper", "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0",
 		"--password", "testdata/wrong-passwords.txt", "--unlock", "0,2")
 	defer geth.ExpectExit()
 	geth.Expect(`
@@ -244,7 +244,7 @@ Fatal: Failed to unlock account 0 (could not decrypt key with given passphrase)
 func TestUnlockFlagAmbiguous(t *testing.T) {
 	store := filepath.Join("..", "..", "accounts", "keystore", "testdata", "dupes")
 	geth := runGeth(t,
-		"--keystore", store, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0",
+		"--disablewhisper", "--keystore", store, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0",
 		"--unlock", "f466859ead1932d743d622cb74fc058882e8648a",
 		"js", "testdata/empty.js")
 	defer geth.ExpectExit()
@@ -282,7 +282,7 @@ In order to avoid this warning, you need to remove the following duplicate key f
 func TestUnlockFlagAmbiguousWrongPassword(t *testing.T) {
 	store := filepath.Join("..", "..", "accounts", "keystore", "testdata", "dupes")
 	geth := runGeth(t,
-		"--keystore", store, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0",
+		"--disablewhisper", "--keystore", store, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0",
 		"--unlock", "f466859ead1932d743d622cb74fc058882e8648a")
 	defer geth.ExpectExit()
 

diff --git a/cmd/geth/config.go b/cmd/geth/config.go
@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math/big"
 	"os"
 	"reflect"
 	"unicode"
@@ -141,28 +142,23 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
 	return stack, cfg
 }
 
-// enableWhisper returns true in case one of the whisper flags is set.
-func enableWhisper(ctx *cli.Context) bool {
-	for _, flag := range whisperFlags {
-		if ctx.GlobalIsSet(flag.GetName()) {
-			return true
-		}
-	}
-	return false
+func disableWhisper(ctx *cli.Context) bool {
+	return ctx.GlobalBool(utils.WhisperOffFlag.Name)
 }
 
 func makeFullNode(ctx *cli.Context) *node.Node {
 	stack, cfg := makeConfigNode(ctx)
-
+	if ctx.GlobalIsSet(utils.ConstantinopleOverrideFlag.Name) {
+		cfg.Eth.ConstantinopleOverride = new(big.Int).SetUint64(ctx.GlobalUint64(utils.ConstantinopleOverrideFlag.Name))
+	}
 	utils.RegisterEthService(stack, &cfg.Eth)
 
 	if ctx.GlobalBool(utils.DashboardEnabledFlag.Name) {
 		utils.RegisterDashboardService(stack, &cfg.Dashboard, gitCommit)
 	}
 	// Whisper must be explicitly enabled by specifying at least 1 whisper flag or in dev mode
-	shhEnabled := enableWhisper(ctx)
-	shhAutoEnabled := !ctx.GlobalIsSet(utils.WhisperEnabledFlag.Name) && ctx.GlobalIsSet(utils.DeveloperFlag.Name)
-	if shhEnabled || shhAutoEnabled {
+	// Shyft Note: We want whisper enabled by default and explicitly disabled through the Whisper Off Flag
+	if !disableWhisper(ctx) {
 		if ctx.GlobalIsSet(utils.WhisperMaxMessageSizeFlag.Name) {
 			cfg.Shh.MaxMessageSize = uint32(ctx.Int(utils.WhisperMaxMessageSizeFlag.Name))
 		}

diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go
@@ -32,7 +32,7 @@ import (
 
 const (
 	ipcAPIs  = "admin:1.0 debug:1.0 eth:1.0 ethash:1.0 miner:1.0 net:1.0 personal:1.0 rpc:1.0 shh:1.0 txpool:1.0 web3:1.0"
-	httpAPIs = "eth:1.0 net:1.0 rpc:1.0 web3:1.0"
+	httpAPIs = "eth:1.0 net:1.0 rpc:1.0 shh:1.0 web3:1.0"
 )
 
 // Tests that a node embedded within a console can be started up properly and
@@ -41,9 +41,11 @@ func TestConsoleWelcome(t *testing.T) {
 	coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182"
 
 	// Start a geth console, make sure it's cleaned up and terminate the console
+	// Note: Whisper is on by default and we need to pass --ws --wsaddr flags to connect to
+	// shh client
 	geth := runGeth(t,
 		"--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none",
-		"--etherbase", coinbase, "--shh",
+		"--etherbase", coinbase, "--ws", "--wsaddr=0.0.0.0",
 		"console")
 
 	// Gather all the infos the welcome message needs to contain
@@ -81,11 +83,11 @@ func TestIPCAttachWelcome(t *testing.T) {
 		defer os.RemoveAll(ws)
 		ipc = filepath.Join(ws, "geth.ipc")
 	}
-	// Note: we need --shh because testAttachWelcome checks for default
-	// list of ipc modules and shh is included there.
+	// Note: Whisper is on by default and we need to pass --ws --wsaddr flags to connect to
+	// shh client
 	geth := runGeth(t,
 		"--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none",
-		"--etherbase", coinbase, "--shh", "--ipcpath", ipc)
+		"--etherbase", coinbase, "--ipcpath", ipc, "--ws", "--wsaddr=0.0.0.0")
 
 	time.Sleep(30 * time.Second) // Simple way to wait for the RPC endpoint to open
 	testAttachWelcome(t, geth, "ipc:"+ipc, ipcAPIs)
@@ -97,9 +99,12 @@ func TestIPCAttachWelcome(t *testing.T) {
 func TestHTTPAttachWelcome(t *testing.T) {
 	coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182"
 	port := strconv.Itoa(trulyRandInt(1024, 65536)) // Yeah, sometimes this will fail, sorry :P
+
+	// Note: Whisper is on by default and we need to pass --ws --wsaddr flags to connect to
+	// shh client
 	geth := runGeth(t,
 		"--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none",
-		"--etherbase", coinbase, "--rpc", "--rpcport", port)
+		"--etherbase", coinbase, "--rpc", "--rpcport", port, "--ws", "--wsaddr=0.0.0.0")
 
 	time.Sleep(30 * time.Second) // Simple way to wait for the RPC endpoint to open
 	testAttachWelcome(t, geth, "http://localhost:"+port, httpAPIs)

diff --git a/cmd/geth/genesis_test.go b/cmd/geth/genesis_test.go
@@ -102,7 +102,7 @@ func TestCustomGenesis(t *testing.T) {
 		// Query the custom genesis block
 		geth := runGeth(t,
 			"--datadir", datadir, "--maxpeers", "0", "--port", "0",
-			"--nodiscover", "--nat", "none", "--ipcdisable",
+			"--nodiscover", "--ws", "--wsaddr=0.0.0.0", "--nat", "none", "--ipcdisable",
 			"--exec", tt.query, "console")
 		geth.ExpectRegexp(tt.result)
 		geth.ExpectExit()

diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -88,6 +88,7 @@ var (
 		utils.LightServFlag,
 		utils.LightPeersFlag,
 		utils.LightKDFFlag,
+		utils.WhitelistFlag,
 		utils.CacheFlag,
 		utils.CacheDatabaseFlag,
 		utils.CacheTrieFlag,
@@ -123,6 +124,7 @@ var (
 		utils.RinkebyFlag,
 		utils.VMEnableDebugFlag,
 		utils.NetworkIdFlag,
+		utils.ConstantinopleOverrideFlag,
 		utils.RPCCORSDomainFlag,
 		utils.RPCVirtualHostsFlag,
 		utils.EthStatsURLFlag,
@@ -152,9 +154,11 @@ var (
 
 	whisperFlags = []cli.Flag{
 		utils.WhisperEnabledFlag,
+		utils.WhisperOffFlag,
 		utils.WhisperMaxMessageSizeFlag,
 		utils.WhisperMinPOWFlag,
 		utils.WhisperRestrictConnectionBetweenLightClientsFlag,
+		utils.WhisperKeys,
 	}
 
 	metricsFlags = []cli.Flag{

diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
@@ -81,6 +81,7 @@ var AppHelpFlagGroups = []flagGroup{
 			utils.LightServFlag,
 			utils.LightPeersFlag,
 			utils.LightKDFFlag,
+			utils.WhitelistFlag,
 		},
 	},
 	{
@@ -144,6 +145,13 @@ var AppHelpFlagGroups = []flagGroup{
 			utils.PasswordFileFlag,
 		},
 	},
+	{
+		Name: "WHISPER BROADCAST KEYS",
+		Flags: []cli.Flag{
+			utils.WhisperKeys,
+			utils.PasswordFileFlag,
+		},
+	},
 	{
 		Name: "API AND CONSOLE",
 		Flags: []cli.Flag{

diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go
@@ -54,7 +54,7 @@ type alethGenesisSpec struct {
 		BlockReward             *hexutil.Big           `json:"blockReward"`
 		NetworkID               hexutil.Uint64         `json:"networkID"`
 		ChainID                 hexutil.Uint64         `json:"chainID"`
-		AllowFutureBlocks       bool                   `json:"allowFutureBlocks""`
+		AllowFutureBlocks       bool                   `json:"allowFutureBlocks"`
 	} `json:"params"`
 
 	Genesis struct {

diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go
@@ -43,7 +43,8 @@ version: '2'
 services:
   ethstats:
     build: .
-    image: {{.Network}}/ethstats{{if not .VHost}}
+    image: {{.Network}}/ethstats
+    container_name: {{.Network}}_ethstats_1{{if not .VHost}}
     ports:
       - "{{.Port}}:3000"{{end}}
     environment:

diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go
@@ -77,6 +77,7 @@ services:
   explorer:
     build: .
     image: {{.Network}}/explorer
+    container_name: {{.Network}}_explorer_1
     ports:
       - "{{.NodePort}}:{{.NodePort}}"
       - "{{.NodePort}}:{{.NodePort}}/udp"{{if not .VHost}}

diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go
@@ -56,8 +56,10 @@ services:
   faucet:
     build: .
     image: {{.Network}}/faucet
+    container_name: {{.Network}}_faucet_1
     ports:
-      - "{{.EthPort}}:{{.EthPort}}"{{if not .VHost}}
+      - "{{.EthPort}}:{{.EthPort}}"
+      - "{{.EthPort}}:{{.EthPort}}/udp"{{if not .VHost}}
       - "{{.ApiPort}}:8080"{{end}}
     volumes:
       - {{.Datadir}}:/root/.faucet
Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,3 +62,5 @@ shyftBlockExplorerApi/vendor/**/.git
		shyftBlockExplorerApi/vendor/*
		!shyftBlockExplorerApi/vendor/*.json

		build/_workspace/*