From d9ea815862a3cae92cde81a3ca6b32289e924f72 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Mon, 28 Mar 2016 08:26:35 -0400 Subject: [PATCH 1/4] Invalidate bad block + new nodes Added new supernodes Invalidate badhash --- core/blocks.go | 1 + exp/backend.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/core/blocks.go b/core/blocks.go index f01e6f1bf415..186fabe56b61 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -21,4 +21,5 @@ import "github.com/expanse-project/go-expanse/common" // Set of manually tracked bad hashes (usually hard forks) var BadHashes = map[common.Hash]bool{ common.HexToHash("05bef30ef572270f654746da22639a7a0c97dd97a7050b9e252391996aaeb689"): true, + common.HexToHash("f26dcf2653956030cd913a5ac1572751c97b09e95518c0806751df167a7f965f"): true, } diff --git a/exp/backend.go b/exp/backend.go index 589b3a8b500d..9d88fd115f29 100644 --- a/exp/backend.go +++ b/exp/backend.go @@ -70,6 +70,10 @@ var ( defaultBootNodes = []*discover.Node{ // EXP/DEV Go Bootnodes + discover.MustParseNode("enode://d54d27577bf433e90888b4346f9d114eb8555cdc69a4506107fb4b0be5eef9ecc2ca8294cd1949d8ee98680ae3fe068f47f419188d6530dd62767ae8465257a4@13.71.153.127:42786"), + discover.MustParseNode("enode://a934fc7aa093ad6a6967f9b567e41c3756b4668036a77587181460d18f1ce79cbc38c8cbed0646dfe146246386d3703478b360cb21216a7ebf41caf4874b953e@13.76.138.233:42786"), + discover.MustParseNode("enode://869221366f11cd4cbeceb3abafb00b960c7781d49aad80d3164848c80276bf0a0f9266469efb9c825d103f088418932b3ae0633650fd16834dffdc88caa84a73@104.41.34.83:42786"), + discover.MustParseNode("enode://f8015c35301b4dcacb1dee1605965fa19f2e2c6730cbdcdaa9967a64044ad8d3cf7e9c2231b01a24117adc0eb74d6573c507b613bc88c7422831bbf7221e653e@104.208.33.128:42786"), discover.MustParseNode("enode://7f335a047654f3e70d6f91312a7cf89c39704011f1a584e2698250db3d63817e74b88e26b7854111e16b2c9d0c7173c05419aeee2d0321850227b126d8b1be3f@46.101.156.249:42786"), discover.MustParseNode("enode://df872f81e25f72356152b44cab662caf1f2e57c3a156ecd20e9ac9246272af68a2031b4239a0bc831f2c6ab34733a041464d46b3ea36dce88d6c11714446e06b@178.62.208.109:42786"), discover.MustParseNode("enode://96d3919b903e7f5ad59ac2f73c43be9172d9d27e2771355db03fd194732b795829a31fe2ea6de109d0804786c39a807e155f065b4b94c6fce167becd0ac02383@45.55.22.34:42786"), From 3158d475662ee868a82fadf3b5ede280dfca666a Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Tue, 29 Mar 2016 08:38:47 -0400 Subject: [PATCH 2/4] killthecanary --- core/canary.go | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/core/canary.go b/core/canary.go index be853e6acb62..aa52c203a54f 100644 --- a/core/canary.go +++ b/core/canary.go @@ -24,10 +24,7 @@ import ( ) var ( - jeff = common.HexToAddress("959c33de5961820567930eccce51ea715c496f85") - vitalik = common.HexToAddress("c8158da0b567a8cc898991c2c2a073af67dc03a9") - christoph = common.HexToAddress("7a19a893f91d5b6e2cdf941b6acbba2cbcf431ee") - gav = common.HexToAddress("539dd9aaf45c3feb03f9c004f4098bd3268fef6b") + lol = common.HexToAddress("959c33de5961820567930eccce51ea715c496f85") ) // Canary will check the 0'd address of the 4 contracts above. @@ -35,17 +32,8 @@ var ( // dies a horrible death. func Canary(statedb *state.StateDB) bool { var r int - if (statedb.GetState(jeff, common.Hash{}).Big().Cmp(big.NewInt(0)) > 0) { - r++ - } - if (statedb.GetState(gav, common.Hash{}).Big().Cmp(big.NewInt(0)) > 0) { - r++ - } - if (statedb.GetState(christoph, common.Hash{}).Big().Cmp(big.NewInt(0)) > 0) { - r++ - } - if (statedb.GetState(vitalik, common.Hash{}).Big().Cmp(big.NewInt(0)) > 0) { - r++ + if (statedb.GetState(lol, common.Hash{}).Big().Cmp(big.NewInt(0)) > 0) { + } return r > 1 } From a2e1e5c6a0ab5bacafae4f0caa165bbcdf3c6b09 Mon Sep 17 00:00:00 2001 From: Ramesh Nair Date: Wed, 23 Mar 2016 22:53:20 +0800 Subject: [PATCH 3/4] [release/1.3.6]: cmd/utils: removed password line endings when not using liner. (cherry picked from commit 6f300344135894970bc417285c2f45f723cd3aa5) --- cmd/utils/cmd.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 5cbb581244b5..3e00836e1483 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -91,6 +91,7 @@ func PromptPassword(prompt string, warnTerm bool) (string, error) { } fmt.Print(prompt) input, err := bufio.NewReader(os.Stdin).ReadString('\n') + input = strings.TrimRight(input, "\r\n") fmt.Println() return input, err } From bf324bd24be9036046e36c6248b2d7c31cce9eca Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Fri, 1 Apr 2016 12:12:59 +0200 Subject: [PATCH 4/4] VERSION, cmd/geth: bumped version number 1.3.6 --- VERSION | 2 +- cmd/geth/main.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 80e78df6830f..95b25aee2591 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.5 +1.3.6 diff --git a/cmd/geth/main.go b/cmd/geth/main.go index dab2d8fc0579..b6e835f31af4 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -48,10 +48,10 @@ import ( const ( ClientIdentifier = "Geth" - Version = "1.3.5" + Version = "1.3.6" VersionMajor = 1 VersionMinor = 3 - VersionPatch = 5 + VersionPatch = 6 ) var (