Minor fixes

firoorg · Oct 7, 2024 · dc29f5b · dc29f5b
1 parent d9a3276
commit dc29f5b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -1222,7 +1222,7 @@ class CRegTestParams : public CChainParams {
         consensus.nLelantusStartBlock = 400;
         consensus.nLelantusFixesStartBlock = 400;
         consensus.nSparkStartBlock = 1000;
-        consensus.nSparkCoinbase = 1300;
+        consensus.nSparkCoinbase = consensus.nSparkStartBlock;
         consensus.nExchangeAddressStartBlock = 1000;
         consensus.nLelantusGracefulPeriod = 1500;
         consensus.nZerocoinV2MintMempoolGracefulPeriod = 1;

diff --git a/src/libspark/coin.h b/src/libspark/coin.h
@@ -131,7 +131,7 @@ class Coin {
 		if (ser_action.ForRead()) {
 			this->params = spark::Params::get_default();
 		}
-		if ((type == COIN_TYPE_MINT || COIN_TYPE_COINBASE) && r_.ciphertext.size() != (1 + AES_BLOCKSIZE) + SCALAR_ENCODING + (1 + params->get_memo_bytes() + 1)) {
+		if ((type == COIN_TYPE_MINT || type == COIN_TYPE_COINBASE) && r_.ciphertext.size() != (1 + AES_BLOCKSIZE) + SCALAR_ENCODING + (1 + params->get_memo_bytes() + 1)) {
 			throw std::invalid_argument("Cannot deserialize mint coin due to bad encrypted data");
 		}
 		if (type == COIN_TYPE_SPEND && r_.ciphertext.size() != 8 + (1 + AES_BLOCKSIZE) + SCALAR_ENCODING + (1 + params->get_memo_bytes() + 1)) {

diff --git a/src/spark/state.cpp b/src/spark/state.cpp
@@ -86,7 +86,7 @@ bool IsPayToSparkAddress(const CScript& script)
 }
 
 bool IsPayToSparkAddress(const CScript& script, spark::Address& addr)
-{   if (script[script.size()-1] != OP_SPARKMINT)
+{   if (script.empty() || script[script.size()-1] != OP_SPARKMINT)
         return false;
     unsigned char network = spark::GetNetworkType();
     unsigned char coinNetwork;
@@ -102,6 +102,9 @@ bool IsPayToSparkAddress(const CScript& script, spark::Address& addr)
 }
 
 std::string ToStringSparkAddress(const CScript script) {
+    if (script.empty())
+        return "";
+
     std::vector<unsigned char> vch(script.begin() + 2, script.end() - 1);
     try {
         const spark::Params* params = spark::Params::get_default();
@@ -893,7 +896,21 @@ std::vector<unsigned char> getSerialContext(const CTransaction &tx) {
             return std::vector<unsigned char>();
         }
     } else if (tx.IsCoinBase()) {
-        std::vector<spark::Coin> coins = GetSparkMintCoins(tx);
+        std::vector<spark::Coin> coins;
+
+        for (const auto& vout : tx.vout) {
+            const auto& script = vout.scriptPubKey;
+            if (script.IsSparkMint()) {
+                try {
+                    spark::Coin coin(Params::get_default());
+                    ParseSparkMintCoin(script, coin);
+                    coins.push_back(coin);
+                } catch (const std::exception &) {
+                    //Continue
+                }
+            }
+        }
+
         if (coins.empty())
             return std::vector<unsigned char>();