aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-04-07Remove dead-code tracking of requests for blocks we generatedMatt Corallo
2017-04-07Add override to functions using CValidationInterface methodsMatt Corallo
2017-04-07Hold cs_wallet for whole block [dis]connection processingMatt Corallo
This simplifies fixing the wallet-returns-stale-info issue as we now hold cs_wallet across an entire block instead of only per-tx.
2017-04-07SyncTransaction->TxAddedToMempool/BlockConnected/DisconnectedMatt Corallo
This simplifies fixing the wallet-returns-stale-info issue as we can now hold cs_wallet across an entire block instead of only per-tx (though we only actually do so in the next commit). This change also removes the NOT_IN_BLOCK constant in favor of only passing the CBlockIndex* parameter to SyncTransactions when a new block is being connected, instead of also when a block is being disconnected. This change adds a parameter to BlockConnectedDisconnected which lists the transactions which were removed from mempool due to confliction as a result of this operation. While its somewhat of a shame to make block-validation-logic generate a list of mempool changes to be included in its generated callbacks, fixing this isnt too hard. Further in this change-set, CValidationInterface starts listening to mempool directly, placing it in the middle and giving it a bit of logic to know how to route notifications from block-validation, mempool, etc (though not listening for conflicted-removals yet).
2017-04-07Handle SyncTransaction in ActivateBestChain instead of ConnectTraceMatt Corallo
This makes a later change to move it all into one per-block callback simpler.
2017-04-07Keep conflictedTxs in ConnectTrace per-blockMatt Corallo
2017-04-07Handle conflicted transactions directly in ConnectTraceMatt Corallo
2017-04-07Make ConnectTrace::blocksConnected private, hide behind accessorsMatt Corallo
2017-04-07Add pblock to connectTrace at the end of ConnectTip, not startMatt Corallo
This makes ConnectTip responsible for the ConnectTrace instead of splitting the logic between ActivateBestChainStep and ConnectTip
2017-04-07Include missing #include in zmqnotificationinterface.hMatt Corallo
2017-04-06Merge #9902: Lightweight abstraction of boost::filesystemWladimir J. van der Laan
f110272 Remove `namespace fs=fs` (Wladimir J. van der Laan) 75594bd torcontrol: Use fs::path instead of std::string for private key path (Wladimir J. van der Laan) 2a5f574 Use fsbridge for fopen and freopen (Wladimir J. van der Laan) bac5c9c Replace uses of boost::filesystem with fs (Wladimir J. van der Laan) 7d5172d Replace includes of boost/filesystem.h with fs.h (Wladimir J. van der Laan) 19e36bb Add fs.cpp/h (Wladimir J. van der Laan) Tree-SHA512: 2c34f059dfa6850b9323f3389e9090a6b5f839a457a2960d182c2ecfafd9883c956f5928bb796613402d3aad68ebc78259796a7a313f4a6cfa98aaf507a66842
2017-04-05Merge #10151: [logging] initialize flag variable to 0 (and continue if ↵Wladimir J. van der Laan
GetLogCategory() fails) cd7f394 initialize flag variable to 0 (and continue if GetLogCategory() fails) (John Newbery) Tree-SHA512: d0f2653bd0e71ed763220cb08d3a5335c5bdfe2f54ff7f9302d97f3265d7aa7f57606fe416a61aaac1535dbb046d0fb40a61f5a9d5cf234b042268e00ee7679d
2017-04-05Merge #10154: init: Remove redundant logging codeWladimir J. van der Laan
faafa80 init: Remove redundant logging code (MarcoFalke) Tree-SHA512: 5ad0e9aba0e25a36025dd4ee5e5fddd2c0039f95bafd0f33300ea59e2f9bba807da6a1a8b4311d6aad5a360b99163edf4a4f161cb13f0f38580d8d6b504c94ad
2017-04-05Merge #10153: logging: Fix off-by-one for shrinkdebugfile defaultWladimir J. van der Laan
faab624 logging: Fix off-by-one for shrinkdebugfile (MarcoFalke) Tree-SHA512: d6153e06067906172ff0611af9e585a3ecf0a7d56925b6ad7c12e75aa802441047059b9b6f6c78e79916c3f2abc8f1998bfd2d5b84201ec6421f727c08da3c21
2017-04-05Merge #10144: Prioritisetransaction wasn't always updating ancestor feeWladimir J. van der Laan
9bef02e Bugfix: ancestor modifed fees were incorrect for descendants (Suhas Daftuar) ba7dd8b Test prioritisetransaction and ancestor fee state (Suhas Daftuar) Tree-SHA512: 01977d88e1afb093a003f22a6f29ea60df3d70a179fe7e55910b9c8c340c4af9fb20cdc804c40235b62c43c453f0194eda0d0d4dbd365d2d98347f5dbe5de01c
2017-04-05Merge #10133: Clean up calculations of pcoinsTip memory usageWladimir J. van der Laan
1b55e07 Make threshold for flushing more conservative. (Alex Morcos) f33afd3 Lower default memory footprint slightly (Alex Morcos) 5b95a19 Make pcoinsTip memory calculations consistent (Alex Morcos) Tree-SHA512: d0061138596cf89008397b8729d9b25293938b1ad454cc99a6fe2f6210e94f76dfa78a8f0fce4c1ba3efec4e742a9c1a3ab26676a4a8346d3e7c3055d032669b
2017-04-05Merge #10104: linearize script: Option to use RPC cookieWladimir J. van der Laan
bd41d98 Datadir option in linearize scripts (Andrew Chow) Tree-SHA512: 0d11866b574986c087ec962a8a9fc0b6dfee8175ae20ef827f8b4a143f657c5bffc9f9696e9dabf29b68002003a5b6a7d8ac473231b5c9c81c3a4fa0318f5bd0
2017-04-05init: Remove redundant logging codeMarcoFalke
2017-04-05logging: Fix off-by-one for shrinkdebugfileMarcoFalke
2017-04-05Merge #10152: [trivial] remove unused line in Travis configMarcoFalke
16791c5 [trivial] remove unused line in Travis config (John Newbery) Tree-SHA512: 760ae21b4d65e2243ff22803d92f17d92f4814a0fd9d9f0766b4c2bca651ca8ac07bb345a02529cda5b526f0292ddf8cbf994c2fea200120266da70f1ca6e95f
2017-04-04initialize flag variable to 0 (and continue if GetLogCategory() fails)John Newbery
2017-04-04[trivial] remove unused line in Travis configJohn Newbery
2017-04-04Merge #10146: Better error handling for submitblockWladimir J. van der Laan
30f30c0 Add braces to submitblock per current style. (Gregory Maxwell) 4f15ea1 Check transaction count early in submitblock. (Gregory Maxwell) ada0caa Make GetWitnessCommitmentIndex callable on blocks without a coinbase txn. (Gregory Maxwell) Tree-SHA512: 02dcd337ad9cdd8e4fa6a42c009d016026d1229c193676ed6fcc9ce55e924fedec57f516ac1e95c3db0985243ba908307338ce783a70416cb292bed881002bfc
2017-04-03Bugfix: ancestor modifed fees were incorrect for descendantsSuhas Daftuar
If prioritisetransaction was called for a tx with in-mempool descendants, the modified ancestor fee values for those descendants was incorrect.
2017-04-03Test prioritisetransaction and ancestor fee stateSuhas Daftuar
There is already a similar test for descendant fee state.
2017-04-03Merge #10123: Allow debug logs to be excluded from specified componentWladimir J. van der Laan
3bde556 Add -debugexclude option to switch off logging for specified components (John Newbery) Tree-SHA512: 30202e3f2085fc2fc5dd4bedb92988f4cb162c612a42cf8f6395a7da326f34975ddc347f82bc4ddca6c84c438dc0cc6e87869f90c7ff88105dbeaa52a947fa43
2017-04-03Add -debugexclude option to switch off logging for specified componentsJohn Newbery
2017-04-03Merge #9533: Allow non-power-of-2 signature cache sizesWladimir J. van der Laan
7482781 Allow non-power-of-2 signature cache sizes (Pieter Wuille) Tree-SHA512: 5731c22b46c5ae81cf6d52000c28e39b243a47d96d91079942a5b5a10db214449217f71aa2195e18f8a3917cb206b04c75dc13e4522eb700a1dbf1819013ba22
2017-04-03Remove `namespace fs=fs`Wladimir J. van der Laan
Having these inside functions is silly and redundant now.
2017-04-03torcontrol: Use fs::path instead of std::string for private key pathWladimir J. van der Laan
2017-04-03Use fsbridge for fopen and freopenWladimir J. van der Laan
Abstracts away how a path is opened to a `FILE*`. Reduces the number of places where path is converted to a string for anything else but printing.
2017-04-03Replace uses of boost::filesystem with fsWladimir J. van der Laan
Step two in abstracting away boost::filesystem. To repeat this, simply run: ``` git ls-files \*.cpp \*.h | xargs sed -i 's/boost::filesystem/fs/g' ```
2017-04-03Replace includes of boost/filesystem.h with fs.hWladimir J. van der Laan
This is step one in abstracting the use of boost::filesystem.
2017-04-03Add fs.cpp/hWladimir J. van der Laan
2017-04-03Merge #10058: No need to use OpenSSL malloc/freeWladimir J. van der Laan
6d5dd60 No need to use OpenSSL malloc/free (Thomas Snider) Tree-SHA512: 29f790067ffd5a10a8e1a621318a0ba445691f57c804aa3b7c8ca372c8408d8c7fe703c42b48018e400fc32e3feff5ab401d97433910ce2c50e69da0b8a6662e
2017-04-03Add braces to submitblock per current style.Gregory Maxwell
2017-04-03Check transaction count early in submitblock.Gregory Maxwell
There is no point in even hashing a submitted block which doesn't have a coinbase transaction. This also results in more useful error reporting on corrupted input. Thanks to rawodb for the bug report.
2017-04-03Merge #10139: [rpc] Remove auth cookie on shutdownWladimir J. van der Laan
4b87973 [rpc] Remove auth cookie on shutdown (practicalswift) Tree-SHA512: 5d7d04413d3eb6a8d167443a3fdfe4c289bdc5cbc4c9b257a557c2a7fab5d4b32a81a1357e27b77ce2623e76e495b2e8b21eab0ab032bb261fdcdf171bac1dac
2017-04-02Make GetWitnessCommitmentIndex callable on blocks without a coinbase txn.Gregory Maxwell
This isn't actually needed anywhere, but it's less brittle.
2017-04-02[rpc] Remove auth cookie on shutdownpracticalswift
Accidentally removed in 40b556d3742a1f65d67e2d4c760d0b13fe8be5b7
2017-04-02Merge #10077: [qa] Add setnetworkactive smoke testWladimir J. van der Laan
fa697b7 [qa] Add setnetworkactive smoke test (MarcoFalke) Tree-SHA512: 7205bae16f551e93383987392702e6853cfb06d4448735815fa116385cbf5deb6c4a8f521efdd43cf3cc59fede3b3d1ffe74e662890b74bcc21b5c13ce1f20b7
2017-04-02Merge #10072: Remove sources of unreliablility in extended functional testsMarcoFalke
a4fd89f Make forknotify.py more robust (John Newbery) 1f3d78b Wait for connection to open in bip9-softforks.py (John Newbery) Tree-SHA512: de7d0002ee62ad97059b6f6c89b11f6e9901e3b4164ef6906bcd61e4ca499c277d9034784755966e5baf599869fad611b0b18f5547a384ceb5b7db3cc5bbd132
2017-04-02Merge #10098: Make qt wallet test compatible with qt4Wladimir J. van der Laan
e9a6461 Make qt wallet test compatible with qt4 (Russell Yanofsky) Tree-SHA512: a3e4598986cb3c5c20aaa1d440abc886d84fcc69a6ee4079787cfc8e3a2dce655060ff95612cb15ce8b5a9b8911e4afe2281345b59a4353ec32edf3771338381
2017-04-02Merge #10036: Fix init README format to render correctly on githubWladimir J. van der Laan
b99fbad Fix init README format to render correctly on github (Jameson Lopp) Tree-SHA512: 52b8ed9661e48e830c9e0c0e9aa670fe8d1a3848426d2d854494b477a9926f286d87e0586c2bc63f433136f8e5acd2cab3ab1f616380fb517c5a8f9d34ed52da
2017-04-02Merge #10128: Speed Up CuckooCache testsWladimir J. van der Laan
3f098cc Decrease testcase sizes in cuckoocache tests (Jeremy Rubin) Tree-SHA512: 71a0e171be8d5473c791440aa4353d99b885b926b7284a3a1914c95e0c2c77925d5f3a6f329778cd81931a4e5832a082cb31d82ee8adb433d357d2e2b4f7a9e5
2017-04-02Merge #9424: Change LogAcceptCategory to use uint32_t rather than sets of ↵Wladimir J. van der Laan
strings. 6b3bb3d Change LogAcceptCategory to use uint32_t rather than sets of strings. (Gregory Maxwell) Tree-SHA512: ebb5bcf9a7d00a32dd1390b727ff4d29330a038423611da01268d8e1d2c0229e52a1098e751d4e6db73ef4ae862e1e96d38249883fcaf12b68f55ebb01035b34
2017-04-02Merge #10136: build: Disable Wshadow warningWladimir J. van der Laan
2c83911 build: Disable Wshadow warning (Wladimir J. van der Laan) Tree-SHA512: e3c1f7253c43449740760da287985b8027344dfc48c8a85ea9bca977c73cbaf75709d6e32ac0fea51eb89dccb48706a5abdf006be45375838df10ccba35e9aa1
2017-04-01Change LogAcceptCategory to use uint32_t rather than sets of strings.Gregory Maxwell
This changes the logging categories to boolean flags instead of strings. This simplifies the acceptance testing by avoiding accessing a scoped static thread local pointer to a thread local set of strings. It eliminates the only use of boost::thread_specific_ptr outside of lockorder debugging. This change allows log entries to be directed to multiple categories and makes it easy to change the logging flags at runtime (e.g. via an RPC, though that isn't done by this commit.) It also eliminates the fDebug global. Configuration of unknown logging categories now produces a warning.
2017-04-01build: Disable Wshadow warningWladimir J. van der Laan
This warning was enabled by default in #8808 but it's a [continuing](https://github.com/bitcoin/bitcoin/pull/9911#issuecomment-285171447) [source](https://github.com/bitcoin/bitcoin/pull/10089#issuecomment-289369688) of [annoyance](https://github.com/bitcoin/bitcoin/pull/9911#issuecomment-285179129) for me and other developers. I'm sick of sounding like a broken record, so disable it again.
2017-04-01Merge #10129: scheduler: fix sub-second precision with boost < 1.50Wladimir J. van der Laan
e025246 scheduler: fix sub-second precision with boost < 1.50 (Cory Fields) Tree-SHA512: b9d4875406c1a2bf3cb6412d7511c24d871bfba6a2ea5ccfbbf7392f2f8850027b001b776da422fea592878da21d897b1aa56d92bc2239869055dce79fd442ac