Matt Corallo
1e0d1a2ff0
Add FundTransaction method to wallet
...
Some code stolen from Jonas Schnelli <jonas.schnelli@include7.ch>
2015-06-11 01:03:23 -07:00
Matt Corallo
2d84e22703
Small tweaks to CCoinControl for fundrawtransaction
2015-06-11 01:03:23 -07:00
Pieter Wuille
9b4e7d9a5e
Add DummySignatureCreator which just creates zeroed sigs
2015-06-11 01:03:23 -07:00
Philip Kaufmann
e059726811
[Qt] deselect peer when switching away from peers tab in RPC console
2015-06-11 08:39:08 +02:00
Philip Kaufmann
7211adad85
[Qt] replace Boost foreach with Qt version peertablemodel.cpp
2015-06-11 08:38:02 +02:00
Philip Kaufmann
1b0db7b984
[Qt] extend rpc console peers tab
...
- add node id, ping wait, whitelisted and common height
- rephrase some labels to make them easier to understand for users
2015-06-11 08:38:01 +02:00
Wladimir J. van der Laan
eba2f061a0
Merge pull request #6061
...
eb83719
2015-06-10 18:04:38 +02:00
Jorge Timón
eb837199a0
Consensus: Refactor: Separate Consensus::CheckTxInputs and GetSpendHeight in CheckInputs
2015-06-10 14:07:30 +02:00
Jorge Timón
425c3a87ff
Consensus: Separate CheckIndexAgainstCheckpoint() from ContextualCheckBlockHeader
2015-06-10 13:04:50 +02:00
Wladimir J. van der Laan
ac5476e2c1
Merge pull request #6057
...
7e6569e7a121193201035
2015-06-10 12:32:31 +02:00
Wladimir J. van der Laan
3a1d3e8f52
Merge pull request #5985
...
14d4eef
2015-06-10 12:15:19 +02:00
Wladimir J. van der Laan
9b5659d1c4
Remove translation for -help-debug options
...
Do not translate -help-debug options, Many technical terms, and
only a very small audience, so is unnecessary stress to translators.
Brings the code up to date with translation string policy in
`doc/translation_strings_policy.md`.
Also remove no-longer-relevant "In this mode -genproclimit controls how
many blocks are generated immediately." (as of #5957 ) from regtest help.
2015-06-10 11:59:23 +02:00
Wladimir J. van der Laan
e54ff2fc0e
Merge pull request #6213
...
eebd4cc
2015-06-10 11:39:06 +02:00
Wladimir J. van der Laan
8d9f0a6069
Merge pull request #5927
...
dce8360
2015-06-10 10:33:12 +02:00
Wladimir J. van der Laan
9c93ee5ceb
Merge pull request #6222
...
efd4444
2015-06-10 09:48:00 +02:00
Wladimir J. van der Laan
643114f539
Merge pull request #6239
...
7d8ffaca04bdef4b4b9a8
2015-06-09 18:38:33 +02:00
Wladimir J. van der Laan
3a2ca9bbde
Merge pull request #6246
...
0640a5e
2015-06-09 18:24:53 +02:00
dexX7
506bae3ac9
Return all available information via validateaddress
...
`"validateaddress"` omits some information, even in cases where is it available.
The primary motivation is to be able to retrieve redeemScripts, after using `"addmultisigaddress"`, when not all keys are available in the keystore, but the redeemScript actually is.
The output of `"validateaddress"` with this commit:
Keys not available:
```js
validateaddress "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3"
{
"isvalid": true,
"address": "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3",
"scriptPubKey": "76a914fa20d564550b105787f7ce3a9ad7fd9a45cd407088ac",
"ismine": false,
"iswatchonly": false,
"isscript": false
}
```
```js
validateaddress "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK"
{
"isvalid": true,
"address": "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK",
"scriptPubKey": "a9146769c19a16c9400b908756e19a4d2afb9e9760e187",
"ismine": false,
"iswatchonly": false,
"isscript": true
}
```
After adding the redeemScript:
```js
addmultisigaddress 2 '["02537357B156A33306A7A014A3748631C59DF405B56F11BA4AA4A3CE81501AF095","02F1FB200390E7864EF4450C07B15988179A57C3CF3A878F668E1070CB615749FE"]'
2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK
validateaddress "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK"
{
"isvalid": true,
"address": "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK",
"scriptPubKey": "a9146769c19a16c9400b908756e19a4d2afb9e9760e187",
"ismine": false,
"iswatchonly": false,
"isscript": true,
"script": "multisig",
"hex": "522102537357b156a33306a7a014a3748631c59df405b56f11ba4aa4a3ce81501af0952102f1fb200390e7864ef4450c07b15988179a57c3cf3a878f668e1070cb615749fe52ae",
"addresses": [
"n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3",
"mmSKNtbYYHRrhTLKiok5TuYrGEs4Y2A4k6"
],
"sigsrequired": 2,
"account": ""
}
```
All keys available:
```js
validateaddress "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3"
{
"isvalid": true,
"address": "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3",
"scriptPubKey": "76a914fa20d564550b105787f7ce3a9ad7fd9a45cd407088ac",
"ismine": true,
"iswatchonly": false,
"isscript": false,
"pubkey": "02537357b156a33306a7a014a3748631c59df405b56f11ba4aa4a3ce81501af095",
"iscompressed": true,
"account": ""
}
```
```js
validateaddress "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK"
{
"isvalid": true,
"address": "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK",
"scriptPubKey": "a9146769c19a16c9400b908756e19a4d2afb9e9760e187",
"ismine": true,
"iswatchonly": false,
"isscript": true,
"script": "multisig",
"hex": "522102537357b156a33306a7a014a3748631c59df405b56f11ba4aa4a3ce81501af0952102f1fb200390e7864ef4450c07b15988179a57c3cf3a878f668e1070cb615749fe52ae",
"addresses": [
"n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3",
"mmSKNtbYYHRrhTLKiok5TuYrGEs4Y2A4k6"
],
"sigsrequired": 2,
"account": ""
}
```
2015-06-09 17:21:27 +02:00
Wladimir J. van der Laan
c57e12aeef
Merge pull request #6217
...
51fc672
2015-06-09 17:13:29 +02:00
Gavin Andresen
65b9454503
Use best header chain timestamps to detect partitioning
...
The partition checking code was using chainActive timestamps
to detect partitioning; with headers-first syncing, it should use
(and with this pull request, does use) pIndexBestHeader timestamps.
Fixes issue #6251
2015-06-08 16:34:58 -04:00
Andriy Voskoboinyk
0640a5eb60
Add an alternate location of endian.h header
2015-06-07 04:54:20 +03:00
Wladimir J. van der Laan
55294a9fb6
Merge pull request #6241
...
c946ebe
2015-06-06 11:31:55 +02:00
Jonas Schnelli
c946ebed5e
fix util_tests.cpp clang warnings
...
was introduced with #6121
2015-06-06 10:12:12 +02:00
Wladimir J. van der Laan
7d8ffac186
Changes necessary now that zero values accepted in AmountFromValue
...
- Add an accept test for zero amounts, and a reject test for negative
amounts
- Remove ugly hack in `settxfee` that is no longer necessary
- Do explicit zero checks in wallet RPC functions
- Don't add a check for zero amounts in `createrawtransaction` - this
could be seen as a feature
2015-06-06 09:41:12 +02:00
Wladimir J. van der Laan
a04bdefbeb
Get rid of fPlus argument to FormatMoney
...
It's never used with any other value than false, the default.
2015-06-06 09:30:41 +02:00
Wladimir J. van der Laan
4b4b9a8de6
Don't go through double in AmountFromValue and ValueFromAmount
...
My prime gripe with JSON spirit was that monetary values still had to be
converted from and to floating point which can cause deviations (see #3759
and https://bitcoin.stackexchange.com/questions/22716/bitcoind-sendfrom-round-amount-error ).
As UniValue stores internal values as strings, this is no longer
necessary. This avoids risky double-to-integer and integer-to-double
conversions completely, and results in more elegant code to boot.
2015-06-06 09:30:41 +02:00
Wladimir J. van der Laan
12cdbabc26
Merge pull request #6152
...
08d9373
2015-06-05 21:24:15 +02:00
Wladimir J. van der Laan
3fce72eaa3
Merge pull request #6206
...
a9ac95c
2015-06-05 07:11:44 +02:00
Jonas Schnelli
ef5fca8b80
fix rpcmining/getblocktemplate univalue transition logic error
2015-06-04 21:40:11 +02:00
Philip Kaufmann
a9ac95c1bc
use const references where appropriate
2015-06-04 19:34:18 +02:00
Suhas Daftuar
3e9143386a
Advance pindexLastCommonBlock for blocks in chainActive
...
This prevents an edge case where a block downloaded and pruned
in-between successive calls to FindNextBlocksToDownload could
cause the block to be unnecessarily re-requested.
2015-06-04 13:00:26 -04:00
Jonas Schnelli
44c7474446
univalue: add type check unit tests
2015-06-04 13:58:14 +02:00
Wladimir J. van der Laan
c02309204b
univalue: add strict type checking
2015-06-04 13:18:57 +02:00
Wladimir J. van der Laan
7e98a3c642
util: Add ParseInt64 and ParseDouble functions
...
Strict parsing functions for other numeric types.
- ParseInt64 analogous to ParseInt32, but for 64-bit values.
- ParseDouble for doubles.
- Make all three Parse* functions more strict (e.g. reject whitespace on
the inside)
Also add tests.
2015-06-04 13:18:46 +02:00
Wladimir J. van der Laan
043df2b568
Simplify RPCclient, adapt json_parse_error test
...
# Conflicts:
# src/test/rpc_tests.cpp
2015-06-04 13:18:35 +02:00
Jonas Schnelli
519eedeba7
fix univalue json parse tests
2015-06-04 10:35:36 +02:00
Jonas Schnelli
c7fbbc7e1d
fix missing univalue types during constructing
2015-06-04 09:16:21 +02:00
Jonas Schnelli
8f7e4abbe6
fix rpc batching univalue issue
2015-06-04 09:16:21 +02:00
Jonas Schnelli
9a8897f4ac
Remove JSON Spirit wrapper, remove JSON Spirit leftovers
...
- implement find_value() function for UniValue
- replace all Array/Value/Object types with UniValues, remove JSON Spirit to UniValue wrapper
- remove JSON Spirit sources
2015-06-04 09:16:21 +02:00
Jonas Schnelli
3df0411ad9
remove JSON Spirit UniValue wrapper
2015-06-04 09:16:06 +02:00
Jonas Schnelli
1f263c899e
fix rpc unit test, plain numbers are not JSON compatible object
...
UniValues read() does only read valid json.
2015-06-04 09:16:06 +02:00
Jonas Schnelli
e04d9c25cf
univalue: correct bool support
2015-06-04 09:16:06 +02:00
Jonas Schnelli
0c5b2cf69a
univalue: add support for real, fix percision and make it json_spirit compatible
...
- avoid breaking the API because of different number/percision handling
2015-06-04 09:16:06 +02:00
Jonas Schnelli
21c10de8c2
special threatment for null,true,false because they are non valid json
2015-06-04 09:16:06 +02:00
Jonas Schnelli
6c7bee0624
expicit set UniValue type to avoid empty values
2015-06-04 09:16:05 +02:00
Jonas Schnelli
53b4671a9d
extend conversion to UniValue
2015-06-04 09:16:05 +02:00
Jeff Garzik
15982a8b69
Convert tree to using univalue. Eliminate all json_spirit uses.
2015-06-04 09:16:05 +02:00
Jeff Garzik
5e3060c0d1
UniValue: export NullUniValue global constant
2015-06-04 09:16:05 +02:00
Jeff Garzik
efc7883772
UniValue: prefer .size() to .count(), to harmonize w/ existing tree
2015-06-04 09:16:05 +02:00
Wladimir J. van der Laan
dbd8550231
Merge pull request #6220
...
d648236
2015-06-03 19:30:08 +02:00
Adam Weiss
c257a8c9a6
Prune: Support noncontiguous block files
...
In some corner cases, it may be possible for recent blocks to end up in
the same block file as much older blocks. Previously, the pruning code
would stop looking for files to remove upon first encountering a file
containing a block that cannot be pruned, now it will keep looking for
candidate files until the target is met and all other criteria are
satisfied.
This can result in a noncontiguous set of block files (by number) on
disk, which is fine except for during some reindex corner cases, so
make reindex preparation smarter such that we keep the data we can
actually use and throw away the rest. This allows pruning to work
correctly while downloading any blocks needed during the reindex.
2015-06-03 13:25:33 -04:00
Wladimir J. van der Laan
9d60602444
Merge pull request #5875
...
aa8c8279be0e68
2015-06-03 16:20:58 +02:00
Wladimir J. van der Laan
4e157fc60d
json: fail read_string if string contains trailing garbage
...
Change `read_string` to fail when not the entire input has been
consumed. This avoids unexpected, even dangerous behavior (fixes #6223 ).
The new JSON parser adapted in #6121 also solves this problem so in
master this is a temporary fix, but should be backported to older releases.
Also adds tests for the new behavior.
2015-06-03 12:18:40 +02:00
Mark Friedenbach
efd44440d8
Explicitly set tx.nVersion for the genesis block and mining tests
...
If/when CTransaction::CURRENT_VERSION is incremented, this will break CChainParams and the miner tests. This fix sets the transaction version explicitly where we depend on the hash value (genesis block, proof of work checks).
2015-06-02 16:39:34 -07:00
Suhas Daftuar
9be0e6837b
Be stricter in processing unrequested blocks
...
AcceptBlock will no longer process an unrequested block, unless it has not
been previously processed and has more work than chainActive.Tip()
2015-06-02 13:54:29 -04:00
Philip Kaufmann
d648236d87
bump version in clientversion.h
2015-06-02 17:11:05 +02:00
Philip Kaufmann
51fc672f59
[Qt] disconnect peers from peers tab via context menu
...
- It is now allowed to disconnect peers from peers tab via
right-click context menu. Peers are not permanently banned!
2015-06-02 09:34:35 +02:00
Wladimir J. van der Laan
f00b62391b
Merge pull request #6203
...
d449772
2015-06-02 09:11:13 +02:00
Wladimir J. van der Laan
88a7ead5de
Merge pull request #6172
...
a1ba077
2015-06-02 07:56:02 +02:00
Philip Kaufmann
eebd4cca19
[init] add -blockversion help and extend -upnp help
2015-06-01 14:38:44 +02:00
Wladimir J. van der Laan
87550eefc1
Merge pull request #6183
...
28bf062
2015-06-01 11:33:33 +02:00
Wladimir J. van der Laan
8d05ec7bda
Merge pull request #6164
...
aa41bc8#4219 change (lpescher)
f60bb5e#4219 change (lpescher)
cb87386
2015-06-01 11:26:59 +02:00
Wladimir J. van der Laan
4f1677b6ba
Merge pull request #6198
...
0bb4385
2015-06-01 11:25:59 +02:00
Wladimir J. van der Laan
e9d0d252fc
Merge pull request #6208
...
d6922aa49b2292
2015-06-01 09:53:45 +02:00
Wladimir J. van der Laan
42746b0476
Merge pull request #6193
...
6e71efa64b8027
2015-06-01 09:48:17 +02:00
Wladimir J. van der Laan
921ea89bc3
Merge pull request #6195
...
8273793
2015-06-01 08:49:47 +02:00
Philip Kaufmann
d6922aad2c
[net, trivial] remove using namespace std pollution in netbase.cpp
2015-05-31 15:48:23 +02:00
Philip Kaufmann
49b22928ee
[net, trivial] explicitly use std::string for FindNode
...
- in OpenNetworkConnection we have a FindNode call, which gets a const
char*, wheras we only have defined a FindNode for std::string
2015-05-31 15:44:22 +02:00
Luke Dashjr
d449772cf6
Remove P2SH coinbase flag, no longer interesting
2015-05-31 06:53:48 +00:00
Jonas Schnelli
7e6569ea5b
[squashme] improve/corrects prune mode detection test for required wallet rescans
2015-05-28 09:00:45 +02:00
Jonas Schnelli
7a12119d7a
[RPC] disable import functions in pruned mode
...
import functions could lead to a rescan beyond prune level
2015-05-28 09:00:45 +02:00
Jonas Schnelli
3201035f22
[autoprune] allow wallet in pruned mode
2015-05-28 09:00:45 +02:00
Peter Todd
0bb43854c7
Improve comment explaining purpose of MAX_MONEY constant
2015-05-27 21:02:04 -04:00
Jonas Schnelli
6e71efa9f0
[REST] remove json input for getutxos, limit to query max. 15 outpoints
...
Remove possibility to send json encoded parameters to `/rest/getutxos/` to avoid possible DoS scenarios.
The JSON output option is untouched.
2015-05-27 20:10:02 +02:00
Suhas Daftuar
8273793350
Eliminate compiler warning due to unused variable
2015-05-27 13:04:59 -04:00
Suhas Daftuar
a1ba0778dd
Ignore getheaders requests when not synced.
2015-05-27 10:36:04 -04:00
Jorge Timón
e69734309c
Chainparams: Explicit CMessageHeader::MessageStartChars to functions in main:
...
-UndoWriteToDisk
-WriteBlockToDisk
2015-05-27 16:01:07 +02:00
Wladimir J. van der Laan
c7c9af381c
Merge pull request #5669
...
da29ecb27afcd8
2015-05-27 15:00:02 +02:00
Peter Todd
28bf06236d
Fix off-by-one error w/ nLockTime in the wallet
...
Previously due to an off-by-one error the wallet ignored
nLockTime-by-height transactions that would be valid in the next block
even though they are accepted into the mempool. The transactions
wouldn't show up until confirmed, nor would they be included in the
unconfirmed balance. Similar to the mempool behavior fix in 665bdd3b
2015-05-27 05:51:33 -04:00
Jonas Schnelli
64b8027c5c
rest.cpp: strip whitespace
2015-05-27 09:41:14 +02:00
Wladimir J. van der Laan
0bcf04f046
Merge pull request #6153
...
8c35b6f
2015-05-27 09:33:01 +02:00
Wladimir J. van der Laan
182686cdbd
Merge pull request #6186
...
b45c50c19e8d7b
2015-05-27 09:08:39 +02:00
Wladimir J. van der Laan
165e323d85
qt: Periodic translation update
2015-05-26 14:36:47 +02:00
Wladimir J. van der Laan
9f7809f6c3
Merge pull request #5976
...
8ba7f84
2015-05-26 13:02:40 +02:00
Michael Ford
8697ff33ed
Remove duplicate chainparams.h include from alert_tests
2015-05-26 17:16:21 +08:00
Wladimir J. van der Laan
e9af4e65b5
Merge pull request #5947
...
36cba8f
2015-05-26 10:41:17 +02:00
Wladimir J. van der Laan
b45c50ce51
Fix two problems in CSubNet parsing
...
Fix two CSubNet constructor problems:
- The use of `/x` where 8 does not divide x was broken, due to a
bit-order issue
- The use of e.g. `1.2.3.4/24` where the netmasked bits in the network
are not 0 was broken. Fix this by explicitly normalizing the netwok
according to the bitmask.
Also add tests for these cases.
Fixes #6179 . Thanks to @jonasschnelli for reporting and initial fix.
2015-05-26 08:59:59 +02:00
Wladimir J. van der Laan
19e8d7be42
Simplify code for CSubnet
...
Simplify the code by using CAddress.ip directly, instead of the reversed
GetByte() semantics.
2015-05-26 08:59:13 +02:00
Wladimir J. van der Laan
e1412d3e96
Merge pull request #6159
...
ffdda4e
2015-05-24 10:57:22 +02:00
Adam Weiss
ffdda4e8a7
Catch errors on datadir lock and pidfile delete
...
Prevents bad permissions (or other fs related problems) from resulting
in hard crashes with cryptic messages on startup and shutdown.
2015-05-22 14:15:22 -04:00
Wladimir J. van der Laan
7708fcde36
Merge pull request #6098
...
cc24610
2015-05-22 08:35:38 +02:00
Luke Dashjr
cc24610fdb
Update Windows resource files (and add one for bitcoin-tx)
2015-05-22 02:56:55 +00:00
Wladimir J. van der Laan
bdcf5dea7c
Fix intermittent hang issue in scheduler_tests
...
Don't clear `stopRequested` and `stopWhenEmpty` at the top of
`serviceQueue`, as this results in a race condition: on systems under
heavy load, some of the threads only get scheduled on the CPU when the
other threads have already finished their work. This causes the flags to
be cleared post-hoc and thus those threads to wait forever.
The potential drawback of this change is that the scheduler cannot be
restarted after being stopped (an explicit reset would be needed), but
we don't use this functionality anyway.
2015-05-21 19:07:10 +02:00
Wladimir J. van der Laan
0d862c2739
Merge pull request #6160
...
16d9cb7
2015-05-20 13:21:01 +02:00
lpescher
aa41bc84b1
Update help message to match the #4219 change
2015-05-19 22:35:11 -06:00
lpescher
cb87386241
Make command line option to show all debugging consistent with similar options
...
Most people expect a value of 1 to enable all for command line arguments.
However to do this for the -debug option you must type "-debug=".
This has been changed to allow "-debug=1" as well as "-debug=" to
enable all debug logging
2015-05-19 22:14:35 -06:00
Jonas Schnelli
fb21862b92
[QT] mainwindow toolbar must not be movable
2015-05-19 20:28:20 +02:00
Jonas Schnelli
16d9cb7e29
[QT] overviewpage: make sure warning icons gets colored
2015-05-19 16:37:13 +02:00
Wladimir J. van der Laan
377711ff3f
Merge pull request #5996
...
935bd0a
2015-05-19 11:42:47 +02:00
Wladimir J. van der Laan
e2e7f9513f
qt: fix unused function warning in scicon.cpp
...
Enclose MakeSingleColorImage in an anonymous namespace to avoid a
unused function warning on Windows and MacOSX.
Github-Pull: #6143
2015-05-19 11:27:54 +02:00
