Backport missing PRs from Bitcoin 0.14 - Part 9 #1859

codablock · 2018-01-19T13:17:38Z

Continuation of #1770

~~We are nearly done with 0.14. After this one I'll create a (hopefully) final PR for 0.14 with bitcoin#8391 (need to figure out the correct BIP heights for Dash) and other PRs I skipped so far.~~

UPDATE: I splitted up the PR into 2 as it got too big, so this one is not the last one.

7451cf5 Allow bitcoin-tx to parse partial transactions (jnewbery)

c5c92c4 Update python tests for default tx version=2 (BtcDrak) dab207e Preserve tx version=1 for certain tests (BtcDrak) c5d746a tiny test fix for mempool_tests (Alex Morcos) 1f0ca1a Bump default transaction version to 2 (BtcDrak)

9cb6624 Fix testfile reference (BtcDrak) 23208ac Remove unused test files and references (BtcDrak)

fa558be test: Include tx data in EXTRA_DIST (MarcoFalke)

122786d Consensus: Remove ISM (NicolasDorier)

UdjinM6

should drop src/test/data/txcreatemultisig3.json, src/test/data/txcreateoutpubkey2.json, src/test/data/txcreatescript3.json (due to "type": "witness_v0_*")

UdjinM6 · 2018-01-20T15:33:37Z

src/chainparams.cpp

transactions per second

UdjinM6 · 2018-01-20T15:37:28Z

src/chainparams.cpp

should say // * estimated number of transactions per second after that timestamp

UdjinM6 · 2018-01-20T15:45:36Z

src/test/data/txcreatemultisig4.json

should be dashified

UdjinM6 · 2018-01-20T15:46:00Z

src/test/data/txcreateoutpubkey3.json

should be dashified

UdjinM6 · 2018-01-20T15:46:23Z

src/test/data/txcreatescript4.json

should be dashified

UdjinM6 · 2018-01-20T16:09:48Z

src/wallet/rpcwallet.cpp

trailing whitespaces

UdjinM6 · 2018-01-20T16:19:55Z

src/chainparams.cpp

should say // * estimated number of transactions per second after that timestamp

UdjinM6 · 2018-01-20T16:25:18Z

src/rpc/client.cpp

rpc/client.cpp:139:28: warning: missing field 'paramName' initializer [-Wmissing-field-initializers] { "setbip69enabled", 0 }, ^

UdjinM6 · 2018-01-20T16:33:17Z

src/consensus/params.h

nMinerConfirmationWindow was not a typo :) should s/retargetting/retargeting/ instead

UdjinM6 · 2018-01-20T16:34:29Z

src/qt/sendcoinsdialog.cpp

should probably do the same to "+tr

This is needed because Dashs chainparams start BIP34 on block 1 and the removal of IsSuperMajority results in the checks to trigger immediately in tests. Also update miner_tests nonces

afffeea fixup! Add pruneblockchain RPC to enable manual block file pruning. (Russell Yanofsky) 1fc4ec7 Add pruneblockchain RPC to enable manual block file pruning. (mrbandrews)

fe7e593 Fix use-after-free in CTxMemPool::removeConflicts() (Suhas Daftuar)

54ee3fc RPC help updated (Michael Rotarius)

faaf3ca travis: make distdir before make (MarcoFalke)

…r warning db904db Deprecate non-txindex getrawtransaction and better warning (Pieter Wuille)

…hain RPC 918d1fb Return height of last block pruned by pruneblockchain RPC (Russell Yanofsky)

…and update it df36371 Update estimated transaction count data (Pieter Wuille) e356d9a Shorten variable names and switch to tx/s (Pieter Wuille) 6dd8116 Remove SIGCHECK_VERIFICATION_FACTOR (Pieter Wuille) 3641141 Move tx estimation data out of CCheckPointData (Pieter Wuille) a4bac66 [MOVEONLY] Move progress estimation out of checkpoints (Pieter Wuille)

