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
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
Matt Corallo
4e048142a5
Lock mapArgs/mapMultiArgs access in util
2016-12-24 11:29:33 -05:00
Matt Corallo
4cd373aea8
Un-expose mapArgs from utils.h
2016-12-24 11:29:33 -05:00
Matt Corallo
71fde5563b
Get rid of mapArgs direct access in ZMQ construction
2016-12-24 11:10:39 -05:00
Matt Corallo
0cf86a6678
Introduce (and use) an IsArgSet accessor method
2016-12-23 21:30:16 -05:00
Matt Corallo
2b5f085ad1
Fix non-const mapMultiArgs[] access after init.
...
Swap mapMultiArgs for a const-reference to a _mapMultiArgs which is
only accessed in util.cpp
2016-12-23 21:30:15 -05:00
Matt Corallo
c8042a48f0
Remove arguments to ParseConfigFile
2016-12-23 21:30:15 -05:00
MarcoFalke
0f921e6a04
Merge #9406 : Re-enable a blank v1 Tx JSON test
...
b371732
Re-enable a blank v1 Tx JSON test (Douglas Roark)
2016-12-23 12:07:16 +01:00
MarcoFalke
041331e1da
Merge #9407 : [Trivial] Added missing colons in when running help command
...
afe5b3f
Added missing colons in when running help command (Anditto Heristyo)
2016-12-22 11:15:20 +01:00
Anditto Heristyo
afe5b3f553
Added missing colons in when running help command
2016-12-22 13:26:03 +09:00
Pieter Wuille
2ddfcfd2d6
Make CScript (and prevector) c++11 movable.
...
Such moves are used when reallocating vectors that contain them,
for example.
2016-12-21 18:28:33 -08:00
Douglas Roark
b3717326c1
Re-enable a blank v1 Tx JSON test
2016-12-21 13:41:47 -08:00
Wladimir J. van der Laan
e8cfe1ee2d
Merge #8589 : Inline CTxInWitness inside CTxIn
...
f6fb7ac
Move CTxInWitness inside CTxIn (Pieter Wuille)
2016-12-21 14:04:06 +01:00
Wladimir J. van der Laan
0698639a38
Merge #9308 : [test] Add CCoinsViewCache Access/Modify/Write tests
...
07df40b
[test] Add CCoinsViewCache Access/Modify/Write tests (Russell Yanofsky)
2016-12-21 12:23:31 +01:00
Wladimir J. van der Laan
38e4887b46
Merge #8717 : [WALLET] Addition of ImmatureCreditCached to MarkDirty()
...
a560378
[WALLET] Addition of ImmatureCreditCached to MarkDirty() (Spencer Lievens)
2016-12-21 11:30:03 +01:00
Wladimir J. van der Laan
8b4127fd4e
Merge #9390 : travis: make distdir
...
fad896d
gitignore: Wipe line after java comp tool removal (MarcoFalke)
fad632e
travis: make distdir (MarcoFalke)
2016-12-21 11:24:41 +01:00
Wladimir J. van der Laan
03d85f6644
Merge #9393 : build: Include cuckoocache header in Makefile
...
fa89581
build: Include cuckoocache header in Makefile (MarcoFalke)
2016-12-21 09:26:35 +01:00
Wladimir J. van der Laan
8dfe9fcb90
Merge #9376 : Remove unused test files and references
...
9cb6624
Fix testfile reference (BtcDrak)
23208ac
Remove unused test files and references (BtcDrak)
2016-12-21 09:26:11 +01:00
MarcoFalke
fa89581860
build: Include cuckoocache header in Makefile
2016-12-21 01:34:54 +01:00
MarcoFalke
fad896df19
gitignore: Wipe line after java comp tool removal
2016-12-20 22:59:08 +01:00
MarcoFalke
fad632ed7a
travis: make distdir
2016-12-20 22:54:13 +01:00
BtcDrak
9cb66248dc
Fix testfile reference
2016-12-20 19:49:02 +00:00
Wladimir J. van der Laan
5a70572049
Merge #9262 : Prefer coins that have fewer ancestors, sanity check txn before ATMP
...
cee1612
reduce number of lookups in TransactionWithinChainLimit (Gregory Sanders)
af9bedb
Test for fix of txn chaining in wallet (Gregory Sanders)
5882c09
CreateTransaction: Don't return success with too-many-ancestor txn (Gregory Sanders)
0b2294a
SelectCoinsMinConf: Prefer coins with fewer ancestors (Gregory Sanders)
2016-12-20 13:27:08 +01:00
Wladimir J. van der Laan
3097ea40d7
Merge #9316 : [wallet] Disable free transactions when relay is disabled
...
faf4ca8
[wallet] Disable free transactions when relay is disabled (MarcoFalke)
2016-12-20 11:29:59 +01:00
Gregory Sanders
cee16123f5
reduce number of lookups in TransactionWithinChainLimit
2016-12-19 20:51:34 -05:00
Wladimir J. van der Laan
7f72568e6b
Merge #9236 : Fix races for strMiscWarning and fLargeWork*Found, make QT runawayException use GetWarnings
...
749be01
Move GetWarnings() into its own file. (Gregory Maxwell)
e3ba0ef
Eliminate data races for strMiscWarning and fLargeWork*Found. (Gregory Maxwell)
c63198f
Make QT runawayException call GetWarnings instead of directly access strMiscWarning. (Gregory Maxwell)
2016-12-19 12:40:01 +01:00
Wladimir J. van der Laan
a336d13a58
Merge #9311 : Flush wallet after abandontransaction
...
0632939
Flush wallet after abandontransaction (Alex Morcos)
2016-12-19 09:43:54 +01:00
Wladimir J. van der Laan
db45ad8516
Merge #9329 : [Qt] Console: allow empty arguments
...
390bd14
[Qt] Console: don't allow empty arguments when using the comma-syntax (Jonas Schnelli)
6a32c0f
Qt/Test: Check handling of empty arguments in RPC debug console (Luke Dashjr)
89c8d2c
[Qt] Console: allow empty arguments (Jonas Schnelli)
2016-12-19 09:08:20 +01:00
Wladimir J. van der Laan
a7f76512d9
Merge #9352 : Attempt reconstruction from all compact block announcements
...
813ede9
[qa] Update compactblocks test for multi-peer reconstruction (Suhas Daftuar)
7017298
Allow compactblock reconstruction when block is in flight (Suhas Daftuar)
2016-12-19 08:52:42 +01:00
Wladimir J. van der Laan
b416095371
Merge #9354 : Make fuzzer actually test CTxOutCompressor
...
5dd626a
Make fuzzer actually test CTxOutCompressor (Pieter Wuille)
2016-12-19 08:50:27 +01:00
BtcDrak
23208ac81b
Remove unused test files and references
2016-12-19 07:43:12 +00:00
Wladimir J. van der Laan
79da3979b7
Merge #9366 : Fix: OSX QT compile: use built-in swap if available, or defer
...
815f414
Uses built-in byte swap if available (Apple) and if bswap_XX is undefined. (Karl-Johan Alm)
2016-12-19 08:29:52 +01:00
Karl-Johan Alm
815f4148b2
Uses built-in byte swap if available (Apple) and if bswap_XX is undefined.
...
Defers to pre-defined version if found (e.g. protobuf). For protobuf case, the definitions are identical and thus include order should not affect results.
2016-12-17 12:27:00 +09:00
Pieter Wuille
b99a093afe
Merge #9346 : Batch construct batches
...
ed58969
Batch construct batches (Pieter Wuille)
2016-12-16 12:32:33 -08:00
Wladimir J. van der Laan
8c7947e09f
Merge #9367 : If we don't allow free txs, always send a fee filter (take 2)
...
fa16b8f
If we don't allow free txs, always send a fee filter (take 2) (MarcoFalke)
2016-12-16 17:09:47 +01:00
MarcoFalke
fa16b8fdba
If we don't allow free txs, always send a fee filter (take 2)
2016-12-16 14:27:55 +01:00
Wladimir J. van der Laan
c9e00591cd
Merge #9322 : [qa] Don't set unknown rpcserialversion
...
fa615d3
[qa] Don't set unknown rpcserialversion (MarcoFalke)
80d073c
Complain when unknown rpcserialversion is specified (Pieter Wuille)
2016-12-15 20:10:36 +01:00
Wladimir J. van der Laan
756374c522
Merge #9313 : If we don't allow free txs, always send a fee filter
...
01fea7a
If we don't allow free txs, always send a fee filter (Alex Morcos)
2016-12-15 19:45:54 +01:00
Pieter Wuille
5dd626a6d3
Make fuzzer actually test CTxOutCompressor
2016-12-15 09:18:31 -08:00
Suhas Daftuar
813ede91e1
[qa] Update compactblocks test for multi-peer reconstruction
2016-12-15 11:47:04 -05:00
Suhas Daftuar
7017298eb2
Allow compactblock reconstruction when block is in flight
2016-12-15 11:47:04 -05:00
Wladimir J. van der Laan
c6fd923886
Merge #9331 : [qa] Add test for rescan feature of wallet key import RPCs
...
d8c0b9f
[qa] Add test for rescan feature of wallet key import RPCs (Russell Yanofsky)
2016-12-15 17:06:53 +01:00