Backports 0.18 pr15 #4359

Munkybooty · 2021-08-23T15:03:48Z

I can't get feature_proxy.py to work at all

github-actions · 2021-08-24T16:16:49Z

This pull request has conflicts, please rebase.

.travis.yml

src/wallet/test/wallet_tests.cpp

src/rpc/blockchain.cpp

test/lint/lint-python.sh

doc/developer-notes.md

test/functional/feature_pruning.py

1db71d4 Add names to Travis jobs (Graham Krizek) Pull request description: This adds the `name` field to all the TravisCI jobs. This will make it more obvious in the Travis UI what job is failing or passing. Tree-SHA512: d65841bab0a80d098a46a4bb54af2f9a93db7abca93b848aa00d25dcf4cd74323371c7c0b78b4dbf390b197e7ba32262a91631e201fc505f834021753f700b28

…inux 79f0a3f Get more info about GUI-related issue on Linux (Hennadii Stepanov) Pull request description: There is bunch of combinations Linux Distro (Debian, Fedora, Ubuntu etc) + Desktop Environment (GNOME, KDE, Xfce etc) + Graphical Shell (Unity, GNOME Shell etc). This PR adds related requests to the issue template. Providing such data will make GUI-related issue reviewing and reproducing easier. Tree-SHA512: 9728d7826108b62a916c43523572d1da1b52b43a21b3d550a84225ff67951224e0b8a9394627f274d7c65383b3f526bcd12cc40eef9d7fec174c19d1abf333d8

UdjinM6

It looks like 15102 requires much more than just 14457 - let's drop them both for now. Also, pls see https://github.com/UdjinM6/dash/commits/pr4359 for more fixes.

f12e1d0 rpc: Avoid permanent cs_main lock in getblockheader (João Barbosa) Pull request description: This PR reduces the `cs_main` lock scope in `getblockheader` RPC. Tree-SHA512: bc51f80e15d1b32d3c7886836457f9929706b6aad9841dafce31ffca444281471b21b56192bb50de774184b9377412f815ad8d3d2439049a7e64d2e59c415767

332b3dd util: Make ToLower and ToUpper take a char (Wladimir J. van der Laan) edb5bb3 util: remove unused [U](BEGIN|END) macros (Wladimir J. van der Laan) 7fa238c Replace use of BEGIN and END macros on uint256 (Wladimir J. van der Laan) Pull request description: Two cleanups in `util/strencodings.h`: - Remove `[U](BEGIN|END)` macros — The only use of these was in the Merkle tree code with `uint256` which has its own `begin` and `end` methods which are better. - Make ToLower and ToUpper take a char — Unfortunately, `std::string` elements are (bare) chars. As these are the most likely type to be passed to these functions, make them use char instead of unsigned char. This avoids some casts. Tree-SHA512: 96c8292e1b588d3d7fde95c2e98ad4e7eb75e7baab40a8e8e8209d4e8e7a1bd3b6846601d20976be34a9daabefc50cbc23f3b04200af17d0dfc857c4ec42aca7

… on intro 9d0e528 implements different disk sizes for different networks on intro (marcoagner) Pull request description: Fixes bitcoin#13213. Mostly, I layed out the concept to open the PR for refinement and getting feedback if the approach is okay. Changes are expected. Two points: - The values for both new consts `TESTNET_BLOCK_CHAIN_SIZE` and `TESTNET_CHAIN_STATE_SIZE` is certainly not optimal; I just checked the size of my testnet3 related dirs and set them to little bit higher values. Which values should be used? - Should we do something like this to regtest? Or these "niceties" do not matter when on regtest? Thanks! Tree-SHA512: 8ae87a29fa8356b899e7a823c76cde793d9126b4ee59554d7a2a8edb088fe42a19976b34c06c2fd4a98a727e1e4971dd983f42b6093ea6caa255b45004e22bb4

@MarcoFalke

