Matt Corallo
a1476877ce
Keep conflictedTxs in ConnectTrace per-block
2017-04-07 11:53:43 +02:00
Matt Corallo
d3167ba9bb
Handle conflicted transactions directly in ConnectTrace
2017-04-07 11:53:42 +02:00
Matt Corallo
29e6e231c8
Make ConnectTrace::blocksConnected private, hide behind accessors
2017-04-07 11:53:42 +02:00
Matt Corallo
822000cf82
Add pblock to connectTrace at the end of ConnectTip, not start
...
This makes ConnectTip responsible for the ConnectTrace instead
of splitting the logic between ActivateBestChainStep and ConnectTip
2017-04-07 11:53:41 +02:00
Matt Corallo
f5e9a019a4
Include missing #include in zmqnotificationinterface.h
2017-04-07 11:52:38 +02:00
Kewde
3491476b6f
Wallet: reduce excess logic InMemPool()
...
removed the excess logic, return directly instead of using if-statement.
2017-04-07 00:53:12 +00:00
Wladimir J. van der Laan
8c28670e92
Merge #9902 : Lightweight abstraction of boost::filesystem
...
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-06 20:35:15 +02:00
John Newbery
bb92d839d5
[tests] Add unicode symbols for tests passing/failing/skipping
2017-04-06 13:31:47 -04:00
John Newbery
1352092dbd
Log calls to getblocktemplate
2017-04-06 10:37:30 -04:00
Wladimir J. van der Laan
9ff781884a
doc: Update release process for simplified version bumping
2017-04-06 10:41:34 +02:00
Wladimir J. van der Laan
08d9aee3eb
build: Remove duplicate version information from src/clientversion.h
...
Fail when the version information is not defined otherwise when
HAVE_CONFIG_H is not set.
2017-04-06 10:41:34 +02:00
John Newbery
63062bda1a
[tests] color test results and sort alphabetically
2017-04-05 18:36:37 -04:00
Wladimir J. van der Laan
c7e73eafa1
Merge #10151 : [logging] initialize flag variable to 0 (and continue if GetLogCategory() fails)
...
cd7f394
initialize flag variable to 0 (and continue if GetLogCategory() fails) (John Newbery)
Tree-SHA512: d0f2653bd0e71ed763220cb08d3a5335c5bdfe2f54ff7f9302d97f3265d7aa7f57606fe416a61aaac1535dbb046d0fb40a61f5a9d5cf234b042268e00ee7679d
2017-04-05 11:30:10 +02:00
Wladimir J. van der Laan
3c95bd43d8
Merge #10154 : init: Remove redundant logging code
...
faafa80
init: Remove redundant logging code (MarcoFalke)
Tree-SHA512: 5ad0e9aba0e25a36025dd4ee5e5fddd2c0039f95bafd0f33300ea59e2f9bba807da6a1a8b4311d6aad5a360b99163edf4a4f161cb13f0f38580d8d6b504c94ad
2017-04-05 11:28:07 +02:00
Wladimir J. van der Laan
168a7034f5
doc: Make build system insert version in Doxyfile
2017-04-05 09:40:56 +02:00
Wladimir J. van der Laan
b67eb8dde8
doc: Remove version numbers from READMEs
...
If we want to keep these numbers, could generate them using autoconf.
But this seems unnecessary.
2017-04-05 09:40:48 +02:00
Wladimir J. van der Laan
fade78854c
Merge #10153 : logging: Fix off-by-one for shrinkdebugfile default
...
faab624
logging: Fix off-by-one for shrinkdebugfile (MarcoFalke)
Tree-SHA512: d6153e06067906172ff0611af9e585a3ecf0a7d56925b6ad7c12e75aa802441047059b9b6f6c78e79916c3f2abc8f1998bfd2d5b84201ec6421f727c08da3c21
2017-04-05 09:23:58 +02:00
Wladimir J. van der Laan
f93f9b9296
Merge #10144 : Prioritisetransaction wasn't always updating ancestor fee
...
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-05 08:36:52 +02:00
Wladimir J. van der Laan
5fc6a77aa6
Merge #10133 : Clean up calculations of pcoinsTip memory usage
...
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-05 08:10:43 +02:00
Wladimir J. van der Laan
fadf078c9c
Merge #10104 : linearize script: Option to use RPC cookie
...
bd41d98
Datadir option in linearize scripts (Andrew Chow)
Tree-SHA512: 0d11866b574986c087ec962a8a9fc0b6dfee8175ae20ef827f8b4a143f657c5bffc9f9696e9dabf29b68002003a5b6a7d8ac473231b5c9c81c3a4fa0318f5bd0
2017-04-05 07:58:45 +02:00
MarcoFalke
faafa801e8
init: Remove redundant logging code
2017-04-05 01:03:26 +02:00
MarcoFalke
faab6241d0
logging: Fix off-by-one for shrinkdebugfile
2017-04-05 00:42:48 +02:00
MarcoFalke
080d7c700f
Merge #10152 : [trivial] remove unused line in Travis config
...
16791c5
[trivial] remove unused line in Travis config (John Newbery)
Tree-SHA512: 760ae21b4d65e2243ff22803d92f17d92f4814a0fd9d9f0766b4c2bca651ca8ac07bb345a02529cda5b526f0292ddf8cbf994c2fea200120266da70f1ca6e95f
2017-04-05 00:23:31 +02:00
John Newbery
cd7f39467a
initialize flag variable to 0 (and continue if GetLogCategory() fails)
2017-04-04 14:59:35 -04:00
John Newbery
16791c5e27
[trivial] remove unused line in Travis config
2017-04-04 14:37:01 -04:00
Wladimir J. van der Laan
72bc7e1303
Merge #10146 : Better error handling for submitblock
...
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-04 09:00:23 +02:00
Suhas Daftuar
9bef02e365
Bugfix: ancestor modifed fees were incorrect for descendants
...
If prioritisetransaction was called for a tx with in-mempool
descendants, the modified ancestor fee values for those descendants was
incorrect.
2017-04-03 15:50:15 -04:00
Suhas Daftuar
ba7dd8bf6f
Test prioritisetransaction and ancestor fee state
...
There is already a similar test for descendant fee state.
2017-04-03 15:48:55 -04:00
Wladimir J. van der Laan
471ed00fcd
Merge #10123 : Allow debug logs to be excluded from specified component
...
3bde556
Add -debugexclude option to switch off logging for specified components (John Newbery)
Tree-SHA512: 30202e3f2085fc2fc5dd4bedb92988f4cb162c612a42cf8f6395a7da326f34975ddc347f82bc4ddca6c84c438dc0cc6e87869f90c7ff88105dbeaa52a947fa43
2017-04-03 17:42:40 +02:00
Russell Yanofsky
bf1026412d
Run bitcoin_test-qt under minimal QPA platform
...
Fixes broken "make check" reported by Matt Corallo <git@bluematt.me> in
https://github.com/bitcoin/bitcoin/issues/10110
Fix was suggested and initially implemented by
Cory Fields <cory-nospam-@coryfields.com> in
https://github.com/bitcoin/bitcoin/pull/10117#issuecomment-290275236
2017-04-03 11:07:40 -04:00
John Newbery
3bde556429
Add -debugexclude option to switch off logging for specified components
2017-04-03 09:04:42 -04:00
Wladimir J. van der Laan
cb598cfba1
Merge #9533 : Allow non-power-of-2 signature cache sizes
...
7482781
Allow non-power-of-2 signature cache sizes (Pieter Wuille)
Tree-SHA512: 5731c22b46c5ae81cf6d52000c28e39b243a47d96d91079942a5b5a10db214449217f71aa2195e18f8a3917cb206b04c75dc13e4522eb700a1dbf1819013ba22
2017-04-03 13:24:34 +02:00
Wladimir J. van der Laan
f110272dc9
Remove namespace fs=fs
...
Having these inside functions is silly and redundant now.
2017-04-03 12:33:14 +02:00
Wladimir J. van der Laan
75594bd7f2
torcontrol: Use fs::path instead of std::string for private key path
2017-04-03 12:33:14 +02:00
Wladimir J. van der Laan
2a5f574762
Use fsbridge for fopen and freopen
...
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-03 12:32:32 +02:00
Wladimir J. van der Laan
bac5c9cf64
Replace uses of boost::filesystem with fs
...
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-03 12:32:32 +02:00
Wladimir J. van der Laan
7d5172d354
Replace includes of boost/filesystem.h with fs.h
...
This is step one in abstracting the use of boost::filesystem.
2017-04-03 12:32:32 +02:00
Wladimir J. van der Laan
19e36bbef6
Add fs.cpp/h
2017-04-03 12:32:32 +02:00
Wladimir J. van der Laan
a2cd0b0eec
Merge #10058 : No need to use OpenSSL malloc/free
...
6d5dd60
No need to use OpenSSL malloc/free (Thomas Snider)
Tree-SHA512: 29f790067ffd5a10a8e1a621318a0ba445691f57c804aa3b7c8ca372c8408d8c7fe703c42b48018e400fc32e3feff5ab401d97433910ce2c50e69da0b8a6662e
2017-04-03 12:06:02 +02:00
Gregory Maxwell
30f30c0f99
Add braces to submitblock per current style.
2017-04-03 07:23:07 +00:00
Gregory Maxwell
4f15ea102d
Check transaction count early in submitblock.
...
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-03 07:15:36 +00:00
Wladimir J. van der Laan
e6033e00b1
Merge #10139 : [rpc] Remove auth cookie on shutdown
...
4b87973
[rpc] Remove auth cookie on shutdown (practicalswift)
Tree-SHA512: 5d7d04413d3eb6a8d167443a3fdfe4c289bdc5cbc4c9b257a557c2a7fab5d4b32a81a1357e27b77ce2623e76e495b2e8b21eab0ab032bb261fdcdf171bac1dac
2017-04-03 08:53:04 +02:00
Gregory Maxwell
ada0caa165
Make GetWitnessCommitmentIndex callable on blocks without a coinbase txn.
...
This isn't actually needed anywhere, but it's less brittle.
2017-04-02 21:28:17 +00:00
practicalswift
4b87973c32
[rpc] Remove auth cookie on shutdown
...
Accidentally removed in 40b556d374
2017-04-02 15:52:41 +02:00
Wladimir J. van der Laan
ebfd653798
Merge #10077 : [qa] Add setnetworkactive smoke test
...
fa697b7
[qa] Add setnetworkactive smoke test (MarcoFalke)
Tree-SHA512: 7205bae16f551e93383987392702e6853cfb06d4448735815fa116385cbf5deb6c4a8f521efdd43cf3cc59fede3b3d1ffe74e662890b74bcc21b5c13ce1f20b7
2017-04-02 15:39:26 +02:00
MarcoFalke
12af74b289
Merge #10072 : Remove sources of unreliablility in extended functional tests
...
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-02 12:52:31 +02:00
Wladimir J. van der Laan
2b477e6aa1
Merge #10098 : Make qt wallet test compatible with qt4
...
e9a6461
Make qt wallet test compatible with qt4 (Russell Yanofsky)
Tree-SHA512: a3e4598986cb3c5c20aaa1d440abc886d84fcc69a6ee4079787cfc8e3a2dce655060ff95612cb15ce8b5a9b8911e4afe2281345b59a4353ec32edf3771338381
2017-04-02 11:58:41 +02:00
Jonas Schnelli
5f59d3ecb7
Improve CFeeBumper interface, add comments, make use of std::move
2017-04-02 10:12:43 +02:00
Jonas Schnelli
0df22ed6fd
Cancel feebump is vErrors is not empty
2017-04-02 10:12:43 +02:00
Jonas Schnelli
44cabe6380
Use static calls for GetRequiredFee and GetMinimumFee, remove make_pair from emplace_back
2017-04-02 10:12:43 +02:00