0c50909 testcases: explicitly specify transaction version 1 (John Newbery) b7e144b Add test cases to test new bitcoin-tx functionality (jnewbery) 61a1534 Add all transaction output types to bitcoin-tx. (jnewbery) 1814b08 add p2sh and segwit options to bitcoin-tx outscript command (Stanislas Marion)

…entRejects dfbe0d5 Add unstored orphans with rejected parents to recentRejects (Alex Morcos)

7f1fa99 [depends] native_ds_store 1.1.0 (fanquake) c6347ae [depends] dbus 1.10.14 (fanquake) a4c6da0 [depends] ccache 3.3.3 (fanquake) 6019d21 [depends] FreeType 2.7.1 (fanquake) 4ed6faf [depends] Boost 1.63.0 (fanquake) 8ac1830 [depends] Latest config.guess and config.sub (fanquake)

…nsaction'. 453bda6 Add 'subtractFeeFromOutputs' option to 'fundrawtransaction'. (Chris Moore)

…FindEarliestAtLeast. 4b06e41 Add unit test for FindEarliestAtLeast (Suhas Daftuar) 997a98a Replace FindLatestBefore used by importmuti with FindEarliestAtLeast. (Gregory Maxwell)

bb077fa [depends] Remove OBJCXX define from config.site.in (fanquake) c37ea4d depends: fix qt translations build (Cory Fields) 2b32dea depends: use new variable layout for qt sdk (Cory Fields) 02fcb29 [depends] Qt 5.7.1 (fanquake)

eb30d1a Introduce -dustrelayfee (Alex Morcos) 7b1add3 Introduce -incrementalrelayfee (Alex Morcos) daec955 Introduce -blockmintxfee (Alex Morcos)

Missed in original backport of assumevalid

…w block 241d893 Wake message handling thread when we receive a new block (Matt Corallo) f13914a Make WakeMessageHandler public (Matt Corallo)

95bab82 Remove unused Python imports (practicalswift)

82e8baa Avoid boost dynamic_bitset in rest_getutxos (Pieter Wuille) 99f001e Fix memory leak in multiUserAuthorized (Pieter Wuille) 5a0b7e4 Fix memory leak in net_tests (Pieter Wuille) 6b03bfb Fix memory leak in wallet tests (Pieter Wuille) f94f3e0 Avoid integer overflows in scriptnum tests (Pieter Wuille) 843c560 Avoid unaligned access in crypto i/o (Pieter Wuille)

b5f374f qt: fix build with zlib for target (Cory Fields) 8efa34f depends: add a zlib build (Cory Fields) 342eb96 build: find qt's renamed helper libs from 5.7 (Cory Fields)

b371732 Re-enable a blank v1 Tx JSON test (Douglas Roark)

fa29736 test: Include tx data in EXTRA_DIST (MarcoFalke)

885cfdd Fix super-unlikely race introduced in 2366180 (Matt Corallo)

Additionally, accept a "now" timestamp, to allow avoiding rescans for keys which are known never to have been used. Note that the behavior when "now" is specified is slightly different than the previous behavior when no timestamp was specified at all. Previously, when no timestamp was specified, it would avoid rescanning during the importmulti call, but set the key's nCreateTime value to 1, which would not prevent future block reads in later ScanForWalletTransactions calls. With this change, passing a "now" timestamp will set the key's nCreateTime to the current block time instead of 1. Fixes bitcoin#9491

Needed by fundrawtransaction tests which rely on the ordering not being changed.

codablock · 2018-01-21T13:40:19Z

Pushed review fixes. The dash-tx test files that needed Dashification were all SegWit related so I removed them.

I also pushed updates to the BIP34/BIP65/BIP66 heights in chainparams.cpp. I found these heights by running the code in https://github.com/codablock/dash/tree/find_bips_heights (if you want to verify this, run the code until all headers are synced and check the logs). I also verified correctness by running full syncs in mainnet and testnet.

UdjinM6 · 2018-01-21T16:37:08Z

👍 , will test.

PS. I still see src/test/data/txcreateoutpubkey2.* and src/test/data/txcreatescript3.* in files list and in src/Makefile.test.include... shouldn't they be dropped as well?

