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.

Sign up for GitHub

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

Jump to bottom

upstream merge #25

Merged
merged 39 commits into from
Feb 27, 2020
Merged

upstream merge #25

merged 39 commits into from
Feb 27, 2020

Conversation

edwardmack
Copy link

PR description

This PR merges current hyperledger master branch onto chainsafe master.

Fixed Issue(s)

shemnon and others added 30 commits February 7, 2020 06:03
@shemnon
Plugin error stack traces (hyperledger#369)
f4b921b 
Because of how the Log4J2 api works exception stack traces were not
being printed.  Update to use the explicit "throwable" overloaded
methods.

Signed-off-by: Danno Ferrin <[email protected]>
@shemnon
VM Trace fixes (hyperledger#372)
059f0ae 
* correct refund addresses
* correct returned memory from static precompiled calls.
* update integration test
* precompiles sometimes get plain old CALLs

Signed-off-by: Danno Ferrin <[email protected]>
@jframe
Validate private transaction before sending to enclave (hyperledger#356)
9b35c3b 
Signed-off-by: Jason Frame <[email protected]>
@shemnon
Trace API fixes (hyperledger#377)
358ab09 
- Correct Reporting of reverts in nested call
- correct reporting and handling of value transfer in nested calls
- correct handling of precompiles via DELEGATECALL & CALLCODE
- Addition of precompiled contract gas costs
- Re-work handling of storage writes
- Initial handling of gas refunds
- fix bug in DELEGATECALL tests, we don't need gas in the stack
  * this has a cascading effect on balances in diff tests
- rework depth detection in flat trace
- two new tests blocks

Signed-off-by: Danno Ferrin <[email protected]>
@matkt @AbdelStark @RatanRSur
[BOUNTY-2] Add NAT Docker Support (hyperledger#368)
39826b1 
* add docker detection

Signed-off-by: Karim TAAM <[email protected]>

* add port mapping detection

Signed-off-by: Karim TAAM <[email protected]>

* add tests and refactor ip detection

Signed-off-by: Karim TAAM <[email protected]>

* clean RunnerBuilder

Signed-off-by: Karim TAAM <[email protected]>

* clean useless modification

Signed-off-by: Karim TAAM <[email protected]>

* spotless

Signed-off-by: Karim TAAM <[email protected]>

* resolve tests issues

Signed-off-by: Karim TAAM <[email protected]>

* streamline auto detection

Signed-off-by: Ratan Rai Sur <[email protected]>

Co-authored-by: Abdelhamid Bakhta <[email protected]>
Co-authored-by: Ratan Rai Sur <[email protected]>
@mark-terry
[PIE-1798] Priv RPC acceptance tests with stub enclave. (hyperledger#330
d252974 
)

* [PIE-1798] Added some Privacy RPC ATs with a stub enclave.

Signed-off-by: Mark Terry <[email protected]>
@shemnon
More specific task metrics names (hyperledger#389)
87f4829 
A prior refactoring had accidentally removed the specific task names
from the metrics labels.

Signed-off-by: Danno Ferrin <[email protected]>
@shemnon
More trace fixes (hyperledger#386)
ae3bd01 
* pop flat trace context when handling halts
* Better detection of precompiled and non-executed contracts
* correct from address when calling in init code
* fix some exotic nesting cases
* correct from field for init code calls at depth >1
* correct cost on a non-call
* changelog and notes

Signed-off-by: Danno Ferrin <[email protected]>
@joshuafernandes
adding the plugin-api javadoc jar at the root level (hyperledger#378)
21e02b1 
Signed-off-by: Joshua Fernandes <[email protected]>
@atoulme
BESU-56: remove erroneous links to errorprone checks (hyperledger#385)
358458d 
Signed-off-by: Antoine Toulme <[email protected]>
@jframe @EdJoJob
Changelog entry for multi-tenancy feature (hyperledger#394)
8b8a39c 
Signed-off-by: Edward Evans <[email protected]>
Signed-off-by: Jason Frame <[email protected]>
@macfarla
1.5 RC Changelog (hyperledger#395)
4c72ab7 
* 1.5 RC changelog additions

Signed-off-by: Sally MacFarlane <[email protected]>
@MadelineMurray @EdJoJob
Fixed link (hyperledger#393)
80e0ee1 
Signed-off-by: Madeline <[email protected]>

Co-authored-by: Edward <[email protected]>
@RatanRSur @MadelineMurray
docker changelog (hyperledger#391)
d06c8bf 
* docker changelog

Signed-off-by: Ratan Rai Sur <[email protected]>

* address comments

Signed-off-by: Ratan Rai Sur <[email protected]>

Co-authored-by: MadelineMurray <[email protected]>
@MadelineMurray
Added known bug to changelog (hyperledger#388)
3728c3c 
* Added known bug

Signed-off-by: Madeline <[email protected]>

* Added another known bug

Signed-off-by: Madeline <[email protected]>
@joshuafernandes
updating version to 1.4.0-rc1 (hyperledger#397)
9135622 
Signed-off-by: Joshua Fernandes <[email protected]>
@joshuafernandes
updating verion to 1.4.1-snapshot (hyperledger#398)
d82c819 
Signed-off-by: Joshua Fernandes <[email protected]>
@AbdelStark
[BESU-169] cache logs bloom filters automatically. (hyperledger#367)
6677362 
* First iteration. Draft PR.

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* fix SPDX header

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* Use block broadcaster to index log bloom.

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* Remove useless toString method

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* spotless apply

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* cacheLogsBloomForBlockHeader

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* spotless apply

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* ensurePreviousSegmentsArePresent

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* Added CLI flag to enable / disable automatic logs bloom indexing.

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* Create cache directory and cache file if not exist.

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* Fix acceptance test

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* Write cache for block only if block is new canonical head.

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* Handling of chain reorg.

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* fix

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* sportless apply

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* Address PR comments.

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* Remove unused constant.

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* spotless apply

Signed-off-by: Abdelhamid Bakhta <[email protected]>
@shemnon
[BESU-25] Use Devp2p Ping packets at v5 (hyperledger#392)
bb0c9cb 
Broadcast that we support snappy compression

Signed-off-by: Danno Ferrin <[email protected]>
@shemnon
Rename logs bloom indexer to log bloom cache to match CLI flag. (hype…
20664f9 
…rledger#401)

Changes class names, variables, and CLI flags as needed.

Signed-off-by: Danno Ferrin <[email protected]>
@mark-terry @mbaxter
[PIE-1798] Fail cases for multitenancy ATs (hyperledger#400)
3773d25 
Signed-off-by: Mark Terry <[email protected]>
@lucassaldanha
Private state update metadata and migration (hyperledger#404)
9fa9c85 
(backport from release-1.4)
Private state update metadata and migration

Signed-off-by: Lucas Saldanha <[email protected]>
@AbdelStark
[PIE-2303] Automatic log bloom caching - Remove usage of pending file. (
c38152a 
hyperledger#407)

* Don't use pending file.

Signed-off-by: Abdelhamid Bakhta <[email protected]>

* Don't use pending file.

Signed-off-by: Abdelhamid Bakhta <[email protected]>
@AbdelStark
Create a custom error when plugin is not found. (hyperledger#409)
8afd651 
Signed-off-by: Abdelhamid Bakhta <[email protected]>
@pinges
Rename method (hyperledger#412)
1b0dffc 
* rename the method isPersistingState to isPersistingPrivateState because that is what it is used for

Signed-off-by: Stefan Pingel <[email protected]>

* rename the method isPersistingState to isPersistingPrivateState because that is what it is used for

Signed-off-by: Stefan Pingel <[email protected]>

* rename the method isPersistingState to isPersistingPrivateState because that is what it is used for

Signed-off-by: Stefan Pingel <[email protected]>
@matkt
[BOUNTY-4] Add NAT Kubernetes Support (hyperledger#410)
8a68402 
* add kubernetes support

Signed-off-by: Karim TAAM <[email protected]>

* fix review issues

Signed-off-by: Karim TAAM <[email protected]>
@shemnon @AbdelStark
LogBloomCache - make sure the current segment is filled (hyperledger#411
90d46b7 
)

Make sure we cache the current cache segment with all of the data from
the beginning of the segment.  Use a flip file approach since it will be
 a partial file until done.

Signed-off-by: Danno Ferrin <[email protected]>

Co-authored-by: Abdelhamid Bakhta <[email protected]>
@shemnon
Reduce recaching in Transaction Log Bloom Filter Cache (hyperledger#415)
e28396a 
Do a cursory cache check at start up (file is present and correct size)
instead of re-generating the cache at startup.

Signed-off-by: Danno Ferrin <[email protected]>
@matkt
fix order of nat detector (hyperledger#414)
145710a 
Signed-off-by: Karim TAAM <[email protected]>
@edwardmack
Update SLOAD_GAS cost to 200 in Aztlan Gas Calculator (#23) (hyperled…
3603f8d 
…ger#382)

* Update SLOAD_GAS cost to 200 in Aztlan Gas Calculator

Change SLOAD_GAS cost in Aztlan Gas Calculator from 800 to 200 and
update functions that use SLOAD_GAS.

Signed-off-by: edwardmack <[email protected]>

* Update SLOAD_GAS cost to 200 in Aztlan Gas Calculator

Change SLOAD_GAS cost in Aztlan Gas Calculator from 800 to 200 and
update functions that use SLOAD_GAS.

Signed-off-by: edwardmack <[email protected]>
Signed-off-by: Edward Mack <[email protected]>

* remove overrides

removed overrides of calculateStorageCost and
calculateStorageRefundAmount in AztlanGasCalculator because these were
causing aztlan fork not to sync with kotti testnet.

Signed-off-by: Edward Mack <[email protected]>

* merge

Signed-off-by: Edward Mack <[email protected]>
hmijail and others added 9 commits February 22, 2020 12:39
@hmijail @CjHare
Remove unused ExecutorService init/termination (hyperledger#419)
0a19f47 
Signed-off-by: Horacio Mijail Anton Quiles <[email protected]>

Co-authored-by: CJ Hare <[email protected]>
@shemnon
Implement Eth/64 (hyperledger#425)
7fe1d47 
Wire in the fork identifier into the status messages as Eth64.

Signed-off-by: Danno Ferrin <[email protected]>
@lucassaldanha
Adds priv_getcode (hyperledger#428)
bfc40be 
* Adds priv_getcode

Signed-off-by: Joshua Richardson <[email protected]>
@anthonybuckle @CjHare
BESU-146 - check if success and return errorResponse otherwise (hyper…
30fa565 
…ledger#424)

Signed-off-by: Anthony Buckle <[email protected]>

Co-authored-by: CJ Hare <[email protected]>
@macfarla @CjHare
fixed typos (hyperledger#429)
9a088f7 
Signed-off-by: Sally MacFarlane <[email protected]>

Co-authored-by: CJ Hare <[email protected]>
@faraggi
roll back on ALL-CAPS.md files for TSC proposal (hyperledger#376)
2820587 
Signed-off-by: Felipe Faraggi <[email protected]>
@joshuafernandes
updating the changelog with 1.4.0 details (hyperledger#431)
2f6c58e 
Signed-off-by: Joshua Fernandes <[email protected]>
@matkt
[BESU-194] Remove max pivot block resets during fast sync (hyperledge…
8ced45c 
…r#427)

* remove max pivot block resets during fast sync

* increase max retry number and fix test

* change logs in the handleFailure method

* change logs related to suspicious number of retries
Signed-off-by: Karim TAAM <[email protected]>
@edwardmack
Merge branch 'master' of https://github.com/hyperledger/besu into ed/…
d119271 
…temp-master

Signed-off-by: Edward Mack <[email protected]>
@GregTheGreek
Copy link
Member

hmm. DCO doesn't like this.

@shemnon Do you envision this will be a problem?

@GregTheGreek GregTheGreek merged commit 28f7a47 into master Feb 27, 2020
@GregTheGreek GregTheGreek deleted the ed/temp-master branch February 27, 2020 22:09
@CLAassistant
Copy link

CLAassistant commented Mar 11, 2020 •
edited
Loading

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 16 committers have signed the CLA.

✅ atoulme
✅ edwardmack
❌ shemnon
❌ jframe
❌ matkt
❌ mark-terry
❌ abdelhamidbakhta
❌ MadelineMurray
❌ RatanRSur
❌ macfarla
❌ joshuafernandes
❌ anthonybuckle
❌ hmijail
❌ faraggi
❌ pinges
❌ lucassaldanha
You have signed the CLA already but the status is still pending? Let us recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GregTheGreek GregTheGreek Awaiting requested review from GregTheGreek

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.