Wladimir J. van der Laan
a5072a7730
util: Remove zero-argument versions of LogPrint and error
...
Changes in tinyformat, recently imported from upstream have made the
zero-argument versions of formatting functions unnecessary. Remove them.
This is a slight semantic change: `%` characters in the zero-argument
call are now regarded and need to be escaped. As for as I know, the only
use of this is in `main.cpp`.
2016-06-27 18:39:25 +02:00
Wladimir J. van der Laan
695041e495
util: Update tinyformat
...
Updates `tinyformat.h` to commit
3a33bbf654
upstream.
Makes sure that our local changes are kept:
- #3767 1b8fd35aad
Make tinyformat errors raise an exception instead of assert()ing
- #4735 9b6d4c5cdc
Move strprintf define to tinyformat.h
- #4748 6e5fd003e0
include stdexcept (for std::exception)
- #8000 9eaa0afa6e
force USE_VARIADIC_TEMPLATES
- Add `std::string format(const std::string &fmt...` added this
at the time, as we want to be able to do `strprintf(_(...), ...)`
Inspired by #8264 .
2016-06-27 18:17:27 +02:00
Suhas Daftuar
f15c2cde45
CreateNewBlock: add support for size-accounting to addPackageTxs
...
Includes a change to not continue to use size-accounting in addScoreTxs
or addPackageTxs just because addPriorityTxs() is used.
2016-06-27 10:58:58 -04:00
Wladimir J. van der Laan
5a06ebbf2d
Merge #8258 : RPC: Hide softfork if timeout is 0
...
409f833
RPC: Hide softfork if timeout is 0 (jl2012)
2016-06-27 16:07:50 +02:00
Pieter Wuille
252675efc6
Do not send witnesses in cmpctblock
2016-06-26 20:19:00 +02:00
Wladimir J. van der Laan
1922e5a654
Merge #8244 : remove unnecessary LOCK(cs_main) in getrawpmempool
...
27f8126
remove unnecessary LOCK(cs_main) (Daniel Cousens)
2016-06-25 16:10:10 +02:00
Wladimir J. van der Laan
63fbdbc94d
Merge #8240 : doc: Mention Windows XP end of support in release notes
...
b0be3a0
doc: Mention Windows XP end of support in release notes (Wladimir J. van der Laan)
2016-06-25 12:59:16 +02:00
jl2012
409f83322e
RPC: Hide softfork if timeout is 0
2016-06-25 00:55:07 +08:00
Wladimir J. van der Laan
b0be3a0186
doc: Mention Windows XP end of support in release notes
...
Closes #7681 .
2016-06-24 18:15:01 +02:00
Wladimir J. van der Laan
5cdc54b4b6
Merge #8252 : [trivial] Add aarch64 to depends .gitignore
...
f70bcfc
[trivial] Add aarch64 to depends .gitignore (fanquake)
2016-06-24 18:12:26 +02:00
Wladimir J. van der Laan
d612837814
Merge #8149 : Segregated witness rebased
...
f852813
BIP9 parameters for testnet (Johnson Lau)
070dbc4
--- [SEGWIT] begin: deployment --- (Pieter Wuille)
fdb43df
[qa] Add GetTransactionSigOpCost unit tests (Jonas Nick)
d846e02
[qa] script_tests: witness tests can specify tx amount (Suhas Daftuar)
330b0f3
[qa] p2p segwit tests (Suhas Daftuar)
4f7ff00
[qa] Add rpc test for segwit (Alex Morcos)
66cca79
[qa] Autogeneration support for witness in script_tests (Pieter Wuille)
06d3805
[qa] Add segwit support to script_tests (Pieter Wuille)
00f46cb
[qa] Add transaction tests for segwit (NicolasDorier)
0aa9207
[qa] Witness version 0 signing unit tests (Pieter Wuille)
978e200
--- [SEGWIT] begin: tests --- (Pieter Wuille)
745eb67
[RPC] signrawtransaction can sign P2WSH (NicolasDorier)
f4691ab
[RPC] Add wallet support for witness transactions (using P2SH) (Pieter Wuille)
605e847
BIP143: Signing logic (Pieter Wuille)
9757b57
--- [SEGWIT] begin: wallet --- (Pieter Wuille)
af87a67
Do not use compact blocks when segwit is enabled (Pieter Wuille)
6032f69
Add rewind logic to deal with post-fork software updates (Pieter Wuille)
b7dbeb2
[libconsensus] Script verification API with amounts (Thomas Kerin)
2b1f6f9
BIP141: Other consensus critical limits, and BIP145 (Pieter Wuille)
7c4bf77
[RPC] Return witness data in blockchain RPCs (Johnson Lau)
3dd4102
BIP143: Verification logic (Pieter Wuille)
0ef1dd3
Refactor script validation to observe amounts (Pieter Wuille)
b8a9749
BIP144: Handshake and relay (receiver side) (Pieter Wuille)
8b49040
BIP141: Commitment structure and deployment (Pieter Wuille)
449f9b8
BIP141: Witness program (Pieter Wuille)
7030d9e
BIP144: Serialization, hashes, relay (sender side) (Pieter Wuille)
ecacfd9
--- [SEGWIT] begin: P2P/node/consensus --- (Pieter Wuille)
2016-06-24 18:07:44 +02:00
Pieter Wuille
1acf1db76f
Do not ask a UI question from bitcoind
2016-06-24 16:45:12 +02:00
Wladimir J. van der Laan
af2421c291
Merge #8256 : BUG: bitcoin-qt crash
...
d7828ab
check that transactionView->selectionModel()->selectedRows(0) exists (fsb4000)
2016-06-24 13:48:16 +02:00
fsb4000
d7828abd5b
check that transactionView->selectionModel()->selectedRows(0) exists
2016-06-24 18:08:32 +07:00
Wladimir J. van der Laan
5cd35d3dbc
Merge #8247 : Mark my dnsseed as supporting filtering
...
133deb8
Mark my dnsseed as supporting filtering (Pieter Wuille)
2016-06-24 12:44:55 +02:00
MarcoFalke
c2c69edf37
Merge #8254 : [doc] Add OSX ZMQ requirement to QA readme
...
d241487
[doc] Add OS X ZMQ requirement to QA readme (fanquake)
2016-06-24 12:39:39 +02:00
fanquake
d24148742e
[doc] Add OS X ZMQ requirement to QA readme
2016-06-24 15:32:48 +08:00
fanquake
f70bcfc6c0
[trivial] Add aarch64 to depends .gitignore
2016-06-24 15:01:45 +08:00
Pieter Wuille
133deb83df
Mark my dnsseed as supporting filtering
2016-06-23 15:44:35 +02:00
Wladimir J. van der Laan
08338942b5
Merge #8204 : Update petertodd's testnet seed
...
d80efec
Update petertodd's testnet seed (Peter Todd)
2016-06-23 13:04:42 +02:00
Wladimir J. van der Laan
147a7b6726
Merge #8246 : trivial: capitalize BIP32 in option help
...
a1c92c2
trivial: capitalize BIP32 in option help (Wladimir J. van der Laan)
2016-06-23 13:02:13 +02:00
Wladimir J. van der Laan
a1c92c29fd
trivial: capitalize BIP32 in option help
...
For consistency, BIP32 should be in uppercase in translation message.
Reported by @pryds on Transifex.
2016-06-23 10:44:36 +00:00
Daniel Cousens
27f8126ff3
remove unnecessary LOCK(cs_main)
2016-06-23 12:44:53 +10:00
Johnson Lau
f8528134fc
BIP9 parameters for testnet
2016-06-22 15:43:02 +02:00
Pieter Wuille
070dbc48a9
--- [SEGWIT] begin: deployment ---
2016-06-22 15:43:02 +02:00
Jonas Nick
fdb43df23e
[qa] Add GetTransactionSigOpCost unit tests
2016-06-22 15:43:02 +02:00
Suhas Daftuar
d846e02372
[qa] script_tests: witness tests can specify tx amount
...
Add tests that witness signatures cover value
2016-06-22 15:43:02 +02:00
Suhas Daftuar
330b0f31ee
[qa] p2p segwit tests
...
mininode now supports witness transactions/blocks, blocktools
has a helper for adding witness commitments to blocks, and script
has a function to calculate hashes for signature under sigversion
1, used by segwit.
Py3 conversion by Marco Falke
Test to make sure upgraded nodes don't ask for non-wit blocks by
Gregory Sanders.
2016-06-22 15:43:02 +02:00
Alex Morcos
4f7ff00497
[qa] Add rpc test for segwit
...
Amended by Pieter Wuille to use multisig 1-of-1 for P2WSH tests, and BIP9
based switchover logic.
Fixes and py3 conversion by Marco Falke.
2016-06-22 15:43:01 +02:00
Pieter Wuille
66cca79130
[qa] Autogeneration support for witness in script_tests
2016-06-22 15:43:01 +02:00
Pieter Wuille
06d3805c1a
[qa] Add segwit support to script_tests
...
Contains fix by Johnson Lau.
2016-06-22 15:43:01 +02:00
NicolasDorier
00f46cbcd9
[qa] Add transaction tests for segwit
...
Including BIP143 P2WSH examples by jl2012.
2016-06-22 15:43:01 +02:00
Pieter Wuille
0aa9207451
[qa] Witness version 0 signing unit tests
2016-06-22 15:43:01 +02:00
Pieter Wuille
978e2004ad
--- [SEGWIT] begin: tests ---
2016-06-22 15:43:01 +02:00
NicolasDorier
745eb678ef
[RPC] signrawtransaction can sign P2WSH
2016-06-22 15:43:01 +02:00
Pieter Wuille
f4691ab3a9
[RPC] Add wallet support for witness transactions (using P2SH)
...
Includes support for pushkeyhash wit v0 by Alex Morcos.
2016-06-22 15:43:01 +02:00
Pieter Wuille
605e8473a7
BIP143: Signing logic
2016-06-22 15:43:01 +02:00
Pieter Wuille
9757b57c25
--- [SEGWIT] begin: wallet ---
2016-06-22 15:43:00 +02:00
Pieter Wuille
af87a67eff
Do not use compact blocks when segwit is enabled
2016-06-22 15:43:00 +02:00
Pieter Wuille
6032f6930a
Add rewind logic to deal with post-fork software updates
...
Includes logic for dealing with pruning by Suhas Daftuar.
2016-06-22 15:43:00 +02:00
Thomas Kerin
b7dbeb24eb
[libconsensus] Script verification API with amounts
...
script_tests: always test bitcoinconsensus_verify_script_with_amount if VERIFY_WITNESS isn't set
Rename internal method + make it static
trim bitcoinconsensus_ prefix
Add SERIALIZE_TRANSACTION_WITNESS flag
2016-06-22 15:43:00 +02:00
Pieter Wuille
2b1f6f9ccf
BIP141: Other consensus critical limits, and BIP145
...
Includes changes by Suhas Daftuar, Luke-jr, and mruddy.
2016-06-22 15:43:00 +02:00
Johnson Lau
7c4bf779e8
[RPC] Return witness data in blockchain RPCs
...
Includes RPC field name changes by Luke-jr.
2016-06-22 15:43:00 +02:00
Pieter Wuille
3dd410294d
BIP143: Verification logic
...
Includes simplifications by Eric Lombrozo.
2016-06-22 15:43:00 +02:00
Pieter Wuille
0ef1dd3e11
Refactor script validation to observe amounts
...
This is a preparation for BIP143 support.
2016-06-22 15:43:00 +02:00
Pieter Wuille
b8a97498df
BIP144: Handshake and relay (receiver side)
...
Service bit logic by Nicolas Dorier.
Only download blocks from witness peers after fork.
2016-06-22 15:42:59 +02:00
Pieter Wuille
8b49040854
BIP141: Commitment structure and deployment
...
Includes a fix by Suhas Daftuar and LongShao007
2016-06-22 15:42:59 +02:00
Pieter Wuille
449f9b8deb
BIP141: Witness program
2016-06-22 15:42:59 +02:00
Pieter Wuille
7030d9eb47
BIP144: Serialization, hashes, relay (sender side)
...
Contains refactorings by Eric Lombrozo.
Contains fixup by Nicolas Dorier.
Contains cleanup of CInv::GetCommand by Alex Morcos
2016-06-22 15:42:59 +02:00
Pieter Wuille
ecacfd98e6
--- [SEGWIT] begin: P2P/node/consensus ---
2016-06-22 15:42:59 +02:00