codablock · 2018-01-21T20:50:58Z

Yepp, txcreateoutpubkey2 and txcreateoutpubkey3 shouldn't be in the list and also the files should have been removed. Squashed this into the segwit removal commit and force pushed.

UdjinM6 · 2018-01-21T21:46:20Z

ok, src/test/data/txcreateoutpubkey2.* is gone now but src/test/data/txcreatescript3.* is still here...

codablock · 2018-01-21T21:52:05Z

Argh, sorry about that...I should (and will) go to bed now. Pushed squashed commit again.

UdjinM6

slightly tested ACK

sipa and others added 6 commits January 20, 2018 09:21

Implement SipHash in Python

3235aad

Merge bitcoin#8837: allow bitcoin-tx to parse partial transactions

71e3e37

7451cf5 Allow bitcoin-tx to parse partial transactions (jnewbery)

Merge bitcoin#9376: Remove unused test files and references

b72f924

9cb6624 Fix testfile reference (BtcDrak) 23208ac Remove unused test files and references (BtcDrak)

Merge bitcoin#9436: test: Include tx data in EXTRA_DIST

17d375e

fa558be test: Include tx data in EXTRA_DIST (MarcoFalke)

Merge bitcoin#8391: Consensus: Remove ISM

7321bfd

122786d Consensus: Remove ISM (NicolasDorier)

codablock force-pushed the pr_backport_bitcoin_0.14-9 branch from 6dc7623 to 1a31f52 Compare January 20, 2018 09:18

UdjinM6 added this to the 12.3 milestone Jan 20, 2018

UdjinM6 requested changes Jan 20, 2018

View reviewed changes

codablock and others added 21 commits January 21, 2018 12:48

Update devnet to activate BIP34/BIP65/BIP66 immediately

56ff71f

Use version 2 blocks for miner_tests

6132bfb

This is needed because Dashs chainparams start BIP34 on block 1 and the removal of IsSuperMajority results in the checks to trigger immediately in tests. Also update miner_tests nonces

Merge bitcoin#7871: Manual block file pruning.

88b9aa4

afffeea fixup! Add pruneblockchain RPC to enable manual block file pruning. (Russell Yanofsky) 1fc4ec7 Add pruneblockchain RPC to enable manual block file pruning. (mrbandrews)

Merge bitcoin#9507: Fix use-after-free in CTxMemPool::removeConflicts()

819ea74

fe7e593 Fix use-after-free in CTxMemPool::removeConflicts() (Suhas Daftuar)

Merge bitcoin#9297: Various RPC help outputs updated

a0438d5

54ee3fc RPC help updated (Michael Rotarius)

Merge bitcoin#9416: travis: make distdir before make

7dfcb15

faaf3ca travis: make distdir before make (MarcoFalke)

Merge bitcoin#9520: Deprecate non-txindex getrawtransaction and bette…

294b8f7

…r warning db904db Deprecate non-txindex getrawtransaction and better warning (Pieter Wuille)

Merge bitcoin#9518: Return height of last block pruned by pruneblockc…

cee8cf1

…hain RPC 918d1fb Return height of last block pruned by pruneblockchain RPC (Russell Yanofsky)

Remove SegWit related code in dash-tx

53820de

Merge bitcoin#9261: Add unstored orphans with rejected parents to rec…

74bfe0b

…entRejects dfbe0d5 Add unstored orphans with rejected parents to recentRejects (Alex Morcos)

Merge bitcoin#9222: Add 'subtractFeeFromAmount' option to 'fundrawtra…

4408b2d

…nsaction'. 453bda6 Add 'subtractFeeFromOutputs' option to 'fundrawtransaction'. (Chris Moore)

Merge bitcoin#9490: Replace FindLatestBefore used by importmuti with …

ad9b925

…FindEarliestAtLeast. 4b06e41 Add unit test for FindEarliestAtLeast (Suhas Daftuar) 997a98a Replace FindLatestBefore used by importmuti with FindEarliestAtLeast. (Gregory Maxwell)

Merge bitcoin#9469: [depends] Qt 5.7.1

87229e0

