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.

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

Merge/foundation master 20200714 #144

Merged
merged 18 commits into from
Jul 15, 2020
Merged

Conversation

meowsbits
Copy link
Contributor

Merges the last few commits unique to EF master prior to their v1.9.16 release, as well as a few subsequent commits since.

fjl and others added 18 commits July 9, 2020 17:45
This is a resubmit of erigontech/erigon#556. The performance
benefit of this change is negligible, but it does remove a TODO.
This change introduces garbage collection for the light client. Historical
chain data is deleted periodically. If you want to disable the GC, use
the --light.nopruning flag.
* modify code owners

* add marius
This fixes a corner case in discv5. The issue cannot happen in discv4
because it performs IP checks on all incoming node information.
* core: added local tx pool test case

* core, crypto: various allocation savings regarding tx handling

* core/txlist, txpool: save a reheap operation, avoid some bigint allocs

Co-authored-by: Marius van der Wijden <[email protected]>
…n-master-20200714

Conflicts:
      .github/CODEOWNERS
      README.md
      cmd/geth/main.go
      cmd/geth/usage.go
      consensus/clique/clique.go
      core/rawdb/database.go
      core/rawdb/freezer.go
      eth/downloader/downloader.go
      internal/ethapi/api.go
      les/client.go
      les/server.go
      params/version.go
@meowsbits meowsbits merged commit d74ff3d into master Jul 15, 2020
@meowsbits meowsbits deleted the merge/foundation-master-20200714 branch July 15, 2020 00:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants