zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
12,367 Commits 9 Branches 176 Tags 87 MiB
Commit Graph

12367 Commits

Author SHA1 Message Date
Gregory Maxwell b05b1af10b Fix qt/paymentrequestplus.cpp for OpenSSL 1.1 API. 
This avoids a compile failure on newly installed debian stretch systems.
 2016-12-12 19:24:34 +00:00
Gregory Maxwell bae1eef752 Fix wallet/test/crypto_tests.cpp for OpenSSL 1.1 API. 
This avoids a compile failure on newly installed debian stretch systems.
 2016-12-12 08:10:27 +00:00
MarcoFalke 76fcd9d503
Merge #9309: [qa] Wallet needs to stay unlocked for whole test 
9359f8a Wallet needs to stay unlocked for whole test (Alex Morcos)
 2016-12-10 18:47:36 +01:00
Pieter Wuille a1dcf2e108
Merge #9240: Remove txConflicted 
a874ab5 remove internal tracking of mempool conflicts for reporting to wallet (Alex Morcos)
bf663f8 remove external usage of mempool conflict tracking (Alex Morcos)
 2016-12-09 16:31:03 -08:00
Pieter Wuille d38b0d7a6b
Merge #9307: Remove undefined FetchCoins method declaration 
fe41f58 Remove undefined FetchCoins method declaration (Russell Yanofsky)
 2016-12-09 16:21:28 -08:00
Pieter Wuille 815640ec6a
Merge #9295: [Wallet] Bugfix: Fundrawtransaction: don't terminate when keypool is empty 
1a6eacb [QA] add fundrawtransaction test on a locked wallet with empty keypool (Jonas Schnelli)
c24a4f5 [Wallet] Bugfix: FRT: don't terminate when keypool is empty (Jonas Schnelli)
 2016-12-09 16:14:54 -08:00
Alex Morcos 9359f8ad3b Wallet needs to stay unlocked for whole test 2016-12-09 11:42:23 -05:00
MarcoFalke 72bf1b3d09
Merge #9303: Update comments in ctaes 
8501bed Squashed 'src/crypto/ctaes/' changes from cd3c3ac..003a4ac (Pieter Wuille)
 2016-12-09 10:22:21 +01:00
Pieter Wuille 760765d5a9 Update ctaes 2016-12-08 17:09:07 -08:00
Pieter Wuille 8501bedd75 Squashed 'src/crypto/ctaes/' changes from cd3c3ac..003a4ac 
003a4ac Merge #5: fix typo
5254f14 [trivial] Fix typo
e7c0aab Merge #4: Fix some comments
d07cead Fix some comments

git-subtree-dir: src/crypto/ctaes
git-subtree-split: 003a4acfc273932ab8c2e276cde3b4f3541012dd
 2016-12-08 17:09:07 -08:00
Wladimir J. van der Laan 86017842d6
Merge #9291: Remove mapOrphanTransactionsByPrev from DoS_tests 
819ca3f Remove mapOrphanTransactionsByPrev from DoS_tests (Pieter Wuille)
 2016-12-08 08:38:15 +01:00
Wladimir J. van der Laan 9851a8461d
Merge #9255: qt: layoutAboutToChange signal is called layoutAboutToBeChanged 
f36349e qt: Remove on_toggleNetworkActiveButton_clicked from RPCConsole (Wladimir J. van der Laan)
297cc20 qt: layoutAboutToChange signal is called layoutAboutToBeChanged (Wladimir J. van der Laan)
 2016-12-08 08:14:16 +01:00
Wladimir J. van der Laan 2044e37beb
Merge #9266: Bugfix: Qt/RPCConsole: Put column enum in the right places 
df17fe0 Bugfix: Qt/RPCConsole: Put column enum in the right places (Luke Dashjr)
 2016-12-08 08:13:15 +01:00
Wladimir J. van der Laan d52ce89bd2
Merge #9299: Remove no longer needed check for premature v2 txs 
b919179 remove no longer needed check for premature v2 txs (Alex Morcos)
 2016-12-08 07:51:35 +01:00
