Merge #1077: [elements-0.21] Release elements 0.21.0.1

2a6dcad doc: update manpages for 0.21.0.1 (Steven Roose)
8294d22 Bump version to 0.21.0.1 (Steven Roose)
a58b3b7 Remove obsolete comment after a06aac1 (Pablo Greco)
85c3c2b Deprecate con_dyna_deploy_start in favor of evbparams (Pablo Greco)
d15d08c Dynafed is already activated in liquidv1, remove start argument parsing (Pablo Greco)
a06aac1 Make dynafed signaling opt-out instead of opt-in (Pablo Greco)
19f54eb Make sure command line takes precedence when processing evbparams (Pablo Greco)
24cafa5 Implement vbparams for Elements (evbparams) (Pablo Greco)
cdfb4c9 Fix elements multiple-header-download issue. (Glenn Willen)
6c1d0d3 Re-evaluate peg-out descriptor if wallet is reparsed (Jeff Frontz)
e72544d Mark pegin-related args to createrawtransaction as optional. (Glenn Willen)
3c911a7 Typos in pset doc (Riccardo Casatta)
b2dd758 Remove redundant log message in IsValidPeginWitness (Glenn Willen)
cfed385 Make error messages when talking to parent chain daemon more useful. (Glenn Willen)

Pull request description:

  This first merges the master branch into the 0.21 release branch and then bumps the version number and updates the man pages.

ACKs for top commit:
  psgreco:
    New version of the manpages looks good, UTACK 2a6dcad
  gwillen:
    utACK 2a6dcad

Tree-SHA512: 6785ab1c95f7442ebd0ea2153dad27829c2320f3b04e957662afbcad6943bdb76d218cbdcedc835fed058907515b2e2878108208571be07c7f8cdf218746d206

configure.ac

@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 21)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2021)

contrib/assets_tutorial/assets_tutorial.py

@@ -482,7 +482,7 @@
     "-con_max_block_sig_size=150",
     # We also disable dynamic federations, since we are not going to do any
     # dynafed transitions in this tutorial. FIXME we probably should.
-    "-con_dyna_deploy_start=0",
+    "-evbparams=dynafed:0:::",
 ]
 
 print ("6b. Restart both nodes")

doc/man/elements-cli.1

@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.3.
-.TH ELEMENTS-CLI "1" "October 2021" "elements-cli 0.21.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.5.
+.TH ELEMENTS-CLI "1" "November 2021" "elements-cli 0.21.0.1" "User Commands"
 .SH NAME
-elements-cli \- manual page for elements-cli 0.21.0.0
+elements-cli \- manual page for elements-cli 0.21.0.1
 .SH SYNOPSIS
 .B elements-cli
 [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to Elements Core\/\fR
@@ -15,7 +15,7 @@ elements-cli \- manual page for elements-cli 0.21.0.0
 .B elements-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Elements Core RPC client version elements\-0.21.0.0
+Elements Core RPC client version elements\-0.21.0.1
 .SH OPTIONS
 .HP
 \-?
@@ -214,14 +214,7 @@ from genesis)
 \fB\-con_dyna_deploy_signal\fR
 .IP
 Whether to signal for the Dynamic Federations deployment (default:
-false).
-.HP
-\fB\-con_dyna_deploy_start\fR
-.IP
-Starting height for Dynamic Federations deployment. Once active,
-signblockscript becomes a BIP141 WSH scriptPubKey of the original
-signblockscript. All other dynamic parameters stay
-constant.(default: \fB\-1\fR, which means ACTIVE from genesis)
+true).
 .HP
 \fB\-con_elementsmode\fR
 .TP
@@ -235,12 +228,6 @@ required for CA/CT. (default: true)
 All non\-zero valued coinbase outputs must go to this scriptPubKey, if
 set.
 .HP
