Backport missing PRs from Bitcoin 0.13 - Part 5 #1811

codablock · 2017-12-22T18:36:50Z

Continuation of #1770

b682960 Adding P2SH(p2pkh) script test case (Chris Stewart)

Fix was introdeced in: dashpay#1169 A fix was later applied to fix a race condition: dashpay#1178 This has to be reverted to be able to backport multiple changes from Bitcoin. Later backported PRs from Bitcoin will remove cs_mapRelay and thus also remove the deadlock that was initially fixed with the above PRs.

38c3102 Change mapRelay to store CTransactions (Pieter Wuille)

Bitcoin bitcoin#7877 changed mapRelay to be indexed by hash instead of inv. This means that we may end up with a false-positive match here and send out an instant transaction as normal transaction.

…ter the last mempool req. 7e908c7 Do not use mempool for GETDATA for tx accepted after the last mempool req. (Gregory Maxwell)

e4f73c7 [Doc] Update implemented BIPs list (fanquake)

723779c build: Enumerate ctaes rather than globbing (Cory Fields) 34ed64a crypter: add tests for crypter (Cory Fields) 0a36b9a crypter: shuffle Makefile so that crypto can be used by the wallet (Cory Fields) 976f9ec crypter: add a BytesToKey clone to replace the use of openssl (Cory Fields) 9049cde crypter: hook up the new aes cbc classes (Cory Fields) fb96831 crypter: constify encrypt/decrypt (Cory Fields) 1c391a5 crypter: fix the stored initialization vector size (Cory Fields) daa3841 crypto: add aes cbc tests (Cory Fields) 27a212d crypto: add AES 128/256 CBC classes (Cory Fields) 6bec172 Add ctaes-based constant time AES implementation (Pieter Wuille) a545127 Squashed 'src/crypto/ctaes/' content from commit cd3c3ac (Pieter Wuille)

383fc10 Only use AddInventoryKnown for transactions (Suhas Daftuar)

88f14b9 Include signal.h for sig_atomic_t in WIN32 (Pieter Wuille)

…ebugLog a886dbf Use std::atomic for fRequestShutdown and fReopenDebugLog (Pieter Wuille) 16cf85f Revert "Include signal.h for sig_atomic_t in WIN32" (Pieter Wuille)

…ta.o ee9f4a5 Consensus: Decouple from chainparams.o and timedata.o (Jorge Timón)

2692e1b [Doc] Simplify OS X build notes (fanquake)

0bf6f30 Prevent multiple calls to ExtractDestination (Pedro Branco)

9805f4a mapNextTx: use pointer as key, simplify value (Kaz Wesley)

…r Python 3.5+ f45f51e Fix interrupted HTTP RPC connection workaround for Python 3.5+ (Pieter Wuille)

04eaa90 Add more clear interface for CoinControl.h regarding individual feerate (Jonas Schnelli) 3b35e48 [RPC] add feerate option to fundrawtransaction (Jonas Schnelli)

e39dc69 comment nit: miners don't vote (instagibbs)

9dfaa1c Improve CWallet API with new AccountMove function. (Patrick Strateman)

f0fdda0 IsInitialBlockDownload: usually avoid locking (Kaz Wesley)

…ction. 152ab23 Improve CWallet API with new GetAccountPubkey function. (Patrick Strateman)

fa51a1d [init] Make feefilter option debug option (MarcoFalke)

bd0f413 Reduce unnecessary hashing in signrawtransaction (Jonas Nick)

8b78486 Log/report in 10% steps during VerifyDB (Jonas Schnelli)

ae357d5 [Bitcoin-Tx] Add tests for sequence number support (Jonas Schnelli) e59336f [bitcoin-tx] allow to set nSequence number over the in= command (Jonas Schnelli) a946bb6 [RPC] createrawtransaction: add option to set the sequence number per input (Jonas Schnelli)

… atoi issue 86efa30 [Bitcoin-Tx] fix missing test fixtures, fix 32bit atoi issue (Jonas Schnelli)

