Skip to content

Commit dd4840a

Browse files
committed
Merge branch 'hotfix_issue19_compiling'
* hotfix_issue19_compiling: add go-ethereum to vendor to prevent incompatible go-ethereum interface
2 parents b607b9c + 781f3ae commit dd4840a

File tree

1,700 files changed

+648499
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,700 files changed

+648499
-5
lines changed

compile.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ mustrun() {
77
}
88

99
echo "Install dependencies..."
10-
mustrun build/env.sh go get -v github.com/ethereum/go-ethereum
1110
mustrun build/env.sh go get -v golang.org/x/crypto/ssh/terminal
1211
mustrun build/env.sh go get -v gopkg.in/urfave/cli.v1
12+
mustrun build/env.sh go get -v golang.org/x/net/context
1313
echo "Compiling SmartPool client..."
1414
mustrun build/env.sh go build -ldflags -s -o smartpool cmd/ropsten/ropsten.go
1515
echo "Done. You can run SmartPool by ./smartpool --help"

ethereum/ethash/ethash.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ func (pow *Full) Search(block pow.Block, stop <-chan struct{}, index int) (nonce
461461
ret := C.ethash_full_compute(dag.ptr, hash, C.uint64_t(nonce))
462462
result := h256ToHash(ret.result).Big()
463463

464-
// TODO: disagrees with the spec https://github.com/ethereum/wiki/wiki/Ethash#mining
464+
// TODO: disagrees with the spec https://gopkg.in/ethereum/wiki/wiki/Ethash#mining
465465
if ret.success && result.Cmp(target) <= 0 {
466466
mixDigest = C.GoBytes(unsafe.Pointer(&ret.mix_hash), C.int(32))
467467
atomic.AddInt32(&pow.hashRate, -previousHashrate)

ethereum/share.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func processDuringRead(
9898
r := bufio.NewReader(f)
9999
buf := [128]byte{}
100100
// ignore first 8 bytes magic number at the beginning
101-
// of dataset. See more at https://github.com/ethereum/wiki/wiki/Ethash-DAG-Disk-Storage-Format
101+
// of dataset. See more at https://gopkg.in/ethereum/wiki/wiki/Ethash-DAG-Disk-Storage-Format
102102
_, err = io.ReadFull(r, buf[:8])
103103
if err != nil {
104104
log.Fatal(err)

kovan_compile.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ mustrun() {
77
}
88

99
echo "Install dependencies..."
10-
mustrun build/env.sh go get -v github.com/ethereum/go-ethereum
1110
mustrun build/env.sh go get -v golang.org/x/crypto/ssh/terminal
1211
mustrun build/env.sh go get -v gopkg.in/urfave/cli.v1
12+
mustrun build/env.sh go get -v golang.org/x/net/context
1313
echo "Compiling SmartPool client..."
14-
mustrun build/env.sh go build -o kovan cmd/kovan/main.go
14+
mustrun build/env.sh go build -ldflags -s -o kovan cmd/kovan/main.go
1515
echo "Done. You can run SmartPool by ./kovan --help"

vendor/github.com/ethereum/go-ethereum/.dockerignore

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ethereum/go-ethereum/.gitattributes

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ethereum/go-ethereum/.github/CONTRIBUTING.md

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ethereum/go-ethereum/.github/ISSUE_TEMPLATE.md

+20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ethereum/go-ethereum/.gitignore

+32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ethereum/go-ethereum/.mailmap

+92
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/ethereum/go-ethereum/.travis.yml

+157
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)