Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No executable gexp file in Darwin 1.7.2 downloads #32

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

No executable gexp file in Darwin 1.7.2 downloads #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d9ea815
Invalidate bad block + new nodes
chrisfranko Mar 28, 2016
3158d47
killthecanary
chrisfranko Mar 29, 2016
a2e1e5c
[release/1.3.6]: cmd/utils: removed password line endings when not us…
hiddentao Mar 23, 2016
bf324bd
VERSION, cmd/geth: bumped version number 1.3.6
obscuren Apr 1, 2016
9e323d6
Merge pull request #2406 from obscuren/release/1.3.6
obscuren Apr 1, 2016
e4223c8
Merge remote-tracking branch 'refs/remotes/ethereum/master' into chri…
chrisfranko Apr 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.5
1.3.6
5 changes: 3 additions & 2 deletions cmd/gexp/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,11 @@ import (
const (

ClientIdentifier = "Gexp"
Version = "1.3.5"
Version = "1.3.6"

VersionMajor = 1
VersionMinor = 3
VersionPatch = 5
VersionPatch = 6
)

var (
Expand Down
1 change: 1 addition & 0 deletions cmd/utils/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
1 change: 1 addition & 0 deletions core/blocks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
18 changes: 3 additions & 15 deletions core/canary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,16 @@ 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.
// If two or more are set to anything other than a 0 the canary
// 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
}
4 changes: 4 additions & 0 deletions exp/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down