From 39112e1eaaebee8623411509b0586bfec54121f8 Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Thu, 15 Apr 2021 16:46:45 +0000
Subject: [PATCH 01/10] correct copy/paste error in error message

---
 src/validation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index da086153dd..472bd4b0ff 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3760,7 +3760,7 @@ static bool ContextualCheckDynaFedHeader(const CBlockHeader& block, BlockValidat
             int fedpeg_version = 0;
             std::vector<unsigned char> fedpeg_program;
             if (!proposed.m_fedpeg_program.IsWitnessProgram(fedpeg_version, fedpeg_program)) {
-                return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "invalid-dyna-fed", "proposed signblockscript must be native segwit scriptPubkey");
+                return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "invalid-dyna-fed", "proposed fedpeg program must be native segwit scriptPubkey");
             }
 
             // for v0, fedpegscript's scriptPubKey must match. v1+ is unencumbered.

From 0045cafd7559fa98eb32802410b51719a42dcb75 Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Thu, 15 Apr 2021 17:03:29 +0000
Subject: [PATCH 02/10] rpc/mining: restore code erroneously dropped in
 0e2c963dbfedbe5c22f08e9f1aecc62882bfdbea

---
 src/rpc/mining.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index bba0ced02a..495e0e54c5 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -130,7 +130,7 @@ static bool GenerateBlock(ChainstateManager& chainman, CBlock& block, uint64_t&
             ++block.nNonce;
             --max_tries;
         }