3a0e76f Replace remaining 0 with nullptr in Qt code (Ben Woosley) 9096276 Don't use zero as null pointer constant (-Wzero-as-null-pointer-constant) (practicalswift) Pull request description: This corrects all violations of `-Wzero-as-null-pointer-constant` identified in the Qt codebase. These changes are extracted from bitcoin#15112 as suggested by @MarcoFalke to ease review. This is in service of enabling `-Wzero-as-null-pointer-constant`, which should eliminate this as a concern going forward. Note there are 2 non-Qt changes: `src/test/allocator_tests.cpp` and `src/wallet/db.cpp`. Tree-SHA512: 206bd668802147ba42bc413c2d7d259cb59aca9ec1da74a6bf2ca3932e60ae492faacbc61bcee0fd6b4b49a4d59d075b7e5404f0526b36c47718f9b0587e7768

…antics fa5e373 validation: Add cs_main locking annotations (MarcoFalke) fa5c346 doc: Add comment to cs_main and mempool::cs (MarcoFalke) fafe941 test: Add missing validation locks (MarcoFalke) fac4558 sync: Add RecursiveMutex type alias (MarcoFalke) Pull request description: Both the chain state and the transaction pool are validation specific, but access to them is protected by two locks. The two locks have the following semantics: * Writing to the chain state or adding transactions to the transaction pool -> Take both `cs_main` and `mempool::cs` * Reading either or removing transactions from the the transaction pool -> Take only the appropriate lock Tree-SHA512: 6f6e612ffc391904c6434a79a4f3f8de1b928bf0a3e3434b73561037b395e2b40a70a5a4bd8472dd230e9eacc8e5d5374c904a3c509910cf3971dd7ff59a626c

…in github-merge f1bd219 contrib: Allow use of github API authentication in github-merge (Wladimir J. van der Laan) a4c5bbf contrib: Add support for http[s] URLs in github-merge (Wladimir J. van der Laan) 059a3cf contrib: Detailed reporting for http errors in github-merge (Wladimir J. van der Laan) Pull request description: Three commits I had locally for `github-merge.py`: - *Detailed reporting for http errors in github-merge*: Print detailed error, this makes it easier to diagnose github API issues. - *Add support for http[s] URLs in github-merge*: Sometimes it can be useful to use github-merge with read-only access (say, for reviewing and testing from untrusted VMs). - *Allow use of github API authentication in github-merge*: The API request limit for unauthenticated requests is quite low. I started running into rate limiting errors. The limit for authenticated requests is much higher. This patch adds an optional configuration setting `user.ghtoken` that, when set, is used to authenticate requests to the API. Tree-SHA512: ca8ae1874a787263e49d915d7cf31c0c0f50aba229c9440265bf1fda69f7e00641d1492512b93d76c17ff1766859283d640d37770acb120898736ad97efbd5c2

7c572c4 Add workaround for QProgressDialog bug on macOS (Hennadii Stepanov) Pull request description: Fix bitcoin#15016. Refs: - [QTBUG-65750: QProgressDialog too small width at larger font size on Mac](https://bugreports.qt.io/browse/QTBUG-65750) - [QTBUG-70357: QProgressDialog is too narrow to fit the text of its label](https://bugreports.qt.io/browse/QTBUG-70357) With this PR: ![screenshot from 2018-12-26 22-01-30](https://user-images.githubusercontent.com/32963518/50456571-1aa35b80-095e-11e9-8442-c285555f2bee.png) Tree-SHA512: dde668dfa7d2144973c0e868aea7fdb7d90f78584836d024ffefb8df4a709d6842fa3601954759b4462856a80e81df15b861ea39506599230a16928b621d9f8f

@Sjors

5b4283c Add comment describing fDisconnect behavior (Carl Dong) Pull request description: Motivated by @Sjors here: bitcoin#14605 (comment) Tree-SHA512: 8fc52eb4d3b5651c19c49b47fad75e8fb939cf524ada647e88d8d5aad7726052d94e500c1ebdb2a41b67bc4669ee61ff151a5cff81a52c68c900da562ef21751

