Skip to content

Commit

Permalink
Merge branch 'hotfix_issue19_compiling'
Browse files Browse the repository at this point in the history
* hotfix_issue19_compiling:
  add go-ethereum to vendor to prevent incompatible go-ethereum interface
  • Loading branch information
tranvictor committed Apr 12, 2017
2 parents b607b9c + 781f3ae commit dd4840a
Show file tree
Hide file tree
Showing 1,700 changed files with 648,499 additions and 5 deletions.
2 changes: 1 addition & 1 deletion compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ mustrun() {
}

echo "Install dependencies..."
mustrun build/env.sh go get -v github.com/ethereum/go-ethereum
mustrun build/env.sh go get -v golang.org/x/crypto/ssh/terminal
mustrun build/env.sh go get -v gopkg.in/urfave/cli.v1
mustrun build/env.sh go get -v golang.org/x/net/context
echo "Compiling SmartPool client..."
mustrun build/env.sh go build -ldflags -s -o smartpool cmd/ropsten/ropsten.go
echo "Done. You can run SmartPool by ./smartpool --help"
2 changes: 1 addition & 1 deletion ethereum/ethash/ethash.go
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ func (pow *Full) Search(block pow.Block, stop <-chan struct{}, index int) (nonce
ret := C.ethash_full_compute(dag.ptr, hash, C.uint64_t(nonce))
result := h256ToHash(ret.result).Big()

// TODO: disagrees with the spec https://github.com/ethereum/wiki/wiki/Ethash#mining
// TODO: disagrees with the spec https://gopkg.in/ethereum/wiki/wiki/Ethash#mining
if ret.success && result.Cmp(target) <= 0 {
mixDigest = C.GoBytes(unsafe.Pointer(&ret.mix_hash), C.int(32))
atomic.AddInt32(&pow.hashRate, -previousHashrate)
Expand Down
2 changes: 1 addition & 1 deletion ethereum/share.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func processDuringRead(
r := bufio.NewReader(f)
buf := [128]byte{}
// ignore first 8 bytes magic number at the beginning
// of dataset. See more at https://github.com/ethereum/wiki/wiki/Ethash-DAG-Disk-Storage-Format
// of dataset. See more at https://gopkg.in/ethereum/wiki/wiki/Ethash-DAG-Disk-Storage-Format
_, err = io.ReadFull(r, buf[:8])
if err != nil {
log.Fatal(err)
Expand Down
4 changes: 2 additions & 2 deletions kovan_compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ mustrun() {
}

echo "Install dependencies..."
mustrun build/env.sh go get -v github.com/ethereum/go-ethereum
mustrun build/env.sh go get -v golang.org/x/crypto/ssh/terminal
mustrun build/env.sh go get -v gopkg.in/urfave/cli.v1
mustrun build/env.sh go get -v golang.org/x/net/context
echo "Compiling SmartPool client..."
mustrun build/env.sh go build -o kovan cmd/kovan/main.go
mustrun build/env.sh go build -ldflags -s -o kovan cmd/kovan/main.go
echo "Done. You can run SmartPool by ./kovan --help"
3 changes: 3 additions & 0 deletions vendor/github.com/ethereum/go-ethereum/.dockerignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/ethereum/go-ethereum/.gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions vendor/github.com/ethereum/go-ethereum/.github/CONTRIBUTING.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions vendor/github.com/ethereum/go-ethereum/.github/ISSUE_TEMPLATE.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions vendor/github.com/ethereum/go-ethereum/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

92 changes: 92 additions & 0 deletions vendor/github.com/ethereum/go-ethereum/.mailmap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

157 changes: 157 additions & 0 deletions vendor/github.com/ethereum/go-ethereum/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dd4840a

Please sign in to comment.