…s disabled 3d3602f Add RPC test for the p2p mempool command in conjunction with disabled bloomfilters (Jonas Schnelli) beceac9 Disable the mempool P2P command when bloom filters disabled (Peter Todd)

6182d10 Do not increment nAttempts by more than one for every Good connection. (Gregory Maxwell) c769c4a Avoid counting failed connect attempts when probably offline. (Gregory Maxwell)

…if -torpassword 2e49448 tor: Change auth order to only use HASHEDPASSWORD if -torpassword (Wladimir J. van der Laan)

… servicebits 2d83013 Add support for dnsseeds with option to filter by servicebits (Jonas Schnelli)

Missed due to out of order backporting of network changes

This seems to have been re-added by accident in older out-of-order backports.

…d unsigned 77f63a4 Fix two warnings for comparison between signed and unsigned (Pieter Wuille)

e012f3c util: Add ParseUInt32 and ParseUInt64 (Wladimir J. van der Laan)

d3d02d5 drop vAddrToSend after sending big addr message (Kaz Wesley)

c2715d3 Do not shadow local variables (Pavel Janík)

…hor date fa42a67 [gitian] hardcode datetime for depends (MarcoFalke) fa58c76 [gitian] Default reference_datetime to commit author date (MarcoFalke)

… RPC 176e19b Mention new RPC's in release notes (Suhas Daftuar) 7f6eda8 Add ancestor statistics to mempool entry RPC output (Suhas Daftuar) a9b8390 Add test coverage for new RPC calls (Suhas Daftuar) b09b813 Add getmempoolentry RPC call (Suhas Daftuar) 0dfd869 Add getmempooldescendants RPC call (Suhas Daftuar) 8f7b5dc Add getmempoolancestors RPC call (Suhas Daftuar) 5ec0cde Refactor logic for converting mempool entries to JSON (Suhas Daftuar)

…otes 3144449 Add git and github tips and tricks to developer notes (Pieter Wuille)

d096d22 build: Get rid of `CLIENT_DATE` (Wladimir J. van der Laan)

d1a3d57 bulid: fix "make translate" when out-of-tree (Cory Fields) 340012d build: add temporary fix for "bad magic number" error in out-of-tree builds (Cory Fields) 142ffc7 travis: use out-of-tree build (Cory Fields) 92e37a3 build: fix out-of-tree 'make deploy' for osx (Cory Fields) ab95d5d build: a few ugly hacks to get the rpc tests working out-of-tree (Cory Fields) fc4ad0c build: more out-of-tree fixups (Cory Fields) 0cb0f26 build: out-of-tree fixups (Cory Fields)

654a211 developer notes: updates for C++11 (Kaz Wesley)

9d25362 build: add armhf/aarch64 gitian builds (Cory Fields) 980e7eb depends: only build qt on linux for x86_64/x86 (Cory Fields)

… guide b0938a0 [trivial][doc] Use Debian 8.5 in the gitian-build guide (fanquake)

…ckAssembler class c2dd5a3 FIX: correctly measure size of priority block (Alex Morcos) a278764 FIX: Account for txs already added to block in addPriorityTxs (Alex Morcos) 4dc94d1 Refactor CreateNewBlock to be a method of the BlockAssembler class (Alex Morcos)

ff2dcf2 Tests: Edit bloated varint test and add option for 'barely expensive' tests (mrbandrews) 12c5a16 Catch exceptions from non-canonical encoding and print only to log (mrbandrews) 291f8aa Continuing port of java comptool (mrbandrews) 8c9e681 Tests: Rework blockstore to avoid re-serialization. (mrbandrews)

fae1d06 [qa] fundrawtransaction: Fix race, assert amounts (MarcoFalke) fa26c42 [qa] util: Move check_fee_amount out of wallet.py (MarcoFalke)

This value is in "millionths of the block interval" and in Bitcoin it's set to exactly 1000000, meaning one full block interval. It still has to be 1000000 for Dash, even though the block intervall is less. This fixes test failures in p2p-fullblocktest.py when large reorgs are tested. These take quite some time and did timeout.