ca91661 Fix wallet selector size adjustment (Hennadii Stepanov) Pull request description: This PR sets `QComboBox::AdjustToContents` instead of default `QComboBox::AdjustToContentsOnFirstShow` for wallet selectors. Before (in master): ![screenshot from 2019-01-14 20-47-22](https://user-images.githubusercontent.com/32963518/51133771-83d00d80-183e-11e9-812c-3a1119fa766e.png) After (with this PR): ![screenshot from 2019-01-14 20-48-43](https://user-images.githubusercontent.com/32963518/51133788-90546600-183e-11e9-8394-eb62a998b90f.png) Tree-SHA512: c23ac91905bb31aaa32f2fccc02b01f5707d8b094020fe6a75a9e099e78f9191670474920234a01c46480f67d3d311f44ff46f1f4202cd50a4a6d4d09a8342ce

948d8f4 lint: Enable python linters via an array (Ben Woosley) Pull request description: This assures consistent recording of the enabled linters. This applies the same fix as bitcoin#15170 to lint-python.sh Tree-SHA512: 6d03f919e86e7c2465475c88b25dd84391282bcc11728078024daf0432a7dccddf9e4a2cdae35d6ef374971cb4e12f0fa21b58f757e25f2fe7c12ceb4f4b2c57

70e7cee Trivial: Doxygenize existing CBufferedFile and VectorReader comments (Ben Woosley) 9431e1b Trivial: fixup a few doxygen comments (Ben Woosley) Pull request description: These were not declared properly, so their results are not properly processed. E.g.: https://dev.visucore.com/bitcoin/doxygen/rpcdump_8cpp.html#a994c8748aaa60fbb78009ff8a0638dea https://dev.visucore.com/bitcoin/doxygen/coins_8cpp.html#aa03af24ef3570144b045f4fca7a0d603 https://dev.visucore.com/bitcoin/doxygen/wallet_2wallet_8cpp.html#a5c2a7725ff8796f03471f844ecded3d9 > A third alternative is to use a block of at least two C++ comment lines, where each line starts with an additional slash or an exclamation mark. http://www.doxygen.nl/manual/docblocks.html Tree-SHA512: c13fd48ac78f25e51b1281385747e8be4bd6e27e0a0f8704608aa5c66c16715c639f1cf27018b1bf05fc2eaed6c7b9be05a68365ffe1d88dd3f400d453b7bead

65bc38d [doc] add notes on release notes (John Newbery) Pull request description: Explains when and how release notes should be written. Tree-SHA512: 94085d5a30499f41e6d1821b9f157aea40b3cff61a8ba606fed1b239e794ffe6769f985f53400715d712d12aadaa8db8cfca08dd1700a1fe17df86e0e554eac2

fa5e6ef wallet: Fixup rescanblockchain result doc (MarcoFalke) Pull request description: This was probably accidentally added to the wrong line when addressing the feedback here: bitcoin#7061 (comment) I already added the default values in bitcoin#14877, but it could be clarified more that this really has no specific block height as default value, since the tip can change during a rescan. Tree-SHA512: 48a3c5143e2b7129ee8f396d2e77550cb393fbe45f5936aeebeb7a201d61560336a3ae47b26bb757a4dbbe217e06abfd67a5a673aef266b6c4d7a80d049a2b49

6f6514a Correct units for "-dbcache" and "-prune" (Hennadii Stepanov) Pull request description: Actually, all `dbcache`-related values in the code are measured in MiB (not in megabytes, MB) or in bytes (e.g., `nTotalCache`). See: https://github.com/bitcoin/bitcoin/blob/master/src/txdb.h https://github.com/bitcoin/bitcoin/blob/ba8c8b22272ad40fe2de465d7e745532bab48d3b/src/init.cpp#L1405-L1424 Also, "-prune" is fixed: 1. The GUI values in GB are translated to the node values in MiB correctly. 2. The maximum of the "prune" `QSpinBox` is not limited by default value of 99 (GB). Fix: bitcoin#15106 Tree-SHA512: 151ec43b31b1074db8b345fedb1dcc10bde225899a5296bfc183f57e1553d13ac27db8db100226646769ad03c9fcab29d88763065a471757c6c41ac51108459d

fa5ce3f travis: Compile trusty with depends for now (MarcoFalke) fa83999 travis: Compile once on trusty (MarcoFalke) Pull request description: To avoid accidentally regressing again on bitcoin#15172, we should compile at least once with gcc4.8 (the minimum required version) Note that this uses the trusty image, which will be removed in a few months from the docker hub, so in the future it had to be switched to the centos7 (or similar) image, which should come with gcc4.8 as well. Tree-SHA512: 9d1704464bde8dbaf3319ac35f72d32dce549818730d3b2fb63df817f84a88dd64aa3419b97a57c1120ffb254784503b7d2675b1291d4ed073cd2a2488aa717d

…pool state changing 2bc4c3e Notify the GUI that the keypool has changed to set the receive button (Andrew Chow) 14bcdbe Check for more than private keys disabled to show receive button (Andrew Chow) Pull request description: Currently the Receive button in the GUI is displayed enabled or disabled by the initial state of the wallet when the wallet is first loaded. The button is only enabled or disabled depending on whether the disable private keys flag is set when the wallet is loaded. However, future changes to the wallet means that this initial state and check may no longer be accurate. bitcoin#14938 introduces empty wallets which do not have private keys. An empty wallet that is loaded should have the Receive button disabled, and then it should become enabled once `sethdseed` is used so that a keypool can be generated and new keys generated. Likewise, with bitcoin#14075, a wallet can be loaded with no keypool initially, so the button should be disabled. Later, public keys can be imported into the keypool, at which time the button should become enabled. When the keypool runs out again (no new keys are generated as the keypool only consists of imports), the button should become disabled. This PR makes it so that the button becomes enabled and disabled as the keypool state changes. The check for whether to enable or disable the receive button has changed to checking whether it is possible to get new keys. It now checks for whether the wallet has an HD seed and, if not, whether the private keys are disabled. When an action happens which would make it possible for a new address to be retrieved or make it possible for a no more addresses to be retrieved, a signal is emitted which has the GUI recheck the conditions for the Receive button. These actions are setting a new HD seed, topping up the keypool, retrieving a key from the keypool, and returning a key to the keypool. Tree-SHA512: eff15a5337f4c64ecd7169414fb47053c04f6a0f0130341b6dd9799ac4d79f451e25284701c668971fca33f0909d5352a474a2c12349375bedfdb59b63077d50

…ockheaderToJSON b9f226b rpc: Remove cs_main lock from blockToJSON and blockHeaderToJSON (João Barbosa) 343b98c rpc: Specify chain tip instead of chain in GetDifficulty (João Barbosa) 54dc13b rpc: Fix SoftForkMajorityDesc and SoftForkDesc signatures (João Barbosa) Pull request description: Motivated by bitcoin#11913 (comment), this pull makes `blockToJSON` and `blockheaderToJSON` free of `cs_main` locks. Locking `cs_main` was required to access `chainActive` in order to check if the block was in the chain and to retrieve the next block index. With the this approach, `CBlockIndex::GetAncestor()` is used in a way to check if the block belongs to the specified chain tip and, at the same time, get the next block index. Tree-SHA512: a6720ace0182c19033bbed1a404f729d793574db8ab16e0966ffe412145611e32c30aaab02975d225df6d439d7b9ef2070e732b16137a902b0293c8cddfeb85f

PastaPastaPasta

A few minor changes

.travis.yml

PastaPastaPasta · 2021-08-24T23:51:01Z

src/util/strencodings.h

 #include <string>
 #include <vector>

-#define BEGIN(a)            ((char*)&(a))


15139 is missing https://github.com/bitcoin/bitcoin/pull/15139/files#diff-3f688af8f182edecd9c33977b905b3e71dc010574f721fd4e328bdbc7706f574L592-R592

~~Does 15139 depend on something else?~~

See

dash/src/util/strencodings.cpp

Line 623 in ff5a947

std::transform(str.begin(), str.end(), str.begin(), [](unsigned char c){return ToLower(c);});

I'm a little confused here

Basically, here:

dash/src/util/strencodings.cpp

Line 623 in ff5a947

std::transform(str.begin(), str.end(), str.begin(), [](unsigned char c){return ToLower(c);});

Need to modify unsigned char to just char to be inline with upstream

So... i'm a little more confused because i have that change already. looking at the commit hash, its seems like you're looking at it from your branch somehow.

doc/developer-notes.md

.travis.yml

Munkybooty · 2021-08-27T03:08:39Z

src/util/strencodings.cpp

 void Downcase(std::string& str)
 {
-    std::transform(str.begin(), str.end(), str.begin(), [](unsigned char c){return ToLower(c);});
+    std::transform(str.begin(), str.end(), str.begin(), [](char c){return ToLower(c);});


@PastaPastaPasta Right here

UdjinM6

LGTM, utACK

PastaPastaPasta

utACK for merging via merge commit

## Issue being fixed or feature implemented we failed to backport 13216 correctly in #4359 noticed this while reviewing/testing #5255 ## What was done? fix it ## How Has This Been Tested? run qt with `-resetguisetting` and check info with and without the patch on testnet for example (or tweak regtest params and test there) ## Breaking Changes n/a ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

## Issue being fixed or feature implemented we failed to backport 13216 correctly in dashpay#4359 noticed this while reviewing/testing dashpay#5255 ## What was done? fix it ## How Has This Been Tested? run qt with `-resetguisetting` and check info with and without the patch on testnet for example (or tweak regtest params and test there) ## Breaking Changes n/a ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

github-actions bot added the needs rebase label Aug 24, 2021

Munkybooty force-pushed the backports-0.18-pr15 branch from 8c6c481 to 0a3ce36 Compare August 24, 2021 16:26

github-actions bot removed the needs rebase label Aug 24, 2021

UdjinM6 requested changes Aug 24, 2021

View reviewed changes

MarcoFalke and others added 2 commits August 24, 2021 14:30

Munkybooty force-pushed the backports-0.18-pr15 branch 2 times, most recently from 521d1bc to 9ae8784 Compare August 24, 2021 18:37

UdjinM6 requested changes Aug 24, 2021

View reviewed changes

laanwj and others added 16 commits August 24, 2021 19:14

Munkybooty force-pushed the backports-0.18-pr15 branch from 9ae8784 to 31c5651 Compare August 24, 2021 23:15

MarcoFalke and others added 3 commits August 24, 2021 19:16

Fix 12153

c7aa119

Fix 15219

d144020

Munkybooty force-pushed the backports-0.18-pr15 branch from 31c5651 to d144020 Compare August 24, 2021 23:20

PastaPastaPasta requested changes Aug 25, 2021

View reviewed changes

UdjinM6 and others added 2 commits August 26, 2021 12:26

15020 new lines

ee02db8

15276 new line

4632686

Munkybooty commented Aug 27, 2021

View reviewed changes

UdjinM6 added this to the 18 milestone Aug 27, 2021

UdjinM6 approved these changes Aug 27, 2021

View reviewed changes

PastaPastaPasta approved these changes Aug 27, 2021

View reviewed changes

PastaPastaPasta merged commit 8311441 into dashpay:develop Aug 27, 2021

UdjinM6 mentioned this pull request Sep 2, 2021

More of 13743: refactor: Replace boost::bind with std::bind #4385

Merged

Munkybooty deleted the backports-0.18-pr15 branch November 30, 2021 03:58

UdjinM6 mentioned this pull request Apr 25, 2023

fix(qt): provide correct data into intro dlg #5348

Merged

5 tasks

Backports 0.18 pr15 #4359

Backports 0.18 pr15 #4359

Uh oh!

Conversation

Munkybooty commented Aug 23, 2021

Uh oh!

github-actions bot commented Aug 24, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PastaPastaPasta Aug 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta Aug 25, 2021

Choose a reason for hiding this comment

Uh oh!

Munkybooty Aug 26, 2021

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta Aug 26, 2021

Choose a reason for hiding this comment

Uh oh!

Munkybooty Aug 27, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Munkybooty Aug 27, 2021

Choose a reason for hiding this comment

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

PastaPastaPasta Aug 24, 2021 •

edited

Loading