Upstream merge 1 #30
Merged
Upstream merge 1 #30
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7bbe98c to
21cd336
Compare
instead of uninitialized
40c6093 to
ba66381
Compare
Avoid stomping on flags from 1st readhdr invocation
Use MDB_CURRENT to avoid seeking to new key when appending DUPs. Reinit cursor on new batch, if appending DUPs.
Might be a bit heavy handed, but conservative.
This completes and fixes various parameters docs
Takes about 10 ms, which takes pretty much all of the get_info RPC, which is called pretty often from wallets. Also add a new lock so we don't need to lock the blockchain lock, which will avoid blocking for a long time when calling the getinfo RPC while syncing. Users of get_difficulty_for_next_block who need the lock will have locked it already.
This bumps DB version to 2, migration code will run for v1 DBs
…onero#3939 This means monero-wallet-rpc still does, but the user level program does not.
…ardware /monero#3921
… /monero#3936 Avoids valgrind reporting uninitialized data usage
Reported to "contain[s] an embedded color calibration (ICC) profile which is copyright Hewlett Packard but lack license"
…rt /monero#3948 This is the new name for --guard-against-pwnage 0
Cold signing was always using Borromean range proofs, causing a larger tx, and an incorrect fee
a connection's timeout is halved for every extra connection from the same host. Also keep track of when we don't need to use a connection anymore, so we can close it and free the resource for another connection. Also use the longer timeout for non routable local addresses.
Update readme to include pcslite dependency
|
Two more commits corresponding to the HackerOne disclosures have been added:
Also, according to @moneromooo-monero's advice, monero-project#4080 and monero-project#4130 have been added in order to eliminate the rare possibility of the daemon crashing introduced in monero-project#3866 and monero-project#3962. |
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR picks up all the patches merged to Monero's master branch since the rebase starting point (May 10, 4b728d7) up to the current latest (June 25, 31f47d7) excluding Monero specific things, specifically:
src/rpc/get_output_distribution_cache.hare clearedNote that the database version has been bumped to v2 (415405beb27b10747ed998ee2697d924b3dabd13) which automatically triggers the conversion from v1. This conversion is irreversible, so make a backup if you need the older version for some reason.
Also note that RapidJSON was made as a submodule (75f8731c190e992d1e749cf1caaeee9464812066), so you'd need to do
git submodule init && git submodule updateto makegitrecognize it properly.