Pieter Wuille
f6b7df3155
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)
2016-05-25 18:08:06 +02:00
MarcoFalke
e2bf830bb6
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)
2016-05-17 09:27:25 +02:00
Patrick Strateman
380498aba4
Move BackupWallet to CWallet::BackupWallet
2016-05-16 17:48:25 -07:00
Patrick Strateman
ecb9741ec3
Move GetAccountBalance from rpcwallet.cpp into CWallet::GetAccountBalance
2016-05-16 17:48:25 -07:00
Gregory Maxwell
d87b198b73
Remove unneeded feerate param from RelayTransaction/AcceptToMemoryPool.
2016-05-16 04:10:06 +00:00
Cory Fields
34ed64a404
crypter: add tests for crypter
...
Verify that results correct (match known values), consistent (encrypt->decrypt
matches the original), and compatible with the previous openssl implementation.
Also check that failed encrypts/decrypts fail the exact same way as openssl.
2016-05-13 10:23:04 +02:00
Cory Fields
976f9ec264
crypter: add a BytesToKey clone to replace the use of openssl
...
BytesToKeySHA512AES should be functionally identical to EVP_BytesToKey, but
drops the dependency on openssl.
2016-05-13 10:23:04 +02:00
Cory Fields
9049cde4d9
crypter: hook up the new aes cbc classes
2016-05-13 10:23:04 +02:00
Cory Fields
fb96831c1f
crypter: constify encrypt/decrypt
...
This makes CCrypter easier to pass aroundf for tests
2016-05-13 10:23:04 +02:00
Cory Fields
1c391a5866
crypter: fix the stored initialization vector size
...
AES IV's are 16bytes, not 32. This was harmless but confusing.
Add WALLET_CRYPTO_IV_SIZE to make its usage explicit.
2016-05-13 10:23:03 +02:00
MarcoFalke
fa72f7d99d
[doc] Remove outdated line from listunspent RPC help, fix typo
2016-05-10 17:59:02 +02:00
Wladimir J. van der Laan
373b50deba
Merge #8028 : Fix insanity of CWalletDB::WriteTx and CWalletTx::WriteToDisk
...
0fd5997
Fix insanity of CWalletDB::WriteTx and CWalletTx::WriteToDisk (Patrick Strateman)
2016-05-10 15:51:34 +02:00
Wladimir J. van der Laan
3e2c946cfd
init: Move berkeleydb version reporting to wallet
...
Move the version reporting to Wallet::Verify, before starting
verification of the wallet.
This removes the dependency of init on a specific wallet database
library.
A further, trivial step towards resolving #7965 .
2016-05-10 12:57:07 +02:00
Patrick Strateman
0fd599767d
Fix insanity of CWalletDB::WriteTx and CWalletTx::WriteToDisk
2016-05-09 00:20:17 -07:00
Pedro Branco
0bf6f30262
Prevent multiple calls to ExtractDestination
2016-05-06 10:50:02 +01:00
Jonas Schnelli
04eaa90958
Add more clear interface for CoinControl.h regarding individual feerate
2016-05-06 11:01:50 +02:00
Jonas Schnelli
3b35e4896b
[RPC] add feerate option to fundrawtransaction
2016-04-28 22:04:07 +02:00
Wladimir J. van der Laan
46880ed2fd
Merge #7688 : List solvability in listunspent output and improve help
...
c3932b3
List solvability in listunspent output and improve help (Pieter Wuille)
2016-04-25 14:46:29 +02:00
Wladimir J. van der Laan
0c95ebce7e
Merge #7816 : [Wallet] slighly refactor GetOldestKeyPoolTime()
...
9f7336b
[Wallet] slightly refactor GetOldestKeyPoolTime() (Jonas Schnelli)
2016-04-22 08:36:56 +02:00
Wladimir J. van der Laan
04a2937357
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)
2016-04-19 16:10:57 +02:00
Wladimir J. van der Laan
187186b0fe
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)
2016-04-19 10:49:48 +02:00
Wladimir J. van der Laan
b30fb42e49
test: Rename wallet.dat to wallet_test.dat
...
Indicate that the file name is not hardcoded, and a little bit of safety
so that it never nukes the main wallet.
Suggestion by Marco Falke.
2016-04-18 15:17:08 +02:00
Wladimir J. van der Laan
a25a4f5b04
wallet_ismine.h → script/ismine.h
...
Removes conditional dependency of `src/test` on wallet.
Makes multisig and P2SH tests complete without wallet built-in.
2016-04-18 15:14:36 +02:00
Wladimir J. van der Laan
f4eae2d910
test: Create test fixture for wallet
...
Removes all the `#ifdef ENABLE_WALLET` from `test_bitcoin` by
making the wallet tests use their own fixture.
2016-04-18 14:57:42 +02:00
Wladimir J. van der Laan
d289950180
Merge #7900 : fix spelling mistake
...
3107c47
fix spelling mistake (Chris Moore)
2016-04-18 14:15:12 +02:00
Wladimir J. van der Laan
de39c95c24
test: move accounting_tests and rpc_wallet_tests to wallet/test
...
Move the two other wallet tests to where they belong.
2016-04-18 14:04:40 +02:00
Chris Moore
3107c475a7
fix spelling mistake
2016-04-17 00:01:49 -07:00
Chris Moore
dc0693f637
add missing newline
...
Without the newline I see "bein" where the two lines are concatenated:
Note that all inputs selected must be of standard form and P2SH scripts must *bein* the wallet using importaddress or addmultisigaddress (to calculate fees).
2016-04-16 13:42:28 -07:00
João Barbosa
f2d0944eb3
Add lockUnspents option to fundrawtransaction
2016-04-15 15:36:05 +02:00
João Barbosa
af4fe7fd12
Add change options to fundrawtransaction
2016-04-15 15:36:05 +02:00
Wladimir J. van der Laan
430fffefaa
Merge #7812 : Tiny refactor of IsRBFOptIn
, avoid exception
...
4f7c959
Refactor IsRBFOptIn, avoid exception (Jonas Schnelli)
2016-04-14 16:35:02 +02:00
Jonas Schnelli
9f7336b457
[Wallet] slightly refactor GetOldestKeyPoolTime()
2016-04-06 11:06:25 +02:00
Jonas Schnelli
4f7c959af1
Refactor IsRBFOptIn, avoid exception
2016-04-06 10:59:03 +02:00
MarcoFalke
fada0c422c
[doc] Fix doxygen comments for members
2016-04-03 11:58:01 +02:00
MarcoFalke
fabbf80f2f
[ui] Move InitError, InitWarning, AmountErrMsg
2016-04-02 15:26:21 +02:00
Wladimir J. van der Laan
30c2dd8d05
Merge #7691 : [Wallet] refactor wallet/init interaction
...
25340b7
[Wallet] refactor wallet/init interaction (Jonas Schnelli)
2016-04-02 11:07:39 +02:00
Wladimir J. van der Laan
fb8a8cf2e6
rpc: Register calls where they are defined
...
Split out methods to every module, apart from 'help' and 'stop' which
are implemented in rpcserver.cpp itself.
- This makes it easier to add or remove RPC commands - no longer everything that includes
rpcserver.h has to be rebuilt when there's a change there.
- Cleans up `rpc/server.h` by getting rid of the huge cluttered list of function definitions.
- Removes most of the bitcoin-specific code from rpcserver.cpp and .h.
Continues #7307 for the non-wallet.
2016-03-31 10:48:32 +02:00
Wladimir J. van der Laan
b35a591793
Merge #7558 : [RPC] Add import/removeprunedfunds rpc call
...
f1bb13c
Added companion removeprunedfunds call. (instagibbs)
7eb7029
Add importprunedfunds rpc call (instagibbs)
2016-03-29 11:15:02 +02:00
Jonas Schnelli
cef8bdf5d7
[Wallet][RPC] add missing abandon status documentation
2016-03-29 08:43:08 +02:00
Wladimir J. van der Laan
b88e0b0c61
Merge #7506 : Use CCoinControl selection in CWallet::FundTransaction
...
d6cc6a1
Use CCoinControl selection in CWallet::FundTransaction (João Barbosa)
2016-03-24 14:59:51 +01:00
João Barbosa
df9e9233dc
Fix lockunspents help message
2016-03-23 15:44:41 +00:00
Jonas Schnelli
263de3d1c8
[Wallet][RPC] add abandoned status to listtransactions
2016-03-23 15:49:53 +01:00
instagibbs
f1bb13c93d
Added companion removeprunedfunds call.
2016-03-23 10:40:38 -04:00
instagibbs
7eb702954e
Add importprunedfunds rpc call
2016-03-23 10:40:38 -04:00
Wladimir J. van der Laan
3bdc583b3f
Merge #7715 : Fix calculation of balances and available coins.
...
68d4282
Fix calculation of balances and available coins. (Alex Morcos)
2016-03-23 15:09:02 +01:00
João Barbosa
bb16c8894b
Prevent multiple calls to CWallet::AvailableCoins
2016-03-22 08:43:37 +00:00
Jonas Schnelli
25340b7cd5
[Wallet] refactor wallet/init interaction
2016-03-22 08:20:59 +01:00
Alex Morcos
9e072a6e66
Implement "feefilter" P2P message.
...
The "feefilter" p2p message is used to inform other nodes of your mempool min fee which is the feerate that any new transaction must meet to be accepted to your mempool. This will allow them to filter invs to you according to this feerate.
2016-03-21 10:46:25 -04:00
Denis Lukianov
c5825d2d73
Correct importaddress help reference to importpubkey
2016-03-21 03:16:19 +00:00
Alex Morcos
68d4282774
Fix calculation of balances and available coins.
...
No longer consider coins which aren't in our mempool.
Add test for regression in abandonconflict.py
2016-03-18 09:56:30 -04:00
Pieter Wuille
c3932b3270
List solvability in listunspent output and improve help
2016-03-14 19:22:11 +01:00
MarcoFalke
fa48bb3148
[qt] Remove 0-fee from send dialog
2016-03-14 18:32:09 +01:00
MarcoFalke
fa19b18c63
[wallet] Move hardcoded file name out of log messages
2016-03-14 13:54:05 +01:00
Jonas Schnelli
15e6e13624
[Wallet] optimize return value of InitLoadWallet()
2016-03-14 09:33:27 +01:00
Jonas Schnelli
fc7c60d699
[Wallet] move "load wallet phase" to CWallet
2016-03-11 14:31:06 +01:00
Wladimir J. van der Laan
86a1ec5b2c
Merge #7576 : [Wallet] move wallet help string creation to CWallet
...
72c2651
[Wallet] move wallet help string creation to CWallet (Jonas Schnelli)
2016-03-11 08:40:37 +01:00
João Barbosa
d6cc6a1830
Use CCoinControl selection in CWallet::FundTransaction
2016-03-08 15:14:47 +00:00
Jonas Schnelli
72c2651581
[Wallet] move wallet help string creation to CWallet
2016-03-05 13:27:04 -05:00
Wladimir J. van der Laan
3368895c3b
Merge #7521 : Don't resend wallet txs that aren't in our own mempool
...
5a2b1c0
Don't resend wallet txs that aren't in our own mempool (Alex Morcos)
2016-03-03 15:09:50 +01:00
Wladimir J. van der Laan
e5121eb951
Merge #7617 : [doc/log] Fix markdown syntax and line terminate LogPrint
...
fa26652
Make sure LogPrintf strings are line-terminated (MarcoFalke)
fa97f95
[doc] Fix markdown (MarcoFalke)
fa06ce0
Fix doxygen comment for payTxFee (MarcoFalke)
2016-03-01 18:39:21 +01:00
Wladimir J. van der Laan
78e81b0bc5
Merge #7537 : wallet: Warn on unexpected EOF while salvaging wallet
...
ca8fb59
wallet: Warn on unexpected EOF while salvaging wallet (Wladimir J. van der Laan)
2016-02-29 10:05:07 +01:00
MarcoFalke
fa06ce0949
Fix doxygen comment for payTxFee
2016-02-27 18:14:57 +01:00
Matthew Zipkin
7eef1d0dad
Clarify description of blockindex
...
see issues:
https://github.com/bitcoin-dot-org/bitcoin.org/issues/1237
https://github.com/bitcoin/bitcoin/issues/7532
2016-02-18 12:42:59 -08:00
Wladimir J. van der Laan
f31b6b8995
test: test leading space for ParseHex
...
BerkeleyDB dump files have key and value lines indented.
The salvage code passes these to ParseHex as-is.
Check this in the tests (should just pass with current code).
2016-02-15 17:14:30 +01:00
Wladimir J. van der Laan
ca8fb59ae1
wallet: Warn on unexpected EOF while salvaging wallet
...
Check for EOF before every getline, and warn when reading gets to EOF
before the end of the data.
Stricter error checking could shed more light on issues such as #7463
and #7379 .
2016-02-15 16:35:12 +01:00
instagibbs
c372572595
Fix and cleanup listreceivedbyX documentation
2016-02-12 14:06:59 -05:00
Alex Morcos
5a2b1c0c8b
Don't resend wallet txs that aren't in our own mempool
2016-02-11 17:34:55 -05:00
Wladimir J. van der Laan
40e7b61835
wallet: Ignore MarkConflict if block hash is not known
...
If number of conflict confirms cannot be determined, this means
that the block is still unknown or not yet part of the main chain,
for example during a reindex. Do nothing in that case,
instead of crash with an assertion.
Fixes #7234 .
2016-02-09 20:38:31 +01:00
Wladimir J. van der Laan
d2228384de
Merge #6480 : include the chaintip blockindex in the SyncTransaction signal, add signal UpdateTip()
...
7d0bf0b
include the chaintip *blockIndex in the SyncTransaction signal (Jonas Schnelli)
2016-02-04 17:03:09 +01:00
MarcoFalke
fad6244879
ATMP: make nAbsurdFee const
2016-02-03 13:14:23 +01:00
MarcoFalke
fa762d0f00
[wallet.h] Remove main.h include
2016-02-03 12:44:43 +01:00
MarcoFalke
fa79db2641
Move maxTxFee out of mempool
...
Also, remove default values in CMerkleTx::AcceptToMemoryPool()
2016-02-02 20:08:51 +01:00
MarcoFalke
fa331db68b
mempool: Replace maxFeeRate of 10000*minRelayTxFee with maxTxFee
2016-01-30 11:29:22 +01:00
Wladimir J. van der Laan
62f2d769e4
Merge #7348 : MOVE ONLY: move rpc* to rpc/
...
d13f65e
rpc: update inline comments to refer to new file paths (Daniel Cousens)
a0eaff8
move rpc* to rpc/ (Daniel Cousens)
2016-01-28 11:28:24 +01:00
Wladimir J. van der Laan
fc08994000
Merge #7262 : Reduce inefficiency of GetAccountAddress()
...
2409865
Reduce inefficiency of GetAccountAddress() (Chris Moore)
2016-01-22 15:31:11 +01:00
Daniel Cousens
d13f65ebac
rpc: update inline comments to refer to new file paths
2016-01-21 08:39:04 +11:00
Daniel Cousens
a0eaff8a1d
move rpc* to rpc/
2016-01-21 08:36:55 +11:00
Wladimir J. van der Laan
b92ea98503
Merge #7183 : Improved readability of ApproximateBestSubset
...
96efcad
Improved readability of sorting for coin selection. (Murch)
2016-01-20 15:55:03 +01:00
Wladimir J. van der Laan
9982710e88
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)
2016-01-20 15:15:51 +01:00
Jonas Schnelli
dd2dc400ee
[RPC, Wallet] Move RPC dispatch table registration to wallet/ code
...
Allow extending the rpc dispatch table by appending commands when server is not running.
2016-01-20 15:03:25 +01:00
Wladimir J. van der Laan
82429d0861
Merge #7222 : RPC: Indicate which transactions are signaling opt-in RBF
...
eaa8d27
RPC: indicate which transactions are replaceable (Suhas Daftuar)
2016-01-20 13:50:37 +01:00
MarcoFalke
fa6d4cc095
[walletdb] Fix syntax error in key parser
2016-01-20 09:44:53 +01:00
Suhas Daftuar
eaa8d2754b
RPC: indicate which transactions are replaceable
...
Add "bip125-replaceable" output field to listtransactions and gettransaction
which indicates if an unconfirmed transaction, or any unconfirmed parent, is
signaling opt-in RBF according to BIP 125.
2016-01-19 08:30:04 -05:00
Wladimir J. van der Laan
a8bd616fea
Merge pull request #7329
...
9d263bd
Typo fixes in comments (Chris Wheeler)
2016-01-18 10:41:32 +01:00
Chris Wheeler
9d263bd17c
Typo fixes in comments
2016-01-17 11:03:56 +00:00
Wladimir J. van der Laan
fd9356ba4e
Merge pull request #7322
...
c0cf48d
c++11: add scoped enum fallbacks to CPPFLAGS rather than defining them locally (Cory Fields)
2016-01-16 10:49:46 +01:00
Wladimir J. van der Laan
17ef279304
Merge pull request #7332
...
faf671b
[wallet] Clarify rpc help message with regard to rounding (MarcoFalke)
2016-01-13 16:01:28 +01:00
Wladimir J. van der Laan
be6d5a617d
Merge pull request #7312
...
d11fc16
[Wallet] Call notification signal when a transaction is abandoned (Jonas Schnelli)
df0e222
Add RPC test for abandoned and conflicted transactions. (Alex Morcos)
01e06d1
Add new rpc call: abandontransaction (Alex Morcos)
9e69717
Make wallet descendant searching more efficient (Alex Morcos)
2016-01-13 15:47:45 +01:00
Jonas Schnelli
d11fc1695c
[Wallet] Call notification signal when a transaction is abandoned
2016-01-13 08:42:04 -05:00
Alex Morcos
01e06d1fa3
Add new rpc call: abandontransaction
...
Unconfirmed transactions that are not in your mempool either due to eviction or other means may be unlikely to be mined. abandontransaction gives the wallet a way to no longer consider as spent the coins that are inputs to such a transaction. All dependent transactions in the wallet will also be marked as abandoned.
2016-01-13 08:42:04 -05:00
MarcoFalke
faf671bca6
[wallet] Clarify rpc help message with regard to rounding
2016-01-13 12:06:24 +01:00
Wladimir J. van der Laan
c49551886a
Merge pull request #7296
...
bebe58b
SQUASHME: Fix rpc tests that assumed fallback to minRelayTxFee (Alex Morcos)
e420a1b
Add sane fallback for fee estimation (Alex Morcos)
995b9f3
Always respect GetRequiredFee for wallet txs (Alex Morcos)
2016-01-13 11:04:31 +01:00
Cory Fields
c0cf48d1ac
c++11: add scoped enum fallbacks to CPPFLAGS rather than defining them locally
...
Due to include ordering, defining in one place was not enough to ensure correct
usage. Use global defines so that we don't have to worry abou this ordering.
Also add a comment in configure about the test.
2016-01-08 13:32:00 -05:00
Wladimir J. van der Laan
9de541a9c9
Merge pull request #7306
...
f61766b
Make sure conflicted wallet tx's update balances (Alex Morcos)
2016-01-08 17:36:19 +01:00
Alex Morcos
9e69717254
Make wallet descendant searching more efficient
2016-01-07 16:31:12 -05:00
Wladimir J. van der Laan
5541560938
Merge pull request #7293
...
faf538b
[trivial] Merge test cases and replace CENT with COIN (MarcoFalke)
fa3c7e6
[wallet] Add regression test for vValue sort order (MarcoFalke)
2016-01-07 09:24:34 +01:00
Wladimir J. van der Laan
d964b5bb1a
Merge pull request #7229
...
fa33d97
[walletdb] Add missing LOCK() in Recover() for dummyWallet (MarcoFalke)
fa14d99
[qa] check if wallet or blochchain maintenance changes the balance (MarcoFalke)
fa0765d
[qa] Cleanup wallet.py test (MarcoFalke)
2016-01-07 09:17:11 +01:00
Alex Morcos
f61766b37b
Make sure conflicted wallet tx's update balances
2016-01-06 17:24:30 -05:00
Cory Fields
57d2f62c99
c++11: CAccountingEntry must be defined before use in a list
...
c++11ism. This fixes builds against libc++.
2016-01-05 17:17:29 -05:00
Cory Fields
76ac35f36d
c++11: detect and correct for boost builds with an incompatible abi
...
This is ugly, but temporary. boost::filesystem will likely be dropped soon
after c++11 is enabled. Otherwise, we could simply roll our own copy_file. I've
fixed this at the buildsystem level for now in order to avoid mixing in
functional changes.
Explanation:
If boost (prior to 1.57) was built without c++11, it emulated scoped enums
using c++98 constructs. Unfortunately, this implementation detail leaked into
the abi. This was fixed in 1.57.
When building against that installed version using c++11, the headers pick up
on the native c++11 scoped enum support and enable it, however it will fail to
link. This can be worked around by disabling c++11 scoped enums if linking will
fail.
Add an autoconf test to determine incompatibility. At build-time, if native
enums are being used (a c++11 build), and force-disabling them causes a
successful link, we can be sure that there's an incompatibility and enable the
work-around.
2016-01-05 17:17:29 -05:00