Peter Todd
fc8c19a07c
Prevent low feerate txs from (directly) replacing high feerate txs
...
Previously all conflicting transactions were evaluated as a whole to
determine if the feerate was being increased. This meant that low
feerate children pulled the feerate down, potentially allowing a high
transaction with a high feerate to be replaced by one with a lower
feerate.
2015-11-10 14:14:07 -05:00
Peter Todd
0137e6fafd
Add tests for transaction replacement
2015-11-10 14:14:07 -05:00
Peter Todd
5891f870d6
Add opt-in full-RBF to mempool
...
Replaces transactions already in the mempool if a new transaction seen
with a higher fee, specifically both a higher fee per KB and a higher
absolute fee. Children are evaluateed for replacement as well, using the
mempool package tracking to calculate replaced fees/size. Transactions
can opt-out of transaction replacement by setting nSequence >= maxint-1
on all inputs. (which all wallets do already)
2015-11-10 14:14:06 -05:00
Wladimir J. van der Laan
de7d4591a7
Merge pull request #6965
...
77f1f59
Benchmark sanity checks and fork checks in ConnectBlock (Matt Corallo)
2015-11-10 19:18:51 +01:00
Wladimir J. van der Laan
b56953e9bb
qt: Periodic translations update
2015-11-10 16:44:53 +01:00
Wladimir J. van der Laan
32d8b1570c
Merge pull request #6940
...
7ca73dc
Improving labels for Sent / Received "Bytes" (Jonathan Cross)
2015-11-10 16:39:12 +01:00
Wladimir J. van der Laan
9fa54a1b0c
Merge pull request #6822
...
e20d924
[trivial] init: Use defaults MIN_RELAY_TX_FEE & TRANSACTION_MAXFEE (MarcoFalke)
536766c
[trivial] New DEFAULT_MIN_RELAY_TX_FEE = 1000 (MarcoFalke)
5f46a7d
transaction_tests: Be more strict checking dust (MarcoFalke)
2015-11-10 15:58:00 +01:00
Wladimir J. van der Laan
755b4ba848
Merge pull request #5574
...
fd55571
wallet: Expose GUI labels in RPC (Luke Dashjr)
2015-11-10 15:48:23 +01:00
Wladimir J. van der Laan
77beab70de
Merge pull request #6163
...
87cbdb8
Globals: Explicit Consensus::Params arg for main: (Jorge Timón)
2015-11-10 15:32:03 +01:00
MarcoFalke
e20d9245e5
[trivial] init: Use defaults MIN_RELAY_TX_FEE & TRANSACTION_MAXFEE
2015-11-09 21:12:55 +01:00
MarcoFalke
536766c903
[trivial] New DEFAULT_MIN_RELAY_TX_FEE = 1000
2015-11-09 21:00:16 +01:00
MarcoFalke
5f46a7d068
transaction_tests: Be more strict checking dust
...
* Don't allow off-by-one or more
* Make clear dust is coupled with minRelayTxFee
* Check rounding for odd values
2015-11-09 21:00:16 +01:00
Wladimir J. van der Laan
503ff6e1ae
Merge pull request #6967
...
9ea7762
Use Pieter's signing subkey instead of his primary key (Matt Corallo)
2015-11-09 15:47:51 +01:00
Wladimir J. van der Laan
f24880b132
Merge pull request #6908
...
c53d48a
BIP70: Chainparams: DRY: Make qt/guiutil.cpp fit BIP70 chain name strings (Jorge Timón)
2015-11-09 14:19:05 +01:00
Wladimir J. van der Laan
6176e9bf3d
Merge pull request #6962
...
6dd3a44
translations: Don't translate markdown or force English grammar (MarcoFalke)
2015-11-09 12:09:33 +01:00
Wladimir J. van der Laan
92701b3b89
Merge pull request #6970
...
2980a18
Fix crash in validateaddress with -disablewallet (Wladimir J. van der Laan)
2015-11-09 11:57:31 +01:00
MarcoFalke
6dd3a44ce2
translations: Don't translate markdown or force English grammar
2015-11-09 11:40:52 +01:00
Wladimir J. van der Laan
2980a18572
Fix crash in validateaddress with -disablewallet
...
Fix a null pointer dereference in validateaddress with -disablewallet. Also add a regression testcase.
2015-11-09 08:44:19 +01:00
Matt Corallo
77f1f59d12
Benchmark sanity checks and fork checks in ConnectBlock
2015-11-06 15:21:14 -08:00
Matt Corallo
9ea7762e2c
Use Pieter's signing subkey instead of his primary key
...
This commit is signed.
2015-11-06 15:19:31 -08:00
Wladimir J. van der Laan
4ee149a6db
Merge pull request #6955
...
e167af2
[doc] Remove excessive white space (MarcoFalke)
e0eeb67
[trivial] clang-format: Set AlignAfterOpenBracket: false (MarcoFalke)
0af8fe4
devtools: Update README.md (MarcoFalke)
2015-11-05 23:39:48 +01:00
MarcoFalke
e167af2acd
[doc] Remove excessive white space
2015-11-05 23:29:29 +01:00
MarcoFalke
e0eeb672f2
[trivial] clang-format: Set AlignAfterOpenBracket: false
2015-11-05 23:28:02 +01:00
Wladimir J. van der Laan
849a7e6453
Merge pull request #6948
...
22e7807
Always flush block and undo when switching to new file (Pieter Wuille)
2015-11-05 23:06:34 +01:00
Wladimir J. van der Laan
3038eb63e8
Merge pull request #6934
...
d1c3762
Revert "Revert "Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints"" (Gregory Maxwell)
e4e5334
Restore MedianTimePast for locktime. (Gregory Maxwell)
2015-11-05 12:13:04 +01:00
Wladimir J. van der Laan
3694b74fa9
Merge pull request #6887
...
53238ff
Clarify what minrelaytxfee does (MarcoFalke)
abd8b76
[qt] Properly display required fee instead of minTxFee (MarcoFalke)
2015-11-05 12:11:11 +01:00
Wladimir J. van der Laan
79456524f8
Merge pull request #6944
...
fb9857b
Squashed 'src/leveldb/' changes from 7d41e6f..20ca81f (Pieter Wuille)
2015-11-05 10:49:59 +01:00
Pieter Wuille
22e780737d
Always flush block and undo when switching to new file
...
Previously, the undo weren't being flushed during a reindex because
fKnown was set to true in FindBlockPos. That is the correct behaviour
for block files as they aren't being touched, but undo files are
touched.
This changes the behaviour to always flush when switching to a new file
(even for block files, though that isn't really necessary).
2015-11-05 00:43:49 +01:00
Pieter Wuille
f0343e9370
Update LevelDB
2015-11-04 23:46:47 +01:00
Pieter Wuille
fb9857bfd6
Squashed 'src/leveldb/' changes from 7d41e6f..20ca81f
...
20ca81f Merge pull request #9
7aa105e leveldb: Win32WritableFile without memory mapping
git-subtree-dir: src/leveldb
git-subtree-split: 20ca81f08fb7fa108923a091668e447dcf5c6b9d
2015-11-04 23:46:47 +01:00
Jonathan Cross
7ca73dcf6b
Improving labels for Sent / Received "Bytes"
...
The labels for Sent & Received data in the "Peers" debug panel should not be defined as "Bytes" because the units (B, KB, MB) appear after the number. I decided to simply use "Sent" and "Received" (rather than "Data Sent" and "Data Received") because we already have translations for the former:
https://www.transifex.com/bitcoin/bitcoin/viewstrings/#ja/qt-translation-011x/47533089?q=sent
https://www.transifex.com/bitcoin/bitcoin/viewstrings/#ja/qt-translation-011x/47533089?q=received
Demo of changes:
Current UI:
Bytes Sent 12 KB
Bytes Received 26 MB
With this pull request:
Sent 12 KB
Received 26 MB
2015-11-04 20:14:16 +01:00
Wladimir J. van der Laan
193f7b553e
Merge pull request #6938
...
dbacc69
build: If both Qt4 and Qt5 are installed, use Qt5 (Wladimir J. van der Laan)
2015-11-04 16:43:12 +01:00
Wladimir J. van der Laan
dbacc69b4f
build: If both Qt4 and Qt5 are installed, use Qt5
...
If both Qt4 and Qt5 development headers are installed, use Qt5. Building
against Qt5 should be encouraged as that is where active development
happens.
2015-11-04 16:19:28 +01:00
Jorge Timón
c53d48a6b3
BIP70: Chainparams: DRY: Make qt/guiutil.cpp fit BIP70 chain name strings
...
As a side effect, the qt user will see "test" instead of "testnet"
2015-11-04 14:02:10 +01:00
Wladimir J. van der Laan
c702521a85
Merge pull request #6864
...
268b79e
[qt] rpcconsole: Scale monospace font to 95% (MarcoFalke)
28313b8
[qt] Use fixed pitch font for the rpc console (MarcoFalke)
2015-11-04 13:06:14 +01:00
MarcoFalke
0af8fe45ae
devtools: Update README.md
2015-11-04 13:05:25 +01:00
Wladimir J. van der Laan
8a95a18562
Merge pull request #6669
...
6342a48
Init: Use DEFAULT_TRANSACTION_MINFEE in help message (MarcoFalke)
a9c73a1
[wallet] Add comments for doxygen (MarcoFalke)
6b0e622
[wallet] Refactor to use new MIN_CHANGE (MarcoFalke)
2015-11-04 12:30:50 +01:00
Wladimir J. van der Laan
aa03fb35c4
Merge pull request #6927
...
de0499d
Fix ZMQ Notification initialization and shutdown (João Barbosa)
2015-11-04 12:10:46 +01:00
Wladimir J. van der Laan
29c3c43e19
Merge pull request #6933
...
35bb381
build: Improve build instructions (Wladimir J. van der Laan)
2015-11-04 12:08:20 +01:00
Wladimir J. van der Laan
35bb381435
build: Improve build instructions
...
- Add package instructions for Ubuntu 15.10
- Clarify BerkeleyDB/wallet situation for unix
- Add basic build instructions for Windows (closes #1401 )
2015-11-04 11:57:30 +01:00
Wladimir J. van der Laan
aca0c00ae1
Merge pull request #6905
...
a6efc01
Bugfix: Omit wallet-related options from -help when wallet is disabled (Luke Dashjr)
5f9260f
Bugfix: If genproclimit is omitted to RPC setgenerate, don't change it; also show correct default in getmininginfo (Luke Dashjr)
420a82f
Bugfix: Describe dblogsize option correctly (it refers to the wallet database, not memory pool) (Luke Dashjr)
caa3d42
Bugfix: RPC: blockchain: Display correct defaults in help for verifychain method (Luke Dashjr)
2015-11-04 11:45:33 +01:00
João Barbosa
de0499d3b8
Fix ZMQ Notification initialization and shutdown
...
Moves the call Initialize() from init.cpp to CreateWithArguments() and handles the
return value. Moves the call Shutdown() from init.cpp to destructor.
Changes Initialize() and Shutdown() to protected members.
2015-11-04 10:36:00 +00:00
Gregory Maxwell
d1c3762ae8
Revert "Revert "Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints""
...
This reverts commit 8537ecdfc4
.
2015-11-03 17:14:09 +00:00
Gregory Maxwell
e4e5334ef8
Restore MedianTimePast for locktime.
...
Revert "Revert "Add rules--presently disabled--for using GetMedianTimePast as endpoint for lock-time calculations""
This reverts commit 40cd32e835
.
After careful analysis it was determined that the change was, in fact, safe and several people were suffering
momentary confusion about locktime semantics.
2015-11-03 17:12:36 +00:00
MarcoFalke
268b79ef0c
[qt] rpcconsole: Scale monospace font to 95%
2015-11-03 12:34:51 +01:00
Wladimir J. van der Laan
42f339ef78
Merge pull request #6930
...
ff2a2af
build: don't distribute tests_config.py (Wladimir J. van der Laan)
2015-11-03 10:09:09 +01:00
MarcoFalke
53238ff0b1
Clarify what minrelaytxfee does
2015-11-03 08:53:37 +01:00
MarcoFalke
abd8b768ee
[qt] Properly display required fee instead of minTxFee
2015-11-03 08:53:37 +01:00
Wladimir J. van der Laan
8fe30fb4d1
Merge pull request #6928
...
40cd32e
Revert "Add rules--presently disabled--for using GetMedianTimePast as endpoint for lock-time calculations" (Gregory Maxwell)
8537ecd
Revert "Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints" (Gregory Maxwell)
2015-11-02 04:44:47 +01:00
Wladimir J. van der Laan
a6d0d623fc
Merge pull request #6926
...
7497e80
tests: Initialize networking on windows (Wladimir J. van der Laan)
2015-11-02 04:29:45 +01:00