neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
14,268 Commits 1 Branch 1 Tag 185 MiB
5adb5b8e8a
Commit Graph

10153 Commits

Author SHA1 Message Date
Wladimir J. van der Laan
1c1554f7ca Merge #8884: Bugfix: Trivial: RPC: getblockchaininfo help: pruneheight is the lowest, not highest, block 
a78e542 Bugfix: Trivial: RPC: getblockchaininfo help: pruneheight is the lowest, not highest, block (Luke Dashjr)
 2018-01-12 09:57:56 +01:00
Wladimir J. van der Laan
fb8d46d44b Merge #8879: [doc] Rework docs 
eeeebdd [doc] Rework docs (MarcoFalke)
 2018-01-12 09:57:56 +01:00
Wladimir J. van der Laan
f45adb5619 Merge #8862: Fix a few cases where messages were sent after requested disconnect 
905bc68 net: fix a few cases where messages were sent rather than dropped upon disconnection (Cory Fields)
 2018-01-12 09:57:56 +01:00
Wladimir J. van der Laan
6e4dad98a6 Merge #8850: Implement (begin|end)_ptr in C++11 and add deprecation comment 
f00705a serialize: Deprecate `begin_ptr` / `end_ptr` (Wladimir J. van der Laan)
47314e6 prevector: add C++11-like data() method (Wladimir J. van der Laan)
 2018-01-12 09:57:56 +01:00
Wladimir J. van der Laan
14483e46f9 Merge #8856: Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs 
3450c18 Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs (Jorge Timón)
 2018-01-12 09:57:56 +01:00
Wladimir J. van der Laan
10127ae80b Merge #8863: univalue: Pull subtree 
2ca7faa Squashed 'src/univalue/' changes from daf1285..16a1f7f (MarcoFalke)
 2018-01-12 09:57:56 +01:00
Wladimir J. van der Laan
210242e5c0 Merge #8813: bitcoind: Daemonize using daemon(3) 
a92bf4a bitcoind: Daemonize using daemon(3) (Matthew King)
 2018-01-12 09:57:55 +01:00
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
Wladimir J. van der Laan
414272af93 Merge #8629: C++11: s/boost::scoped_ptr/std::unique_ptr/ 
cdd79eb C++11: s/boost::scoped_ptr/std::unique_ptr/ (Jorge Timón)
 2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
4d0be42c6e Merge #8272: Make the dummy argument to getaddednodeinfo optional 
854f1af Make the dummy argument to getaddednodeinfo optional (Pieter Wuille)
 2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
bc91f34da6 Merge #8638: rest.cpp: change HTTP_INTERNAL_SERVER_ERROR to HTTP_BAD_REQUEST 
f012a85 rest.cpp: change HTTP_INTERNAL_SERVER_ERROR to HTTP_BAD_REQUEST (djpnewton)
 2018-01-09 14:16:38 +01:00
Wladimir J. van der Laan
88fcf3fbd2 Merge #8191: Do not shadow variables in src/wallet 
b175cb7 Do not shadow variables. (Pavel Janík)
 2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
5ce7ba6115 Merge #8291: [util] CopyrightHolders: Check for untranslated substitution 
33336e1 [util] CopyrightHolders: Check for untranslated substitution (MarcoFalke)
 2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
9d061a2730 Merge #8163: Do not shadow global RPC table variable (tableRPC) 
de1bbe3 Do not shadow global RPC table variable (tableRPC) (Pavel Janík)
 2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
3b45caeeb7 Merge #8626: Berkeley DB v6 compatibility fix 
323a5fe Berkeley DB v6 compatibility fix (Alexey Vesnin)
 2018-01-09 14:16:37 +01:00
Wladimir J. van der Laan
f6658c07f3 Merge #8611: Reduce default number of blocks to check at startup 
203f212 Reduce default number of blocks to check at startup (Pieter Wuille)
 2018-01-09 14:16:37 +01:00
Pieter Wuille
707e2945a4 Merge #8564: [Wallet] remove unused code/conditions in ReadAtCursor 
beef966 [Wallet] remove unused code/conditions in ReadAtCursor (Jonas Schnelli)
 2018-01-09 14:04:21 +01:00
