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

395 Commits

Author SHA1 Message Date
Wladimir J. van der Laan
6cacb79c03 Merge #8980: RPC: importmulti: Avoid using boost::variant::operator!=, which is only in newer boost versions 
7942d31 RPC: importmulti: Avoid using boost::variant::operator!=, which is only in newer boost versions (Luke Dashjr)
 2018-01-13 13:44:37 +01:00
Wladimir J. van der Laan
efded3ca9c Merge #7551: Add importmulti RPC call 
215caba Add consistency check to RPC call importmulti (Pedro Branco)
cb08fdb Add importmulti rpc call (Pedro Branco)
 2018-01-13 13:44:37 +01:00
Alexander Block
3b084b25bd Remove unnecessary function prototypes 2018-01-13 13:44:37 +01:00
Wladimir J. van der Laan
dd6b9ad20f Merge #8788: [RPC] Give RPC commands more information about the RPC request 
e7156ad [RPC] pass HTTP basic authentication username to the JSONRequest object (Jonas Schnelli)
69d1c25 [RPC] Give RPC commands more information about the RPC request (Jonas Schnelli)
23c32a9 rpc: Change JSONRPCRequest to JSONRPCRequestObj (Wladimir J. van der Laan)
 2018-01-13 13:44:37 +01:00
Alexander Block
6989f94d6e Get rid of InsecureRand and use equivalent FastRandomContext 
Also extend FastRandomContext to be compatible to existing uses, especially
with std::random_shuffle
 2018-01-12 16:37:39 +01:00
Wladimir J. van der Laan
0dcca9b99b Merge #8287: [wallet] Set fLimitFree = true 
fa8b02d [rpc] rawtx: Prepare fLimitFree to make it an option (MarcoFalke)
fa28bfa [wallet] Set fLimitFree = true (MarcoFalke)
 2018-01-12 09:58:14 +01:00
Wladimir J. van der Laan
239ce534c2 Merge #8914: Kill insecure_random and associated global state 
5eaaa83 Kill insecure_random and associated global state (Wladimir J. van der Laan)
 2018-01-12 09:58:14 +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
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
Alexander Block
9b1d1c61b2 Move AutoBackup initialization into CWallet::InitAutoBackup 2018-01-11 18:39:50 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
Pieter Wuille
256b9b77a2 Merge #7946: Reduce cs_main locks during ConnectTip/SyncWithWallets 
b3b3c2a Reduce cs_main locks during ConnectTip/SyncWithWallets (Jonas Schnelli)
 2018-01-08 18:04:55 +01:00
Pieter Wuille
e34e2bbcca Merge #8432: Make CWallet::fFileBacked private. 
29c2d99 Make CWallet::fFileBacked private. (Patrick Strateman)
 2018-01-08 18:04:55 +01:00
Pieter Wuille
9589e24485 Merge #8152: [Wallet] Remove CWalletDB* parameter from CWallet::AddToWallet 
5723bb4 Remove unused pwalletdb from CWallet::AddToWallet (Patrick Strateman)
867f842 Remove CWalletDB* parameter from CWallet::AddToWallet (Patrick Strateman)
00f09c9 Split CWallet::AddToWallet into AddToWallet and LoadToWallet. (Patrick Strateman)
 2018-01-08 18:04:55 +01:00
