Skip to content
This repository has been archived by the owner on Jan 5, 2021. It is now read-only.

Merge go-ethereum updates into 2.5.3 #69

Merged
merged 63 commits into from
Dec 1, 2017
Merged

Merge go-ethereum updates into 2.5.3 #69

merged 63 commits into from
Dec 1, 2017

Conversation

5chdn
Copy link
Collaborator

@5chdn 5chdn commented Nov 27, 2017

Upstream changes since v2.5.3 include:

  • internal/ethapi: Add method getBalanceFromJs for work with address as bytes #15297
  • swarm/api: bug fix exact match for manifest #15329
  • cmd/puppeth: new version as presented at devcon3 #15390
  • Minor comments cleanup #15495
  • rpc: allow dumb empty requests for AWS health checks #15496
  • accounts/keystore: change modtime for test case files to be bigger than 1sec. #15498
  • core/vm, internal/ethapi: tracer no full storage, nicer json output #15499
  • rpc: disallow PUT and DELETE on HTTP RPC #15501
  • rpc: minor cleanups to RPC PR #15505
  • internal/ethapi: Changed output in txpool.inspect #15506
  • .github: add CODEOWNERS #15507
  • Fix typo in README.md #15509
  • eth, internal: Implement getModifiedAccountsBy(Hash|Number) using trie diffs #15512
  • cmd/utils: Disallow --lightserv in light mode #15514
  • cmd, consensus, eth: split ethash related config to it own #15520
  • core, les: clean up tx journal file after testing #15521
  • accounts: fix two races in the account manager #15526
  • accounts/keystore: Ignore initial trigger of rescan-event #15527
  • Fix issue with geth account new #15529
  • build: fix typo in comment #15538
  • cmd: fix typo in comment #15539
  • Fix code comment typos #15547
  • core/state: copy trie too, not just content #15549
  • internal/ethapi: avoid recreating JavaScript tracer wrappers #15552

Closes #70

Fabio Barone and others added 30 commits November 9, 2017 10:38
it's -> its

pet peeve, and I like to imagine I'm not alone.
rpc: allow dumb empty requests for AWS health checks
…#15499)

* core/vm, internal/ethapi: tracer no full storage, nicer json output

* core/vm, internal/ethapi: omit disabled trace fields
internal/ethapi: changed output in txpool.inspect
* Add method getBalanceFromJs for work with address as bytes

* expect []byte instead of common.Address in ethapi tracer
accounts: fix two races in the account manager
accounts/keystore: Ignore initial trigger of rescan-event
…e diffs (#15512)

* eth, internal: Implement  using trie diffs

* eth, internal: Changes in response to review

* eth: More fixes to getModifiedAccountsBy*

* eth: minor polishes on error capitalization
karalabe and others added 14 commits November 24, 2017 13:55
internal/ethapi: avoid recreating JavaScript tracer wrappers
* cmd, consensus, eth: split ethash related config to it own

* eth, consensus: minor polish

* eth, consenus, console: compress pow testing config field to single one

* consensus, eth: document pow mode
accounts/keystore: change modtime for test case files to be bigger than 1sec.
swarm/api: bug fix exact match for manifest
core/state: copy trie too, not just content
* Disallow --lightserv in light mode

* Reformatted

* cmd/utils: reduce nesting levels a bit
@5chdn 5chdn added the review label Nov 27, 2017
@Varunram Varunram assigned Varunram and immartian and unassigned Varunram Dec 1, 2017
@Varunram
Copy link
Contributor

Varunram commented Dec 1, 2017

Builds fine with go1.9 on Unix.

Copy link
Contributor

@Varunram Varunram left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works fine for me

@Varunram
Copy link
Contributor

Varunram commented Dec 1, 2017

Was about to point those fixed, thanks @5chdn! I'll merge this one.

@Varunram Varunram merged commit 6942270 into master Dec 1, 2017
@5chdn 5chdn deleted the a5-ethereum branch December 1, 2017 09:20
@Varunram
Copy link
Contributor

Reverting to this branch for 2.6.1

@immartian
Copy link
Contributor

off the topic, I can imagine more future bumps with Ethereum, if they keep adding more unstable features without a broader view of its lifecycle.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^^

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[2.5.2] Build Errors on macOS High Sierra