From 7fb99ff33f2e90b704dbcdce819766ed723dcbfd Mon Sep 17 00:00:00 2001
From: Pablo Greco <psgreco@gmail.com>
Date: Thu, 11 Aug 2022 21:15:01 +0000
Subject: [PATCH 1/4] 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 d8d5bac883..9542f37468 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 <roconnor@blockstream.com>
Date: Fri, 12 Aug 2022 11:56:15 -0400
Subject: [PATCH 2/4] 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 266e625d56..ce08a5544a 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 <andrea@bonel.com.ar>
Date: Thu, 18 Aug 2022 13:16:37 -0300
Subject: [PATCH 3/4] 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 546dc56617..f169f09b22 100644
--- a/src/qt/bitcoinamountfield.cpp
+++ b/src/qt/bitcoinamountfield.cpp
@@ -121,7 +121,7 @@ public:
                 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 <allen@blockstream.com>
Date: Thu, 18 Aug 2022 09:15:31 -0500
Subject: [PATCH 4/4] 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 358ac9103f..a1b21e5dd0 100644
--- a/src/blindpsbt.cpp
+++ b/src/blindpsbt.cpp
@@ -476,6 +476,9 @@ BlindingStatus BlindPSBT(PartiallySignedTransaction& psbt, std::map<uint32_t, st
                         }
                     }
                 }
+                else {
+                    input_asset_blinders.emplace_back();
+                }
             }
         }
     }
diff --git a/src/psbt.cpp b/src/psbt.cpp
index f0ec757a34..f598e5706b 100644
--- a/src/psbt.cpp
+++ b/src/psbt.cpp
@@ -123,13 +123,26 @@ CMutableTransaction PartiallySignedTransaction::GetUnsignedTx(bool force_unblind
         txin.nSequence = input.sequence.value_or(max_sequence);
         txin.assetIssuance.assetBlindingNonce = input.m_issuance_blinding_nonce;
         txin.assetIssuance.assetEntropy = input.m_issuance_asset_entropy;
-        if (input.m_issuance_value != std::nullopt && input.m_issuance_inflation_keys_amount != std::nullopt && force_unblinded) {
+        // If there is a commitment we should set the value to the commitment unless we are forcing unblinded.
+        // If we are forcing unblinded but there is no value, we just use the commitment.
+        if (input.m_issuance_value != std::nullopt && (input.m_issuance_value_commitment.IsNull() || force_unblinded)) {
             txin.assetIssuance.nAmount.SetToAmount(*input.m_issuance_value);
-            txin.assetIssuance.nInflationKeys.SetToAmount(*input.m_issuance_inflation_keys_amount);
-        } else {
+        }
+        else if(!input.m_issuance_value_commitment.IsNull()) {
             txin.assetIssuance.nAmount = input.m_issuance_value_commitment;
+        }
+        else {
+            txin.assetIssuance.nAmount.SetNull();
+        }
+        if (input.m_issuance_inflation_keys_amount != std::nullopt && (input.m_issuance_inflation_keys_commitment.IsNull() || force_unblinded)) {
+            txin.assetIssuance.nInflationKeys.SetToAmount(*input.m_issuance_value);
+        }
+        else if(!input.m_issuance_inflation_keys_commitment.IsNull()) {
             txin.assetIssuance.nInflationKeys = input.m_issuance_inflation_keys_commitment;
         }
+        else {
+            txin.assetIssuance.nInflationKeys.SetNull();
+        }
         mtx.vin.push_back(txin);
     }
     for (const PSBTOutput& output : outputs) {
@@ -531,12 +544,9 @@ bool PSBTOutput::Merge(const PSBTOutput& output)
 CTxOut PSBTOutput::GetTxOut() const
 {
     assert(script != std::nullopt);
-    if (!m_value_commitment.IsNull() && !m_asset_commitment.IsNull()) {
-        return CTxOut(m_asset_commitment, m_value_commitment, *script);
-    }
-    assert(amount != std::nullopt);
-    assert(!m_asset.IsNull());
-    return CTxOut(CConfidentialAsset(CAsset(m_asset)), CConfidentialValue(*amount), *script);
+    assert(amount != std::nullopt || !m_value_commitment.IsNull());
+    assert(!m_asset.IsNull() || !m_asset_commitment.IsNull());
+    return CTxOut(!m_asset_commitment.IsNull() ? m_asset_commitment : CAsset(m_asset), !m_value_commitment.IsNull() ? m_value_commitment : CConfidentialValue(*amount), *script);
 }
 
 bool PSBTOutput::IsBlinded() const
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 6366e5e213..47e936274c 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2048,11 +2048,15 @@ TransactionError CWallet::SignPSBT(PartiallySignedTransaction& psbtx, bool& comp
             txin.assetIssuance.nAmount = input.m_issuance_value_commitment;
         } else if (input.m_issuance_value) {
             txin.assetIssuance.nAmount.SetToAmount(*input.m_issuance_value);
+        } else {
+            txin.assetIssuance.nAmount.SetNull();
         }
         if (!input.m_issuance_inflation_keys_commitment.IsNull()) {
             txin.assetIssuance.nInflationKeys = input.m_issuance_inflation_keys_commitment;
         } else if (input.m_issuance_inflation_keys_amount) {
             txin.assetIssuance.nInflationKeys.SetToAmount(*input.m_issuance_inflation_keys_amount);
+        } else {
+            txin.assetIssuance.nInflationKeys.SetNull();
         }
         if (!input.m_issuance_rangeproof.empty()) {
             txinwit.vchIssuanceAmountRangeproof = input.m_issuance_rangeproof;