Auto merge of #4303 - ebfull:release-v2.1.1, r=mdr0id
Release v2.1.1 The release height for this is roughly Tuesday.
This commit is contained in:
commit
b8ca7131c7
|
@ -1,4 +1,4 @@
|
|||
Zcash 2.1.1-rc2
|
||||
Zcash 2.1.1
|
||||
<img align="right" width="120" height="80" src="doc/imgs/logo.png">
|
||||
===========
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ AC_PREREQ([2.60])
|
|||
define(_CLIENT_VERSION_MAJOR, 2)
|
||||
define(_CLIENT_VERSION_MINOR, 1)
|
||||
define(_CLIENT_VERSION_REVISION, 1)
|
||||
define(_CLIENT_VERSION_BUILD, 26)
|
||||
define(_CLIENT_VERSION_BUILD, 50)
|
||||
define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
|
||||
define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
|
||||
define(_CLIENT_VERSION_IS_RELEASE, true)
|
||||
|
|
|
@ -1,3 +1,9 @@
|
|||
zcash (2.1.1) stable; urgency=medium
|
||||
|
||||
* 2.1.1 release.
|
||||
|
||||
-- Electric Coin Company <team@electriccoin.co> Fri, 17 Jan 2020 10:27:31 -0700
|
||||
|
||||
zcash (2.1.1~rc2) stable; urgency=medium
|
||||
|
||||
* 2.1.1-rc2 release.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
name: "zcash-2.1.1-rc2"
|
||||
name: "zcash-2.1.1"
|
||||
enable_cache: true
|
||||
distro: "debian"
|
||||
suites:
|
||||
|
|
|
@ -1,46 +1,48 @@
|
|||
Zcash Contributors
|
||||
==================
|
||||
|
||||
Jack Grigg (921)
|
||||
Simon Liu (459)
|
||||
Sean Bowe (280)
|
||||
Eirik Ogilvie-Wigley (210)
|
||||
Daira Hopwood (144)
|
||||
Jack Grigg (923)
|
||||
Simon Liu (460)
|
||||
Sean Bowe (288)
|
||||
Eirik Ogilvie-Wigley (212)
|
||||
Daira Hopwood (145)
|
||||
Wladimir J. van der Laan (89)
|
||||
Jay Graber (89)
|
||||
Wladimir J. van der Laan (82)
|
||||
Taylor Hornby (73)
|
||||
Jonas Schnelli (62)
|
||||
Taylor Hornby (84)
|
||||
Jonas Schnelli (71)
|
||||
Pieter Wuille (63)
|
||||
Nathan Wilcox (56)
|
||||
Pieter Wuille (54)
|
||||
Larry Ruane (41)
|
||||
Kevin Gallagher (38)
|
||||
Larry Ruane (36)
|
||||
Cory Fields (35)
|
||||
Marshall Gaucher (22)
|
||||
Cory Fields (38)
|
||||
Marco Falke (31)
|
||||
Marshall Gaucher (25)
|
||||
Matt Corallo (23)
|
||||
Alfredo Garcia (19)
|
||||
Jonathan "Duke" Leto (17)
|
||||
Luke Dashjr (16)
|
||||
syd (15)
|
||||
Matt Corallo (13)
|
||||
Jorge Timón (14)
|
||||
Dimitris Apostolou (13)
|
||||
Paige Peterson (11)
|
||||
Marco Falke (11)
|
||||
Ariel Gabizon (11)
|
||||
Jorge Timón (10)
|
||||
nomnombtc (9)
|
||||
Dimitris Apostolou (9)
|
||||
Benjamin Winston (9)
|
||||
kozyilmaz (8)
|
||||
fanquake (8)
|
||||
Luke Dashjr (8)
|
||||
Benjamin Winston (8)
|
||||
Peter Todd (8)
|
||||
Gregory Maxwell (8)
|
||||
Jeff Garzik (7)
|
||||
Gregory Maxwell (7)
|
||||
Charlie O'Keefe (7)
|
||||
Marius Kjærstad (6)
|
||||
David Mercer (6)
|
||||
Daniel Cousens (6)
|
||||
Charlie O'Keefe (6)
|
||||
Suhas Daftuar (5)
|
||||
Peter Todd (5)
|
||||
Karl-Johan Alm (5)
|
||||
Johnathan Corgan (5)
|
||||
Gareth Davies (5)
|
||||
Alex Morcos (5)
|
||||
sandakersmann (4)
|
||||
WO (4)
|
||||
Philip Kaufmann (4)
|
||||
Pavel Janík (4)
|
||||
|
@ -52,8 +54,10 @@ lpescher (3)
|
|||
ca333 (3)
|
||||
Per Grön (3)
|
||||
Patick Strateman (3)
|
||||
Jim Posen (3)
|
||||
Jason Davies (3)
|
||||
James O'Beirne (3)
|
||||
Gavin Andresen (3)
|
||||
Alfie John (3)
|
||||
rofl0r (2)
|
||||
mruddy (2)
|
||||
|
@ -72,7 +76,7 @@ Kaz Wesley (2)
|
|||
Joe Turgeon (2)
|
||||
Jack Gavigan (2)
|
||||
ITH4Coinomia (2)
|
||||
Gavin Andresen (2)
|
||||
Casey Rodarmor (2)
|
||||
Bryant Eisenbach (2)
|
||||
Brad Miller (2)
|
||||
Bjorn Hjortsberg (2)
|
||||
|
@ -81,7 +85,6 @@ Alex Tsankov (2)
|
|||
zathras-crypto (1)
|
||||
unsystemizer (1)
|
||||
tpantin (1)
|
||||
sandakersmann (1)
|
||||
practicalswift (1)
|
||||
mrbandrews (1)
|
||||
kazcw (1)
|
||||
|
@ -97,6 +100,7 @@ calebogden (1)
|
|||
ayleph (1)
|
||||
Za Wilcox (1)
|
||||
William M Peaster (1)
|
||||
Ulrich Kempken (1)
|
||||
Tom Ritter (1)
|
||||
Tom Harding (1)
|
||||
Stephen (1)
|
||||
|
@ -113,6 +117,7 @@ Paragon Initiative Enterprises, LLC (1)
|
|||
Nicolas DORIER (1)
|
||||
Nathaniel Mahieu (1)
|
||||
Murilo Santana (1)
|
||||
Miles Manley (1)
|
||||
Maxwell Gubler (1)
|
||||
Matt Quinn (1)
|
||||
Mark Friedenbach (1)
|
||||
|
@ -124,17 +129,22 @@ Kevin Pan (1)
|
|||
Jonas Nick (1)
|
||||
Jeremy Rubin (1)
|
||||
Jeffrey Walton (1)
|
||||
Jainan-Tandel (1)
|
||||
Ian T (1)
|
||||
Ian Munoz (1)
|
||||
Ian Kelling (1)
|
||||
Gregory Sanders (1)
|
||||
Gaurav Rana (1)
|
||||
Forrest Voight (1)
|
||||
Florian Schmaus (1)
|
||||
Ethan Heilman (1)
|
||||
Eran Tromer (1)
|
||||
Denis Lukianov (1)
|
||||
David Llop (1)
|
||||
Dagur Valberg Johannsson (1)
|
||||
Christian von Roques (1)
|
||||
Chirag Davé (1)
|
||||
Casey Rodarmor (1)
|
||||
Carl Dong (1)
|
||||
Cameron Boehmer (1)
|
||||
Bryan Stitt (1)
|
||||
Bruno Arueira (1)
|
||||
|
@ -142,6 +152,7 @@ Braydon Fuller (1)
|
|||
Boris Hajduk (1)
|
||||
Bob McElrath (1)
|
||||
Bitcoin Error Log (1)
|
||||
Ben Woosley (1)
|
||||
Ashley Holman (1)
|
||||
Anthony Towns (1)
|
||||
Allan Niemerg (1)
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11.
|
||||
.TH ZCASH-CLI "1" "January 2020" "zcash-cli v2.1.1-rc2" "User Commands"
|
||||
.TH ZCASH-CLI "1" "January 2020" "zcash-cli v2.1.1" "User Commands"
|
||||
.SH NAME
|
||||
zcash-cli \- manual page for zcash-cli v2.1.1-rc2
|
||||
zcash-cli \- manual page for zcash-cli v2.1.1
|
||||
.SH DESCRIPTION
|
||||
Zcash RPC client version v2.1.1\-rc2
|
||||
Zcash RPC client version v2.1.1
|
||||
.PP
|
||||
In order to ensure you are adequately protecting your privacy when using Zcash,
|
||||
please see <https://z.cash/support/security/>.
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11.
|
||||
.TH ZCASH-TX "1" "January 2020" "zcash-tx v2.1.1-rc2" "User Commands"
|
||||
.TH ZCASH-TX "1" "January 2020" "zcash-tx v2.1.1" "User Commands"
|
||||
.SH NAME
|
||||
zcash-tx \- manual page for zcash-tx v2.1.1-rc2
|
||||
zcash-tx \- manual page for zcash-tx v2.1.1
|
||||
.SH DESCRIPTION
|
||||
Zcash zcash\-tx utility version v2.1.1\-rc2
|
||||
Zcash zcash\-tx utility version v2.1.1
|
||||
.SS "Usage:"
|
||||
.TP
|
||||
zcash\-tx [options] <hex\-tx> [commands]
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11.
|
||||
.TH ZCASHD "1" "January 2020" "zcashd v2.1.1-rc2" "User Commands"
|
||||
.TH ZCASHD "1" "January 2020" "zcashd v2.1.1" "User Commands"
|
||||
.SH NAME
|
||||
zcashd \- manual page for zcashd v2.1.1-rc2
|
||||
zcashd \- manual page for zcashd v2.1.1
|
||||
.SH DESCRIPTION
|
||||
Zcash Daemon version v2.1.1\-rc2
|
||||
Zcash Daemon version v2.1.1
|
||||
.PP
|
||||
In order to ensure you are adequately protecting your privacy when using Zcash,
|
||||
please see <https://z.cash/support/security/>.
|
||||
|
|
|
@ -4,44 +4,3 @@ release-notes at release time)
|
|||
Notable changes
|
||||
===============
|
||||
|
||||
`z_mergetoaddress` promoted out of experimental status
|
||||
------------------------------------------------------
|
||||
|
||||
The `z_mergetoaddress` API merges funds from t-addresses, z-addresses, or both,
|
||||
and sends them to a single t-address or z-address. It was added in v1.0.15 as an
|
||||
experimental feature, to simplify the process of combining many small UTXOs and
|
||||
notes into a few larger ones.
|
||||
|
||||
In this release we are promoting `z_mergetoaddress` out of experimental status.
|
||||
It is now a stable RPC, and any future changes to it will only be additive. See
|
||||
`zcash-cli help z_mergetoaddress` for API details and usage.
|
||||
|
||||
Unlike most other RPC methods, `z_mergetoaddress` operates over a particular
|
||||
quantity of UTXOs and notes, instead of a particular amount of ZEC. By default,
|
||||
it will merge 50 UTXOs and 10 notes at a time; these limits can be adjusted with
|
||||
the parameters `transparent_limit` and `shielded_limit`.
|
||||
|
||||
`z_mergetoaddress` also returns the number of UTXOs and notes remaining in the
|
||||
given addresses, which can be used to automate the merging process (for example,
|
||||
merging until the number of UTXOs falls below some value).
|
||||
|
||||
Option parsing behavior
|
||||
-----------------------
|
||||
|
||||
Command line options are now parsed strictly in the order in which they are
|
||||
specified. It used to be the case that `-X -noX` ends up, unintuitively, with X
|
||||
set, as `-X` had precedence over `-noX`. This is no longer the case. Like for
|
||||
other software, the last specified value for an option will hold.
|
||||
|
||||
Low-level RPC changes
|
||||
---------------------
|
||||
|
||||
- Bare multisig outputs to our keys are no longer automatically treated as
|
||||
incoming payments. As this feature was only available for multisig outputs for
|
||||
which you had all private keys in your wallet, there was generally no use for
|
||||
them compared to single-key schemes. Furthermore, no address format for such
|
||||
outputs is defined, and wallet software can't easily send to it. These outputs
|
||||
will no longer show up in `listtransactions`, `listunspent`, or contribute to
|
||||
your balance, unless they are explicitly watched (using `importaddress` or
|
||||
`importmulti` with hex script argument). `signrawtransaction*` also still
|
||||
works for them.
|
||||
|
|
|
@ -0,0 +1,301 @@
|
|||
Notable changes
|
||||
===============
|
||||
|
||||
`z_mergetoaddress` promoted out of experimental status
|
||||
------------------------------------------------------
|
||||
|
||||
The `z_mergetoaddress` API merges funds from t-addresses, z-addresses, or both,
|
||||
and sends them to a single t-address or z-address. It was added in v1.0.15 as an
|
||||
experimental feature, to simplify the process of combining many small UTXOs and
|
||||
notes into a few larger ones.
|
||||
|
||||
In this release we are promoting `z_mergetoaddress` out of experimental status.
|
||||
It is now a stable RPC, and any future changes to it will only be additive. See
|
||||
`zcash-cli help z_mergetoaddress` for API details and usage.
|
||||
|
||||
Unlike most other RPC methods, `z_mergetoaddress` operates over a particular
|
||||
quantity of UTXOs and notes, instead of a particular amount of ZEC. By default,
|
||||
it will merge 50 UTXOs and 10 notes at a time; these limits can be adjusted with
|
||||
the parameters `transparent_limit` and `shielded_limit`.
|
||||
|
||||
`z_mergetoaddress` also returns the number of UTXOs and notes remaining in the
|
||||
given addresses, which can be used to automate the merging process (for example,
|
||||
merging until the number of UTXOs falls below some value).
|
||||
|
||||
Option parsing behavior
|
||||
-----------------------
|
||||
|
||||
Command line options are now parsed strictly in the order in which they are
|
||||
specified. It used to be the case that `-X -noX` ends up, unintuitively, with X
|
||||
set, as `-X` had precedence over `-noX`. This is no longer the case. Like for
|
||||
other software, the last specified value for an option will hold.
|
||||
|
||||
Low-level RPC changes
|
||||
---------------------
|
||||
|
||||
- Bare multisig outputs to our keys are no longer automatically treated as
|
||||
incoming payments. As this feature was only available for multisig outputs for
|
||||
which you had all private keys in your wallet, there was generally no use for
|
||||
them compared to single-key schemes. Furthermore, no address format for such
|
||||
outputs is defined, and wallet software can't easily send to it. These outputs
|
||||
will no longer show up in `listtransactions`, `listunspent`, or contribute to
|
||||
your balance, unless they are explicitly watched (using `importaddress` or
|
||||
`importmulti` with hex script argument). `signrawtransaction*` also still
|
||||
works for them.
|
||||
|
||||
Changelog
|
||||
=========
|
||||
|
||||
Alfredo Garcia (19):
|
||||
remove duplicated prefix in errors and warnings
|
||||
Consensus: Decouple pow.cpp from util.h
|
||||
change some wallet functions from bool to void
|
||||
limit blockchain progress to a max of 1.000000
|
||||
remove z_mergetoaddress from experimental
|
||||
add version to thank you string
|
||||
add next upgrade info to metrics console
|
||||
change target spacing to up to upgrade height
|
||||
create and use SecondsLeftToHeight to display next upgrade info
|
||||
add NextUpgrade test case
|
||||
fix spacing
|
||||
add after blossom test
|
||||
change var and function names for clarity, refactor function
|
||||
reverse conditional, replace get_value_or(0) calls
|
||||
remove redundant line from test
|
||||
remove zmergetoaddress from experimental state in rpc-tests
|
||||
get UPGRADE_TESTDUMMY back to default at the end of the test
|
||||
remove dead code in init
|
||||
readd create_directories
|
||||
|
||||
Ben Woosley (1):
|
||||
Assert CPubKey::ValidLength to the pubkey's header-relevent size
|
||||
|
||||
Carl Dong (1):
|
||||
depends: tar: Always extract as yourself
|
||||
|
||||
Casey Rodarmor (1):
|
||||
Give a better error message if system clock is bad
|
||||
|
||||
Charlie O'Keefe (1):
|
||||
Add check-depends step to STAGE_COMMANDS list
|
||||
|
||||
Cory Fields (3):
|
||||
depends: qt/cctools: fix checksum checksum tests
|
||||
depends: bump OSX toolchain
|
||||
depends: make osx output deterministic
|
||||
|
||||
Dagur Valberg Johannsson (1):
|
||||
Remove option mempooltxinputlimit
|
||||
|
||||
Daira Hopwood (1):
|
||||
Remove temporary workaround for deprecation height.
|
||||
|
||||
Denis Lukianov (1):
|
||||
Correct importaddress help reference to importpubkey
|
||||
|
||||
Dimitris Apostolou (4):
|
||||
Fix typo
|
||||
Remove stale comment
|
||||
Change "protect" terminology to "shield"
|
||||
depends macOS: hide linker visibility warnings
|
||||
|
||||
Eirik Ogilvie-Wigley (2):
|
||||
Show time elapsed when running RPC tests
|
||||
Update team email
|
||||
|
||||
Gavin Andresen (1):
|
||||
Unit test doublespends in new blocks
|
||||
|
||||
Gregory Maxwell (1):
|
||||
Make connect=0 disable automatic outbound connections.
|
||||
|
||||
Gregory Sanders (1):
|
||||
Added additional config option for multiple RPC users.
|
||||
|
||||
Ian T (1):
|
||||
Update RPC generate help for numblocks to include required
|
||||
|
||||
Jack Grigg (32):
|
||||
Upgrade librustzcash to 0.2.0
|
||||
Migrate to librustzcash 0.2.0 API
|
||||
Remove invalid address comparison from gtest
|
||||
Cast uint8* in InterruptibleRecv to char* for recv
|
||||
Add Heartwood to upgrade list
|
||||
Initialize experimental mode in a separate function
|
||||
Fix benchmarks after removal of SelectParamsFromCommandLine()
|
||||
Handle Equihash and optional miner code in TestChain100Setup
|
||||
Add tests covering the current interaction of alerts with subver comments
|
||||
Parameterize zcash.conf in init error message
|
||||
cleanup: Comments
|
||||
Wrap long line
|
||||
Match alerts both with and without comments
|
||||
pyflakes fixes
|
||||
Revert "Remove insecurely-downloaded dependencies that we don't currently use."
|
||||
depends: Compile bdb with --disable-atomics when cross-compiling darwin
|
||||
depends: Add Rust targets for cross-compiling darwin
|
||||
configure: Don't require RELRO and BIND_NOW when cross-compiling darwin
|
||||
depends: Manually apply build_env to second half of googletest build
|
||||
Revert "depends: Explicitly set Boost toolchain during configuration"
|
||||
Add z_mergetoaddress to release notes
|
||||
ThreadNotifyRecentlyAdded -> ThreadNotifyWallets
|
||||
Move mempool tx notifying logic out of CTxMemPool
|
||||
Merge tree and boolean fields in ChainTip API
|
||||
Move block-notifying logic into ThreadNotifyWallets
|
||||
Tie sync_blocks in RPC tests to notifier thread
|
||||
Extend comment with reason for taking care with locks
|
||||
test: Add sync_all points after block generation to RPC tests
|
||||
test: Remove genesis-block Sapling activation from shorter_block_times
|
||||
test: Reverse hashtx and hashblock ordering at start of ZMQ RPC test
|
||||
test: Add missing sync_all point
|
||||
test: Update wallet RPC test with change to "absurdly high fee" limit
|
||||
|
||||
Jainan-Tandel (1):
|
||||
Cosmetic update to README.md .
|
||||
|
||||
Jim Posen (3):
|
||||
Comments: More comments on functions/globals in standard.h.
|
||||
[script] Unit tests for script/standard functions
|
||||
[script] Unit tests for IsMine
|
||||
|
||||
Jonas Schnelli (9):
|
||||
[autoprune] allow wallet in pruned mode
|
||||
[RPC] disable import functions in pruned mode
|
||||
[squashme] improve/corrects prune mode detection test for required wallet rescans
|
||||
Refactor parameter interaction, call it before AppInit2()
|
||||
Initialize logging before we do parameter interaction
|
||||
[Wallet] move wallet help string creation to CWallet
|
||||
[Wallet] move "load wallet phase" to CWallet
|
||||
[Wallet] optimize return value of InitLoadWallet()
|
||||
[Wallet] refactor wallet/init interaction
|
||||
|
||||
Jorge Timón (4):
|
||||
Chainparams: Replace CBaseChainParams::Network enum with string constants (suggested by Wladimir)
|
||||
Chainparams: Translations: DRY: options and error strings
|
||||
Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs
|
||||
Policy: MOVEONLY: Create policy/policy.h with some constants
|
||||
|
||||
Larry Ruane (5):
|
||||
simplify locking, merge cs_SpendingKeyStore into cs_KeyStore
|
||||
eliminate races: hold cs_KeyStore lock while reading fUseCrypto
|
||||
revert CCryptoKeyStore::SetCrypted() return value
|
||||
insightexplorer: LOCK(cs_main) during rpcs
|
||||
fix tests for enable-debug build
|
||||
|
||||
Luke Dashjr (8):
|
||||
Bugfix: RPC: blockchain: Display correct defaults in help for verifychain method
|
||||
Bugfix: Describe dblogsize option correctly (it refers to the wallet database, not memory pool)
|
||||
Bugfix: If genproclimit is omitted to RPC setgenerate, don't change it; also show correct default in getmininginfo
|
||||
Bugfix: Omit wallet-related options from -help when wallet is disabled
|
||||
Constrain constant values to a single location in code
|
||||
Bugfix: Omit wallet-related options from -help when wallet is not supported
|
||||
Policy: MOVEONLY: 3 functions to policy.o:
|
||||
Common argument defaults for NODE_BLOOM stuff and -wallet
|
||||
|
||||
Marco Falke (20):
|
||||
[trivial] Reuse translation and cleanup DEFAULT_* values
|
||||
[qt] Move GUI related HelpMessage() part downstream
|
||||
[trivial] init cleanup
|
||||
[wallet] Refactor to use new MIN_CHANGE
|
||||
[wallet] Add comments for doxygen
|
||||
Init: Use DEFAULT_TRANSACTION_MINFEE in help message
|
||||
[qt] Properly display required fee instead of minTxFee
|
||||
Clarify what minrelaytxfee does
|
||||
translations: Don't translate markdown or force English grammar
|
||||
transaction_tests: Be more strict checking dust
|
||||
[trivial] init: Use defaults MIN_RELAY_TX_FEE & TRANSACTION_MAXFEE
|
||||
contrib: Del. gitian downloader config and update gitian README
|
||||
rpcwallet: Clarify what settxfee does
|
||||
HelpMessage: Don't hide -mintxfee behind showDebug
|
||||
mempool: Replace maxFeeRate of 10000*minRelayTxFee with maxTxFee
|
||||
[doxygen] Actually display comment
|
||||
Fix doxygen comment for payTxFee
|
||||
[doc] Fix markdown
|
||||
Make sure LogPrintf strings are line-terminated
|
||||
[wallet] Move hardcoded file name out of log messages
|
||||
|
||||
Marshall Gaucher (3):
|
||||
Update `import *` to unblock pyflakes from failing
|
||||
Update z_sendmany calls passing int 0, instead of Decimal('0')
|
||||
Update to stop random race error from assert
|
||||
|
||||
Matt Corallo (10):
|
||||
Also remove pay-2-pubkey from watch when adding a priv key
|
||||
Split up importaddress into helper functions
|
||||
Add p2sh option to importaddress to import redeemScripts
|
||||
Add importpubkey method to import a watch-only pubkey
|
||||
Update importaddress help to push its use to script-only
|
||||
Add have-pubkey distinction to ISMINE flags
|
||||
Add logic to track pubkeys as watch-only, not just scripts
|
||||
Implement watchonly support in fundrawtransaction
|
||||
SQUASH "Add have-pubkey distinction to ISMINE flags"
|
||||
SQUASH "Implement watchonly support in fundrawtransaction"
|
||||
|
||||
Miles Manley (1):
|
||||
Update libsodium download-path
|
||||
|
||||
Peter Todd (3):
|
||||
Make TX_SCRIPTHASH clear vSolutionsRet first
|
||||
Add IsPushOnly(const_iterator pc)
|
||||
Accept any sequence of PUSHDATAs in OP_RETURN outputs
|
||||
|
||||
Pieter Wuille (9):
|
||||
Remove template matching and pseudo opcodes
|
||||
Stop treating importaddress'ed scripts as change
|
||||
Make CScript -> CScriptID conversion explicit
|
||||
Do not expose SigVersion argument to IsMine
|
||||
Switch to a private version of SigVersion inside IsMine
|
||||
Track difference between scriptPubKey and P2SH execution in IsMine
|
||||
Do not treat bare multisig as IsMine
|
||||
Mention removal of bare multisig IsMine in release notes
|
||||
Use anonymous namespace instead of static functions
|
||||
|
||||
Sean Bowe (8):
|
||||
make-release.py: Versioning changes for 2.1.1-rc1.
|
||||
make-release.py: Updated manpages for 2.1.1-rc1.
|
||||
make-release.py: Updated release notes and changelog for 2.1.1-rc1.
|
||||
make-release.py: Versioning changes for 2.1.1-rc2.
|
||||
make-release.py: Updated manpages for 2.1.1-rc2.
|
||||
make-release.py: Updated release notes and changelog for 2.1.1-rc2.
|
||||
make-release.py: Versioning changes for 2.1.1.
|
||||
make-release.py: Updated manpages for 2.1.1.
|
||||
|
||||
Simon Liu (1):
|
||||
Closes #3911. Fix help message of RPC getwalletinfo.
|
||||
|
||||
Taylor Hornby (11):
|
||||
Add AFL instrumentation scripts to zcutil.
|
||||
Add configure option to replace main with a stub for fuzzing
|
||||
Add all-in-one script for starting AFL fuzzing
|
||||
Separate AFL build, run fuzz stages, and add afl argument pass-through
|
||||
Have make clean delete fuzz.cpp
|
||||
Pass AFL input file path to zcashd
|
||||
Add fuzzing stub for AddrMan deserialization
|
||||
Add fuzzing stub for ReadFeeEstimates
|
||||
Add fuzzing stub for CheckBlock
|
||||
Update proton from 0.26.0 to 0.30.0
|
||||
Fix broken proton build
|
||||
|
||||
Ulrich Kempken (1):
|
||||
depends: switch to secure download of all dependencies
|
||||
|
||||
Wladimir J. van der Laan (7):
|
||||
make proxy_test work on servers without ipv6
|
||||
Fix argument parsing oddity with -noX
|
||||
doc: mention change to option parsing behavior in release notes
|
||||
test: move accounting_tests and rpc_wallet_tests to wallet/test
|
||||
test: Create test fixture for wallet
|
||||
wallet_ismine.h → script/ismine.h
|
||||
test: Rename wallet.dat to wallet_test.dat
|
||||
|
||||
sandakersmann (3):
|
||||
Update of copyright year to 2020
|
||||
Update COPYRIGHT_YEAR in clientversion.h to 2020
|
||||
Update _COPYRIGHT_YEAR in configure.ac to 2020
|
||||
|
||||
Jack Grigg (2):
|
||||
Apply suggestions from code review
|
||||
Apply suggestions from code review
|
||||
|
||||
Benjamin Winston (1):
|
||||
Added basic fuzzing to the monolith, see ticket #4155
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
#define CLIENT_VERSION_MAJOR 2
|
||||
#define CLIENT_VERSION_MINOR 1
|
||||
#define CLIENT_VERSION_REVISION 1
|
||||
#define CLIENT_VERSION_BUILD 26
|
||||
#define CLIENT_VERSION_BUILD 50
|
||||
|
||||
//! Set to true for release, false for prerelease or test build
|
||||
#define CLIENT_VERSION_IS_RELEASE true
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
// Deprecation policy:
|
||||
// * Shut down 16 weeks' worth of blocks after the estimated release block height.
|
||||
// * A warning is shown during the 2 weeks' worth of blocks prior to shut down.
|
||||
static const int APPROX_RELEASE_HEIGHT = 691620;
|
||||
static const int APPROX_RELEASE_HEIGHT = 698112;
|
||||
static const int WEEKS_UNTIL_DEPRECATION = 16;
|
||||
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 48);
|
||||
|
||||
|
|
Loading…
Reference in New Issue