-        if (max_tries == 0) {
+        if (max_tries == 0 || ShutdownRequested()) {
             return false;
         }
         if (block.nNonce == std::numeric_limits<uint32_t>::max()) {

From 257374744742eab4aae173a3bdaf04f687a47123 Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Thu, 15 Apr 2021 17:06:13 +0000
Subject: [PATCH 03/10] fix test code duplication from
 3a0de44d90bf8a01d3f7431fd849e8b63b1e951f

---
 test/functional/test_framework/util.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
index 285147a321..eeb1d9baac 100644
--- a/test/functional/test_framework/util.py
+++ b/test/functional/test_framework/util.py
@@ -502,12 +502,9 @@ def gen_return_txouts():
     txouts = []
     from .messages import CTxOut, CTxOutValue
     txout = CTxOut()
-    txout.nValue = 0
+    txout.nValue = CTxOutValue(0)
     txout.scriptPubKey = hex_str_to_bytes(script_pubkey)
     for _ in range(128):
-        txout = CTxOut()
-        txout.nValue = CTxOutValue(0)
-        txout.scriptPubKey = hex_str_to_bytes(script_pubkey)
         txouts.append(txout)
     return txouts
 

From 1f3cfb451a2dd7446de844110baba2b89863a498 Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Thu, 15 Apr 2021 17:09:11 +0000
Subject: [PATCH 04/10] chainparamsbase: fix bool-vs-enum mistake in
 9c3480fea96abe7cc1adbdb2c754cce0224b23fa

---
 src/chainparamsbase.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index 19c85b832d..6acec8efae 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -40,7 +40,7 @@ void SetupChainParamsBaseOptions(ArgsManager& argsman)
     argsman.AddArg("-con_connect_genesis_outputs", "Connect outputs in genesis block to utxo database.", ArgsManager::ALLOW_ANY, OptionsCategory::ELEMENTS);
     argsman.AddArg("-con_elementsmode", "Use Elements-like instead of Core-like witness encoding.  This is required for CA/CT. (default: true)", ArgsManager::ALLOW_ANY, OptionsCategory::ELEMENTS);
     argsman.AddArg("-con_blockheightinheader", "Whether the chain includes the block height directly in the header, for easier validation of block height in low-resource environments. (default: true)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
-    argsman.AddArg("-con_genesis_style=<style>", "Use genesis style <style> (default: elements). Results in genesis block compatibility with various networks. Allowed values: elements, bitcoin", true, OptionsCategory::ELEMENTS);
+    argsman.AddArg("-con_genesis_style=<style>", "Use genesis style <style> (default: elements). Results in genesis block compatibility with various networks. Allowed values: elements, bitcoin", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::ELEMENTS);
     argsman.AddArg("-con_signed_blocks", "Signed blockchain. Uses input of `-signblockscript` to define what signatures are necessary to solve it.", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-signblockscript", "Signed blockchain enumberance. Only active when `-con_signed_blocks` set to true.", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-con_max_block_sig_size", "Max allowed witness data for the signed block header.", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);

From 5819f259757a17cf8faf60b266bac995741389b9 Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Thu, 15 Apr 2021 17:33:44 +0000
Subject: [PATCH 05/10] bitcoin-tx: add ASSET to the help text of some option

---
 src/bitcoin-tx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 5fd66f244f..3286de865c 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -51,7 +51,7 @@ static void SetupBitcoinTxArgs(ArgsManager &argsman)
     argsman.AddArg("in=TXID:VOUT(:SEQUENCE_NUMBER)", "Add input to TX", ArgsManager::ALLOW_ANY, OptionsCategory::COMMANDS);
     argsman.AddArg("locktime=N", "Set TX lock time to N", ArgsManager::ALLOW_ANY, OptionsCategory::COMMANDS);
     argsman.AddArg("nversion=N", "Set TX version to N", ArgsManager::ALLOW_ANY, OptionsCategory::COMMANDS);
-    argsman.AddArg("outaddr=VALUE:ADDRESS", "Add address-based output to TX", ArgsManager::ALLOW_ANY, OptionsCategory::COMMANDS);
+    argsman.AddArg("outaddr=VALUE:ADDRESS(:ASSET)", "Add address-based output to TX", ArgsManager::ALLOW_ANY, OptionsCategory::COMMANDS);
     argsman.AddArg("outdata=[VALUE:]DATA", "Add data-based output to TX", ArgsManager::ALLOW_ANY, OptionsCategory::COMMANDS);
     argsman.AddArg("outmultisig=VALUE:REQUIRED:PUBKEYS:PUBKEY1:PUBKEY2:....[:FLAGS]", "Add Pay To n-of-m Multi-sig output to TX. n = REQUIRED, m = PUBKEYS. "
         "Optionally add the \"W\" flag to produce a pay-to-witness-script-hash output. "

From 057237bd02deddf7daf54ecc82d036ac8531e0a6 Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Thu, 15 Apr 2021 17:39:50 +0000
Subject: [PATCH 06/10] qt: fix double-scoping of enum introduced in c3b6bbb

---
 src/qt/sendcoinsdialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 3ebe9e488c..4c39372611 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -424,7 +424,7 @@ void SendCoinsDialog::on_sendButton_clicked()
                     fileNameSuggestion.append(" - ");
                 }
                 QString labelOrAddress = rcp.label.isEmpty() ? rcp.address : rcp.label;
-                QString amount = GUIUtil::formatAssetAmount(rcp.asset, rcp.asset_amount, bitcoin_unit, BitcoinUnits::BitcoinUnits::SeparatorStyle::STANDARD, true);
+                QString amount = GUIUtil::formatAssetAmount(rcp.asset, rcp.asset_amount, bitcoin_unit, BitcoinUnits::SeparatorStyle::STANDARD, true);
                 fileNameSuggestion.append(labelOrAddress + "-" + amount);
                 first = false;
             }

From adbd9f163adf68c95e75efced8d403d98dfb49ca Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Thu, 15 Apr 2021 18:04:01 +0000
Subject: [PATCH 07/10] qt: fix PSBT/PSET change from
 4839db857d5fbe2a27ebabb7bf5bf9d59ef244e9

---
 src/qt/bitcoingui.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 072be9fe03..31c2ffcc31 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -323,9 +323,9 @@ void BitcoinGUI::createActions()
     signMessageAction->setStatusTip(tr("Sign messages with your %1 addresses to prove you own them").arg("Liquid"));
     verifyMessageAction = new QAction(tr("&Verify message..."), this);
     verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified %1 addresses").arg("Liquid"));
-    m_load_psbt_action = new QAction(tr("&Load PSBT from file..."), this);
+    m_load_psbt_action = new QAction(tr("&Load PSET from file..."), this);
     m_load_psbt_action->setStatusTip(tr("Load Partially Signed Elements Transaction"));
-    m_load_psbt_clipboard_action = new QAction(tr("Load PSBT from clipboard..."), this);
+    m_load_psbt_clipboard_action = new QAction(tr("Load PSET from clipboard..."), this);
     m_load_psbt_clipboard_action->setStatusTip(tr("Load Partially Signed Elements Transaction from clipboard"));
 
     openRPCConsoleAction = new QAction(tr("Node window"), this);

From 40c09f637c8501954e9fc1d1eb4b59fd130afa63 Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Thu, 15 Apr 2021 18:06:52 +0000
Subject: [PATCH 08/10] rpc: fix error message accidentally changed in 5e62edc

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 36c89d4227..34c69c5008 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -3340,7 +3340,7 @@ void FundTransaction(CWallet* const pwallet, CMutableTransaction& tx, CAmount& f
                     destinations[asset] = dest;
                 }
             } else {
-                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Change address must be a valid address");
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Change address must be either a map or a string");
             }
 
             coinControl.destChange = destinations;

From 9c1de4d85f6e045b76106ecb9e6dd498c02af3ac Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Thu, 15 Apr 2021 18:23:57 +0000
Subject: [PATCH 09/10] ci: give more memory to a couple Cirrus jobs

---
 .cirrus.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 4c4ba4ab41..d08192c7fd 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -103,7 +103,8 @@ task:
   << : *GLOBAL_TASK_TEMPLATE
   container:
     image: ubuntu:focal
-    memory: 12G # ELEMENTS: need more memory
+    memory: 16G # ELEMENTS: need more memory
+    cpu: 4  # ELEMENTS: cirrus wants more CPUs if you want more memory
   env:
     FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
 
@@ -112,6 +113,8 @@ task:
   << : *GLOBAL_TASK_TEMPLATE
   container:
     image: ubuntu:focal
+    memory: 16G # ELEMENTS: need more memory
+    cpu: 4  # ELEMENTS: cirrus wants more CPUs if you want more memory
   env:
     FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh"
 

From f2a0050f3184da2f39e0af4aa197acac907a99b6 Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Wed, 28 Apr 2021 16:25:58 +0000
Subject: [PATCH 10/10] primitives: do not de/serialize asset issuance in
 bitcoin mode

Fixes a fuzztest failure related to `g_con_elementsmode`.
---
 src/primitives/transaction.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 0bdad772a0..d15ea944f7 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -146,7 +146,7 @@ class CTxIn
     inline void Serialize(Stream& s) const {
         bool fHasAssetIssuance;
         COutPoint outpoint;
-        if (prevout.n == (uint32_t) -1) {
+        if (!g_con_elementsmode || prevout.n == (uint32_t) -1) {
             // Coinbase inputs do not have asset issuances attached
             // to them.
             fHasAssetIssuance = false;
@@ -189,7 +189,7 @@ class CTxIn
         COutPoint outpoint;
         s >> outpoint;
 
-        if (outpoint.n == (uint32_t) -1) {
+        if (!g_con_elementsmode || outpoint.n == (uint32_t) -1) {
             // No asset issuance for Coinbase inputs.
             fHasAssetIssuance = false;
             prevout = outpoint;