-\fB\-con_taproot_signal_start\fR
-.IP
-Whether, and at what blockheight, to start signalling for Taproot
-activation (default: false) (regtest, Liquid testnet, or custom
-only).
-.HP
 \fB\-dynamic_epoch_length\fR
 .IP
 Per\-chain parameter that sets how many blocks dynamic federation voting

doc/man/elements-qt.1

@@ -1,12 +1,12 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.3.
-.TH ELEMENTS-QT "1" "October 2021" "elements-qt 0.21.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.5.
+.TH ELEMENTS-QT "1" "November 2021" "elements-qt 0.21.0.1" "User Commands"
 .SH NAME
-elements-qt \- manual page for elements-qt 0.21.0.0
+elements-qt \- manual page for elements-qt 0.21.0.1
 .SH SYNOPSIS
 .B elements-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Elements Core version elements\-0.21.0.0
+Elements Core version elements\-0.21.0.1
 .SH OPTIONS
 .HP
 \-?
@@ -106,7 +106,7 @@ Do not keep transactions in the mempool longer than <n> hours (default:
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-64\fR to 15, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-8\fR to 15, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-persistmempool\fR
@@ -877,14 +877,7 @@ from genesis)
 \fB\-con_dyna_deploy_signal\fR
 .IP
 Whether to signal for the Dynamic Federations deployment (default:
-false).
-.HP
-\fB\-con_dyna_deploy_start\fR
-.IP
-Starting height for Dynamic Federations deployment. Once active,
-signblockscript becomes a BIP141 WSH scriptPubKey of the original
-signblockscript. All other dynamic parameters stay
-constant.(default: \fB\-1\fR, which means ACTIVE from genesis)
+true).
 .HP
 \fB\-con_elementsmode\fR
 .TP
@@ -898,12 +891,6 @@ required for CA/CT. (default: true)
 All non\-zero valued coinbase outputs must go to this scriptPubKey, if
 set.
 .HP
-\fB\-con_taproot_signal_start\fR
-.IP
-Whether, and at what blockheight, to start signalling for Taproot
-activation (default: false) (regtest, Liquid testnet, or custom
-only).
-.HP
 \fB\-defaultpeggedassetname\fR
 .IP
 Default name of the pegged asset. (default: bitcoin)

doc/man/elements-tx.1

@@ -1,15 +1,15 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.3.
-.TH ELEMENTS-TX "1" "October 2021" "elements-tx 0.21.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.5.
+.TH ELEMENTS-TX "1" "November 2021" "elements-tx 0.21.0.1" "User Commands"
 .SH NAME
-elements-tx \- manual page for elements-tx 0.21.0.0
+elements-tx \- manual page for elements-tx 0.21.0.1
 .SH SYNOPSIS
 .B elements-tx
 [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded bitcoin transaction\/\fR
 .br
 .B elements-tx
 [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]   \fI\,Create hex-encoded bitcoin transaction\/\fR
 .SH DESCRIPTION
-Elements Core elements\-tx utility version elements\-0.21.0.0
+Elements Core elements\-tx utility version elements\-0.21.0.1
 .SH OPTIONS
 .HP
 \-?
@@ -121,14 +121,7 @@ from genesis)
 \fB\-con_dyna_deploy_signal\fR
 .IP
 Whether to signal for the Dynamic Federations deployment (default:
-false).
-.HP
-\fB\-con_dyna_deploy_start\fR
-.IP
-Starting height for Dynamic Federations deployment. Once active,
-signblockscript becomes a BIP141 WSH scriptPubKey of the original
-signblockscript. All other dynamic parameters stay
-constant.(default: \fB\-1\fR, which means ACTIVE from genesis)
+true).
 .HP
 \fB\-con_elementsmode\fR
 .TP
@@ -142,12 +135,6 @@ required for CA/CT. (default: true)
 All non\-zero valued coinbase outputs must go to this scriptPubKey, if
 set.
 .HP
