Merge pull request ethereum#192 from nextyio/testnet

dccs: update token manager state position

.gitignore

@@ -5,6 +5,8 @@
 #   git config --global core.excludesfile ~/.gitignore_global
 
 /tmp
+/data/**/gonex
+/data/**/history
 */**/*un~
 */**/*.test
 *un~
@@ -21,7 +23,6 @@ build/_vendor/pkg
 *~
 .project
 .settings
-
 # used by the Makefile
 /build/_workspace/
 /build/bin/

cmd/gonex/main.go

@@ -42,7 +42,7 @@ import (
 )
 
 const (
-	clientIdentifier = "geth" // Client identifier to advertise over the network
+	clientIdentifier = "gonex" // Client identifier to advertise over the network
 )
 
 var (

consensus/dccs/dccs.go

@@ -921,7 +921,7 @@ func deployConsensusContracts(state *state.StateDB, chainConfig *params.ChainCon
 		}
 
 		// replace the random generated sender address in MultiOwnable's manager field
-		storage[common.BigToHash(common.Big1)] = owner.Hash()
+		storage[common.BigToHash(common.Big0)] = owner.Hash()
 
 		// Deploy only, no upgrade
 		deployContract(state, params.TokenAddress, code, storage, false)

node/config.go

@@ -239,7 +239,7 @@ func (c *Config) NodeName() string {
 	name := c.name()
 	// Backwards compatibility: previous versions used title-cased "Geth", keep that.
 	if name == "geth" || name == "geth-testnet" {
-		name = "gonex"
+		name = "Geth"
 	}
 	if c.UserIdent != "" {
 		name += "/" + c.UserIdent