Wladimir J. van der Laan
2f3abc62ee
Merge #8830 : [test] Add option to run bitcoin-util-test.py manually
...
b82f493 Add option to run bitcoin-util-test.py manually (jnewbery)
2018-01-12 09:57:55 +01:00
Wladimir J. van der Laan
972a44b707
Merge #8836 : bitcoin-util-test.py should fail if the output file is empty
...
da94697 bitcoin-util-test.py should fail if the output file is empty (jnewbery)
2018-01-12 09:57:55 +01:00
MarcoFalke
963f6a6f3a
Merge #8829 : Add bitcoin-tx JSON tests
...
54e5d7c Add bitcoin-tx JSON tests (jnewbery)
2018-01-12 09:57:55 +01:00
Wladimir J. van der Laan
272fddce2c
Merge #8826 : Do not include env_win.cc on non-Windows systems
...
7e5fd71 Do not include env_win.cc on non-Windows systems (Pavel Janík)
2018-01-12 09:56:53 +01:00
Wladimir J. van der Laan
575f625f4d
Merge #8658 : Remove unused statements in serialization
...
64d9507 [WIP] Remove unused statement in serialization (Pavel Janík)
2018-01-12 09:56:53 +01:00
Wladimir J. van der Laan
79f6d3d304
Merge #8832 : [rpc] throw JSONRPCError when utxo set can not be read
...
fa05cfd [rpc] throw JSONRPCError when utxo set can not be read (MarcoFalke)
2018-01-12 08:02:45 +01:00
Wladimir J. van der Laan
a26bad09b6
Merge #8784 : Copyright headers for build scripts
...
0c4e6ce Add MIT license to build-aux/m4 scripts (Luke Dashjr)
3f8a5d8 Trivial: build-aux/m4/l_atomic: Fix typo (Luke Dashjr)
3b4b6dc Add MIT license to autogen.sh and share/genbuild.sh (Luke Dashjr)
f4dffdd Add MIT license to Makefiles (Luke Dashjr)
2018-01-12 08:02:45 +01:00
Wladimir J. van der Laan
8b8362ff15
Merge #8814 : [wallet, policy] ParameterInteraction: Don't allow 0 fee
...
fa4bfb4 [wallet, policy] ParameterInteraction: Don't allow 0 fee (MarcoFalke)
2018-01-12 08:02:45 +01:00
Wladimir J. van der Laan
a75d6110ee
Merge #8634 : Add policy: null signature for failed CHECK(MULTI)SIG
...
e41bd44 Add policy: null signature for failed CHECK(MULTI)SIG (Johnson Lau)
2018-01-12 08:02:45 +01:00
Wladimir J. van der Laan
b224c02090
Merge #8357 : [mempool] Fix relaypriority calculation error
...
94a34a5 Fix relaypriority calculation error (maiiz)
2018-01-12 08:02:45 +01:00
Alexander Block
9b1d1c61b2
Move AutoBackup initialization into CWallet::InitAutoBackup
2018-01-11 18:39:50 +01:00
Alexander Block
faf52c5908
Fix rpcnestedtests
...
Use correct genesis transaction hash
2018-01-11 14:24:14 +01:00
Wladimir J. van der Laan
ec9de93aee
Merge #8655 : Do not shadow variables (trivials)
...
4731cab Do not shadow variables (Pavel Janík)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
4a917b1b35
Merge #8796 : [trivial] fix mempool comment (outdated by BIP125)
...
c14ffd5 [trivial] fix mempool comment (outdated by BIP125) (jonnynewbs)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
0028dbfbfd
Merge #8780 : [rpc] Deprecate getinfo
...
fa6e71b [qa] Add getinfo smoke tests and rework versionbits test (MarcoFalke)
ddddaaf [rpc] Deprecate getinfo (MarcoFalke)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
8e610c0ac3
Merge #8722 : bitcoin-cli: More detailed error reporting
...
381826d bitcoin-cli: More detailed error reporting (Wladimir J. van der Laan)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
d87c156f19
Merge #8486 : [wallet] Add high transaction fee warnings
...
faef293 [wallet] Add high transaction fee warnings (MarcoFalke)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
6262f79f00
Merge #8807 : [univalue] Pull subtree from upstream
...
3650668 Squashed 'src/univalue/' changes from f32df99..daf1285 (MarcoFalke)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
18218aa3c2
Merge #8802 : Fix future copyright year
...
edeaf24 Fix future copyright year (Mitchell Cash)
2018-01-11 13:22:22 +01:00
MarcoFalke
54703891e1
Merge #8790 : [test] Remove redundant debug print in addrman_tests
...
3333bd2 [test] Remove redundant print in addrman_tests (MarcoFalke)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
39d2131142
Merge #8661 : Do not set an addr time penalty when a peer advertises itself.
...
6d0ced1 Do not set an addr time penalty when a peer advertises itself. (Gregory Maxwell)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
c7a0b91d31
Merge #8793 : Do not shadow in src/qt
...
f839350 Do not shadow in src/qt (Pavel Janík)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
17e110f47e
Merge #8785 : Comment on CNode::nLocalServices meaning
...
b5ccded Comment on CConnman::nLocalServices meaning (instagibbs)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
97b63420dd
Merge #8656 : Trivial: Do not shadow global variable fileout
...
7c069a7 Do not shadow global variable (Pavel Janík)
2018-01-11 13:22:21 +01:00
Wladimir J. van der Laan
bfa539a1dd
Merge #8777 : [qt] WalletModel: Expose disablewallet
...
6666ca6 [qt] WalletModel: Expose disablewallet (MarcoFalke)
2018-01-11 13:22:21 +01:00
Wladimir J. van der Laan
06f41f3586
Merge #8768 : init: Get rid of fDisableWallet
...
fa58edb [wallet] Introduce DEFAULT_DISABLE_WALLET (MarcoFalke)
fab9107 init: Get rid of fDisableWallet (MarcoFalke)
2018-01-11 13:22:17 +01:00
Wladimir J. van der Laan
e02b48cad0
Merge #8765 : [Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds
...
c6f5ca8 [Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds (Jonas Schnelli)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
387201712a
Merge #7783 : [Qt] RPC-Console: support nested commands and simple value queries
...
1586044 [Qt] RPC-Console: support nested commands and simple value queries (Jonas Schnelli)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
630c699f00
Merge #8696 : [Wallet] Remove last external reference to CWalletDB
...
2ca6b9d Remove last reference to CWalletDB from accounting_tests.cpp (Patrick Strateman)
02e2a81 Remove pwalletdb parameter from CWallet::AddAccountingEntry (Patrick Strateman)
d2e678d Add CWallet::ReorderTransactions and use in accounting_tests.cpp (Patrick Strateman)
59adc86 Add CWallet::ListAccountCreditDebit (Patrick Strateman)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
fbbddf8107
Merge #8760 : [init] Get rid of some ENABLE_WALLET
...
faddd62 init: Get rid of some ENABLE_WALLET (MarcoFalke)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
a5a9e46042
Merge #8700 : [copyright] add MIT license headers to .sh scripts where missing
...
0766d1c [copyright] add MIT license headers to .sh scripts where missing (isle2983)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
b04e32c43d
Merge #8688 : Move static global randomizer seeds into CConnman
...
d9ff591 Move static global randomizer seeds into CConnman (Pieter Wuille)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
412f79083c
Merge #8737 : Trivial: UndoReadFromDisk works on undo files (rev), not on block files.
...
b4fb512 UndoReadFromDisk works on undo files (rev), not on block files. (Pavel Janík)
2018-01-11 13:20:57 +01:00
Wladimir J. van der Laan
af5d18ad5c
Merge #8707 : net: fix maxuploadtarget setting
...
f3552da net: fix maxuploadtarget setting (Cory Fields)
2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
2a13321ffc
Merge #8742 : Specify Protobuf version 2 in paymentrequest.proto
...
c4084c2 Specify Protobuf version 2 in paymentrequest.proto (fanquake)
2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
9432e1904f
Merge #8494 : [init, wallet] ParameterInteraction() iff wallet enabled
...
fa5d276 [init] ParameterInteraction() iff wallet enabled (MarcoFalke)
2018-01-11 13:19:32 +01:00
Jonas Schnelli
eae44bd3d7
Merge #8712 : Remove maxuploadtargets recommended minimum
...
1b6bcdd Remove maxuploadtargets recommended minimum (Jonas Schnelli)
2018-01-11 13:19:32 +01:00
Wladimir J. van der Laan
85ce0ef287
Merge #8697 : fix op order to append first alert
...
1d635ae fix op order to append first alert (rodasmith)
2018-01-11 13:19:32 +01:00
Alexander Block
3aad9d9085
Fix logging in PushInventory ( #1847 )
...
Merge conflict resolution went wrong here. It showed filtered in case it
was pushed and nothing in case it was filtered.
2018-01-11 04:59:25 +03:00
UdjinM6
94e891c020
Merge pull request #1842 from codablock/pr_backport_bitcoin_0.14-2
...
Backport missing PRs from Bitcoin 0.14 - Part 2
2018-01-11 04:58:52 +03:00
Alexander Block
c2de362b98
Actually honor fMiningRequiresPeers in getblocktemplate ( #1844 )
...
MiningRequiresPeers() was not used at all. I checked the Bitcoin
code and even there it is set but then ignored. Updated getblocktemplate
to actually honor the value.
The check also removes the need for IsInitialBlockDownload() to be false.
As regtest nodes start with an empty chain they won't be able to use
getblocktemplate for mining otherwise.
2018-01-10 15:22:00 +03:00
Alexander Block
81fb931fb8
Don't delay GETHEADERS when no blocks have arrived yet in devnet ( #1807 )
...
When the first mined block arrives from another node on devnet, we have to
send GETHEADERS immediately as we otherwise will never leave the IBD mode.
2018-01-10 15:20:08 +03:00
Wladimir J. van der Laan
fdd0638161
Merge #8928 : Fix init segfault where InitLoadWallet() calls ATMP before genesis
...
37aefff Fix init segfault where InitLoadWallet() calls ATMP before genesis (Matt Corallo)
2018-01-09 17:23:39 +01:00
Pieter Wuille
3baee7ba24
Merge #8681 : Performance Regression Fix: Pre-Allocate txChanged vector
...
ec81881 Performance Regression Fix: Pre-Allocate txChanged vector (Jeremy Rubin)
2018-01-09 14:16:39 +01:00
Wladimir J. van der Laan
0324fa0121
Merge #8677 : Do not shadow upper local variable 'send', prevent -Wshadow compiler warning.
...
125b946 Do not shadow upper local variable 'send', prevent -Wshadow compiler warning. (Pavel Janík)
2018-01-09 14:16:39 +01:00
Wladimir J. van der Laan
c2a601f507
Merge #8680 : Address Travis spurious failures
...
d6a5dc4 add waitfornewblock/waitforblock/waitforblockheight rpcs and use them for tests (Cory Fields)
2018-01-09 14:16:39 +01:00
MarcoFalke
3d26438bec
Merge #8673 : Trivial: Fix obvious assignment/equality error in test
...
426e7bc Fix obvious assignment/equality error in test (Jeremy Rubin)
2018-01-09 14:16:39 +01:00
Pieter Wuille
f7e9bc613a
Merge #8606 : Fix some locks
...
144ed76 Fix some locks (Pieter Wuille)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
75f920e897
Merge #8663 : trivial: remove unnecessary variable fDaemon
...
ff2ed7a trivial: remove unnecessary variable fDaemon (mruddy)
2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
313cfb09da
Merge #8466 : [Trivial] Do not shadow variables in networking code
...
b7c349d Do not shadow variables in networking code (Pavel Janík)
2018-01-09 14:16:38 +01:00