bb077fa [depends] Remove OBJCXX define from config.site.in (fanquake) c37ea4d depends: fix qt translations build (Cory Fields) 2b32dea depends: use new variable layout for qt sdk (Cory Fields) 02fcb29 [depends] Qt 5.7.1 (fanquake)

Merge bitcoin#9380: Separate different uses of minimum fees

40dff10

eb30d1a Introduce -dustrelayfee (Alex Morcos) 7b1add3 Introduce -incrementalrelayfee (Alex Morcos) daec955 Introduce -blockmintxfee (Alex Morcos)

Add assumevalid testcase

2adb355

Missed in original backport of assumevalid

Merge bitcoin#9561: Wake message handling thread when we receive a ne…

3bd155b

…w block 241d893 Wake message handling thread when we receive a new block (Matt Corallo) f13914a Make WakeMessageHandler public (Matt Corallo)

Merge bitcoin#9508: Remove unused Python imports

be63fb7

95bab82 Remove unused Python imports (practicalswift)

laanwj and others added 15 commits January 21, 2018 12:48

Merge bitcoin#9646: depends: Fix cross build for qt5.7

a757261

b5f374f qt: fix build with zlib for target (Cory Fields) 8efa34f depends: add a zlib build (Cory Fields) 342eb96 build: find qt's renamed helper libs from 5.7 (Cory Fields)

Merge bitcoin#9406: Re-enable a blank v1 Tx JSON test

dd5ccf1

b371732 Re-enable a blank v1 Tx JSON test (Douglas Roark)

Merge bitcoin#9525: test: Include tx data in EXTRA_DIST

4f6de16

fa29736 test: Include tx data in EXTRA_DIST (MarcoFalke)

Merge bitcoin#9671: Fix super-unlikely race introduced in 2366180

2cdafa0

885cfdd Fix super-unlikely race introduced in 2366180 (Matt Corallo)

Use new data structures for devnet checkpointData/chainTxData

cd0c910

Fix transaction_tests.cpp

9e13bb3

Fix new bitcoin-util-tests

771c56a

Fix use of distdir and docker build dir

228d774

Add spaces around + in updateGlobalFeeVariables

86753a8

Fix new dash-tx tests

611cb6f

Add "setbip69enabled" RPC usable by tests only

9bc404a

Needed by fundrawtransaction tests which rely on the ordering not being changed.

Fix listsinceblock.py

715be73

Update testnet chainparams to use correct heights for BIP34/BIP65/BIP66

3824192

Update mainnet chainparams to use correct heights for BIP34/BIP65/BIP66

4d65162

codablock force-pushed the pr_backport_bitcoin_0.14-9 branch 2 times, most recently from 818ddff to 32c43f6 Compare January 21, 2018 13:36

codablock force-pushed the pr_backport_bitcoin_0.14-9 branch from 32c43f6 to a2a05f1 Compare January 21, 2018 20:50

Remove segwit related dash-tx tests

ec81769

codablock force-pushed the pr_backport_bitcoin_0.14-9 branch from a2a05f1 to e119956 Compare January 21, 2018 21:51

Fix review nits

b97eecc

codablock force-pushed the pr_backport_bitcoin_0.14-9 branch from e119956 to b97eecc Compare January 22, 2018 07:05

UdjinM6 approved these changes Jan 22, 2018

View reviewed changes

UdjinM6 merged commit 4052401 into dashpay:develop Jan 22, 2018

codablock deleted the pr_backport_bitcoin_0.14-9 branch January 22, 2018 13:31

Backport missing PRs from Bitcoin 0.14 - Part 9 #1859

Backport missing PRs from Bitcoin 0.14 - Part 9 #1859

Uh oh!

Conversation

codablock commented Jan 19, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codablock commented Jan 21, 2018

Uh oh!

UdjinM6 commented Jan 21, 2018

Uh oh!

codablock commented Jan 21, 2018

Uh oh!

UdjinM6 commented Jan 21, 2018

Uh oh!

codablock commented Jan 21, 2018

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

codablock commented Jan 19, 2018 •

edited

Loading