Wladimir J. van der Laan
22604cbbcc Merge #8607: [doc] Fix doxygen off-by-one comments, fix typos 
fafe7b3 contrib: Make fix-copyright-headers.py more portable (MarcoFalke)
fa27c0a [doc] Fix typos in comments, doxygen: Fix comment syntax (MarcoFalke)
fabfd5d [qa] pull-tester: Don't mute zmq ImportError (MarcoFalke)
67a5502 init: Fix typo in help message for -whitelistforcerelay (Wladimir J. van der Laan)
 2018-01-09 14:04:21 +01:00
Pieter Wuille
30066a6004 Merge #8109: Do not shadow member variables 
ff8d279 Do not shadow member variables (Pavel Janík)
 2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
95c61637d5 Merge #8590: Remove unused variables 
fa6dc9f Remove unused variables (MarcoFalke)
 2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
15b9e43abe Merge #8581: [wallet] rpc: Drop misleading option 
fab5ecb [wallet] rpc: Drop misleading option (MarcoFalke)
 2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
b00f025dd8 Merge #8583: Show XTHIN in GUI 
4c3e2cb Show XTHIN in GUI (R E Broadley)
 2018-01-09 14:04:20 +01:00
Wladimir J. van der Laan
df07a31743 Merge #8561: Show "end" instead of many zeros when getheaders request received with a hashStop of Null 
259ee09 Show "end" instead of many zeros when getheaders request received with a hashStop of Null. (R E Broadley)
 2018-01-09 14:04:20 +01:00
Pieter Wuille
3a497a6b5c Merge #8462: Move AdvertiseLocal debug output to net category 
f13c1ba Move AdvertiseLocal debug output to net category (Michael Rotarius)
 2018-01-09 14:04:20 +01:00
Jonas Schnelli
3fca7e2044 Merge #7579: [Qt] show network/chain errors in the GUI 
2f32c82 [Qt] show network/chain errors in the GUI (Jonas Schnelli)
 2018-01-09 14:04:20 +01:00
MarcoFalke
249e720254 Merge #8578: [test] Remove unused code 
fa1cf9e [test] Remove unused code (MarcoFalke)
 2018-01-09 14:04:19 +01:00
Wladimir J. van der Laan
e61556e20e Merge #8450: [Test] Replace rpc_wallet_tests.cpp with python RPC unit tests 
9578333 Remove rpc_wallet_tests.cpp (Patrick Strateman)
25400c4 Account wallet feature RPC tests. (Patrick Strateman)
 2018-01-09 14:04:19 +01:00
Pieter Wuille
c9ebd95163 Merge #8560: Trivial: Fix two VarInt examples in serialize.h 
7bd5ff4 Trivial: Fix two VarInt examples in serialize.h (Christian Barcenas)
 2018-01-09 14:04:19 +01:00
Wladimir J. van der Laan
d97fa0402f Merge #8445: Move CWallet::setKeyPool to private section of CWallet. 
8680d3a Move wallet initialization logic from AppInit2 to CWallet::InitLoadWallet (Patrick Strateman)
e86eb71 Move CWallet::setKeyPool to private section of CWallet (Patrick Strateman)
 2018-01-09 14:04:19 +01:00
Wladimir J. van der Laan
61a3d9aeb4 Merge #8554: trivial: remove unused variable 
4207630 trivial: remove unused variable (Daniel Kraft)
 2018-01-09 12:24:57 +01:00
Wladimir J. van der Laan
39909d3736 Merge #8558: Add copyright header to wallet_text_fixture.cpp 
653bb3d Add copyright header to wallet_text_fixture.cpp (Wladimir J. van der Laan)
 2018-01-09 12:24:57 +01:00
