Upstream merge 2 #77
Merged
Upstream merge 2 #77
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
also use reserve where appropriate
…onero#3716 Processing typically is the bottleneck
key derivation and checking for incoming outputs are threaded in batch before adding blocks to the local blockchain. Other minor bits and bobs are also cached.
Decrease the number of worker threads by one to account for the fact the calling thread acts as a worker thread now
Speeds up syncing with a lot of outgoing outputs as key generation runs Cryptonight.
…ubaddresses /monero#3979
…estnet::X : stagenet ? config::stagenet::X : config::X /monero#3982
Signed-off-by: Jean Pierre Dudey <jeandudey@hotmail.com>
for privacy reasons, so an untrusted node can't easily track wallets from IP address to IP address, etc. The granularity is 1024 blocks, which is about a day and a half.
…monero#3907 This is based on how much an attacking miner stands to lose in block rewardy by mining a private chain which double spends a payment. This is not foolproof, since mining is based on luck, and breaks down as the attacking miner nears 50% of the network hash rate, and the estimation is based on a constant block reward.
…ocesses /monero#3994
Also remove dust() from UnsignedTransactionImpl (already in PendingTransactionImpl)
a7353e5 to
1643745
Compare
Includes various rapidjson fixes.
Fixes building in MSYS2 with openssl 1.1.1
|
Also added monero-project#4105 and monero-project#4471 so that it compiles on MSYS2. |
|
Also added monero-project#4295 to make it compile on MSYS2. |
Current GCC produces broken binaries with these options
|
Also added monero-project#4060 and monero-project#4290 to make it compile and run on Windows. |
…4108 It's not 100% certain it'll be needed, but it avoids getinfo needing the blockchain lock and potentially blocking
|
Also added monero-project#4108 so that the difficulty drift bug is hopefully fixed. |
This inconsistent state would not actually be used in practice
|
Also added monero-project#4806 which seems potentially related to the issue |
|
Added a sanity check patch made by @moneromooo-monero for testing purposes. I'll remove it when this PR is to be merged. |
01870c5 to
9d49606
Compare
|
Now that the testing seems to be deemed complete, the sanity checking code is removed. |
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 merges upstream patches after monero-project#3977 which is the last one included in #30; specifically, it includes upstream PRs from monero-project#3716 up to monero-project#4067, both merged on June 28.
Notably, the wallet scanning speedup PR monero-project#3716 adds significant amount of changes to some critical parts of the wallet code where some merge conflicts (due to the recent security upstream fixes #31 & #45 having been merged earlier) had to be resolved with care. Please test and confirm that the wallet functions without problems.