Develop merge into Master for the v4.6.1 mainnet release #1205
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
… 001 (PR #873) Merged, as we want to continue testing on develop.
Update configure.ac to c++17
Update ax_cxx_compile_stdcxx.m4 from bitcoin
Copied from bitcoin master branch.
Use C++11 member initializer in CNodeState
Manually copied/adapted from bitcoin#21370
net_processing:
IteratorComparator add const. [c++17]
…1021) backport from bitcoin #9683
Ref: CVE-2017-8798 bitcoin#10414 bitcoin#15993 configure-checks for miniupnpc API >=10. This commit does not include the compile-time checks from bitcoin#15993.
Remove compiler warning.
Added 7 nodes picked from my 3 testnet wallets. Better than the two we know do not respond to anything.
We don't want these to change.
Fixes issue #800.
* contrib: Dockerfile updated
Use Ubuntu 20.04.
Drop outdated bitcoin-ppa.
Build Berkeley DB 4.8 from source with install_db4.sh.
Usage: 'docker build -t ravencoin:4.7 -f contrib/Dockerfile .'
* Remove obsolete Dockerfiles.
Expat renamed files because of CVE-2013-0340/CWE-776. This switches to v.2.4.1. Source changed from sourceforge to github. doc: update dependencies.md
* gui: option to hide text in toolbar Add option to only show icons in toolbar. Closes #478 * Don't require restart. * Update comment.
Update libevent to 2.1.12-stable.
https://raw.githubusercontent.com/libevent/libevent/release-2.1.12-stable/ChangeLog
backport bitcoin#204
In Qt 5 the last column resizing with dragging its left edge works
out-of-the-box.
The current TableViewLastColumnResizingFixer implementation could put
the last column content out of the view port and confuse a user.
moved app out of the if.
removed extra qt version check.
Code segment moved to match the order it appears
Switched alt-<num> hotkeys to match the correct order.
Set hotkey for Restricted assets (ALT+8).
…tion (#1019) Handle pre-fork padded P2SH-ish transactions like v4.3.2.1.
Disable units spinbox if max units is already set.
Set minvalue for spinbox after setting value, to allow
updates when the number of units in the selected asset is
lower than the number of units in the previous.
Update asset list when the qcombobox is shown.
Fixes #1059
Backport part of bitcoin#14624 bitcoin#3db746beb407f7cdd9cd6a605a195bef1254b4c0
Bump version number for second test release.
It does not make sense to force dns seeds by default.
If the wallet does not have words, an error message is shown. This happens after the wallet is unlocked, to check for words. This change locks the wallet after showing the error.
backport of bitcoin#22054 Slightly modified for Ravencoin. Co-Authored-by: fdov <fd21@pm.me> Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
…zed reads (#1161) Manual backport of bitcoin PR #17906 Initialize CConnman byte counters during construction, so GetTotalBytesRecv() and GetTotalBytesSent() methods don't return garbage before Start() is called. Change shouldn't have any effect outside of the GUI. It just fixes a race condition during a qt test that was observed on travis: https://travis-ci.org/bitcoin/bitcoin/jobs/634989685
manual backport of bitcoin PR # 14993 rpc: Fix data race (UB) in InterruptRPC()
Manual backport of bitcoin PR 14728 Reachable from either place where SetIP is used when our best-guess addrLocal for a peer is IPv4, but the peer tells us it's reaching us at an IPv6 address. In that case, SetIP turns an IPv4 address into an IPv6 address without setting the scopeId, which is subsequently read in GetSockAddr during CNetAddr::ToStringIP and passed to getnameinfo. Fix by ensuring every constructor initializes the scopeId field with something.
Manual backport of bitcoin PR #13907 The largest sensible size for a locator is log in the number of blocks. But, as noted by Coinr8d on BCT a maximum size message could encode a hundred thousand locators. If height were used to limit the messages that could open new attacks where peers on long low diff forks would get disconnected and end up stuck. Ideally, nodes first first learn to limit the size of locators they send before limiting what would be processed, but common implementations back off with an exponent of 2 and have an implicit limit of 2^32 blocks, so they already cannot produce locators over some size. This sets the limit to an absurdly high amount of 101 in order to maximize compatibility with existing software.
…t) (#1167) Co-authored-by: practicalswift <practicalswift@users.noreply.github.com>
* [wallet] Tidy up CWallet::FundTransaction * [wallet] Make CWallet::FundTransaction atomic Co-authored-by: João Barbosa <joao.paulo.barbosa@gmail.com>
This bug was discovered in Dec-2021 when two blocks were mined within one second. Pool operators locked up and required restarting. It happened because when CheckTxInputs finds a double spend, ConnectBlock fails but didn't mark the bad txn to be flushed from the mempool.
* SetAddressBook(...) is locking cs_wallet internally * DelAddressBook(...) is locking cs_wallet internally Co-authored-by: practicalswift <practicalswift@users.noreply.github.com>
* gui: create asset view - browse ipfs button
* Add button to open ipfs-hash in the configured ipfs-viewer.
This can be handy to verify your ipfs-hash is correct, before creating the asset.
* Remove a check that enabled the Check Availability button once the `Add IPFS/Txid hash` was enabled.
* gui: reissue asset view, browse ipfs button.
* Add button to open ipfs-hash in the configured ipfs-viewer.
This can be handy to verify your ipfs-hash is correct, before reissuing the asset.
* net: Add missing locks in net.{cpp,h}
* writing variable 'nTotalBytesRecv' requires holding mutex 'cs_totalBytesRecv' exclusively
* writing variables 'nTotalBytesSent'/'nMaxOutboundTotalBytesSentInCycle'/'nMaxOutboundCycleStartTime' require holding mutex 'cs_totalBytesSent' exclusively
* writing variable 'nMaxOutboundTimeframe'/'nMaxOutboundLimit' require holding mutex 'cs_totalBytesSent' exclusively
* writing variable 'vAddedNodes' requires holding mutex 'cs_vAddedNodes' exclusively
* Add Clang thread safety analysis annotations
Co-authored-by: practicalswift <practicalswift@users.noreply.github.com>
Co-authored-by: hans-schmidt <43421934+hans-schmidt@users.noreply.github.com>
Fixes issue #1102. Removed some brackets. Removed one asset_quantity. Adjusted indentation.
Fix mining bug - lockup in CreateNewBlock loop
Put the how-to md files front and center for novice users
Fix bug with in memory qualifier address checking
hans-schmidt
changed the title
|
I cross checked all commits, and they seem ok to me. @TronBlack One thing to think about is updating the build pipeline: |
jeroz1
approved these changes
Aug 17, 2022
|
I prefer not to update the build environment at this time. |
TronBlack
approved these changes
Aug 19, 2022
HyperPeek
approved these changes
Aug 21, 2022
There was a problem hiding this comment.
With leaving p2sh out of this merge this does not touch consensus, so I do not see a risk here. I have merged / seen / approved most individual commits before and apart from the language (.ts) files I checked the diffs once more.
Approved and good to go from my side -- great work!
|
Three approvals (not including me). Good to go. |
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 is the merge of the develop branch into master, including all the improvements made and tested over the last 2 years with the exception of P2SH asset support, which is not included.
There are quite a few bug fixes and GUI improvements, but NO changes in consensus.