Add serial context into mobile api (#1378)

firoorg · Dec 21, 2023 · 6946bf3 · 6946bf3
1 parent b6371c7
commit 6946bf3
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/src/chain.h b/src/chain.h
@@ -255,7 +255,7 @@ class CBlockIndex
     //! Map id to <hash of the set>
     std::map<int, std::vector<unsigned char>> sparkSetHash;
     //! map spark coin S to tx hash, this is used when you run with -mobile
-    std::unordered_map<GroupElement, uint256> sparkTxHash;
+    std::unordered_map<GroupElement, std::pair<uint256, std::vector<unsigned char>>> sparkTxHashContext;
 
     //! Values of coin serials spent in this block
     sigma::spend_info_container sigmaSpentSerials;
@@ -303,7 +303,7 @@ class CBlockIndex
         sparkMintedCoins.clear();
         sparkSetHash.clear();
         spentLTags.clear();
-        sparkTxHash.clear();
+        sparkTxHashContext.clear();
         sigmaSpentSerials.clear();
         lelantusSpentSerials.clear();
         activeDisablingSporks.clear();
@@ -562,7 +562,7 @@ class CDiskBlockIndex : public CBlockIndex
             READWRITE(spentLTags);
 
             if (GetBoolArg("-mobile", false)) {
-                READWRITE(sparkTxHash);
+                READWRITE(sparkTxHashContext);
             }
         }
 

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -1235,7 +1235,7 @@ UniValue getsparkanonymityset(const JSONRPCRequest& request)
     }
 
     uint256 blockHash;
-    std::vector<std::pair<spark::Coin, uint256>> coins;
+    std::vector<std::pair<spark::Coin, std::pair<uint256, std::vector<unsigned char>>>> coins;
     std::vector<unsigned char> setHash;
 
     {
@@ -1261,7 +1261,8 @@ UniValue getsparkanonymityset(const JSONRPCRequest& request)
 
         std::vector<UniValue> data;
         data.push_back(EncodeBase64(vch.data(), size_t(vch.size()))); // coin
-        data.push_back(EncodeBase64(coin.second.begin(), coin.second.size())); // tx hash
+        data.push_back(EncodeBase64(coin.second.first.begin(), coin.second.first.size())); // tx hash
+        data.push_back(EncodeBase64(coin.second.second.data(), coin.second.second.size())); // spark serial context
 
         UniValue entity(UniValue::VARR);
         entity.push_backV(data);

diff --git a/src/spark/state.cpp b/src/spark/state.cpp
@@ -1017,7 +1017,12 @@ void CSparkState::AddMintsToStateAndBlockIndex(
         if (GetBoolArg("-mobile", false)) {
             COutPoint outPoint;
             GetOutPointFromBlock(outPoint, mint, *pblock);
-            index->sparkTxHash[mint.S] = outPoint.hash;
+            CTransactionRef tx;
+            for (CTransactionRef itr : pblock->vtx) {
+                if (outPoint.hash == itr->GetHash())
+                    tx = itr;
+            }
+            index->sparkTxHashContext[mint.S] = {outPoint.hash, getSerialContext(*tx)};
         }
     }
 }
@@ -1257,7 +1262,7 @@ void CSparkState::GetCoinsForRecovery(
         int coinGroupID,
         std::string start_block_hash,
         uint256& blockHash_out,
-        std::vector<std::pair<spark::Coin, uint256>>& coins,
+        std::vector<std::pair<spark::Coin, std::pair<uint256, std::vector<unsigned char>>>>& coins,
         std::vector<unsigned char>& setHash_out) {
     coins.clear();
     if (coinGroups.count(coinGroupID) == 0) {
@@ -1290,10 +1295,10 @@ void CSparkState::GetCoinsForRecovery(
             numberOfCoins += block->sparkMintedCoins[id].size();
             if (block->sparkMintedCoins.count(id) > 0) {
                 for (const auto &coin : block->sparkMintedCoins[id]) {
-                    uint256 txHash;
-                    if (block->sparkTxHash.count(coin.S))
-                        txHash = block->sparkTxHash[coin.S];
-                    coins.push_back({coin, txHash});
+                    std::pair<uint256, std::vector<unsigned char>> txHashContext;
+                    if (block->sparkTxHashContext.count(coin.S))
+                        txHashContext = block->sparkTxHashContext[coin.S];
+                    coins.push_back({coin, txHashContext});
                 }
             }
         }

diff --git a/src/spark/state.h b/src/spark/state.h
@@ -208,7 +208,7 @@ class CSparkState {
             int coinGroupID,
             std::string start_block_hash,
             uint256& blockHash_out,
-            std::vector<std::pair<spark::Coin, uint256>>& coins,
+            std::vector<std::pair<spark::Coin, std::pair<uint256, std::vector<unsigned char>>>>& coins,
             std::vector<unsigned char>& setHash_out);
 
     std::unordered_map<spark::Coin, CMintedCoinInfo, spark::CoinHash> const & GetMints() const;

diff --git a/src/txdb.cpp b/src/txdb.cpp
@@ -402,7 +402,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts(boost::function<CBlockIndex*(const uint256
                 pindexNew->sparkMintedCoins   = diskindex.sparkMintedCoins;
                 pindexNew->sparkSetHash       = diskindex.sparkSetHash;
                 pindexNew->spentLTags         = diskindex.spentLTags;
-                pindexNew->sparkTxHash         = diskindex.sparkTxHash;
+                pindexNew->sparkTxHashContext = diskindex.sparkTxHashContext;
 
                 pindexNew->activeDisablingSporks = diskindex.activeDisablingSporks;