-\fB\-con_taproot_signal_start\fR
-.IP
-Whether, and at what blockheight, to start signalling for Taproot
-activation (default: false) (regtest, Liquid testnet, or custom
-only).
-.HP
 \fB\-dynamic_epoch_length\fR
 .IP
 Per\-chain parameter that sets how many blocks dynamic federation voting

doc/man/elements-wallet.1

@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.3.
-.TH ELEMENTS-WALLET "1" "October 2021" "elements-wallet 0.21.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.5.
+.TH ELEMENTS-WALLET "1" "November 2021" "elements-wallet 0.21.0.1" "User Commands"
 .SH NAME
-elements-wallet \- manual page for elements-wallet 0.21.0.0
+elements-wallet \- manual page for elements-wallet 0.21.0.1
 .SH DESCRIPTION
-Elements Core elements\-wallet version elements\-0.21.0.0
+Elements Core elements\-wallet version elements\-0.21.0.1
 .PP
 elements\-wallet is an offline tool for creating and interacting with Elements Core wallet files.
 By default elements\-wallet will act on wallets in the default mainnet wallet directory in the datadir.
@@ -127,14 +127,7 @@ from genesis)
 \fB\-con_dyna_deploy_signal\fR
 .IP
 Whether to signal for the Dynamic Federations deployment (default:
-false).
-.HP
-\fB\-con_dyna_deploy_start\fR
-.IP
-Starting height for Dynamic Federations deployment. Once active,
-signblockscript becomes a BIP141 WSH scriptPubKey of the original
-signblockscript. All other dynamic parameters stay
-constant.(default: \fB\-1\fR, which means ACTIVE from genesis)
+true).
 .HP
 \fB\-con_elementsmode\fR
 .TP
@@ -148,12 +141,6 @@ required for CA/CT. (default: true)
 All non\-zero valued coinbase outputs must go to this scriptPubKey, if
 set.
 .HP
-\fB\-con_taproot_signal_start\fR
-.IP
-Whether, and at what blockheight, to start signalling for Taproot
-activation (default: false) (regtest, Liquid testnet, or custom
-only).
-.HP
 \fB\-dynamic_epoch_length\fR
 .IP
 Per\-chain parameter that sets how many blocks dynamic federation voting

doc/man/elementsd.1

@@ -1,12 +1,12 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.3.
-.TH ELEMENTSD "1" "October 2021" "elementsd 0.21.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.5.
+.TH ELEMENTSD "1" "November 2021" "elementsd 0.21.0.1" "User Commands"
 .SH NAME
-elementsd \- manual page for elementsd 0.21.0.0
+elementsd \- manual page for elementsd 0.21.0.1
 .SH SYNOPSIS
 .B elementsd
 [\fI\,options\/\fR]                     \fI\,Start Elements Core\/\fR
 .SH DESCRIPTION
-Elements Core version elements\-0.21.0.0
+Elements Core version elements\-0.21.0.1
 .SH OPTIONS
 .HP
 \-?
@@ -106,7 +106,7 @@ Do not keep transactions in the mempool longer than <n> hours (default:
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-64\fR to 15, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-8\fR to 15, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-persistmempool\fR
@@ -855,14 +855,7 @@ from genesis)
 \fB\-con_dyna_deploy_signal\fR
 .IP
 Whether to signal for the Dynamic Federations deployment (default:
-false).
-.HP
-\fB\-con_dyna_deploy_start\fR
-.IP
-Starting height for Dynamic Federations deployment. Once active,
-signblockscript becomes a BIP141 WSH scriptPubKey of the original
-signblockscript. All other dynamic parameters stay
-constant.(default: \fB\-1\fR, which means ACTIVE from genesis)
+true).
 .HP
 \fB\-con_elementsmode\fR
 .TP
@@ -876,12 +869,6 @@ required for CA/CT. (default: true)
 All non\-zero valued coinbase outputs must go to this scriptPubKey, if
 set.
 .HP
