Wladimir J. van der Laan
649cf5fe89
Merge #9462 : [qt] Do not translate tilde character
...
fab6c5f
[qt] Do not translate `~` (MarcoFalke)
2017-01-04 08:21:04 +01:00
Cory Fields
67ee4ec901
net: misc header cleanups
2017-01-03 17:56:21 -05:00
Cory Fields
8b3159ef0a
net: make proxy receives interruptible
2017-01-03 17:56:21 -05:00
Cory Fields
5cb0fcee81
net: remove thread_interrupted catch
...
This is now a std::thread, so there's no hope of catching a boost interruption
point.
2017-01-03 17:56:21 -05:00
Cory Fields
d3d7056d2a
net: make net processing interruptible
2017-01-03 17:56:20 -05:00
Cory Fields
0985052319
net: make net interruptible
...
Also now that net threads are interruptible, switch them to use std
threads/binds/mutexes/condvars.
2017-01-03 17:53:09 -05:00
Cory Fields
799df9115f
net: add CThreadInterrupt and InterruptibleSleep
2017-01-03 17:53:09 -05:00
Cory Fields
7325b15566
net: a few small cleanups before replacing boost threads
...
- Drop the interruption point directly after the pnode allocation. This would
be leaky if hit.
- Rearrange thread creation so that the socket handler comes first
2017-01-03 17:53:09 -05:00
Pieter Wuille
2a524b8e8f
Merge #8776 : Wallet refactoring leading up to multiwallet
...
5394b39
Wallet: Split main logic from InitLoadWallet into CreateWalletFromFile (Luke Dashjr)
fb0c934
Wallet: Let the interval-flushing thread figure out the filename (Luke Dashjr)
2017-01-03 14:11:11 -08:00
Pieter Wuille
ce5c1f4aca
Merge #9252 : Release cs_main before calling ProcessNewBlock, or processing headers (cmpctblock handling)
...
bd02bdd
Release cs_main before processing cmpctblock as header (Suhas Daftuar)
680b0c0
Release cs_main before calling ProcessNewBlock (cmpctblock handling) (Suhas Daftuar)
2017-01-03 13:52:16 -08:00
MarcoFalke
fab6c5f46b
[qt] Do not translate ~
2017-01-03 17:51:12 +01:00
Jonas Schnelli
6dc4c43d32
Merge #8877 : Qt RPC console: history sensitive-data filter, and saving input line when browsing history
...
8562792
GUI/RPCConsole: Include importmulti in history sensitive-command filter (Luke Dashjr)
ff77faf
Qt/RPCConsole: Use RPCParseCommandLine to perform command filtering (Luke Dashjr)
a79598d
Qt/Test: Make sure filtering sensitive data works correctly in nested commands (Luke Dashjr)
629cd42
Qt/RPCConsole: Teach RPCParseCommandLine how to filter out arguments to sensitive commands (Luke Dashjr)
e2d9213
Qt/RPCConsole: Make it possible to parse a command without executing it (Luke Dashjr)
1755c04
Qt/RPCConsole: Truncate filtered commands to just the command name, rather than skip it entirely in history (Luke Dashjr)
d80a006
Qt/RPCConsole: Add signmessagewithprivkey to list of commands filtered from history (Luke Dashjr)
afde12f
Qt/RPCConsole: Refactor command_may_contain_sensitive_data function out of RPCConsole::on_lineEdit_returnPressed (Luke Dashjr)
de8980d
Bugfix: Do not add sensitive information to history for real (Luke Dashjr)
9044908
Qt/RPCConsole: Don't store commands with potentially sensitive information in the history (Jonas Schnelli)
fc95daa
Qt/RPCConsole: Save current command entry when browsing history (Jonas Schnelli)
2017-01-03 16:57:21 +01:00
Wladimir J. van der Laan
e0dc3d70c6
Merge #9460 : Fix a few typos in translated strings
...
d45b21e
qt: Fill in English numerusforms (Wladimir J. van der Laan)
a9d6151
qt,wallet: Fix a few typos in messages (Wladimir J. van der Laan)
2017-01-03 15:44:09 +01:00
Wladimir J. van der Laan
d45b21e2b3
qt: Fill in English numerusforms
...
minute/minutes block/blocks and so forth.
2017-01-03 15:03:37 +01:00
Wladimir J. van der Laan
a9d6151802
qt,wallet: Fix a few typos in messages
...
As reported by [yahoe.001](https://www.transifex.com/user/profile/yahoe.001/ ).
2017-01-03 15:01:46 +01:00
Wladimir J. van der Laan
03e1d6ce34
doc: Add historical release notes for 0.13.2
2017-01-03 11:52:31 +01:00
Jonas Schnelli
510c0d9c79
Merge #9446 : SetMerkleBranch: remove unused code, remove cs_main lock requirement
...
9e351c9
SetMerkleBranch: remove unused code, remove cs_main lock requirement (Jonas Schnelli)
2017-01-03 09:31:57 +01:00
Karl-Johan Alm
73f41190b9
Refactoring: Removed using namespace <xxx> from bench/ and test/ source files.
2017-01-02 20:35:23 +09:00
Jonas Schnelli
53442af0aa
Merge #9412 : build: Fix 'make deploy' for OSX
...
2fb98f6
Fix bug in dmg builder so that it actually reads in the configuration file (Don Patterson)
b01667c
Mention RSVG dependency when creating the disk image on OSX (Jonas Schnelli)
09aefb5
build: Fix 'make deploy' for OSX (Cory Fields)
2017-01-02 09:43:15 +01:00
Wladimir J. van der Laan
1d2d67692c
qt: Set transifex slug to 0.14
...
Also perform update of source translations.
2017-01-02 09:36:03 +01:00
MarcoFalke
caa2f106d7
Merge #9433 : Update the Windows build notes
...
b705a04
Update the Windows build notes (Douglas Roark)
2017-01-01 12:59:00 +01:00
isle2983
27765b6403
Increment MIT Licence copyright header year on files modified in 2016
...
Edited via:
$ contrib/devtools/copyright_header.py update .
2016-12-31 11:01:21 -07:00
Gregory Sanders
d4781ac6c2
Set peers as HB peers upon full block validation
2016-12-30 14:05:13 -05:00
Don Patterson
2fb98f6661
Fix bug in dmg builder so that it actually reads in the configuration file
2016-12-30 10:44:58 +01:00
Jonas Schnelli
9e351c9586
SetMerkleBranch: remove unused code, remove cs_main lock requirement
2016-12-30 10:37:13 +01:00
Douglas Roark
b705a04b91
Update the Windows build notes
...
- Clarify the Windows Subsystem For Linux section.
- Clarify the build requirements.
2016-12-29 23:54:14 -08:00
Jonas Schnelli
bebe3697fd
Merge #9420 : Fix linker error when configured with --enable-lcov
...
e2b5c98
Fix linker error when configured with --enable-lcov (Douglas Roark)
2016-12-30 08:43:31 +01:00
jnewbery
b7e144bb73
Add test cases to test new bitcoin-tx functionality
...
This commit add testcases to test the following functions in bitcoin-tx:
- add a pay to non-standard script output
- add a P2SH output
- add a P2WSH output
- add a P2WSH wrapped in a P2SH output
- add a pay to pub key output
- add a P2WPKH output
- add a P2WPKH wrapped in a P2SH output
- add a bare multisig output
- add a multisig in P2SH output
- add a multisig in a P2WSH output
- add a multisig in a P2WSH wrapped in as P2SH output
2016-12-29 15:40:40 +00:00
jnewbery
61a153443e
Add all transaction output types to bitcoin-tx.
...
This commit enhances bitcoin-tx so all remaining standard TXO types can be created:
- Pay to Pub Key
- Multi-sig
- bare multi-sig
- multi-sig in Pay To Script Hash
- multi-sig in Pay to Witness Script Hash
- multi-sig in Pay to Witness Script Hash, wrapped in P2SH
- Pay to Witness Pub Key Hash
- Pay to Witness Pub Key Hash, wrapped in P2SH
- Pay to Witness Script Hash
- Pay to Witness Script Hash, wrapped in P2SH
2016-12-29 15:40:40 +00:00
Stanislas Marion
1814b089fb
add p2sh and segwit options to bitcoin-tx outscript command
2016-12-29 15:40:40 +00:00
Luke Dashjr
ed1fcdcac0
Bugfix: Detect genbuild.sh in repo correctly
2016-12-29 15:24:38 +00:00
Luke Dashjr
8562792095
GUI/RPCConsole: Include importmulti in history sensitive-command filter
2016-12-29 11:47:58 +00:00
Luke Dashjr
ff77faf480
Qt/RPCConsole: Use RPCParseCommandLine to perform command filtering
2016-12-29 11:47:58 +00:00
Luke Dashjr
a79598ddf4
Qt/Test: Make sure filtering sensitive data works correctly in nested commands
2016-12-29 11:46:26 +00:00
Luke Dashjr
629cd42364
Qt/RPCConsole: Teach RPCParseCommandLine how to filter out arguments to sensitive commands
2016-12-29 11:46:26 +00:00
Luke Dashjr
e2d9213c32
Qt/RPCConsole: Make it possible to parse a command without executing it
2016-12-29 11:43:29 +00:00
Luke Dashjr
1755c04576
Qt/RPCConsole: Truncate filtered commands to just the command name, rather than skip it entirely in history
2016-12-29 11:43:29 +00:00
Luke Dashjr
d80a00660f
Qt/RPCConsole: Add signmessagewithprivkey to list of commands filtered from history
2016-12-29 11:43:29 +00:00
Luke Dashjr
afde12f265
Qt/RPCConsole: Refactor command_may_contain_sensitive_data function out of RPCConsole::on_lineEdit_returnPressed
2016-12-29 11:43:29 +00:00
Luke Dashjr
de8980df9d
Bugfix: Do not add sensitive information to history for real
...
Original code was missing braces, and short-circuited before checking everything after importprivkey
2016-12-29 11:43:29 +00:00
Jonas Schnelli
9044908636
Qt/RPCConsole: Don't store commands with potentially sensitive information in the history
...
Filters importprivkey, signrawtransaction, walletpassphrase, walletpassphrasechange, and encryptwallet
2016-12-29 11:43:28 +00:00
Jonas Schnelli
fc95daa97f
Qt/RPCConsole: Save current command entry when browsing history
...
Shell-like, but doesn't store changed history commands until executing it.
2016-12-29 11:43:28 +00:00
Douglas Roark
e2b5c98cef
Fix linker error when configured with --enable-lcov
2016-12-28 21:47:51 -08:00
MarcoFalke
dce853ef76
Merge #9436 : test: Include tx data in EXTRA_DIST
...
fa558be
test: Include tx data in EXTRA_DIST (MarcoFalke)
2016-12-28 12:58:20 +01:00
Pieter Wuille
2db4cbcc43
Merge #9349 : Make CScript (and prevector) c++11 movable.
...
2ddfcfd
Make CScript (and prevector) c++11 movable. (Pieter Wuille)
2016-12-27 11:04:14 -08:00
Pieter Wuille
7aa700424c
Merge #9243 : Clean up mapArgs and mapMultiArgs Usage
...
c2f61be
Add a ForceSetArg method for testing (Matt Corallo)
4e04814
Lock mapArgs/mapMultiArgs access in util (Matt Corallo)
4cd373a
Un-expose mapArgs from utils.h (Matt Corallo)
71fde55
Get rid of mapArgs direct access in ZMQ construction (Matt Corallo)
0cf86a6
Introduce (and use) an IsArgSet accessor method (Matt Corallo)
2b5f085
Fix non-const mapMultiArgs[] access after init. (Matt Corallo)
c8042a4
Remove arguments to ParseConfigFile (Matt Corallo)
2016-12-27 10:17:11 -08:00
MarcoFalke
fa558be2c1
test: Include tx data in EXTRA_DIST
2016-12-27 19:16:17 +01:00
MarcoFalke
dbc8a8c86a
Merge #9435 : Removed unused variable in test, fixing warning.
...
35356b4
Remove unused variable in test, fixing warning. (Russell Yanofsky)
2016-12-27 18:51:36 +01:00
Matt Corallo
c2f61bebb1
Add a ForceSetArg method for testing
2016-12-27 13:52:07 +01:00
Russell Yanofsky
35356b40ef
Remove unused variable in test, fixing warning.
...
Pointed out by Pavel Janík <Pavel@Janik.cz> in
https://github.com/bitcoin/bitcoin/pull/9308 .
2016-12-27 07:35:39 -05:00