From f9925853c5986a6a752d8f8985f46e7273ba5319 Mon Sep 17 00:00:00 2001
From: Steven Roose <steven@stevenroose.org>
Date: Tue, 31 Mar 2020 12:28:15 +0100
Subject: [PATCH 1/2] Remove the GetNumIssuances in the assertion

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

diff --git a/src/blind.cpp b/src/blind.cpp
index 0cb30a41c0..491f912580 100644
--- a/src/blind.cpp
+++ b/src/blind.cpp
@@ -226,8 +226,8 @@ int BlindTransaction(std::vector<uint256 >& input_value_blinding_factors, const
 {
     // Sanity check input data and output_pubkey size, clear other output data
     assert(tx.vout.size() >= output_pubkeys.size());
-    assert(tx.vin.size()+GetNumIssuances(CTransaction(tx)) >= issuance_blinding_privkey.size());
-    assert(tx.vin.size()+GetNumIssuances(CTransaction(tx)) >= token_blinding_privkey.size());
+    assert(tx.vin.size() >= issuance_blinding_privkey.size());
+    assert(tx.vin.size() >= token_blinding_privkey.size());
     out_val_blind_factors.clear();
     out_val_blind_factors.resize(tx.vout.size());
     out_asset_blind_factors.clear();

From 34ef250721939e358d57a6b2b64a4cd07bd03416 Mon Sep 17 00:00:00 2001
From: Steven Roose <steven@stevenroose.org>
Date: Tue, 31 Mar 2020 12:28:34 +0100
Subject: [PATCH 2/2] Move GetNumIssuances to issuance.cpp

---
 src/blind.cpp    | 16 ----------------
 src/blind.h      |  2 --
 src/issuance.cpp | 16 ++++++++++++++++
 src/issuance.h   |  5 +++++
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/blind.cpp b/src/blind.cpp
index 491f912580..e9db1a034f 100644
--- a/src/blind.cpp
+++ b/src/blind.cpp
@@ -206,22 +206,6 @@ void CreateValueCommitment(CConfidentialValue& conf_value, secp256k1_pedersen_co
     assert(conf_value.IsValid());
 }
 
-size_t GetNumIssuances(const CTransaction& tx)
-{
-    unsigned int num_issuances = 0;
-    for (unsigned int i = 0; i < tx.vin.size(); i++) {
-        if (!tx.vin[i].assetIssuance.IsNull()) {
-            if (!tx.vin[i].assetIssuance.nAmount.IsNull()) {
-                num_issuances++;
-            }
-            if (!tx.vin[i].assetIssuance.nInflationKeys.IsNull()) {
-                num_issuances++;
-            }
-        }
-    }
-    return num_issuances;
-}
-
 int BlindTransaction(std::vector<uint256 >& input_value_blinding_factors, const std::vector<uint256 >& input_asset_blinding_factors, const std::vector<CAsset >& input_assets, const std::vector<CAmount >& input_amounts, std::vector<uint256 >& out_val_blind_factors, std::vector<uint256 >& out_asset_blind_factors, const std::vector<CPubKey>& output_pubkeys, const std::vector<CKey>& issuance_blinding_privkey, const std::vector<CKey>& token_blinding_privkey, CMutableTransaction& tx, std::vector<std::vector<unsigned char> >* auxiliary_generators)
 {
     // Sanity check input data and output_pubkey size, clear other output data
diff --git a/src/blind.h b/src/blind.h
index 650f933a27..4d9bb67c68 100644
--- a/src/blind.h
+++ b/src/blind.h
@@ -61,6 +61,4 @@ int BlindTransaction(std::vector<uint256 >& input_value_blinding_factors, const
  */
 void RawFillBlinds(CMutableTransaction& tx, std::vector<uint256>& output_value_blinds, std::vector<uint256>& output_asset_blinds, std::vector<CPubKey>& output_pubkeys);
 
-size_t GetNumIssuances(const CTransaction& tx);
-
 #endif //BITCOIN_BLIND_H
diff --git a/src/issuance.cpp b/src/issuance.cpp
index abf7061032..cba4432558 100644
--- a/src/issuance.cpp
+++ b/src/issuance.cpp
@@ -4,6 +4,22 @@
 #include <primitives/transaction.h>
 #include <amount.h>
 
+size_t GetNumIssuances(const CTransaction& tx)
+{
+    unsigned int num_issuances = 0;
+    for (unsigned int i = 0; i < tx.vin.size(); i++) {
+        if (!tx.vin[i].assetIssuance.IsNull()) {
+            if (!tx.vin[i].assetIssuance.nAmount.IsNull()) {
+                num_issuances++;
+            }
+            if (!tx.vin[i].assetIssuance.nInflationKeys.IsNull()) {
+                num_issuances++;
+            }
+        }
+    }
+    return num_issuances;
+}
+
 void GenerateAssetEntropy(uint256& entropy, const COutPoint& prevout, const uint256& contracthash)
 {
     // E : entropy
diff --git a/src/issuance.h b/src/issuance.h
index b64ec8b75a..709416e68a 100644
--- a/src/issuance.h
+++ b/src/issuance.h
@@ -7,6 +7,11 @@
 #include <hash.h>
 #include <consensus/merkle.h>
 
+/**
+ * Get the number of issuances in the given transaction.
+ */
+size_t GetNumIssuances(const CTransaction& tx);
+
 /**
  * Calculate the asset entropy from an COutPoint and a tx-author specified
  * Ricardian contract. See Definition 18 of the confidential assets paper.