-\fB\-con_taproot_signal_start\fR
-.IP
-Whether, and at what blockheight, to start signalling for Taproot
-activation (default: false) (regtest, Liquid testnet, or custom
-only).
-.HP
 \fB\-defaultpeggedassetname\fR
 .IP
 Default name of the pegged asset. (default: bitcoin)

doc/pset.mediawiki

@@ -24,7 +24,7 @@ This BIP is licensed under the 2-clause BSD license.
 
 ==Specification==
 
-The Partially Signed ELements Transaction (PSET) format is identical to the BIP 370 PSBT format.
+The Partially Signed Elements Transaction (PSET) format is identical to the BIP 370 PSBT format.
 The changes are new proprietary type fields, a new magic sequence, and new roles.
 The fields added for PSET are only allowed when the PSBT version is 2.
 
@@ -60,13 +60,13 @@ The currently defined elements global proprietary types are as follows:
 | None
 | No key data
 | <tt><8-bit uint></tt>
-| An 8 bit little endian unsigned integer as a bitfield for various elements specific transaction modification flags. Bit 0 is the PSBT Blinded flag and it is set to 1 to indicate that the PSET has not been blinded yet. Once all confidential values, rangeproofs, and asset surjection proofs have been attached to the PSET, it must be set to 0.
+| An 8 bit little endian unsigned integer as a bitfield for various elements specific transaction modification flags. Bit 0 is the PSET Blinded flag and it is set to 1 to indicate that the PSET has not been blinded yet. Once all confidential values, rangeproofs, and asset surjection proofs have been attached to the PSET, it must be set to 0.
 |
 | 0
 | 2
 |}
 
-The currently defined elements per-input proprietary types are as folows:
+The currently defined elements per-input proprietary types are as follows:
 
 {|
 ! Name
@@ -213,7 +213,7 @@ The currently defined elements per-input proprietary types are as folows:
 | <tt>PSBT_ELEMENTS_IN_ISSUANCE_ASSET_ENTROPY = 0x0d</tt>
 | None
 | No key data
-| <tt><32 byte entrpy></tt>
+| <tt><32 byte entropy></tt>
 | The 32 byte asset entropy. For new issuances, an arbitrary and optional 32 bytes of no consensus meaning combined used as additional entropy in the asset tag calculation. For reissuances, the original, final entropy used for the asset tag calculation.
 |
 | 0
@@ -423,7 +423,7 @@ It will also add the ephemeral pubkey used for ECDH of the nonce for the rangepr
 
 The blinder will then compute a scalar offset that will be added as a <tt>PSBT_ELEMENTS_GLOBAL_SCALAR</tt>.
 For each input and output owned/blinded by this blinder, the following formula is computed:
-<tt> asset_blinding_factor * amount + amount_blinding_factor (mod n)<tt>.
+<tt> asset_blinding_factor * amount + amount_blinding_factor (mod n)</tt>.
 The scalars for the inputs are summed, and then that sum is subtracted from the sum of the scalars for the outputs.
 The result is the scalar offset added as a <tt>PSBT_ELEMENTS_GLOBAL_SCALAR</tt>.
 
@@ -441,7 +441,7 @@ A single entity is likely to be a Creator, Updater, and Blinder.
 
 ===Signer===
 
-In addition to the BIP 370 PSBT Signer behavior, PSET specifies some addtional constraints.
+In addition to the BIP 370 PSBT Signer behavior, PSET specifies some additional constraints.
 Before signing, the Signer must check whether blinding is complete. If any output contains a blinding pubkey but no commitments or proofs, then it must not sign.
 
 ===Combiner===
@@ -470,4 +470,4 @@ TBD
 
 ==Reference implementation==
 
-The reference implementation of the PSBT format is available at https://github.com/achow101/elements/tree/pset.
+The reference implementation of the PSET format is available at https://github.com/achow101/elements/tree/pset.