Skip to content

Commit

Permalink
Update geth to v1.8.15 (#1213)
Browse files Browse the repository at this point in the history
* Update geth to v1.8.15

* Apply patches
  • Loading branch information
dshulyak committed Sep 25, 2018
1 parent ff7c0e0 commit 529e18a
Show file tree
Hide file tree
Showing 70 changed files with 1,245 additions and 575 deletions.
7 changes: 4 additions & 3 deletions Gopkg.lock

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

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ignored = [ "github.com/ethereum/go-ethereum/ethapi" ]

[[constraint]]
name = "github.com/ethereum/go-ethereum"
version = "=v1.8.14"
version = "=v1.8.15"

[[override]]
name = "github.com/golang/protobuf"
Expand Down
2 changes: 1 addition & 1 deletion _assets/patches/geth/0014-whisperv6-notifications.patch
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ index 880cced09..702556079 100644
+ return nil
+}
+
// HasKeyPair checks if the the whisper node is configured with the private key
// HasKeyPair checks if the whisper node is configured with the private key
// of the specified public pair.
func (whisper *Whisper) HasKeyPair(id string) bool {
+ deterministicID, err := toDeterministicID(id, keyIDSize)
Expand Down
13 changes: 0 additions & 13 deletions _assets/patches/geth/0036-fix-whisper-expire-loop.patch

This file was deleted.

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

23 changes: 8 additions & 15 deletions vendor/github.com/ethereum/go-ethereum/cmd/geth/main.go

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/cmd/geth/usage.go

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

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

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

44 changes: 25 additions & 19 deletions vendor/github.com/ethereum/go-ethereum/cmd/utils/flags.go

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

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

Loading

0 comments on commit 529e18a

Please sign in to comment.