aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2016-06-09Merge #7938: [0.12.2] BackportsWladimir J. van der Laan
c3d1bc3 CBase58Data::SetString: cleanse the full vector (Kaz Wesley) 43c14ac Fix headers announcements edge case (Suhas Daftuar) 06c73a1 Removed call to `TryCreateDirectory` from `GetDefaultDataDir` in `src/util.cpp`. (Alexander Regueiro) 7e71785 Use txid as key in mapAlreadyAskedFor (Suhas Daftuar) 5583a3d Add curl to Gitian setup instrustions (BtcDrak) d3ead9b Avoid "Unknown command" messages when receiving getaddr on outbound connections. (R E Broadley) a5bc6a1 Remove vfReachable and modify IsReachable to only use vfLimited. (Patrick Strateman) 52c1011 Clarify description of blockindex (Matthew Zipkin) 21b2f82 Don't resend wallet txs that aren't in our own mempool (Alex Morcos) 66d5408 Fix memleak in TorController [rework] (Wladimir J. van der Laan) 1c3d38b Remove spurious dollar sign. Fixes #7189. (Chris Moore) 64fd0ce fix spelling of advertise in src and doc (jloughry) a9e73f7 Fix and cleanup listreceivedbyX documentation (instagibbs) 9095594 Do not download transactions during inital sync (ptschip)
2016-06-04CBase58Data::SetString: cleanse the full vectorKaz Wesley
SetString seems to be passing the length of the wrong variable to memory_cleanse, resulting in the last byte of the temporary buffer not being securely erased. Github-Pull: #7922 Rebased-From: 57704499be948c640c789c7fc11ed1abf8a681bd
2016-05-31Merge #8001: [0.12.2] backport script_tests improvementsWladimir J. van der Laan
e3a9ce9 Refactor script tests (Pieter Wuille) 87129b2 test: script_error checking in script_invalid tests (Wladimir J. van der Laan)
2016-05-04Refactor script testsPieter Wuille
Github-Pull: #7818 Rebased-From: c7c664191fd6ca4843cfe9d00abf8f2362b9550f 269281b7cc56e728fa64803fc7509ab3a0ce1805 d03e46625ac95954bb9ecbc2cf73ffd8de6b8a13 76da7613517d05aca31c2cee42b5ebf3d5c54974 009b503792737ab03aeb6e15060bc4f499500a96 dde46d3ae1de18700e089bc1861cf1e18649dc5d
2016-05-04test: script_error checking in script_invalid testsWladimir J. van der Laan
Github-Pull: #7517 Rebased-From: b0ff8572aeb8211ad30f24ca42d20a46debb5e9d 2317ad7c56c6f5a55984459947f69cc3bfbe340a 0ecb3401fe157cb0779d3970c6080b463b1b0ed2
2016-04-27Fix headers announcements edge caseSuhas Daftuar
Previously we would assert that if every block in vBlockHashesToAnnounce is in chainActive, then the blocks to be announced must connect. However, there are edge cases where this assumption could be violated (eg using invalidateblock / reconsiderblock), so just check for this case and revert to inv-announcement instead. Github-Pull: #7919 Rebased-From: 3a99fb2cb14955f5e029d315041a093e957e6c3e
2016-04-27Removed call to `TryCreateDirectory` from `GetDefaultDataDir` in `src/util.cpp`.Alexander Regueiro
See https://github.com/bitcoin/bitcoin/issues/7845#issuecomment-207684728. Also refactored `GetDefaultDataDir` function to return path for Mac in one expression. Github-Pull: #7850 Rebased-From: 41dbc4849e0bf14eef98962b0f0bddcde0bb3014
2016-04-27Use txid as key in mapAlreadyAskedForSuhas Daftuar
Previously we used the CInv that would be sent to the peer announcing the transaction as the key, but using the txid instead allows us to decouple the p2p layer from the application logic (which relies on this map to avoid duplicate tx requests). Github-Pull: #7862 Rebased-From: 7e91f632c70ff1848a152f24ee67a06796803943
2016-04-27Avoid "Unknown command" messages when receiving getaddr on outbound connections.R E Broadley
Github-Pull: #7642 Rebased-From: d84ea1a59ce3704457a162f1fd8a7353047156de
2016-04-27Remove vfReachable and modify IsReachable to only use vfLimited.Patrick Strateman
We do not know that a class of Network is reachable, only that it is not. Github-Pull: #7553 Rebased-From: 110b62f06992d0fb989153afff2dc3aea62a674f
2016-04-27Clarify description of blockindexMatthew Zipkin
see issues: https://github.com/bitcoin-dot-org/bitcoin.org/issues/1237 https://github.com/bitcoin/bitcoin/issues/7532 Github-Pull: #7541 Rebased-From: 7eef1d0dad0c48e9faefdc4fe5cfb6182edc79ab
2016-04-27Don't resend wallet txs that aren't in our own mempoolAlex Morcos
Github-Pull: #7521 Rebased-From: 5a2b1c0c8b49c5ae79946e71b9f989b33c9fcf5c
2016-04-27Fix memleak in TorController [rework]Wladimir J. van der Laan
It looks like, TorController::disconnected_cb(TorControlConnection& conn) gets called multiple times which results in multiple event_new(). Avoid this by creating the event only once in the constructore, and deleting it only once in the destructor (thanks to Cory Fields for the idea). Replaces the fix by Jonas Schnelli in #7610, see discussion there. Github-Pull: #7637 Rebased-From: e2195037116f47b11b66452351dba4fe606423a2
2016-04-27fix spelling of advertise in src and docjloughry
Github-Pull: #7526 Rebased-From: 37767fd46f673a06864df6e14d3030622b1cb2c9
2016-04-27Fix and cleanup listreceivedbyX documentationinstagibbs
Github-Pull: #7527 Rebased-From: c372572595b6b19a4dd88258401d8a0046ce4469
2016-04-27Do not download transactions during inital syncptschip
Github-Pull: #7164 Rebased-From: 39a525c21fd1b34df63ab30868423b97b708ee49
2016-04-25Merge #7811: [0.12.2] qa BackportsMarcoFalke
6862627 Add listunspent() test for spendable/unspendable UTXO (Joao Fonseca) 28ba22c [qa] Remove misleading "errorString syntax" (MarcoFalke) f1f1b82 [qa] py2: Unfiddle strings into bytes explicitly (MarcoFalke) c0d9e31 Tests: make prioritise_transaction.py more robust (Suhas Daftuar) ff9b436 [qa] Bug fixes and refactor (MarcoFalke) b1dd64b [qa] wallet: Wait for reindex to catch up (MarcoFalke) f23cb7c [qa] Add tests verifychain, lockunspent, getbalance, listsinceblock (MarcoFalke) 3316552 [qa] Test walletpassphrase timeout (MarcoFalke) 6aae129 [qa] wallet: Print maintenance (MarcoFalke) ad8c743 [qa] Extend tests (MarcoFalke) d89fbfe [qa] rpc-test: Normalize assert() (MarcoFalke)
2016-04-15[qa] py2: Unfiddle strings into bytes explicitlyMarcoFalke
Github-Pull: #7853 Rebased-From: faa41ee204124da19dcf1e5b8a3aef1e216bf5e6, fa7abe0a00464e6aa88d55c63dba40878bbe5b79 Conflicts: qa/rpc-tests/invalidtxrequest.py qa/rpc-tests/p2p-feefilter.py qa/rpc-tests/proxy_test.py qa/rpc-tests/test_framework/mininode.py qa/rpc-tests/test_framework/netutil.py src/test/bctest.py
2016-04-08Version 2 transactions remain non-standard until CSV activatesSuhas Daftuar
Before activation, such transactions might not be mined, so don't allow into the mempool. - Tests: move get_bip9_status to util.py - Test relay of version 2 transactions Github-Pull: #7835 Rebased-From: e4ba9f6b0402cf7a2ad0d74f617c434a26c6e124 5cb1d8a2071d05beb9907a423178895fd8a5c359 da5fdbb3a2778523cce70d635c1aa2b31a693bc6
2016-04-07Reduce block timeout to 10 minutesWladimir J. van der Laan
Now that #7804 fixed the timeout handling, reduce the block timeout from 20 minutes to 10 minutes. 20 minutes is overkill. Conflicts: src/main.h Github-Pull: #7832 Rebased-From: 62b9a557fca2aa55803c336ffcceccc50ccf0c3e
2016-04-07Track block download times per individual blockPieter Wuille
Currently, we're keeping a timeout for each requested block, starting from when it is requested, with a correction factor for the number of blocks in the queue. That's unnecessarily complicated and inaccurate. As peers process block requests in order, we can make the timeout for each block start counting only when all previous ones have been received, and have a correction based on the number of peers, rather than the total number of blocks. Conflicts: src/main.cpp src/main.h Self check after the last peer is removed Github-Pull: #7804 Rebased-From: 2d1d6581eca4508838cd339cc19c72efc42d6ea0 0e24bbf679c95784ed5514a6a1f2fbf99dd97725
2016-04-07init: allow shutdown during 'Activating best chain...'Wladimir J. van der Laan
Two-line patch to make it possible to shut down bitcoind cleanly during the initial ActivateBestChain. Fixes #6459 (among other complaints). To reproduce: - shutdown bitcoind - copy chainstate - start bitcoind - let the chain sync a bit - shutdown bitcoind - copy back old chainstate - start bitcoind - bitcoind will catch up with all blocks during Init() (the `boost::this_thread::interruption_point` / `ShutdownRequested()` dance is ugly, this should be refactored all over bitcoind at some point when moving from boost::threads to c++11 threads, but it works...) Github-Pull: #7821 Rebased-From: 07398e8e9d2ef807e63abd0978a6e98549bdf271
2016-04-05pre-rc1 translations updateWladimir J. van der Laan
New languages: - `af` Afrikaans - `es_AR` Spanish (Argentina) - `es_CO` Spanish (Colombia) - `ro` Romanian - `ta` Tamil - `uz@Latn` Uzbek in Latin script
2016-04-05[qa] Extend testsMarcoFalke
Github-Pull: #7684 Rebased-From: fa3a81af18347a1d3fed41aa89ee643cbf0e7abc fad7dc8a6c0ca9c067a249cf8896dd2e64703e48 fad8cfb893ac0ba83c6fc2367ade55bfe4fa75f6
2016-04-04Merge #7543: [0.12] Backport BIP9, BIP68 and BIP112 with softforkWladimir J. van der Laan
640666b [qa] rpc-tests: Properly use integers, floats (BtcDrak) c270b62 Fix comments in tests (BtcDrak) caf1381 Add bip68-sequence.py to extended rpc tests (BtcDrak) 26e9a05 Test of BIP9 fork activation of mtp, csv, sequence_lock (NicolasDorier) 3a99feb Add RPC test for BIP 68/112/113 soft fork. (Alex Morcos) 159ee3d Policy: allow transaction version 2 relay policy. (BtcDrak) 9713ed3 Soft fork logic for BIP68 (BtcDrak) 648be9b Soft fork logic for BIP113 (BtcDrak) ee40924 Add CHECKSEQUENCEVERIFY softfork through BIP9 (Pieter Wuille) 6ff0b9f RPC test for BIP9 warning logic (Suhas Daftuar) 0710b30 Test versionbits deployments (Suhas Daftuar) 8ebc6f2 Add testing of ComputeBlockVersion (Suhas Daftuar) 0bdaacd Softfork status report in RPC (Pieter Wuille) 5f90d4e Versionbits tests (Pieter Wuille) 6f83cf2 BIP9 Implementation (Pieter Wuille) ade85e1 Add LockPoints (Alex Morcos) c8d309e Code style fix. (BtcDrak) 6170506 Separate CheckLockTime() and CheckSequence() logic (BtcDrak) c0c5e09 BIP112: Implement CHECKSEQUENCEVERIFY (Mark Friedenbach) 197c376 fix sdaftuar's nits again (Alex Morcos) 0a79c04 Bug fix to RPC test (Alex Morcos) 0d09af7 Add RPC test exercising BIP68 (mempool only) (Suhas Daftuar) 15ba08c Implement SequenceLocks functions (Alex Morcos)
2016-03-31Disable bad chain alertsBtcDrak
Continuous false positives lead to them being ignored entirely so it's better to disable now until this can be fixed more thoroughly.
2016-03-30bump version to 0.12.1Wladimir J. van der Laan
2016-03-24Mark p2p alert system as deprecated.BtcDrak
Set default to off This feature is removed entirely as of 0.13.0
2016-03-24Remove openssl info from init/log and from Qt debug windowJonas Schnelli
Conflicts: src/init.cpp Github-Merge: #7605 Rebased-From: 5ecfa36fd01fc27475abbfcd53b4efb9da4a7398
2016-03-23[Wallet][RPC] add abandoned status to listtransactionsJonas Schnelli
Github-Pull: #7739 Rebased-From: 263de3d1c80c8a0aa54acd4d6708a4078d479b70
2016-03-23Fix calculation of balances and available coins.Alex Morcos
No longer consider coins which aren't in our mempool. Add test for regression in abandonconflict.py Github-Pull: #7715 Rebased-From: 68d4282774d6a60c609301cddad0b652f16df4d9
2016-03-18Policy: allow transaction version 2 relay policy.BtcDrak
This commit introduces a way to gracefully bump the default transaction version in a two step process.
2016-03-18Soft fork logic for BIP68BtcDrak
2016-03-18Soft fork logic for BIP113BtcDrak
2016-03-18Add CHECKSEQUENCEVERIFY softfork through BIP9Pieter Wuille
2016-03-18Test versionbits deploymentsSuhas Daftuar
2016-03-18Add testing of ComputeBlockVersionSuhas Daftuar
2016-03-18Softfork status report in RPCPieter Wuille
2016-03-18Versionbits testsPieter Wuille
2016-03-18BIP9 ImplementationPieter Wuille
Inspired by former implementations by Eric Lombrozo and Rusty Russell, and based on code by Jorge Timon.
2016-03-18Add LockPointsAlex Morcos
Obtain LockPoints to store in CTxMemPoolEntry and during a reorg, evaluate whether they are still valid and if not, recalculate them.
2016-03-18Code style fix.BtcDrak
This if statement is a little obtuse and using braces here improves readability.
2016-03-18Separate CheckLockTime() and CheckSequence() logicBtcDrak
For the sake of a little repetition, make code more readable.
2016-03-18BIP112: Implement CHECKSEQUENCEVERIFYMark Friedenbach
- Replace NOP3 with CHECKSEQUENCEVERIFY (BIP112) <nSequence> CHECKSEQUENCEVERIFY -> <nSequence> - Fails if txin.nSequence < nSequence, allowing funds of a txout to be locked for a number of blocks or a duration of time after its inclusion in a block. - Pull most of CheckLockTime() out into VerifyLockTime(), a local function that will be reused for CheckSequence() - Add bitwise AND operator to CScriptNum - Enable CHECKSEQUENCEVERIFY as a standard script verify flag - Transactions that fail CSV verification will be rejected from the mempool, making it easy to test the feature. However blocks containing "invalid" CSV-using transactions will still be accepted; this is *not* the soft-fork required to actually enable CSV for production use.
2016-03-18fix sdaftuar's nits againAlex Morcos
it boggles the mind why these nits can't be delivered on a more timely basis
2016-03-18Implement SequenceLocks functionsAlex Morcos
SequenceLocks functions are used to evaluate sequence lock times or heights per BIP 68. The majority of this code is copied from maaku in #6312 Further credit: btcdrak, sipa, NicolasDorier
2016-03-11[doc/log] Fix markdown syntax and line terminate LogPrintMarcoFalke
- Fix doxygen comment for payTxFee - [doc] Fix markdown - Make sure LogPrintf strings are line-terminated Github-Pull: #7617 Rebased-From: fa06ce09498707d5e82633f1e1b034675e552628 fa97f95c15a7aee15feea500571a10a90f22ea8b fa266524592cc18c789cc587d738fb0e548fd23a
2016-02-10qt: Translation update pre-rc5v0.12.0rc5Wladimir J. van der Laan
2016-02-10Changed getnetworkhps value to double to avoid overflow.instagibbs
Github-Pull; #7480 Rebased-From: 993d089e82fc045d7b0f23e1a5dc934cba0e3306
2016-02-10Fix spelling: misbeha{b,v}ingMatt
Github-Pull: #7469 Rebased-From: 0830552673e37142599de897e87510f2f9866e1e