UdjinM6
1448506570
Switch KeePassHttp integration to new AES lib, add tests and a note about KeePassHttp security (#1818) 
* Add a note about KeePassHttp security

* Use new AES lib instead of OpenSSL for KeePassHttp encryption/decryption

* Add tests to make sure new AES lib works corrctly for KeePassHttp encryption/decryption and produces the same results as OpenSSL did
 2017-12-29 01:10:34 +03:00
Wladimir J. van der Laan
355f3724d2 Merge #8298: wallet: Revert input selection post-pruning 
20f3cd7 wallet: Revert input selection post-pruning (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
b7b5d6ea7b Merge #8246: trivial: capitalize BIP32 in option help 
a1c92c2 trivial: capitalize BIP32 in option help (Wladimir J. van der Laan)
 2017-12-28 11:44:59 +01:00
Wladimir J. van der Laan
d2c3b7efef Merge #7687: Stop treating importaddress'ed scripts as change 
595b22e Stop treating importaddress'ed scripts as change (Pieter Wuille)
 2017-12-28 11:44:59 +01:00
MarcoFalke
46473757ee Merge #8215: [wallet] tests: Don't use floating point 
faa91b1 [wallet] tests: Don't use floating point (MarcoFalke)
 2017-12-28 11:44:59 +01:00
Alexander Block
fa25499868 Swap iterations and fUseInstantSend parameters in ApproximateBestSubset (#1819) 
#1695 introduced a fix for a instant send related edge case. Somehow the
parameters got mixed up and fUseInstantSend was passed as "iterations".
 2017-12-28 03:49:05 +03:00
Wladimir J. van der Laan
79db88bbb1 Merge #8181: build: Get rid of CLIENT_DATE 
d096d22 build: Get rid of `CLIENT_DATE` (Wladimir J. van der Laan)
 2017-12-22 17:20:31 +01:00
Wladimir J. van der Laan
cfc76bab9a Merge #8172: Fix two warnings for comparison between signed and unsigned 
77f63a4 Fix two warnings for comparison between signed and unsigned (Pieter Wuille)
 2017-12-22 17:20:31 +01:00
Wladimir J. van der Laan
05419aba3c Merge #8153: [rpc] fundrawtransaction feeRate: Use BTC/kB 
fa7f4f5 [rpc] fundrawtransaction feeRate: Use BTC/kB (MarcoFalke)
faf82e8 [rpc] fundrawtransaction: Fix help text and interface (MarcoFalke)
 2017-12-22 16:33:56 +01:00
Wladimir J. van der Laan
b2bd69a7a9 Merge #8142: Improve CWallet API with new GetAccountPubkey function. 
152ab23 Improve CWallet API  with new GetAccountPubkey function. (Patrick Strateman)
 2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
d7d5d577f4 Merge #8137: Improve CWallet API with new AccountMove function. 
9dfaa1c Improve CWallet API with new AccountMove function. (Patrick Strateman)
 2017-12-22 16:33:55 +01:00
Wladimir J. van der Laan
c69df9b82c Merge #7967: [RPC] add feerate option to fundrawtransaction 
04eaa90 Add more clear interface for CoinControl.h regarding individual feerate (Jonas Schnelli)
3b35e48 [RPC] add feerate option to fundrawtransaction (Jonas Schnelli)
 2017-12-22 16:33:55 +01:00
Pieter Wuille
df14a7f009 Merge #7825: Prevent multiple calls to ExtractDestination 
0bf6f30 Prevent multiple calls to ExtractDestination (Pedro Branco)
 2017-12-22 16:33:52 +01:00
Alexander Block
433a026a15 Fix OpenSSL build error 2017-12-22 16:33:04 +01:00
Pieter Wuille
91752ab7ed Merge #7689: Replace OpenSSL AES with ctaes-based version 
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)
 2017-12-22 16:33:04 +01:00
Pieter Wuille
43cbeb7fa5 Merge #7891: Always require OS randomness when generating secret keys 
628cf14 Don't use assert for catching randomness failures (Pieter Wuille)
fa2637a Always require OS randomness when generating secret keys (Pieter Wuille)
 2017-12-21 18:50:14 +01:00
Alexander Block
51d17dcde3 Move AutoBackupWallet into wallet.cpp 2017-12-21 18:50:14 +01:00
Pieter Wuille
8723f99569 Merge #8061: [Wallet] Improve Wallet encapsulation 
380498a Move BackupWallet to CWallet::BackupWallet (Patrick Strateman)
ecb9741 Move GetAccountBalance from rpcwallet.cpp into CWallet::GetAccountBalance (Patrick Strateman)
 2017-12-21 18:50:14 +01:00
MarcoFalke
a0afc3ee01 Merge #8038: [qa, doc] Various minor fixes 
fa83a5d [qa] wallet: Temporarily disable salvagewallet test (MarcoFalke)
fadd048 [doc] Link to clang-format in the developer notes (MarcoFalke)
fa72f7d [doc] Remove outdated line from listunspent RPC help, fix typo (MarcoFalke)
ac40ed7 Increase timeout waiting for pruned blk00000.dat (error10)
 2017-12-21 18:50:13 +01:00
Pieter Wuille
7b25879463 Merge #8059: Remove unneeded feerate param from RelayTransaction/AcceptToMemoryPool. 
d87b198 Remove unneeded feerate param from RelayTransaction/AcceptToMemoryPool. (Gregory Maxwell)
 2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
76b72a7f2b Merge #8028: Fix insanity of CWalletDB::WriteTx and CWalletTx::WriteToDisk 
0fd5997 Fix insanity of CWalletDB::WriteTx and CWalletTx::WriteToDisk (Patrick Strateman)
 2017-12-21 18:50:13 +01:00
Wladimir J. van der Laan
4750be1afb Merge #8036: init: Move berkeleydb version reporting to wallet 
3e2c946 init: Move berkeleydb version reporting to wallet (Wladimir J. van der Laan)
 2017-12-21 18:50:13 +01:00
Alexander Block
b78bd5cc76 Dashify help text of fundrawtransaction 2017-12-21 07:12:35 +01:00
Alexander Block
da2de07718 Put ps_rounds to the bottom of the result of listunspent 
Avoids future conflicts in upcoming backports
 2017-12-21 07:02:24 +01:00
Alexander Block
2c63839f23 Dashify fundrawtransaction exception 
Fixes test failure
 2017-12-20 17:32:14 +01:00
Alexander Block
7973142f16 Reformat listunstpent help to align with upstream 2017-12-20 17:25:03 +01:00
Alexander Block
a60c351826 Error/Warning fixes for HD wallet part in wallet.cpp 2017-12-20 17:25:03 +01:00
Wladimir J. van der Laan
bacc864640 Merge #7787: [Moveonly] Create ui_interface.cpp 
fa10ce6 Move ui_interface.cpp to libbitcoin_server_a_SOURCES (MarcoFalke)
fabbf80 [ui] Move InitError, InitWarning, AmountErrMsg (MarcoFalke)
 2017-12-20 17:25:03 +01:00
Wladimir J. van der Laan
8678f2b391 Merge #7905: test: move accounting_tests and rpc_wallet_tests to wallet/test 
b30fb42 test: Rename wallet.dat to wallet_test.dat (Wladimir J. van der Laan)
a25a4f5 wallet_ismine.h → script/ismine.h (Wladimir J. van der Laan)
f4eae2d test: Create test fixture for wallet (Wladimir J. van der Laan)
de39c95 test: move accounting_tests and rpc_wallet_tests to wallet/test (Wladimir J. van der Laan)
 2017-12-20 17:25:03 +01:00
Wladimir J. van der Laan
1b17e94ee6 Merge #7900: fix spelling mistake 
3107c47 fix spelling mistake (Chris Moore)
 2017-12-20 17:25:03 +01:00
Wladimir J. van der Laan
96f9a7c3eb Merge #7897: add missing newline 
dc0693f add missing newline (Chris Moore)
 2017-12-20 17:25:03 +01:00
Wladimir J. van der Laan
6c7d133801 Merge #7518: Add multiple options to fundrawtransaction 
f2d0944 Add lockUnspents option to fundrawtransaction (João Barbosa)
af4fe7f Add change options to fundrawtransaction (João Barbosa)
41e835d Add strict flag to RPCTypeCheckObj (João Barbosa)
 2017-12-20 17:25:02 +01:00
Wladimir J. van der Laan
c176f6c5b5 Merge #7812: Tiny refactor of IsRBFOptIn, avoid exception 
4f7c959 Refactor IsRBFOptIn, avoid exception (Jonas Schnelli)
 2017-12-20 14:58:27 +01:00
Wladimir J. van der Laan
738e1c51c0 Merge #7793: [doxygen] Fix member comments 
fada0c4 [doc] Fix doxygen comments for members (MarcoFalke)
 2017-12-20 14:45:12 +01:00
Alexander Block
f235b6a6ac Apply review suggestions/fixes 2017-12-20 07:51:20 +01:00
Alexander Block
9dbda86cb1 HDWallet error/warning message fixes 2017-12-19 13:42:36 +01:00
Wladimir J. van der Laan
298224b3b7 Merge #7691: [Wallet] refactor wallet/init interaction 
25340b7 [Wallet] refactor wallet/init interaction (Jonas Schnelli)
 2017-12-19 13:42:36 +01:00
Wladimir J. van der Laan
644240157a Merge #7766: rpc: Register calls where they are defined 
fb8a8cf rpc: Register calls where they are defined (Wladimir J. van der Laan)
 2017-12-19 13:42:35 +01:00
Alexander Block
a309bf372e Clear setInternalKeyPool and setExternalKeyPool instead of setKeyPool 
Due to out of order backporting this was missed in the past
 2017-12-19 13:18:30 +01:00
Wladimir J. van der Laan
e2fefa539d Merge #7558: [RPC] Add import/removeprunedfunds rpc call 
f1bb13c Added companion removeprunedfunds call. (instagibbs)
7eb7029 Add importprunedfunds rpc call (instagibbs)
 2017-12-19 13:18:30 +01:00
Wladimir J. van der Laan
ca33635ef7 Merge #7742: [Wallet][RPC] add missing abandon status documentation 
cef8bdf [Wallet][RPC] add missing abandon status documentation (Jonas Schnelli)
 2017-12-19 13:18:30 +01:00
Wladimir J. van der Laan
a4911c383b Merge #7646: Fix lockunspent help message 
df9e923 Fix lockunspents help message (João Barbosa)
 2017-12-19 13:18:30 +01:00
Wladimir J. van der Laan
f933c67266 Merge #7715: Fix calculation of balances and available coins. 
68d4282 Fix calculation of balances and available coins. (Alex Morcos)
 2017-12-19 13:18:30 +01:00
Wladimir J. van der Laan
74fe8fe598 Merge #7649: Prevent multiple calls to CWallet::AvailableCoins 
bb16c88 Prevent multiple calls to CWallet::AvailableCoins (João Barbosa)
 2017-12-19 13:18:30 +01:00
Wladimir J. van der Laan
11ac70af9e Merge #7542: Implement "feefilter" P2P message 
0371797 modify release-notes.md and bips.md (Alex Morcos)
b536a6f Add p2p test for feefilter (Alex Morcos)
5fa66e4 Create SingleNodeConnCB class for RPC tests (Alex Morcos)
9e072a6 Implement "feefilter" P2P message. (Alex Morcos)
 2017-12-19 13:18:30 +01:00
Wladimir J. van der Laan
2839222434 Merge #7726: Correct importaddress help reference to importpubkey 
c5825d2 Correct importaddress help reference to importpubkey (Denis Lukianov)
 2017-12-19 12:55:49 +01:00
Wladimir J. van der Laan
721171ee39 Merge #7686: [qt] Remove 0-fee from send dialog 
fae8467 [qt] Remove unneeded "fSendFreeTransactions" check (MarcoFalke)
fa48bb3 [qt] Remove 0-fee from send dialog (MarcoFalke)
 2017-12-19 12:55:49 +01:00
Wladimir J. van der Laan
abbbe61d0f Merge #7608: [wallet] Move hardcoded file name out of log messages 
fa19b18 [wallet] Move hardcoded file name out of log messages (MarcoFalke)
 2017-12-19 12:55:49 +01:00
Alexander Block
332fbfc0e3 HDWallet fixes after moving wallet initialization 2017-12-19 12:55:49 +01:00
Wladimir J. van der Laan
b3525b2e67 Merge #7577: [Wallet] move "load wallet phase" to CWallet 
15e6e13 [Wallet] optimize return value of InitLoadWallet() (Jonas Schnelli)
fc7c60d [Wallet] move "load wallet phase" to CWallet (Jonas Schnelli)
 2017-12-19 12:55:49 +01:00
Wladimir J. van der Laan
51c6ab20f3 Merge #7576: [Wallet] move wallet help string creation to CWallet 
72c2651 [Wallet] move wallet help string creation to CWallet (Jonas Schnelli)
 2017-12-19 12:55:48 +01:00
UdjinM6
0658252f59
Merge pull request #1770 from codablock/pr_backport_bitcoin_0.12-1 
Backport missing PRs from Bitcoin 0.13 - Part 1
 2017-12-19 14:41:47 +03:00
UdjinM6
f37a64208c
InstantSend txes should never qualify to be a 0-fee txes (#1777) 2017-12-13 15:43:05 +03:00
Alexander Block
51ca0d5b47 Move privatesend to rpcwallet.cpp as well after Bitcoin #7307 was backported 
Allows to compile with no wallet again.
 2017-12-11 08:30:26 +01:00
Wladimir J. van der Laan
74eda87591 Merge #7537: wallet: Warn on unexpected EOF while salvaging wallet 
ca8fb59 wallet: Warn on unexpected EOF while salvaging wallet (Wladimir J. van der Laan)
 2017-12-11 08:30:26 +01:00
Wladimir J. van der Laan
ee5f8d2115 Merge #7536: test: test leading spaces for ParseHex 
f31b6b8 test: test leading space for ParseHex (Wladimir J. van der Laan)
 2017-12-11 08:30:26 +01:00
Wladimir J. van der Laan
8874b2e0fd Merge #6480: include the chaintip blockindex in the SyncTransaction signal, add signal UpdateTip() 
7d0bf0b include the chaintip *blockIndex in the SyncTransaction signal (Jonas Schnelli)
 2017-12-11 08:30:26 +01:00
Wladimir J. van der Laan
a3d1e5eda9 Merge #7070: Move maxTxFee out of mempool 
fad6244 ATMP: make nAbsurdFee const (MarcoFalke)
fa762d0 [wallet.h] Remove main.h include (MarcoFalke)
fa79db2 Move maxTxFee out of mempool (MarcoFalke)
 2017-12-11 08:30:26 +01:00
Wladimir J. van der Laan
0afbd1c3de Merge #7084: mempool: Replace maxFeeRate of 10000*minRelayTxFee with maxTxFee 
fa1193e [doxygen] Actually display comment (MarcoFalke)
fa331db mempool: Replace maxFeeRate of 10000*minRelayTxFee with maxTxFee (MarcoFalke)
 2017-12-11 08:08:49 +01:00
Wladimir J. van der Laan
643181fe15 Merge #7262: Reduce inefficiency of GetAccountAddress() 
2409865 Reduce inefficiency of GetAccountAddress() (Chris Moore)
 2017-12-10 00:04:02 +01:00
Wladimir J. van der Laan
59db2fda16 Merge #7183: Improved readability of ApproximateBestSubset 
96efcad Improved readability of sorting for coin selection. (Murch)
 2017-12-10 00:04:02 +01:00
Wladimir J. van der Laan
78ad32d105 Merge #7307: [RPC, Wallet] Move RPC dispatch table registration to wallet/ code 
dd2dc40 [RPC, Wallet] Move RPC dispatch table registration to wallet/ code (Jonas Schnelli)
 2017-12-10 00:04:02 +01:00
UdjinM6
3028af19f1
post-DIP0001 cleanup (#1763) 
* post-DIP0001 cleanup

also fixes tests

* bump nMinimumChainWork and defaultAssumeValid
 2017-12-07 12:43:23 +03:00
UdjinM6
7e96af4e65
Refactor PrivateSend (#1735) 
* make infoMixingMasternode private

* move PS queue entries expiration checks (and cs_darksend) to CPrivateSendBase

* drop CTxDSOut

* move prevPubKey out of CTxIn into CTxDSIn and use CTxDSIn explicitly

* drop CPrivateSendClient::NewBlock

* move IsDenominatedAmount to CPrivateSend

* move IsCollateralAmount to CPrivateSend

* drop darksend-relay.cpp/h

* drop GetMasternodeByRank
 2017-12-04 09:06:07 +03:00
UdjinM6
c166ed39b0
Allow compilation with --disable-wallet (#1733) 
* Allow compilation with `--disable-wallet`

* fix remaining references

* Drop wallet references/include in CActiveMasternode and fix other files affected by this change

* Wrap privatesend-client.h include with ifdef/endif and fix other files affected by this change

* Re-enable Travis build with no wallet

reverts 267e57877b
 2017-12-01 21:53:34 +03:00
UdjinM6
89f326c6da Merge branch 'master' into develop 2017-11-12 19:18:08 +03:00
UdjinM6
8591448094
fix bug introduced in #1695 (#1714) 2017-11-03 23:04:47 +03:00
UdjinM6
312663b4be
Remove support for local masternodes (#1706) 2017-11-01 18:11:39 +03:00