Wladimir J. van der Laan
b16b5bc191
Merge #7371 : [0.12] backports
...
236686b [init] Add missing help for args (MarcoFalke)
44438a1 [init] Fix error message of maxtxfee invalid amount (MarcoFalke)
a74fa1f [Wallet] Transaction View: LastMonth calculation fixed (crowning-)
2016-01-22 11:41:04 +01:00
Wladimir J. van der Laan
f4b2ce8ee8
Merge #7387 : Get rid of inaccurate ScriptSigArgsExpected
...
52b29dc Get rid of inaccurate ScriptSigArgsExpected (Pieter Wuille)
2016-01-22 11:39:58 +01:00
MarcoFalke
7726c487f8
[qt] Windows: Make rpcconsole monospace font larger
...
Github-Pull: #7364
Rebased-From: fa6a59dd39
2016-01-22 11:21:33 +01:00
Jonas Schnelli
f221fc1887
Merge #7364 : [qt] Windows: Make rpcconsole monospace font larger
...
fa6a59d [qt] Windows: Make rpcconsole monospace font larger (MarcoFalke)
2016-01-22 09:47:51 +01:00
Pieter Wuille
52b29dca76
Get rid of inaccurate ScriptSigArgsExpected
2016-01-21 13:52:32 +01:00
Wladimir J. van der Laan
da83ecd454
Add option -permitrbf to set transaction replacement policy
...
Add a configuration option `-permitrbf` to set transaction replacement policy
for the mempool.
Enabling it will enable (opt-in) RBF, disabling it will refuse all
conflicting transactions.
Conflicts:
src/init.cpp
src/main.cpp
src/main.h
Github-Pull: #7386
Rebased-From: b768108d9c
2016-01-21 12:38:52 +01:00
Wladimir J. van der Laan
6f7841d545
Merge #7386 : Add option -permitrbf to set transaction replacement policy
...
b768108 Add option `-permitrbf` to set transaction replacement policy (Wladimir J. van der Laan)
2016-01-21 12:36:41 +01:00
Wladimir J. van der Laan
b768108d9c
Add option -permitrbf to set transaction replacement policy
...
Add a configuration option `-permitrbf` to set transaction replacement policy
for the mempool.
Enabling it will enable (opt-in) RBF, disabling it will refuse all
conflicting transactions.
2016-01-21 11:24:31 +01:00
Jonas Schnelli
ae2db67fee
Merge #7383 : [Qt] rename "amount" to "requested amount" in receive coins table
...
df6e8e1 [Qt] rename "amount" to "requested amount" in receive coins table (Jonas Schnelli)
2016-01-21 09:00:53 +01:00
MarcoFalke
faa9011d09
[qt] Peertable: Increase SUBVERSION_COLUMN_WIDTH
2016-01-20 23:00:10 +01:00
Daniel Cousens
d13f65ebac
rpc: update inline comments to refer to new file paths
2016-01-21 08:39:04 +11:00
Daniel Cousens
a0eaff8a1d
move rpc* to rpc/
2016-01-21 08:36:55 +11:00
Jonas Schnelli
df6e8e17e4
[Qt] rename "amount" to "requested amount" in receive coins table
2016-01-20 17:30:06 +01:00
MarcoFalke
fa8e2a6925
[qa] Change default block priority size to 0
2016-01-20 16:58:43 +01:00
Wladimir J. van der Laan
b92ea98503
Merge #7183 : Improved readability of ApproximateBestSubset
...
96efcad Improved readability of sorting for coin selection. (Murch)
2016-01-20 15:55:03 +01:00
Wladimir J. van der Laan
9982710e88
Merge #7307 : [RPC, Wallet] Move RPC dispatch table registration to wallet/ code
...
dd2dc40 [RPC, Wallet] Move RPC dispatch table registration to wallet/ code (Jonas Schnelli)
2016-01-20 15:15:51 +01:00
Jonas Schnelli
dd2dc400ee
[RPC, Wallet] Move RPC dispatch table registration to wallet/ code
...
Allow extending the rpc dispatch table by appending commands when server is not running.
2016-01-20 15:03:25 +01:00
Suhas Daftuar
e25b158ab8
RPC: indicate which transactions are replaceable
...
Add "bip125-replaceable" output field to listtransactions and gettransaction
which indicates if an unconfirmed transaction, or any unconfirmed parent, is
signaling opt-in RBF according to BIP 125.
Github-Pull: #7286
Rebased-From: eaa8d2754b
2016-01-20 13:50:58 +01:00
Wladimir J. van der Laan
82429d0861
Merge #7222 : RPC: Indicate which transactions are signaling opt-in RBF
...
eaa8d27 RPC: indicate which transactions are replaceable (Suhas Daftuar)
2016-01-20 13:50:37 +01:00
Wladimir J. van der Laan
e6f97efbca
Merge pull request #7378
...
da6d18b devtools: replace github-merge with python version (Wladimir J. van der Laan)
2016-01-20 13:39:31 +01:00
Wladimir J. van der Laan
5578144413
Merge #7350 : Banlist updates
...
e8600c9 banlist (bugfix): allow CNode::SweepBanned() to run on interval (Philip Kaufmann)
2977c24 banlist: add more banlist infos to log / add GUI signal (Philip Kaufmann)
ce479aa banlist: better handling of banlist in StartNode() (Philip Kaufmann)
57c77fe banlist: update set dirty to be more fine grained (Philip Kaufmann)
2016-01-20 13:38:40 +01:00
BtcDrak
64612f1820
Update project URL
...
Github-Pull: #7328
Rebased-From: b07b103e8a
2016-01-20 13:31:33 +01:00
Wladimir J. van der Laan
f48e59df0a
Merge #7328 : Update README.md website link
...
b07b103 Update project URL (BtcDrak)
2016-01-20 13:28:53 +01:00
Wladimir J. van der Laan
5bb3e263e2
build: Make networking work inside LXC builder in gitian-building.md
...
These are changes I needed to get gitian building to work with Debian
8.2, which is the version we tell to use.
- Set up NAT, so that container can access network beyond host
- Remove explicit cgroup setup - these are mounted automatically now
- gitian: Need `ca-certificates` and `python` for LXC builds
Github-Pull: #7060
Rebased-From: 99fda26de0 3b468a0e60
2016-01-20 13:26:49 +01:00
Wladimir J. van der Laan
53fa09f04d
Merge #7060 : build: Make networking work inside LXC builder in gitian-building.md
...
3b468a0 gitian: Need `ca-certificates` and `python` for LXC builds (Wladimir J. van der Laan)
99fda26 doc: Make networking work inside builder in gitian-building.md (Wladimir J. van der Laan)
2016-01-20 13:25:07 +01:00
MarcoFalke
621bbd88ba
[walletdb] Fix syntax error in key parser
...
Github-Pull: #7381
Rebased-From: fa6d4cc095
2016-01-20 13:08:40 +01:00
Wladimir J. van der Laan
545c5f920e
Merge #7381 : [walletdb] Fix syntax error in key parser
...
fa6d4cc [walletdb] Fix syntax error in key parser (MarcoFalke)
2016-01-20 13:08:03 +01:00
Wladimir J. van der Laan
da6d18b6c7
devtools: replace github-merge with python version
...
This is meant to be a direct translation of the bash script,
with the difference that it retrieves the PR title from github,
thus creating pull messages like:
Merge #12345 : Expose transaction temperature over RPC
2016-01-20 13:02:45 +01:00
MarcoFalke
fa6d4cc095
[walletdb] Fix syntax error in key parser
2016-01-20 09:44:53 +01:00
Suhas Daftuar
eaa8d2754b
RPC: indicate which transactions are replaceable
...
Add "bip125-replaceable" output field to listtransactions and gettransaction
which indicates if an unconfirmed transaction, or any unconfirmed parent, is
signaling opt-in RBF according to BIP 125.
2016-01-19 08:30:04 -05:00
Wladimir J. van der Laan
f9fd4c2884
Merge pull request #7281 : Improve CheckInputs() comment about sig verification
...
fd83615 Improve CheckInputs() comment about sig verification (Peter Todd)
2016-01-19 13:23:32 +01:00
Wladimir J. van der Laan
3b43cad9d0
Merge pull request #7164 : Do not download transactions during initial blockchain sync
...
39a525c Do not download transactions during inital sync (ptschip)
2016-01-19 12:58:15 +01:00
Luke Dashjr
3cae14056a
Bugfix: Actually use _COPYRIGHT_HOLDERS_SUBSTITUTION everywhere
2016-01-19 08:42:05 +00:00
Wladimir J. van der Laan
668906fcf2
Merge pull request #7280
...
faeda0e [travis] Run contrib/devtools/check-doc.py early (MarcoFalke)
fada0c9 [travis] Fail when documentation is outdated (MarcoFalke)
2016-01-19 09:41:32 +01:00
Luke Dashjr
4b8d2bc625
release-notes: Cover priority changes correctly, removing mentions of possible futures
2016-01-18 18:12:33 +00:00
Wladimir J. van der Laan
cda064caa1
Merge pull request #7370
...
fa31133 [Doc] Wallet & Pruning (MarcoFalke)
2016-01-18 16:31:07 +01:00
MarcoFalke
fa311338d2
[Doc] Wallet & Pruning
2016-01-18 16:26:57 +01:00
Wladimir J. van der Laan
21376af183
Merge pull request #7372
...
facd288 [qa] wallet: Print maintenance (MarcoFalke)
2016-01-18 16:24:14 +01:00
MarcoFalke
facd288c31
[qa] wallet: Print maintenance
2016-01-18 16:18:48 +01:00
Suhas Daftuar
51af87f078
Fix error in blockchain.py introduced in merge
...
Github-Pull: #7373
Rebased-From: 4a04879378
2016-01-18 16:01:31 +01:00
Wladimir J. van der Laan
e2ed57e61e
Merge pull request #7373
...
4a04879 Fix error in blockchain.py introduced in merge (Suhas Daftuar)
2016-01-18 16:00:58 +01:00
Suhas Daftuar
4a04879378
Fix error in blockchain.py introduced in merge
2016-01-18 09:17:48 -05:00
MarcoFalke
236686b844
[init] Add missing help for args
...
Github-Pull: #7290
Rebased-From: fa6ab96799 faa572a329 fa461df685
2016-01-18 14:24:07 +01:00
MarcoFalke
44438a192a
[init] Fix error message of maxtxfee invalid amount
...
Github-Pull: #7290
Rebased-From: fac11ea310
2016-01-18 14:18:49 +01:00
crowning-
a74fa1f06b
[Wallet] Transaction View: LastMonth calculation fixed
...
Github-Pull: #7327
Rebased-From: 30cdacea3c
2016-01-18 14:14:31 +01:00
MarcoFalke
faeda0e677
[travis] Run contrib/devtools/check-doc.py early
2016-01-18 14:00:02 +01:00
James O'Beirne
351ffd8482
Fix help, add RPC tests for getblockheader
...
- Add assert_is_hex_string and assert_is_hash_string to RPC test utils.
- Add RPC documentation for getblockheader[chainwork].
- Add RPC tests for getblockheader.
Github-Pull: #7194
Rebased-From: 16d4fce0b2 4745636126 135d6ec8ce
2016-01-18 12:25:50 +01:00
Wladimir J. van der Laan
e4e77ee55d
Merge pull request #7194
...
135d6ec Add RPC tests for getblockheader. (James O'Beirne)
4745636 Add RPC documentation for getblockheader[chainwork]. (James O'Beirne)
16d4fce Add assert_is_hex_string and assert_is_hash_string to RPC test utils. (James O'Beirne)
2016-01-18 12:24:01 +01:00
Gregory Sanders
c0d2382170
Added help text for chainwork value
...
Github-Pull: #7232
Rebased-From: 94bdd71f9b
2016-01-18 12:20:42 +01:00
Wladimir J. van der Laan
ae20172941
Merge pull request #7232
...
94bdd71 Added help text for chainwork value (Gregory Sanders)
2016-01-18 12:20:13 +01:00