Wladimir J. van der Laan
5d3064bc44
Temporarily add SetNull/IsNull/GetCheapHash to base_uint
...
Also add a stub for arith_uint256 and its conversion functions,
for now completely based on uint256.
Eases step-by-step migration to blob.
2015-01-05 15:14:47 +01:00
Wladimir J. van der Laan
a043facf5a
Merge pull request #5594
...
7eeeac0
Remove dead BitcoinUnits::id code and update assets-attribution for non-image unit selector (Luke Dashjr)
2015-01-05 08:57:04 +01:00
Peter Todd
0ea28baeb8
Reject non-final txs even in testnet/regtest
...
Previous behavior with IsFinalTx() being an IsStandard() rule was rather
confusing and interferred with testing of protocols that depended on
nLockTime.
2015-01-04 14:17:39 -05:00
Pieter Wuille
e41345790f
Catch LevelDB errors during flush
2015-01-04 19:12:00 +01:00
Pieter Wuille
02bced1661
Bugfix: only track UTXO modification after lookup
...
Otherwise, if CCoinsViewCache::ModifyCoins throws an exception in between
setting hasModifier and constructing the CCoinsModifier, the cache ends up
in an inconsistent state, resulting in an assert failure in the next
modification.
Bug discovered by Wladimir J. van der Laan.
2015-01-04 17:16:43 +01:00
Pieter Wuille
84eba479a1
Merge pull request #5540
...
12d927a
RPC test for immature balance (Jonas Schnelli)
8024d67
Add immature balances to getwalletinfo. (Gregory Maxwell)
d44c545
Add unconfirmedbalance field to getwalletinfo (azeteki)
2015-01-04 17:06:17 +01:00
Pieter Wuille
9a5cabf3da
Merge pull request #5508
...
146c0a7
Add RandAddSeedPerfmon to MakeNewKey (21E14)
2015-01-04 16:37:24 +01:00
Luke Dashjr
7eeeac0ff5
Remove dead BitcoinUnits::id code and update assets-attribution for non-image unit selector
2015-01-03 15:43:04 +00:00
Thomas Zander
70477a0bdf
On close of splashscreen interrupt verifyDB
...
With the splashscreen being able to be closed it is possible to
shutdown during the lengthy verifyDB method. (Takes about a minute
on my machine). This change allows us to shutdown much sooner.
Github-Pull: #5557
2015-01-03 10:22:02 +01:00
Cory Fields
856e862f4a
namespace: drop most boost namespaces and a few header cleanups
...
A few boost::asio were left around because they're very wordy otherwise.
2015-01-02 15:12:03 -05:00
Cory Fields
9b1ab860ff
namespace: drop boost::assign altogether here
...
Standard functions are even simpler
2015-01-02 15:12:03 -05:00
Cory Fields
a3241998e1
namespace: remove boost namespace pollution
2015-01-02 15:12:03 -05:00
Wladimir J. van der Laan
f55c5e9749
Merge pull request #5349
...
0125988
Implement test for merkle tree malleability in CPartialMerkleTree (Pieter Wuille)
2015-01-02 18:06:52 +01:00
Wladimir J. van der Laan
c986972ad7
Merge pull request #5476
...
73caf47
Display time offset in the debug window's Peers tab (Pavel Janík)
26a6bae
Add time offset to getpeerinfo output (Pavel Janík)
2015-01-02 17:54:21 +01:00
Wladimir J. van der Laan
40d65eb66d
Merge pull request #5580
...
1b178a7
Bugfix: ConnectBlock: In case the genesis block gets in with fJustCheck, behave correctly (Luke Dashjr)
228d238
Make CCoinsViewCache's copy constructor private (Luke Dashjr)
2015-01-02 17:35:45 +01:00
Wladimir J. van der Laan
269d8ba0d2
Remove declaration of no longer existent CheckWork
...
Also make ProcessBlockFound static as it is not used outside
miner.cpp.
Alternative implementation of #5549 .
2015-01-02 17:30:00 +01:00
Wladimir J. van der Laan
fe39ce6b23
Merge pull request #5583
...
643415a
[Qt] update a translation string and argument counts (Philip Kaufmann)
2015-01-02 11:18:28 +01:00
Wladimir J. van der Laan
edbc9045cb
Bump project-wide COPYRIGHT_YEAR to 2015
...
There is still a redundancy here between configure.ac and
clientversion.h.
2015-01-02 10:53:13 +01:00
Wladimir J. van der Laan
e6df2bb48f
Remove redundant copyright notices from README files
...
The normative place for these for the entire project is COPYING,
and the main README already has a MIT license section.
2015-01-02 10:46:23 +01:00
Wladimir J. van der Laan
9adfacdb8b
Merge pull request #5551
...
dd3f697
Use real text rather than image-rendered text for unit selector (Luke Dashjr)
2015-01-02 10:04:48 +01:00
Luke Dashjr
23f3435962
Rename MAX_TX_SIGOPS to MAX_STANDARD_TX_SIGOPS to match similar policy constant MAX_STANDARD_TX_SIZE
2015-01-01 11:35:51 +00:00
Jeff Garzik
39d6b5fd42
Merge #5528 from
...
branch 'bitcoin-tx-copy-paste' of git://github.com/ers35/bitcoin into merge-5528
2014-12-31 08:57:55 -05:00
Jeff Garzik
664999eb87
Merge #5578 from
...
branch 'error_typos' of git://github.com/paveljanik/bitcoin into merge-5578
2014-12-31 08:00:37 -05:00
Jeff Garzik
95ecc0a857
Merge #4964 from
...
branch 'validateaddress-return-scriptpubkey' of git://github.com/petertodd/bitcoin into merge-4964
2014-12-31 07:05:14 -05:00
Jeff Garzik
aa5c0d34b7
Merge #5111 from
...
branch 'core2' of git://github.com/jtimon/bitcoin into merge-5111
2014-12-31 06:48:42 -05:00
Philip Kaufmann
643415aade
[Qt] update a translation string and argument counts
2014-12-31 12:03:00 +01:00
Wladimir J. van der Laan
a5eb61d9ef
Merge pull request #5499
...
7f71813
Bugfix: prioritisetransaction: Do some basic sanity checking on txid (Luke Dashjr)
2014-12-31 10:50:06 +01:00
Wladimir J. van der Laan
639c79a41f
Merge pull request #5545
...
a094b3d
Remove bitnodes.io from dnsseeds. (Gregory Maxwell)
2014-12-31 10:42:58 +01:00
Wladimir J. van der Laan
6e557c2b9d
Merge pull request #5571
...
06206bb
Correct tooltip on address book page (Michael Ford)
2014-12-31 10:35:52 +01:00
Wladimir J. van der Laan
0a42036ded
Merge pull request #5576
...
8f6860a
Bugfix: RPCWallet: Docs: Booleans aren't quoted (Luke Dashjr)
2014-12-31 09:46:00 +01:00
Luke Dashjr
1b178a7f96
Bugfix: ConnectBlock: In case the genesis block gets in with fJustCheck, behave correctly
2014-12-31 03:28:05 +00:00
Luke Dashjr
228d238525
Make CCoinsViewCache's copy constructor private
...
It is easily confused with CCoinsViewCache(CCoinsView*), which creates a sub-cache, but instead of creating a sub-cache, the copy constructor would copy the original and use that original's base, defeating the intended isolation.
2014-12-31 03:19:24 +00:00
Pavel Janík
4f1ee565b5
Clean AcceptToMemoryPool error messages
2014-12-30 23:02:46 +01:00
Luke Dashjr
8f6860a083
Bugfix: RPCWallet: Docs: Booleans aren't quoted
2014-12-30 15:15:40 +00:00
Michael Ford
06206bb3b7
Correct tooltip on address book page
2014-12-30 17:46:57 +08:00
Pavel Vasin
de236f57c6
clarify obscure uses of EvalScript()
...
The 3rd argument of EvalScript() is the unsigned int flags, not a bool.
2014-12-30 10:01:16 +03:00
Pieter Wuille
1c52aad540
Require sufficent priority for relay of free transactions
2014-12-30 02:03:29 +01:00
Cory Fields
8db1760751
rpcserver: attempt to fix uncaught exception.
2014-12-29 15:20:09 -05:00
Wladimir J. van der Laan
a99ef7d353
Merge pull request #5505
...
469d564
Build winshutdownmonitor.cpp on Windows only. (Pavel Janík)
2014-12-29 13:44:02 +01:00
Luke Dashjr
dd3f69736a
Use real text rather than image-rendered text for unit selector
...
The width of each unit is measured to set a fixed width for the widget, and the color is set to match the other status widgets.
2014-12-29 09:59:54 +00:00
Wladimir J. van der Laan
ed11d53077
Merge pull request #5514
...
be43492
build: fix 'make distcheck' (Cory Fields)
2014-12-29 10:05:02 +01:00
Wladimir J. van der Laan
565b3008ec
Merge pull request #5530
...
7c5dd60
Adding RPC tests for the following wallet related calls: getbalance, listsinceblock, listtransactions, listlockunspent, listaccounts listaddressgroupings (Everett Forth)
2014-12-29 09:53:01 +01:00
Thomas Zander
99913f0f70
Fix reference.
...
The text talked about "Quit" while Bitcoin uses "Exit" in its menu.
2014-12-28 22:57:39 +01:00
Luke Dashjr
9b7d3fb165
Adopt style colour for button icons
2014-12-27 19:04:49 +01:00
jtimon
87fb31086d
Move UndoWriteToDisk() and UndoReadFromDisk() to anon namespace
2014-12-27 16:01:31 +01:00
jtimon
937ba572d0
MOVEONLY: CBlockUndo from main.h to undo.h
2014-12-27 16:01:31 +01:00
jtimon
e035c6a737
Decouple CBlockUndo from CDiskBlockPos
2014-12-27 16:01:31 +01:00
jtimon
d7621ccf9d
Decouple miner.o and txmempool.o from CTxUndo
2014-12-27 16:01:12 +01:00
jtimon
c444c620c6
Decouple CCoins from CTxInUndo
2014-12-27 15:46:09 +01:00
Jonas Schnelli
de779b307b
[Qt] new icon for the debug window
2014-12-27 12:35:38 +01:00
Gregory Maxwell
a094b3d973
Remove bitnodes.io from dnsseeds.
...
I'm not comfortable with retaining this entry.
2014-12-27 01:38:47 -08:00
Wladimir J. van der Laan
0f2308cf7c
Merge pull request #5272
...
13f9031
init: minor parameter interaction updates (Philip Kaufmann)
2014-12-27 05:41:13 +01:00
Wladimir J. van der Laan
a3bd5d7d82
Merge pull request #5533
...
a15dba5
en: Avoid ambiguous language regarding when transactions confirm (Luke Dashjr)
2014-12-27 05:01:09 +01:00
Gregory Maxwell
8024d67dae
Add immature balances to getwalletinfo.
2014-12-25 20:14:29 -08:00
azeteki
d44c545673
Add unconfirmedbalance field to getwalletinfo
2014-12-25 20:12:23 -08:00
Peter Todd
d78f0dafd5
Fix CScriptID(const CScript& in) in empty script case
...
Previously an empty script wouldn't be hashed, and CScriptID would be
assigned the incorrect value of 0 instead. This bug can be seen in the
RPC decodescript command:
$ btc decodescript ""
{
"asm" : "",
"type" : "nonstandard",
"p2sh" : "31h1vYVSYuKP6AhS86fbRdMw9XHieotbST"
}
Correct output:
$ btc decodescript ""
{
"asm" : "",
"type" : "nonstandard",
"p2sh" : "3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy"
}
2014-12-25 03:18:40 -05:00
Eric R. Schulz
2c14d1532f
bitcoin-tx: Add test case for signing a tx
2014-12-24 01:56:28 +00:00
Luke Dashjr
a15dba5dff
en: Avoid ambiguous language regarding when transactions confirm
2014-12-23 22:07:10 +00:00
Wladimir J. van der Laan
844ace95de
Merge pull request #5507
...
c907704
DOS: Respect max per-peer blocks in flight limit (Adam Weiss)
2014-12-23 12:32:47 +01:00
Wladimir J. van der Laan
055f3ae9aa
Merge pull request #5481
...
6484930
Apply AreSane() checks to the fees from the network. (Gregory Maxwell)
2014-12-23 12:29:33 +01:00
Wladimir J. van der Laan
d01bcc446e
Merge pull request #5485
...
aa279d6
Enforce minRelayTxFee on wallet created tx and add a maxtxfee option. (Gregory Maxwell)
2014-12-23 12:12:05 +01:00
Wladimir J. van der Laan
4406c3e0f4
Merge pull request #5459
...
3497022
Reject headers that build on an invalid parent (Pieter Wuille)
2014-12-23 11:54:07 +01:00
Everett Forth
7c5dd60306
Adding RPC tests for the following wallet related calls: getbalance,
...
listsinceblock, listtransactions, listlockunspent, listaccounts
listaddressgroupings
2014-12-23 02:27:17 -08:00
Adam Weiss
c90770430d
DOS: Respect max per-peer blocks in flight limit
...
Don't allow immediate inv driven block downloads if
a peer already has MAX_BLOCKS_IN_TRANSIT_PER_PEER
active downloads. Prevents bogus inv spam from
blowing up block transfer tracking data structures.
2014-12-23 02:19:34 -05:00
Eric R. Schulz
a089c50981
bitcoin-tx: Refer to the JSON fields rather than the whole object
2014-12-23 02:59:00 +00:00
Eric R. Schulz
2a3d988b80
bitcoin-tx: Fix JSON validation of prevtxs
2014-12-22 21:04:53 -05:00
Pieter Wuille
3497022347
Reject headers that build on an invalid parent
2014-12-22 15:10:56 +01:00
Wladimir J. van der Laan
fcbc8bfa6d
Merge pull request #5523
...
4bc95c4
remove max orphan blocks config parameter since it is no longer functional (Jameson Lopp)
2014-12-22 15:02:42 +01:00
Wladimir J. van der Laan
203632d20b
Merge pull request #5253
...
7c041b3
Check against MANDATORY flags prior to accepting to mempool (Peter Todd)
2014-12-22 12:41:40 +01:00
Jameson Lopp
4bc95c4387
remove max orphan blocks config parameter since it is no longer functional
2014-12-21 09:10:43 -05:00
Pavel Janík
bdb6a71d3d
IsNull doesn't change CBlockLocator, add const hint
2014-12-20 16:58:40 +01:00
Pavel Janík
1b37333a7f
Remove no longer needed declaration of CBlockLocator
2014-12-20 16:57:46 +01:00
Cory Fields
be43492945
build: fix 'make distcheck'
...
Rather than treating the .py as a regular built test, run it from check-local
so that we can better control the paths used.
2014-12-19 18:04:12 -05:00
Gregory Maxwell
aa279d6131
Enforce minRelayTxFee on wallet created tx and add a maxtxfee option.
...
Previously the minRelayTxFee was only enforced on user specified values.
It was possible for smartfee to produce a fee below minRelayTxFee which
would just result in the transaction getting stuck because it can't be
relayed.
This also introduces a maxtxfee option which sets an absolute maximum
for any fee created by the wallet, with an intention of increasing
user confidence that the automatic fees won't burn them. This was
frequently a concern even before smartfees.
If the configured fee policy won't even allow the wallet to meet the relay
fee the transaction creation may be aborted.
2014-12-19 12:05:10 -08:00
sandakersmann
f914f1a746
Added "Core" to copyright headers
...
Github-Pull: #5494
Rebased-From: 15de949bb9277e442302bdd8dee299a8d6deee60
2014-12-19 19:55:32 +01:00
Wladimir J. van der Laan
111a7d45f1
Merge pull request #5470
...
78253fc
Remove references to X11 licence (Michael Ford)
2014-12-19 19:23:23 +01:00
Wladimir J. van der Laan
811c71d287
Merge pull request #2340
...
ba7fcc8
Discourage fee sniping with nLockTime (Peter Todd)
2014-12-19 18:54:51 +01:00
Philip Kaufmann
84857e87e4
add missing CAutoFile::IsNull() check in main
...
Rebased-From: ccd056a30db0ba5e04b858a682907b378e464d34
Github-Pull: #5437
2014-12-19 18:47:00 +01:00
Wladimir J. van der Laan
c63b47df11
Merge pull request #5341
...
4709160
[Qt] fix a translation that occurs 2 times but was a little different (Philip Kaufmann)
50db7d9
[Qt] change some strings to reflect name change to Bitcoin Core (Philip Kaufmann)
2747f7c
[Qt] fix missing plural form for a string in sendcoinsdialog (Philip Kaufmann)
2014-12-19 18:02:24 +01:00
Wladimir J. van der Laan
886eb57507
Merge pull request #5421
...
cac15be
Test unexecuted OP_CODESEPARATOR (Peter Todd)
2014-12-19 17:54:21 +01:00
Wladimir J. van der Laan
6e718f9435
Remove outdated comment about NTP
...
The comment has been around since 0.1, but NTP inside the client
isn't deemed necessary so remove the comment to avoid confusion.
2014-12-19 16:26:27 +01:00
21E14
146c0a7c5a
Add RandAddSeedPerfmon to MakeNewKey
2014-12-18 20:25:04 -05:00
Pavel Janík
469d564951
Build winshutdownmonitor.cpp on Windows only.
2014-12-18 13:34:16 +01:00
Wladimir J. van der Laan
4444b879bc
Merge pull request #5484
...
7c8e4c5
Make pass-by-ref arguments const. (Daniel Kraft)
2014-12-17 19:21:48 +01:00
Luke Dashjr
7f71813919
Bugfix: prioritisetransaction: Do some basic sanity checking on txid
...
Besides giving a nicer error, this also prevents logging arbitrary data (which could have been used to exploit log readers) into debug.log
2014-12-17 09:37:58 +00:00
Philip Kaufmann
27df4123c4
make all catch() arguments const
...
- I saw this on http://en.cppreference.com/w/cpp/language/try_catch and
thought it would be a good idea
- also unify used format to better be able to search for exception
uses in our codebase
2014-12-17 09:39:24 +01:00
Daniel Kraft
7c8e4c5cfb
Make pass-by-ref arguments const.
...
Make some of the arguments in rest.cpp, that are passed by
reference but never modified, const to emphasise that.
2014-12-16 13:45:27 +01:00
Jonas Schnelli
ff63801bc0
[Qt] light blue icon color for regtest
...
Changing the icons color for regtest in now lightweight.
2014-12-16 13:37:44 +01:00
Jonas Schnelli
270f42d39f
[Qt] fix a <Qt4.7 compatibility issue raised in #5228
2014-12-16 13:21:36 +01:00
Wladimir J. van der Laan
73cbf0a527
Merge pull request #5258
...
4a8fc15
[Qt] the RPC Console should be a QWidget to make window more independent (Jonas Schnelli)
2014-12-16 11:30:27 +01:00
Pavel Janík
bf7835c271
Fix small typos in comments and error messages
...
Rebased-From: 67b2d819cdf6181e7f016e5366ce7479830893bd
Github-Pull: #5404
2014-12-16 11:24:43 +01:00
Jonas Schnelli
ac23394ea8
resize tray icon because a 1024x1024 icon won't show in ubuntu (bug)
2014-12-16 11:15:08 +01:00
Wladimir J. van der Laan
8e76ca0429
Qt: Go back to using QIcon functionality for scaling
2014-12-16 11:15:08 +01:00
Jonas Schnelli
54f2571a00
Qt: HiDPI (retina) support for splash screen
...
- remove splash screen images (reduce binary size)
- dynamicly draw splash screen with available icon.
- remove testnet icon
- dynamicly colorize testnet icon
2014-12-16 11:15:05 +01:00
Wladimir J. van der Laan
f3af0c898f
Merge pull request #5219
...
31aac02
Qt: new icons (Jonas Schnelli)
2014-12-16 11:04:24 +01:00
Wladimir J. van der Laan
103f66bf82
Merge pull request #5444
...
f676c80
Add /rest/headers (Pieter Wuille)
2014-12-16 10:40:16 +01:00
Michael Ford
78253fcbad
Remove references to X11 licence
2014-12-16 15:56:50 +08:00
Manuel Araoz
87e8e1ca8b
minor fix on script test data docs
2014-12-16 00:55:21 -03:00
Gregory Maxwell
6484930690
Apply AreSane() checks to the fees from the network.
...
'Sane' was already defined by this code as:
fee.GetFeePerK() > minRelayFee.GetFeePerK() * 10000
But sanity was only enforced for data loaded from disk.
Note that this is a pretty expansive definition of 'sane': A 10 BTC
fee is still passes the test if its on a 100kb transaction.
This prevents a single insane fee on the network from making us reject
our stored fee data at start. We still may reject valid saved fee
state if minRelayFee is changed between executions.
This also reduces the risk and limits the damage from a cascading
failure where one party pays a bunch of insane fees which cases
others to pay insane fees.
2014-12-15 14:50:24 -08:00
Pavel Janík
73caf47dfe
Display time offset in the debug window's Peers tab
2014-12-15 19:56:45 +01:00