Wladimir J. van der Laan ea33f197ef
Merge #9276: Some minor testing cleanups 
30b620c remove obsolete run-bitcoind-for-test.sh (Alex Morcos)
2a99522 remove relaypriority from rpc tests (Alex Morcos)
e2184cc Reorder RPC tests for running time (Alex Morcos)
 2016-12-08 07:50:56 +01:00
Russell Yanofsky fe41f58365 Remove undefined FetchCoins method declaration 2016-12-07 15:41:56 -05:00
Alex Morcos b919179cbb remove no longer needed check for premature v2 txs 2016-12-07 09:58:20 -05:00
Jonas Schnelli 1a6eacbf3b
[QA] add fundrawtransaction test on a locked wallet with empty keypool 2016-12-07 15:20:40 +01:00
Wladimir J. van der Laan f36349e898 qt: Remove on_toggleNetworkActiveButton_clicked from RPCConsole 
There is no network toggle button (anymore?) in the RPC console.
Removes another warning (#9250).
 2016-12-07 05:55:16 +01:00
Pieter Wuille 09c4fd157c
Merge #9268: Fix rounding privacy leak introduced in #9260 
9b9324e Fix rounding privacy leak introduced in #9260 (Matt Corallo)
 2016-12-06 13:33:01 -08:00
Wladimir J. van der Laan fde7d99c4d
Merge #9296: Fix missed change to WalletTx structure 
28f8ae8 Fix missed change to WalletTx structure (Alex Morcos)
 2016-12-06 15:41:43 +01:00
Alex Morcos 28f8ae8adf Fix missed change to WalletTx structure 2016-12-06 08:56:12 -05:00
Jonas Schnelli c24a4f5981
[Wallet] Bugfix: FRT: don't terminate when keypool is empty 2016-12-06 13:45:56 +01:00
Jonas Schnelli e15660c16f
Merge #9280: [Qt] Show ModalOverlay by pressing the progress bar, allow hiding 
89a3723 [Qt] Show ModalOverlay by pressing the progress bar, disabled show() in sync mode (Jonas Schnelli)
 2016-12-06 13:03:33 +01:00
MarcoFalke 919db037f1
Merge #9274: [qa] Use cached utxo set to fix performance regression 
fab1af3 [qa] maxuploadtarget: Use cached utxo set (MarcoFalke)
fa2ecc4 [qa] pruning: Use cached utxo set to run faster (MarcoFalke)
 2016-12-06 12:08:27 +01:00
Wladimir J. van der Laan ed8d693c71
Merge #9194: Add option to return non-segwit serialization via rpc 
412bab2 Adapt ZMQ/rest serialization to take rpcserialversion arg (instagibbs)
bc7ff8d Add option to return non-segwit serialization via rpc (Gregory Sanders)
 2016-12-06 08:21:57 +01:00
Pieter Wuille 819ca3f18e Remove mapOrphanTransactionsByPrev from DoS_tests 
This is another violation of the one definition rule, as the type
for mapOrphanTransactionsByPrev did not match the one in
net_processing.cpp anymore. As it now depends on a custom Iterator,
it seems too much hassle to correctly expose it to the tests.
Instead, this commit just removes the one test it was referenced in.
 2016-12-05 23:04:50 -08:00
Alex Morcos a874ab5ccf remove internal tracking of mempool conflicts for reporting to wallet 2016-12-05 13:41:25 -05:00
Alex Morcos bf663f8e93 remove external usage of mempool conflict tracking 2016-12-05 13:41:25 -05:00
Jonas Schnelli 89a3723bdc
[Qt] Show ModalOverlay by pressing the progress bar, disabled show() in sync mode 2016-12-05 13:58:00 +01:00
instagibbs 412bab22b2 Adapt ZMQ/rest serialization to take rpcserialversion arg 2016-12-05 07:43:22 -05:00
Gregory Sanders bc7ff8db99 Add option to return non-segwit serialization via rpc 2016-12-05 07:43:22 -05:00
Wladimir J. van der Laan 7d5d44969b
Merge #9282: CMutableTransaction is defined as struct 
c4b6fa8 CMutableTransaction is defined as struct. (Pavel Janík)
 2016-12-05 12:55:03 +01:00
Wladimir J. van der Laan c01f16aaa0
Merge #9165: SendMoney: use already-calculated balance 
ea83d00 SendMoney: use already-calculated balance (instagibbs)
 2016-12-05 12:47:31 +01:00
Pavel Janík c4b6fa8edf CMutableTransaction is defined as struct. 2016-12-05 11:13:17 +01:00
Wladimir J. van der Laan 43e8150ef6
Merge #9269: Align struct COrphan definition 
2efc438 Align struct COrphan definition (Pieter Wuille)
 2016-12-05 11:09:26 +01:00
Wladimir J. van der Laan 613bda418f
Merge #8613: LevelDB 1.19 
634ad51 Squashed 'src/leveldb/' changes from 20ca81f..a31c8aa (Pieter Wuille)
 2016-12-05 10:58:36 +01:00
Pieter Wuille 2efc43874c Align struct COrphan definition 2016-12-05 00:35:07 -08:00
Wladimir J. van der Laan d04aebaec7
Merge #9014: Fix block-connection performance regression 
dd0df81 Document ConnectBlock connectTrace postconditions (Matt Corallo)
2d6e561 Switch pblock in ProcessNewBlock to a shared_ptr (Matt Corallo)
2736c44 Make the optional pblock in ActivateBestChain a shared_ptr (Matt Corallo)
ae4db44 Create a shared_ptr for the block we're connecting in ActivateBCS (Matt Corallo)
fd9d890 Keep blocks as shared_ptrs, instead of copying txn in ConnectTip (Matt Corallo)
6fdd43b Add struct to track block-connect-time-generated info for callbacks (Matt Corallo)
 2016-12-05 08:07:45 +01:00
Wladimir J. van der Laan 46904ee5d2
Merge #8580: Make CTransaction actually immutable 
81e3228 Make CTransaction actually immutable (Pieter Wuille)
42fd8de Make DecodeHexTx return a CMutableTransaction (Pieter Wuille)
c3f5673 Make CWalletTx store a CTransactionRef instead of inheriting (Pieter Wuille)
a188353 Switch GetTransaction to returning a CTransactionRef (Pieter Wuille)
 2016-12-05 08:05:48 +01:00
MarcoFalke fab1af31d4 [qa] maxuploadtarget: Use cached utxo set 2016-12-05 00:31:10 +01:00
Alex Morcos 30b620c48a remove obsolete run-bitcoind-for-test.sh 2016-12-04 15:44:41 -05:00
MarcoFalke fa2ecc48fb [qa] pruning: Use cached utxo set to run faster 2016-12-04 21:30:20 +01:00
Jonas Schnelli 4d955fc582
Merge #9218: qt: Show progress overlay when clicking spinner icon 
042f9fa qt: Show progress overlay when clicking spinner icon (Wladimir J. van der Laan)
827d9a3 qt: Replace NetworkToggleStatusBarControl with generic ClickableLabel (Wladimir J. van der Laan)
 2016-12-04 20:57:57 +01:00
Matt Corallo dd0df81ebd Document ConnectBlock connectTrace postconditions 2016-12-04 00:18:44 -08:00
Matt Corallo 2d6e5619af Switch pblock in ProcessNewBlock to a shared_ptr 
This (finally) fixes a performance regression in
b3b3c2a562
 2016-12-04 00:17:30 -08:00
Matt Corallo 2736c44c8e Make the optional pblock in ActivateBestChain a shared_ptr 2016-12-04 00:13:09 -08:00
Matt Corallo ae4db44d03 Create a shared_ptr for the block we're connecting in ActivateBCS 2016-12-04 00:13:09 -08:00
Matt Corallo fd9d89070a Keep blocks as shared_ptrs, instead of copying txn in ConnectTip 2016-12-04 00:13:09 -08:00
Matt Corallo 6fdd43b968 Add struct to track block-connect-time-generated info for callbacks 2016-12-04 00:13:09 -08:00