From 7fb99ff33f2e90b704dbcdce819766ed723dcbfd Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Thu, 11 Aug 2022 21:15:01 +0000 Subject: [PATCH 1/6] Fix Icon position in dmg --- contrib/macdeploy/macdeployqtplus | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index d8d5bac8833..9542f374680 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -536,7 +536,7 @@ ds['.']['icvp'] = icvp ds['.']['vSrn'] = ('long', 1) ds['Applications']['Iloc'] = (370, 156) -ds['Bitcoin-Qt.app']['Iloc'] = (128, 156) +ds['Elements-Qt.app']['Iloc'] = (128, 156) ds.flush() ds.close() From 707cf20b126788fcec7a29126eebaa83be7dd6a8 Mon Sep 17 00:00:00 2001 From: roconnor-blockstream Date: Fri, 12 Aug 2022 11:56:15 -0400 Subject: [PATCH 2/6] Fix tapscript comment In elements tapscript is verison 0xc4 --- src/script/interpreter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 266e625d562..ce08a5544a0 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -3173,7 +3173,7 @@ static bool VerifyWitnessProgram(const CScriptWitness& witness, int witversion, } execdata.m_tapleaf_hash_init = true; if ((control[0] & TAPROOT_LEAF_MASK) == TAPROOT_LEAF_TAPSCRIPT) { - // Tapscript (leaf version 0xc0) + // Tapscript (leaf version 0xc4) execdata.m_validation_weight_left = ::GetSerializeSize(witness.stack, PROTOCOL_VERSION) + VALIDATION_WEIGHT_OFFSET; execdata.m_validation_weight_left_init = true; return ExecuteWitnessScript(stack, exec_script, flags, SigVersion::TAPSCRIPT, checker, execdata, serror); From 38e9490de58198af8dccfe062395ee7a52607897 Mon Sep 17 00:00:00 2001 From: Andrea Bonel Date: Thu, 18 Aug 2022 13:16:37 -0300 Subject: [PATCH 3/6] Elements-qt: Fix arrows to increase/decrease Amount --- src/qt/bitcoinamountfield.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index 546dc566177..f169f09b222 100644 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -121,7 +121,7 @@ class AmountSpinBox: public QAbstractSpinBox currentSingleStep = 100000000; // a whole asset } } - val.second = val.second + steps * singleStep; + val.second = val.second + steps * currentSingleStep; val.second = qMax(val.second, CAmount(0)); val.second = qBound(m_min_amount, val.second, m_max_amount); // FIXME: Add this back in when assets can have > MAX_MONEY From 5954b10a1aa5e55ecd3ea0b8a9c0e01ab6cdcda4 Mon Sep 17 00:00:00 2001 From: Allen Piscitello Date: Thu, 18 Aug 2022 09:15:31 -0500 Subject: [PATCH 4/6] Fixing issuance cases and half blinded cases in PSET --- src/blindpsbt.cpp | 3 +++ src/psbt.cpp | 28 +++++++++++++++++++--------- src/wallet/wallet.cpp | 4 ++++ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/blindpsbt.cpp b/src/blindpsbt.cpp index 358ac9103f8..a1b21e5dd07 100644 --- a/src/blindpsbt.cpp +++ b/src/blindpsbt.cpp @@ -476,6 +476,9 @@ BlindingStatus BlindPSBT(PartiallySignedTransaction& psbt, std::map Date: Thu, 18 Aug 2022 15:14:36 -0300 Subject: [PATCH 5/6] Update manpages --- doc/man/elements-cli.1 | 2 +- doc/man/elements-qt.1 | 2 +- doc/man/elements-tx.1 | 2 +- doc/man/elements-util.1 | 2 +- doc/man/elements-wallet.1 | 2 +- doc/man/elementsd.1 | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/man/elements-cli.1 b/doc/man/elements-cli.1 index cd4c1461e0e..417ed3f68ae 100644 --- a/doc/man/elements-cli.1 +++ b/doc/man/elements-cli.1 @@ -15,7 +15,7 @@ elements-cli \- manual page for elements-cli v22.0.0 .B elements-cli [\fI\,options\/\fR] \fI\,help Get help for a command\/\fR .SH DESCRIPTION -Elements Core RPC client version elements\-22.0.0 +Elements Core RPC client version v22.0.0 .SH OPTIONS .HP \-? diff --git a/doc/man/elements-qt.1 b/doc/man/elements-qt.1 index 76435b25252..cd8a03a2d30 100644 --- a/doc/man/elements-qt.1 +++ b/doc/man/elements-qt.1 @@ -6,7 +6,7 @@ elements-qt \- manual page for elements-qt v22.0.0 .B elements-qt [\fI\,command-line options\/\fR] .SH DESCRIPTION -Elements Core version elements\-22.0.0 +Elements Core version v22.0.0 .SH OPTIONS .HP \-? diff --git a/doc/man/elements-tx.1 b/doc/man/elements-tx.1 index 162dbd2611b..a5fd983d226 100644 --- a/doc/man/elements-tx.1 +++ b/doc/man/elements-tx.1 @@ -9,7 +9,7 @@ elements-tx \- manual page for elements-tx v22.0.0 .B elements-tx [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded Elements transaction\/\fR .SH DESCRIPTION -Elements Core elements\-tx utility version elements\-22.0.0 +Elements Core elements\-tx utility version v22.0.0 .SH OPTIONS .HP \-? diff --git a/doc/man/elements-util.1 b/doc/man/elements-util.1 index df789f968eb..b87f145fcc7 100644 --- a/doc/man/elements-util.1 +++ b/doc/man/elements-util.1 @@ -6,7 +6,7 @@ elements-util \- manual page for elements-util v22.0.0 .B elements-util [\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR .SH DESCRIPTION -Elements Core elements\-util utility version elements\-22.0.0 +Elements Core elements\-util utility version v22.0.0 .SH OPTIONS .HP \-? diff --git a/doc/man/elements-wallet.1 b/doc/man/elements-wallet.1 index a8b866528e7..10a38215033 100644 --- a/doc/man/elements-wallet.1 +++ b/doc/man/elements-wallet.1 @@ -3,7 +3,7 @@ .SH NAME elements-wallet \- manual page for elements-wallet v22.0.0 .SH DESCRIPTION -Elements Core elements\-wallet version elements\-22.0.0 +Elements Core elements\-wallet version v22.0.0 .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. diff --git a/doc/man/elementsd.1 b/doc/man/elementsd.1 index 9a0ae2286ef..1d8f9377022 100644 --- a/doc/man/elementsd.1 +++ b/doc/man/elementsd.1 @@ -6,9 +6,9 @@ elementsd \- manual page for elementsd v22.0.0 .B elementsd [\fI\,options\/\fR] \fI\,Start Elements Core\/\fR .SH DESCRIPTION -Elements Core version elements\-22.0.0 -Copyright \(co 2009\-2021 The Elements Project developers -Copyright \(co 2009\-2021 The Bitcoin Core developers +Elements Core version v22.0.0 +Copyright \(co 2009\-2022 The Elements Project developers +Copyright \(co 2009\-2022 The Bitcoin Core developers .PP Please contribute if you find Elements Core useful. Visit for further information about the software. From 85c25b1adbd4a7f1cefbdf688e61b420e99e4897 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Thu, 18 Aug 2022 17:09:58 +0000 Subject: [PATCH 6/6] Bump version to -rc4 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5c7ace06ced..9d389a9caa6 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 22) define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_RC, 3) +define(_CLIENT_VERSION_RC, 4) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2022) define(_COPYRIGHT_HOLDERS,[The %s developers])