Kamil Woźniak
1cffb8a7ec Include p2pk into addressindex (#1839) 
* Add simple test for p2pk script

refs #1767

* Add p2pk transaction addresses indexing

Addresses from p2pk transaction are now indexed by transations pubkeys
hashes. Even if it isn't strict behavior and the p2pk are rare
and obsolete, it is transaction that should be able to be looked up.

fixes #1767

* Add p2pk script checking tests

refs #1767
 2018-01-09 14:23:46 +03:00
UdjinM6
eecec4535c
Merge pull request #1824 from codablock/pr_backport_bitcoin_0.14-1 
Backport missing PRs from Bitcoin 0.14 - Part 1
 2018-01-09 14:22:25 +03:00
UdjinM6
9965d51bb6
Avoid reference leakage in CKeyHolderStorage::AddKey (#1840) 2018-01-09 14:11:43 +03:00
UdjinM6
c532be1c06
Protect CKeyHolderStorage via mutex (#1834) 2018-01-09 12:18:10 +03:00
UdjinM6
d69ad9d619
Skip existing masternode conections on mixing (#1833) 2018-01-09 12:17:54 +03:00
Alexander Block
e2a795fd84 Return EXIT_SUCCESS instead of 0 in main() 2018-01-08 18:41:25 +01:00
Alexander Block
e3da73ebf8 Update Dash related code to use new SyncTransaction notifications interface 2018-01-08 18:41:06 +01:00
Alexander Block
f8ffc55af2 Partially cherry-pick tests refactorings found in Bitcoin SegWit PRs 
These were mixed into SegWit related PRs and are still needed in Dash.
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
b47cc13317 Merge #8548: [wallet] Use __func__ to get function name for output printing 
fa785d1 Use __func__ to get function name for output printing (MarcoFalke)
 2018-01-08 18:04:55 +01:00
Alexander Block
ae90d0f09e Align HD wallet status icon code with Bitcoin code 
Rename labelEncryptionIcon to labelWalletEncryptionIcon
Reorder icons in Makefile.qt.include
Add missing entries in debian/copyright
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
5bf3dadcb6 Merge #8461: document return value of networkhashps for getmininginfo RPC endpoint 
65f4532 document return value of networkhashps for getmininginfo RPC endpoint (Jameson Lopp)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
80573f2bf4 Merge #8540: qt: Fix random segfault when closing "Choose data directory" dialog 
b4a9aa5 qt: Fix random segfault when closing "Choose data directory" dialog (Wladimir J. van der Laan)
 2018-01-08 18:04:55 +01:00
Pieter Wuille
55ccc56a80 Merge #8453: Bring secp256k1 subtree up to date with master 
b213535 Squashed 'src/secp256k1/' changes from 6c527ec..7a49cac (Wladimir J. van der Laan)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
10aaf04b73 Merge #8505: Trivial: Fix typos in various files 
1aacfc2 various typos (leijurv)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
6b8160ba20 Merge #8513: Fix a type error that would not compile on OSX. 
8194a6e Fix a type error that would not compile on Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) (Jeremy Rubin)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
5c928f0052 Merge #8512: Trivial: Corrected JSON typo on setban of net.cpp 
6ffd996 Corrected JSON typo on setban of net.cpp (Sev)
 2018-01-08 18:04:55 +01:00
Wladimir J. van der Laan
599df51726 Merge #8516: [trivial] remove no-longer-used InitError logic 
edb6cf1 remove no-longer-used InitError logic (instagibbs)
 2018-01-08 18:04:55 +01:00
MarcoFalke
bc659c3e6e Merge #8270: Tests: Use portable #! in python scripts (/usr/bin/env) 
7b01ce2 Favour python over python2 as per PR #7723 (Matthew King)
873e81f Use portable #! in python scripts (/usr/bin/env) (Matthew King)
 2018-01-08 18:04:55 +01:00
Jonas Schnelli
a377499c10 Merge #8192: [trivial] Remove URLs from About dialog translations 
208d37f [trivial] Remove URLs from About dialog translations (fanquake)
 2018-01-08 18:04:55 +01:00
Alexander Block
f4af44676a Add SYNC_TRANSACTION_NOT_IN_BLOCK constant and fix callers of SyncTransaction 
Needed due to out-of-order backporting.
 2018-01-08 18:04:55 +01:00