UdjinM6

👍

UdjinM6 · 2017-12-25T05:22:12Z

doc/build-osx.md

+------------------------

-1. Clone the GitHub tree to get the source code and go into the directory.
+1. Clone the bitcoin source code and cd into `dash`


s/bitcoin/Dash Core/

UdjinM6 · 2017-12-25T05:22:28Z

doc/build-osx.md

-2.  Build Dash Core:
-    This will configure and build the headless dash binaries as well as the gui (if Qt is found).
-    You can disable the gui build by passing `--without-gui` to configure.
+2.  Build dash-core:


s/dash-core/Dash Core/

UdjinM6 · 2017-12-25T05:32:01Z

src/net_processing.cpp

            }
            else
            {
+                pfrom->AddInventoryKnown(inv);


Should also remove pfrom->AddInventoryKnown(inv); from L1358

UdjinM6 · 2017-12-25T13:36:52Z

src/validation.h

 static const unsigned int MAX_FEEFILTER_CHANGE_DELAY = 5 * 60;
 /** Block download timeout base, expressed in millionths of the block interval (i.e. 2.5 min) */
-static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 250000;
+static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 1000000;


Hmmm.. I guess you are right, I misunderstood the meaning of this when I tweaked it back then. Should revert BLOCK_DOWNLOAD_TIMEOUT_PER_PEER to 500000 as well I think.

Yepp, pushed this now.

This should have been part of Bitcoin bitcoin#7960 but was missed in merge conflict resolution.

Same reason as for reverting BLOCK_DOWNLOAD_TIMEOUT_BASE

codablock · 2017-12-27T13:08:45Z

Pushed review fixes.

UdjinM6

Slightly tested, ACK

laanwj and others added 30 commits December 22, 2017 16:33

Merge bitcoin#8090: Adding P2SH(p2pkh) script test case

d8c5a59

b682960 Adding P2SH(p2pkh) script test case (Chris Stewart)

Merge bitcoin#7877: Change mapRelay to store CTransactions

bef0361

38c3102 Change mapRelay to store CTransactions (Pieter Wuille)

Only serve normal transactions from mapRelay

b2a27c0

Bitcoin bitcoin#7877 changed mapRelay to be indexed by hash instead of inv. This means that we may end up with a false-positive match here and send out an instant transaction as normal transaction.

Merge bitcoin#8080: Do not use mempool for GETDATA for tx accepted af…

dfa0bd2

…ter the last mempool req. 7e908c7 Do not use mempool for GETDATA for tx accepted after the last mempool req. (Gregory Maxwell)

Merge bitcoin#8121: [Doc] Update implemented BIPs list

e65bf22

e4f73c7 [Doc] Update implemented BIPs list (fanquake)

Directly push messages instead of using CDataStream first

83dc1dc

Fix OpenSSL build error

433a026

Merge bitcoin#7960: Only use AddInventoryKnown for transactions

bad08ea

383fc10 Only use AddInventoryKnown for transactions (Suhas Daftuar)

Merge bitcoin#8112: Include signal.h for sig_atomic_t in WIN32

09eda97

88f14b9 Include signal.h for sig_atomic_t in WIN32 (Pieter Wuille)

Merge bitcoin#8123: Use std::atomic for fRequestShutdown and fReopenD…

bf069fb

…ebugLog a886dbf Use std::atomic for fRequestShutdown and fReopenDebugLog (Pieter Wuille) 16cf85f Revert "Include signal.h for sig_atomic_t in WIN32" (Pieter Wuille)

Merge bitcoin#8077: Consensus: Decouple from chainparams.o and timeda…

fefd0ac

…ta.o ee9f4a5 Consensus: Decouple from chainparams.o and timedata.o (Jorge Timón)

Merge bitcoin#8029: [Doc] Simplify OS X build notes

dbf4dc4

2692e1b [Doc] Simplify OS X build notes (fanquake)

Merge bitcoin#7825: Prevent multiple calls to ExtractDestination

df14a7f

0bf6f30 Prevent multiple calls to ExtractDestination (Pedro Branco)

Merge bitcoin#7997: replace mapNextTx with slimmer setSpends

fb88e9b

9805f4a mapNextTx: use pointer as key, simplify value (Kaz Wesley)

Merge bitcoin#8139: Fix interrupted HTTP RPC connection workaround fo…

af51e59

…r Python 3.5+ f45f51e Fix interrupted HTTP RPC connection workaround for Python 3.5+ (Pieter Wuille)

Merge bitcoin#7967: [RPC] add feerate option to fundrawtransaction

c69df9b

04eaa90 Add more clear interface for CoinControl.h regarding individual feerate (Jonas Schnelli) 3b35e48 [RPC] add feerate option to fundrawtransaction (Jonas Schnelli)

Merge bitcoin#8143: comment nit: miners don't vote

7538795

e39dc69 comment nit: miners don't vote (instagibbs)

Merge bitcoin#8137: Improve CWallet API with new AccountMove function.

d7d5d57

9dfaa1c Improve CWallet API with new AccountMove function. (Patrick Strateman)

Merge bitcoin#8007: Minor locking improvements

463a68d

f0fdda0 IsInitialBlockDownload: usually avoid locking (Kaz Wesley)

Merge bitcoin#8142: Improve CWallet API with new GetAccountPubkey fun…

b2bd69a

…ction. 152ab23 Improve CWallet API with new GetAccountPubkey function. (Patrick Strateman)

Merge bitcoin#8151: [init] Make feefilter option debug option

49c2e97

fa51a1d [init] Make feefilter option debug option (MarcoFalke)

Merge bitcoin#8118: Reduce unnecessary hashing in signrawtransaction

7f0213a

bd0f413 Reduce unnecessary hashing in signrawtransaction (Jonas Nick)

Merge bitcoin#8136: Log/report in 10% steps during VerifyDB

d5d2556

8b78486 Log/report in 10% steps during VerifyDB (Jonas Schnelli)

Merge bitcoin#8164: [Bitcoin-Tx] fix missing test fixtures, fix 32bit…

0b8169d

… atoi issue 86efa30 [Bitcoin-Tx] fix missing test fixtures, fix 32bit atoi issue (Jonas Schnelli)

Merge bitcoin#8078: Disable the mempool P2P command when bloom filter…

2ee817f

…s disabled 3d3602f Add RPC test for the p2p mempool command in conjunction with disabled bloomfilters (Jonas Schnelli) beceac9 Disable the mempool P2P command when bloom filters disabled (Peter Todd)

Merge bitcoin#8065: Addrman offline attempts

00c84ca

6182d10 Do not increment nAttempts by more than one for every Good connection. (Gregory Maxwell) c769c4a Avoid counting failed connect attempts when probably offline. (Gregory Maxwell)

Merge bitcoin#7703: tor: Change auth order to only use password auth …

881d832

…if -torpassword 2e49448 tor: Change auth order to only use HASHEDPASSWORD if -torpassword (Wladimir J. van der Laan)

sipa and others added 21 commits December 22, 2017 16:33

Merge bitcoin#8083: Add support for dnsseeds with option to filter by…

b3e26cc

… servicebits 2d83013 Add support for dnsseeds with option to filter by servicebits (Jonas Schnelli)

Use nRelevantServices for requiredServiceBits

80d02d8

Missed due to out of order backporting of network changes

Remove 'LDFLAGS=-static-libstdc++' from CONFIGFLAGS in gitian-linux.yml

a60d4d6

This seems to have been re-added by accident in older out-of-order backports.

Merge bitcoin#8172: Fix two warnings for comparison between signed an…

cfc76ba

…d unsigned 77f63a4 Fix two warnings for comparison between signed and unsigned (Pieter Wuille)

Merge bitcoin#8168: util: Add ParseUInt32 and ParseUInt64

ca228f0

e012f3c util: Add ParseUInt32 and ParseUInt64 (Wladimir J. van der Laan)

Merge bitcoin#8154: drop vAddrToSend after sending big addr message

aa6cb48

d3d02d5 drop vAddrToSend after sending big addr message (Kaz Wesley)

Merge bitcoin#8166: src/test: Do not shadow local variables

2e3aacf

c2715d3 Do not shadow local variables (Pavel Janík)

Merge bitcoin#7283: [gitian] Default reference_datetime to commit aut…

856e546

…hor date fa42a67 [gitian] hardcode datetime for depends (MarcoFalke) fa58c76 [gitian] Default reference_datetime to commit author date (MarcoFalke)

Merge bitcoin#8178: Add git and github tips and tricks to developer n…

209a4d6

…otes 3144449 Add git and github tips and tricks to developer notes (Pieter Wuille)

Merge bitcoin#8181: build: Get rid of CLIENT_DATE

79db88b

d096d22 build: Get rid of `CLIENT_DATE` (Wladimir J. van der Laan)

Merge bitcoin#8177: developer notes: updates for C++11

acbda5d

654a211 developer notes: updates for C++11 (Kaz Wesley)

Merge bitcoin#8188: Add armhf/aarch64 gitian builds

06a73ad

9d25362 build: add armhf/aarch64 gitian builds (Cory Fields) 980e7eb depends: only build qt on linux for x86_64/x86 (Cory Fields)

Merge bitcoin#8193: [trivial][doc] Use Debian 8.5 in the gitian-build…

6ef8aae

… guide b0938a0 [trivial][doc] Use Debian 8.5 in the gitian-build guide (fanquake)

Merge bitcoin#8201: [qa] fundrawtransaction: Fix race, assert amounts

2e51d82

fae1d06 [qa] fundrawtransaction: Fix race, assert amounts (MarcoFalke) fa26c42 [qa] util: Move check_fee_amount out of wallet.py (MarcoFalke)

Dashify new tests in bitcoin-util-test.json

05c8f2e

Fix failing test in p2p-fullblocktest.py

f00aeb8

UdjinM6 requested changes Dec 25, 2017

View reviewed changes

codablock added 3 commits December 27, 2017 14:00

Dashify build-osx.md

e3ca41b

Remove unnecessary call to AddInventoryKnown in INV message handling

c7937c2

This should have been part of Bitcoin bitcoin#7960 but was missed in merge conflict resolution.

Also revert BLOCK_DOWNLOAD_TIMEOUT_PER_PEER to 500000

0c61226

Same reason as for reverting BLOCK_DOWNLOAD_TIMEOUT_BASE

UdjinM6 approved these changes Dec 27, 2017

View reviewed changes

UdjinM6 added this to the 12.3 milestone Dec 27, 2017

UdjinM6 merged commit c494804 into dashpay:develop Dec 27, 2017

codablock deleted the pr_backport_bitcoin_0.13-5 branch December 27, 2017 16:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Backport missing PRs from Bitcoin 0.13 - Part 5 #1811

Backport missing PRs from Bitcoin 0.13 - Part 5 #1811

Uh oh!

codablock commented Dec 22, 2017

Uh oh!

UdjinM6 left a comment

Uh oh!

UdjinM6 Dec 25, 2017

Uh oh!

UdjinM6 Dec 25, 2017

Uh oh!

UdjinM6 Dec 25, 2017

Uh oh!

UdjinM6 Dec 25, 2017

Uh oh!

codablock Dec 27, 2017

Uh oh!

codablock commented Dec 27, 2017

Uh oh!

UdjinM6 left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Backport missing PRs from Bitcoin 0.13 - Part 5 #1811

Backport missing PRs from Bitcoin 0.13 - Part 5 #1811

Uh oh!

Conversation

codablock commented Dec 22, 2017

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Dec 25, 2017

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Dec 25, 2017

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Dec 25, 2017

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Dec 25, 2017

Choose a reason for hiding this comment

Uh oh!

codablock Dec 27, 2017

Choose a reason for hiding this comment

Uh oh!

codablock commented Dec 27, 2017

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants