Skip to content

Backports 0.16 pr17#3407

Merged
UdjinM6 merged 15 commits into
dashpay:developfrom
PastaPastaPasta:backports-0.16-pr17
Apr 18, 2020
Merged

Backports 0.16 pr17#3407
UdjinM6 merged 15 commits into
dashpay:developfrom
PastaPastaPasta:backports-0.16-pr17

Conversation

@PastaPastaPasta
Copy link
Copy Markdown
Member

No description provided.

@PastaPastaPasta
Copy link
Copy Markdown
Member Author

test failure seems unrelated, tests still fail after merging codablocks latest PR in test branch (https://travis-ci.com/github/PastaPastaPasta/dash/builds/159966024). Travis is somewhat happy with the tests though.

@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented Apr 14, 2020

f1d026e/bitcoin#13652 is missing some previous pr which introduced signrawtransactionwithwallet rpc

@codablock codablock added this to the 16 milestone Apr 14, 2020
@PastaPastaPasta
Copy link
Copy Markdown
Member Author

PastaPastaPasta commented Apr 14, 2020

@UdjinM6 That's weird... bitcoin#10579 is the PR which adds signrawtransactionwithwallet but this PR was merged into 0.17 and as far as I can tell never backported to 0.16, whereas bitcoin#13652 was merged into 0.17 but backported to 0.16 in bitcoin@20461fc

@PastaPastaPasta
Copy link
Copy Markdown
Member Author

Ahh, I see, the backported commit, is using the old RPC. How do you think I should resolve this? should I drop bitcoin#13652 and pick it up when I reach it in 0.17 backports or should I backport bitcoin#10579 early/now

@PastaPastaPasta
Copy link
Copy Markdown
Member Author

resolved signrawtransactionwithwallet problem

@PastaPastaPasta
Copy link
Copy Markdown
Member Author

rebased on develop

laanwj and others added 6 commits April 15, 2020 21:01
342fb80 qt: Avoid resetting on resetguisettigs=0 (MarcoFalke)

Pull request description:

  Shouldn't be affecting anyone, but might still be worth to fix at some point.

Tree-SHA512: af7fe67f1e8b3a0ff041258e3056d2e3e518258b015ee765f291e91fca86a7f7cd43c83844fd83f00a52dac2cf382db5d568aab91db636a031040551bd34172d
…aders.py.

12d1b77 [tests] Fixed intermittent failure in p2p_sendheaders.py. (lmanners)

Pull request description:

  Added handling for the case where headers are announced over more than one message.
  refs bitcoin#12453

Tree-SHA512: 2c5b48ff019089b86e358181ba170d3aac09d4ae41ec79c2718e0ee83705860501bbcb8fd94d0f5c4f86c0d54a96781a967716621bb8c5ecc991b39af3cec506
fa865ef qa: Fix wallet_listreceivedby race (MarcoFalke)

Pull request description:

  Generating a block on node 0 will only get node 0 out of IBD and not node 1. So the inv for the `txid` is dropped by node 1 and the call to `sync_all` fails.

  Solve it by a call to `sync_blocks` after `generate`.

Tree-SHA512: e21b01a9e8c90bd6a3aad290c97cc4866ab384e22797b318eed55ae2767512203597d3a184b23ad5a3fe76bdbb8a3d5c51e097d56b160232851164434059ff23
05c03d1 rpc: fix type mistmatch in listreceivedbyaddress (joemphilips)

Pull request description:

  `txids` filed in return value is supposed be `string` but it was `numeric` in the help message

Tree-SHA512: 7d860994c2d1d9149b41fd7afefc1a44460eede5a023070fcc18b0a4a19a26c5eec5abd157038c15fe7d50a3390bdaf7a4823279129eb1458b0d3c6141a533ee
3ee4be1 Make tests pass after 2020 (Bernhard M. Wiedemann)

Pull request description:

  Make tests pass after 2020
  and also test that 64 bit integers are properly handled

  Without this patch, the failure was
  ```
  unknown location(0): fatal error: in "rpc_tests/rpc_ban": std::runtime_error: JSON value is not an object as expected
  test/rpc_tests.cpp(260): last checkpoint
  ```

  I found this when testing reproducible builds for openSUSE Linux packages, building 15 years from now (this is the expected lifespan of today's software)

  There is 1 other issue in ./src/qt/test/paymentservertests.cpp that fails to verify a cert that expires in 2022 after 10y.

  ```
  QWARN  : PaymentServerTests::paymentServerTests() PaymentRequestPlus::getMerchant: Payment request: certificate expired or not yet active:  QSslCertificate("3", "01", "Ipbt+DxK8RDQd25/5ueXqw==", (), ("Payment Request Test Merchant"), QMap(), QDateTime(2012-12-10 16:37:24.000 UTC Qt::TimeSpec(UTC)), QDateTime(2022-12-08 16:37:24.000 UTC Qt::TimeSpec(UTC)))
  FAIL!  : PaymentServerTests::paymentServerTests() Compared values are not the same
  ```

Tree-SHA512: d6c49879b6abbddbecc1168ac24c2d4f4ee9949b615607b3e6ba350c415136017f32cd112708791b063a2f2dc1b12f295f4ee55a346bd2128aa6480088d8db48
…nedfunds

faa18ca wallet: Erase wtxOrderd wtx pointer on removeprunedfunds (MarcoFalke)

Pull request description:

  This prevents segfaults, when reading from the freed memory.

Tree-SHA512: 04f8190dea7901cf1cc298d5db98c83b02858f27114c5ef4da738accd176d6647d6b81f3dc39f3d5912b1a981cf0599370fd391c4154ffbde97afc1fac389123
@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented Apr 16, 2020

07f13ae/bitcoin#13545 is missing changes for lint-includes.sh which was introduced in bitcoin#11878 and changed/moved later, should be dropped probably or marked as "partial merge" (to make sure we won't miss these changes later). Otherwise looks good imo.

MarcoFalke and others added 9 commits April 16, 2020 10:24
…ta_xor. Remove Boost dependency.

962d8ee Remove boost dependency (boost/assign/std/vector.hpp) (practicalswift)
c6fd0df Fix incorrect tests (practicalswift)

Pull request description:

  * Fix test case `streams_serializedata_xor`.
  * Remove Boost dependency.

Tree-SHA512: 609c4ced1b6a8b86f6a37e4220535f1b3c9f2e80949cd034ecc069a94c55c05cd514f2e132fe7f715161ee29811a0fadb6903635c507411d8dc3e7efe864edeb
…uiltin_clz*

1830784 Consensus: Fix bug when compiler do not support __builtin_clz* (532479301)

Pull request description:

  #ifdef is not correct since defination is defined to 0 or 1. Should change to #if

Tree-SHA512: ba13a591d28f4d7d6ebaab081be4304c43766a611226f8d2994c8db415dfcf318e82217d26a8c4af290760c68eded9503b39535b0e6e079ded912e6a8fca5b36
4a6c0e3 Modernize best block mutex/cv/hash variable naming (Pieter Wuille)
45dd135 Fix csBestBlock/cvBlockChange waiting in rpc/mining (Pieter Wuille)

Pull request description:

  This is an alternative to bitcoin#11694.

  It reintroduces a uint256 variable with the best block hash, protected by csBestBlock, and only updated while holding it.

  Also rename the involved variable to modern guidelines, as there are very few uses.

Tree-SHA512: 826a86c7d3cee7fe49f99f4398ae99e81cb0563197eaeba77306a3ca6072b67cdb932bc35720fc0f99c2a57b218efa029d0b8bdfb240591a629b2e90efa3199d
…tions

f506c0a [qt] send: Clear All also resets coin control options (Sjors Provoost)

Pull request description:

  This change makes it so that a custom change address and manual input selection are removed if the user clicks Clear All in the send screen.

Tree-SHA512: 78746043a74c9c26ef476eb0df7ce95411683749d9f6b2747222eaac751e241ea7d4d7ce9e4e69ed0b19fa76754d8584e5bef5bba1ad6598f8e39c784b4264d2
Currently, error messages (such as InitError) are displayed as-is, which
means Qt does auto detection on the format.

This means that it's possible to inject HTML from the command line
though e.g. specifying a wallet name with HTML in it. This isn't
a direct security risk because fetching content from internet is
disabled (and as far as I know we never report strings received
from the network this way). However, it can be confusing.

So explicitly force the format as text.
…leave the grandchildren, etc. active

89e70f9 Fix that CWallet::AbandonTransaction would only traverse one level (Ben Woosley)

Pull request description:

  Prior to this change, it would mark only the first layer of
  child transactions abandoned, due to always following the input `hashTx`
  rather than the current `now` tx.

Tree-SHA512: df068b49637d299ad73237c7244005fe5aa966d6beae57aff12e6948f173d9381e1b5d08533f7e3a1416991ed57f9f1f7b834057141d85c07dc60bb1f0872cea
…ds6 to pnSeed6

d1b828b correcting the array name from pnSeeds6 to pnSeed6 (okayplanet)

Pull request description:

  After reading this comment, I tried to grep the code base for `pnSeeds6` but couldn't find anything.  After some time wasted, I realized the arrays actually start with `pnSeed6`.

Tree-SHA512: 78a66d96128267278c7b02dbc0c966a7447cb258c71b04be5a00de8ed10ee11437550bbbf7dd4208315a59d19408a31b62774ae6dbc521261818dece4970a602
…rded variables in the networking code

4894133 Add missing lock in CNode::copyStats(...) (practicalswift)
b312cd7 Add missing locking annotations (practicalswift)

Pull request description:

  Add Clang thread safety annotations for variables guarded by:
  * `cs_addrLocal`
  * `cs_addrName`
  * `cs_feeFilter`
  * `cs_filter`
  * `cs_hSocket`
  * `cs_inventory`
  * `cs_mapLocalHost`
  * `cs_most_recent_block`
  * `cs_proxyInfos`
  * `cs_sendProcessing`
  * `cs_setBanned`
  * `cs_SubVer`
  * `cs_vOneShots`
  * `cs_vProcessMsg`
  * `cs_vRecv`
  * `cs_vSend`

  Changed files:
  * `src/net.{cpp,h}`
  * `src/netbase.cpp`

Tree-SHA512: 319a1574a07d766e81fab19b9cfdcf8b5f0b175034ebef220cd406f1672b4ef2c57f5c456c623456ca7a1f96308de69c73535792e9e4c34b848b55fd4f35fc95
…-watchonly addresses

73041c3 RPC Docs: addmultisigaddress is intended for non-watchonly addresses (Gregory Sanders)

Pull request description:

  Spent a couple hours debugging why my p2sh watchonly funds were not appearing in various accounting calls when address was imported via `addmultisigaddress`.

Tree-SHA512: 0673e276e5ca8cdc4c9357bd835a29bd5a994520a78179600944932c700917142930288bf179f5e89b0874beaf1a88bd70129f3a297a46df42a10bab847017bb
@PastaPastaPasta
Copy link
Copy Markdown
Member Author

renamed 07f13ae to be a partial merge, should grab it when I go fully through 0.17

@PastaPastaPasta
Copy link
Copy Markdown
Member Author

test failure seems unrelated (pose test)

Copy link
Copy Markdown

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6 UdjinM6 merged commit 20a0f3a into dashpay:develop Apr 18, 2020
UdjinM6 added a commit to UdjinM6/dash that referenced this pull request Apr 18, 2020
One of rebases in dashpay#3407 reverted the fix
@UdjinM6 UdjinM6 mentioned this pull request Apr 18, 2020
@PastaPastaPasta PastaPastaPasta deleted the backports-0.16-pr17 branch April 18, 2020 16:18
codablock pushed a commit that referenced this pull request Apr 18, 2020
One of rebases in #3407 reverted the fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants