Commit Graph
100 Commits
Author SHA1 Message Date
Wladimir J. van der Laan 5f5f14e9f2 Merge pull request #5554
244fdc7 Fix typo (Julian Yap)
2014-12-29 09:19:45 +01:00
Wladimir J. van der Laan f8c48589cf Merge pull request #5558
99913f0 Fix reference. (Thomas Zander)
2014-12-29 09:16:25 +01:00
Wladimir J. van der Laan e5153095ea Merge pull request #5493
9b7d3fb Adopt style colour for button icons (Luke Dashjr)
2014-12-27 19:16:03 +01:00
Wladimir J. van der Laan a39aa74a8d Merge pull request #5547
de779b3 [Qt] new icon for the debug window (Jonas Schnelli)
2014-12-27 16:21:33 +01: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
Wladimir J. van der Laan a992d600c5 Merge pull request #5536
566c6cb gitian: attempt to fix tarball determinisim (Cory Fields)
2014-12-27 04:11:18 +01:00
Wladimir J. van der Laan 3c9daa2f24 Merge pull request #5541
d78f0da Fix CScriptID(const CScript& in) in empty script case (Peter Todd)
2014-12-27 04:06:48 +01:00
Wladimir J. van der Laan 4312c8fc18 Merge pull request #5512
dd14a0e docs: update gitian building docs (Cory Fields)
2014-12-23 14:16:38 +01: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
Wladimir J. van der Laan 66ef824a9f Merge pull request #5517
39c8099 contrib: make github-merge require signing (Wladimir J. van der Laan)
2014-12-23 11:28:08 +01:00
Wladimir J. van der Laan 146e68059c Merge pull request #5518
1e22d45 Add libbitcoinconsensus.pc to .gitignore (Michael Ford)
2014-12-22 15:13:31 +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
Wladimir J. van der Laan 39c809942d contrib: make github-merge require signing
- Exit when there is no signing key configured
- Exit when user does not want to sign off
2014-12-20 13:58:51 +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
Wladimir J. van der Laan cf875367d2 Merge pull request #5334
eef747b libbitcoinconsensus: Add pkg-config support (Luke Dashjr)
2014-12-19 18:05:04 +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 87a5270d58 Merge pull request #5413
88eb44d Revised translation process doc (Blake Jakopovic)
2014-12-19 17:55:46 +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 07c31466c9 Merge pull request #5500
e85855f Drop beta suffixes from readmes (Michael Ford)
2014-12-19 17:49:40 +01:00
Wladimir J. van der Laan 94736e312e Merge pull request #5504
7a3b832 [QA] fix httpbasics RPC test typo (Jonas Schnelli)
2014-12-19 17:48:39 +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
Wladimir J. van der Laan c76c9d2e7f Merge pull request #5501
e36e619 Add mips, mipsel and aarch64 to depends platforms (Wladimir J. van der Laan)
2014-12-19 12:01:54 +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
Wladimir J. van der Laan 89802fe3ee Merge pull request #5438
27df412 make all catch() arguments const (Philip Kaufmann)
2014-12-17 18:13:28 +01:00
Wladimir J. van der Laan e36e619886 Add mips, mipsel and aarch64 to depends platforms 2014-12-17 13:20:11 +01:00
Wladimir J. van der Laan 851dfc7f88 Merge pull request #5488
ff63801 [Qt] light blue icon color for regtest (Jonas Schnelli)
2014-12-16 14:16:38 +01:00
Wladimir J. van der Laan 28a274e6ce Merge pull request #5487
270f42d [Qt] fix a <Qt4.7 compatibility issue raised in #5228 (Jonas Schnelli)
2014-12-16 13:27:56 +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
Wladimir J. van der Laan 2f2d3370cc Merge pull request #5453
1340f00 [RPC-TESTS] ability to run single test manually (Jonas Schnelli)
2014-12-16 11:19:39 +01:00
Wladimir J. van der Laan bb3c75bdf4 Merge pull request #5228
ac23394 resize tray icon because a 1024x1024 icon won't show in ubuntu (bug) (Jonas Schnelli)
8e76ca0 Qt: Go back to using QIcon functionality for scaling (Wladimir J. van der Laan)
54f2571 Qt: HiDPI (retina) support for splash screen (Jonas Schnelli)
2014-12-16 11:15:41 +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
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
Wladimir J. van der Laan bf4bf40a1c Merge pull request #5482
87e8e1c minor fix on script test data docs (Manuel Araoz)
2014-12-16 07:58:09 +01:00
Wladimir J. van der Laan 13c077c7cf Merge pull request #5471
164a45f Fix download link for gitian builds (BtcDrak)
2014-12-15 09:46:10 +01:00
Wladimir J. van der Laan 5f7279ac70 Merge pull request #5461
aa768f1 signrawtransaction: validate private key. (Pavel Janík)
2014-12-12 11:52:07 +01:00
Wladimir J. van der Laan 1bcb52143a Merge pull request #5465
e27d7cb docs: release process fixups (Cory Fields)
d7db4b6 depends: fix packages with hard-coded SOURCES_PATH (Cory Fields)
d546191 depends: Move source stamps to source dir and misc cleanups (Cory Fields)
422f873 depends: teach 'make download' to download sources for all hosts (Cory Fields)
2014-12-12 11:36:21 +01:00
Wladimir J. van der Laan 6f2ee04f75 Merge pull request #5457
830ee48 Update Bitcoin for libsecp256k1 API change (Pieter Wuille)
ecae2ac Squashed 'src/secp256k1/' changes from b0210a9..bccaf86 (Pieter Wuille)
2014-12-12 11:17:23 +01:00
Wladimir J. van der Laan 3bb29a3e13 Merge pull request #5440
ebdd6bf Remove genesis block hash from error (Micha)
8d174d6 Make several small string fixes in linearize-data.py (Micha)
2014-12-11 16:33:27 +01:00
Wladimir J. van der Laan dcc1304426 Merge pull request #5367
63d1ae5 Do all block index writes in a batch (Pieter Wuille)
2014-12-11 16:15:34 +01:00
Wladimir J. van der Laan d7492304e9 Now that 0.10 has been branched, master is 0.10.99 2014-12-11 16:03:46 +01:00
Wladimir J. van der Laan 41cced2106 Merge pull request #5267
34318d7 RPC-test based on invalidateblock for mempool coinbase spends (Gavin Andresen)
7fd6219 Make CTxMemPool::remove more effecient by avoiding recursion (Matt Corallo)
b7b4318 Make CTxMemPool::check more thourough by using CheckInputs (Matt Corallo)
723d12c Remove txn which are invalidated by coinbase maturity during reorg (Matt Corallo)
868d041 Remove coinbase-dependant transactions during reorg. (Matt Corallo)
2014-12-11 15:24:00 +01:00
Wladimir J. van der Laan 7c001bb49c qt: translations pull from transifex 2014-12-11 11:10:23 +01:00
Wladimir J. van der Laan 5e521d3e4e Merge pull request #5391
932ef50 [REST] JSON output: remove block infos from tx details if it is nested in block (Jonas Schnelli)
cae5486 [REST] added /rest/block/notxdetails/<hash> into REST-interface.md documentation (Jonas Schnelli)
73351c3 [REST] /rest/block response with full tx details (Jonas Schnelli)
2014-12-11 10:33:11 +01:00
Wladimir J. van der Laan 34468066ff Merge pull request #5399
4be639e Use RPC_INVALID_PARAMETER instead of RPC_WALLET_ERROR for invalid amount. No return at the end of void function. (Pavel Janík)
b93173d Move SendMoney() to rpcwallet.cpp. (Pavel Janík)
2014-12-10 08:22:20 +01:00
Wladimir J. van der Laan 12c05ee938 Merge pull request #5395
4c69ebe Add /opt/local/include/db48 only if it exists. (Pavel Janík)
2014-12-10 08:16:42 +01:00
Wladimir J. van der Laan 0a1d03ca52 Merge pull request #5449
6e6a36c contrib: show pull # in prompt for github-merge script (Wladimir J. van der Laan)
2014-12-09 15:34:02 +01:00
Wladimir J. van der Laan 09ac7f9e6d Merge pull request #5427
1577df9 Port of walletbackup.sh to Python. (mrbandrews)
2014-12-09 11:09:31 +01:00
Wladimir J. van der Laan 6e6a36ce30 contrib: show pull # in prompt for github-merge script 2014-12-09 10:16:58 +01:00
Wladimir J. van der Laan 7f76dda903 Merge pull request #5216
5ec654b [Qt] update paymentserver license and cleanup ordering (Philip Kaufmann)
4333e26 [Qt] add BIP70 DoS protection test (Philip Kaufmann)
31f8494 [Qt] add BIP70 payment request size DoS protection for URIs (Philip Kaufmann)
2284ccb [Qt] remove dup lock that is done in SetAddressBook() (Philip Kaufmann)
1ec753f [Qt] ensure socket is set to NULL in PaymentServer::ipcSendCommandLine (Philip Kaufmann)
814429d [Qt] add BIP70/BIP71 constants for all messages and mime types (Philip Kaufmann)
b82695b [Qt] make PaymentServer::ipcParseCommandLine void (Philip Kaufmann)
2014-12-09 10:16:16 +01:00
Wladimir J. van der Laan 4f85383cb3 Merge pull request #5409
65b0328 newlines in strings are invalid JSON (Ryan X. Charles)
2014-12-09 10:07:35 +01:00
Wladimir J. van der Laan 4b5b263ac0 Merge pull request #5434
683dc40 Disable SSLv3 (in favor of TLS) for the RPC client and server. (Gregory Maxwell)
2014-12-08 13:31:13 +01:00
Wladimir J. van der Laan 053038e5ba Merge pull request #5436
11d7a7d [RPC] add rpc-test for http keep-alive (persistent connections) (Jonas Schnelli)
2014-12-08 09:25:18 +01:00
Wladimir J. van der Laan 4d8bea0dc3 Merge pull request #5435
a26bf47 Add a new test for FormatParagraph (string longer than the default width). (Pavel Janík)
83b81f6 Format paragraphs properly - count the space between words. (Pavel Janík)
2014-12-08 09:19:35 +01:00
Wladimir J. van der Laan b5fa132329 Merge pull request #5181
afd4b94 Move CMerkleBlock and CPartialMerkleTree to their own file (Matt Corallo)
2014-12-05 16:50:48 +01:00
Wladimir J. van der Laan dbf1dc239e Merge pull request #5398
8a20cd3 prioritisetransaction RPC: Restore compatibility with existing implementations by using satoshis for fee offset rather than BTC (Luke Dashjr)
2014-12-05 11:41:06 +01:00
Wladimir J. van der Laan 800458eddd Merge pull request #5408
35e408f Regard connection failures as attempt for addrman (Wladimir J. van der Laan)
2014-12-05 11:39:18 +01:00
Wladimir J. van der Laan 7a88e3b0fc Merge pull request #5425
87bddb7 Squashed 'src/secp256k1/' changes from ad2028f..b0210a9 (Pieter Wuille)
ffe3291 Remove gmp dependency and doc mentions (Pieter Wuille)
2014-12-05 11:30:26 +01:00
Wladimir J. van der Laan 7d42644dda Merge pull request #5207
8487790 bitcoin-tx: Add the "-txid" option. Also add the hex-encoded transaction to the JSON output as the "hex" property. (mruddy)
2014-12-05 11:24:39 +01:00
Wladimir J. van der Laan c78a18087f Merge pull request #5308
60d1ecd change nSubsidy's type from int64_t to CAmount (HarryWu)
2014-12-05 11:11:24 +01:00
Wladimir J. van der Laan c932c47e34 Merge pull request #5329
199627c [REST] adding basic documentation (Jonas Schnelli)
2014-12-05 11:06:50 +01:00
Wladimir J. van der Laan 68705996a9 Merge pull request #5419
12a49ca Limit the number of new addressses to accumulate (Pieter Wuille)
2014-12-05 11:01:19 +01:00
Wladimir J. van der Laan 9ddc8c63ab Merge pull request #5394
307f7d4 Report script evaluation failures in log and reject messages (Pieter Wuille)
2014-12-04 16:43:35 +01:00
Wladimir J. van der Laan 4d2ecc4f94 Merge pull request #5417
be7b0bf Package libqt5core5 replaced with libqt5core5a (LongShao007)
2014-12-04 16:25:16 +01:00
Wladimir J. van der Laan a0417b8cc8 Merge pull request #5306
d227011 MOVEONLY: core/ -> primitives/ (Luke Dashjr)
2014-12-03 12:05:43 +01:00
Wladimir J. van der Laan c2d7c6134e Merge pull request #5407
9e56532 Coinbases-in-mempool regression test (Gavin Andresen)
2014-12-03 10:51:36 +01:00
Wladimir J. van der Laan 7eb0667384 Merge pull request #5403
c5b390b Make comments in main an init doxygen compatible (Michael Ford)
2014-12-03 10:48:53 +01:00
Wladimir J. van der Laan 133344208c Merge pull request #5400
32b93a1 Extra explanation for getchaintips (Pieter Wuille)
2014-12-03 10:17:13 +01:00
Wladimir J. van der Laan 1863deae5f Merge pull request #5406
5fdbe67 Add 0.10 release notes on improvement to signing security. (Gregory Maxwell)
2014-12-03 10:03:57 +01:00
Wladimir J. van der Laan 35e408f8a4 Regard connection failures as attempt for addrman
This avoids connecting to them again too soon in ThreadOpenConnections.

Make an exception for connection failures to the proxy as these
shouldn't affect the status of specific nodes.
2014-12-02 17:54:16 +01:00
Wladimir J. van der Laan 90f7aa7778 Fix rest.py test after #5376 2014-12-02 15:57:20 +01:00
Wladimir J. van der Laan fec0d100d5 Merge pull request #5376
8a5c951 [REST] make selection of output-format mandatory, support dot url syntax (Jonas Schnelli)
2014-12-02 15:34:43 +01:00
Wladimir J. van der Laan 7026cbd6db Merge pull request #5379
01dc2d8 [REST] add REST interface tests in rpc-test section (Jonas Schnelli)
2014-12-01 20:24:50 +01:00
Wladimir J. van der Laan f0877f8b62 Merge pull request #5227
4cdaa95 Resize after succesful result (Pieter Wuille)
9d8604f Header define style cleanups (Pieter Wuille)
a53fd41 Deterministic signing (Pieter Wuille)
3060e36 Add the RFC6979 PRNG (Pieter Wuille)
a8f5087 Add HMAC-SHA256 (Pieter Wuille)
36fa4a7 Split up crypto/sha2 (Pieter Wuille)
2014-12-01 14:57:58 +01:00
Wladimir J. van der Laan 89151d9f29 Merge pull request #5390
43422a0 [Qt] Fix wallet-lock in CWallet::GetAccountAddresses(..) (Cozz Lovan)
2014-12-01 12:44:26 +01:00
Wladimir J. van der Laan 0ddf4416cc Merge pull request #5386
1b91be4 Report status of chain tips (Pieter Wuille)
2014-12-01 11:49:35 +01:00
Wladimir J. van der Laan b248a38aa5 Merge pull request #5388
1cf23f6 Update the intent on SI-style separators. (21E14)
2014-12-01 10:17:58 +01:00
Wladimir J. van der Laan d7c8a830c4 Merge pull request #5316
f86a24b Move `setmocktime` to hidden category (Wladimir J. van der Laan)
bd9aebf Introduce a hidden category (Pieter Wuille)
0dd06b2 Delay writing block indexes in invalidate/reconsider (Pieter Wuille)
9b0a8d3 Add 'invalidateblock' and 'reconsiderblock' RPC commands. (Pieter Wuille)
2014-11-28 11:19:15 +01:00
Wladimir J. van der Laan f86a24b368 Move setmocktime to hidden category
Another testing-only potential footgun command.
2014-11-28 10:57:14 +01:00
Wladimir J. van der Laan 631e698bb7 Merge pull request #5374
a53d16a Use complete path to include bitcoin-config.h. (Pavel Janík)
2014-11-28 09:46:39 +01:00
Wladimir J. van der Laan 2adce1f716 Merge pull request #5385
57be955 Remove -printblock, -printblocktree, and -printblockindex (Pieter Wuille)
2014-11-27 13:26:36 +01:00
Wladimir J. van der Laan faa1623a44 Merge pull request #5384
e3f315a Fix python usage for arch's broken maintainers (Matt Corallo)
2014-11-27 12:11:07 +01:00
Wladimir J. van der Laan 9ff0bc9beb Merge pull request #5158
9ec75c5 Add a locking mechanism to IsInitialBlockDownload to ensure it never goes from false to true. (Ruben Dario Ponticelli)
a2d0fc6 Fix IsInitialBlockDownload which was broken by headers first. (Ruben Dario Ponticelli)
2014-11-26 15:09:03 +01:00
Wladimir J. van der Laan b031137977 Merge pull request #5273
cd4d3f1 Win32: change buffer size for gethotsname in Discover() (Philip Kaufmann)
8fa0494 Win32: log addresses found in Discover() calls (Philip Kaufmann)
2014-11-26 14:36:50 +01:00
Wladimir J. van der Laan 108b19f7ef Merge pull request #5326
5dc713b [REST] set REST API behind "-rest" option (Jonas Schnelli)
78bdc81 [REST] give an appropriate response in warmup phase (Jonas Schnelli)
210eba9 [REST] fix headersonly flag for BINARY responses (Jonas Schnelli)
2014-11-26 14:30:11 +01:00
Wladimir J. van der Laan 8ba38aba42 qt: Update translations from transifex 2014-11-26 13:47:49 +01:00
Wladimir J. van der Laan 53a87c0355 Merge pull request #5321
34559c7 Make PruneBlockIndexCandidates safer (Pieter Wuille)
cca48f6 Reset setBlockIndexCandidates once block index db loaded (21E14)
2014-11-26 13:31:03 +01:00
Wladimir J. van der Laan 4baa9f0c9b Merge pull request #5323
a328dd6 [Qt] small changes to sendcoinsdialog (Philip Kaufmann)
2014-11-26 13:00:50 +01:00
Wladimir J. van der Laan 686fa79cae Merge pull request #5363
7a9cf80 docs: add/update docs for osx dmg signing (Cory Fields)
914868a build: add a deterministic dmg signer (Cory Fields)
d69ed2b build: Clean up the dmg layout (Cory Fields)
2f327a3 build: add the deploydir target for gitian (Cory Fields)
2014-11-26 11:29:23 +01:00
Wladimir J. van der Laan ce7204bf2e Merge pull request #5371
dfef929 release: update docs to reflect new layout (Cory Fields)
52bb7a7 gitian: update descriptors to use a sane uniform output (Cory Fields)
2014-11-26 11:15:35 +01:00
Wladimir J. van der Laan 91eaedd4ce Merge pull request #5370
b7f2cdc build: disable static lib stripping during osx make install-strip (Cory Fields)
2014-11-26 11:07:25 +01:00
Wladimir J. van der Laan 124b4895b8 Merge pull request #5209
9b1627d [Wallet] Reduce minTxFee for transaction creation to 1000 satoshis (Cozz Lovan)
2014-11-26 10:58:20 +01:00
Wladimir J. van der Laan e6751ca68a Merge pull request #5361
3223179 libbitcoinconsensus: don't require any global constructors (Cory Fields)
2014-11-26 10:44:42 +01:00
Wladimir J. van der Laan 70f9e33fa0 Merge pull request #5340
c8ed613 Include missing config/bitcoin-config.h. (Pavel Janík)
494f6e7 Check for strnlen and provide it if it is not found. (Pavel Janík)
2014-11-26 09:51:05 +01:00