Fixing performance issue by removing uneeded GroupElement conversions… (

#1056) * Fixing performance issue by removing uneeded GroupElement conversions and hashing by std::hash()
firoorg · Jul 21, 2021 · 7960de9 · 7960de9
1 parent e1c5ec2
commit 7960de9
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 15 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -397,6 +397,12 @@ class CMainParams : public CChainParams {
             consensus.lelantusBlacklist.insert(coin);
         }
 
+        for (const auto& str : sigma::sigma_blacklist) {
+            GroupElement coin;
+            coin.deserialize(ParseHex(str).data());
+            consensus.sigmaBlacklist.insert(coin);
+        }
+
         consensus.evoSporkKeyID = "a78fERshquPsTv2TuKMSsxTeKom56uBwLP";
         consensus.nEvoSporkStartBlock = ZC_LELANTUS_STARTING_BLOCK;
         consensus.nEvoSporkStopBlock = ZC_LELANTUS_STARTING_BLOCK + 24*12*365;  // one year after lelantus

diff --git a/src/consensus/params.h b/src/consensus/params.h
@@ -236,6 +236,9 @@ struct Params {
     // Lelantus Blacklist
     std::unordered_set<secp_primitives::GroupElement> lelantusBlacklist;
 
+    // Sigma Blacklist
+    std::unordered_set<secp_primitives::GroupElement> sigmaBlacklist;
+
     // The block number introducing evo sporks
     int nEvoSporkStartBlock;
 

diff --git a/src/lelantus.cpp b/src/lelantus.cpp
@@ -17,7 +17,6 @@
 #include "policy/policy.h"
 #include "coins.h"
 #include "batchproof_container.h"
-#include "blacklists.h"
 
 #include <atomic>
 #include <sstream>
@@ -440,8 +439,7 @@ bool CheckLelantusJoinSplitTransaction(
                     BOOST_FOREACH(
                     const sigma::PublicCoin &pubCoinValue,
                     index->sigmaMintedPubCoins[denominationAndId]) {
-                        std::vector<unsigned char> vch = pubCoinValue.getValue().getvch();
-                        if (sigma::sigma_blacklist.count(HexStr(vch.begin(), vch.end())) > 0) {
+                        if (::Params().GetConsensus().sigmaBlacklist.count(pubCoinValue.getValue()) > 0) {
                             continue;
                         }
                         lelantus::PublicCoin publicCoin(pubCoinValue.getValue() + lelantusParams->get_h1() * intDenom);

diff --git a/src/secp256k1/include/GroupElement.h b/src/secp256k1/include/GroupElement.h
@@ -103,6 +103,8 @@ class GroupElement final {
 
   std::size_t hash() const;
 
+  std::size_t get_hash() const;
+
   GroupElement& set_base_g();
 
   friend class MultiExponent;
@@ -125,7 +127,7 @@ namespace std {
     {
         size_t operator()(const secp_primitives::GroupElement& g) const
         {
-            return g.hash();
+            return g.get_hash();
         }
     };
 } // namespace std

diff --git a/src/secp256k1/include/Scalar.h b/src/secp256k1/include/Scalar.h
@@ -69,6 +69,8 @@ class Scalar final {
 
     Scalar hash(const unsigned char* data,size_t len);
 
+    std::size_t get_hash() const;
+
     bool isMember() const;
 
     bool isZero() const;
@@ -131,9 +133,7 @@ using namespace secp_primitives;
 template<>
 struct hash<Scalar> {
     size_t operator()(const Scalar& s) const {
-        array<unsigned char, 32> d;
-        s.serialize(d.data());
-        return hash<string>()(string(d.begin(), d.end()));
+        return s.get_hash();
     }
 };
 

diff --git a/src/secp256k1/src/cpp/GroupElement.cpp b/src/secp256k1/src/cpp/GroupElement.cpp
@@ -555,6 +555,12 @@ std::size_t GroupElement::hash() const
     return std::hash<std::string>()(std::string(coord.begin(), coord.end()));
 }
 
+std::size_t GroupElement::get_hash() const {
+    secp256k1_fe x = reinterpret_cast<secp256k1_gej *>(g_)->x;
+    secp256k1_fe_normalize(&x);
+    return x.n[0] ^ (x.n[1] << 16);
+}
+
 const void* GroupElement::get_value() const {
     return g_;
 }

diff --git a/src/secp256k1/src/cpp/Scalar.cpp b/src/secp256k1/src/cpp/Scalar.cpp
@@ -263,6 +263,10 @@ Scalar Scalar::hash(const unsigned char* data, size_t len) {
     return result_;
 }
 
+std::size_t Scalar::get_hash() const {
+    auto scalar = reinterpret_cast<const secp256k1_scalar *>(value_);
+    return scalar->d[0] ^ (scalar->d[1] << 8);
+}
 
 std::string Scalar::tostring() const {
     unsigned char buffer[32];

diff --git a/src/sigma.cpp b/src/sigma.cpp
@@ -14,8 +14,6 @@
 #include "primitives/mint_spend.h"
 #include "batchproof_container.h"
 
-#include "blacklists.h"
-
 #include <atomic>
 #include <sstream>
 #include <chrono>
@@ -277,8 +275,7 @@ bool CheckSigmaSpendTransaction(
                 BOOST_FOREACH(const sigma::PublicCoin& pubCoinValue,
                         index->sigmaMintedPubCoins[denominationAndId]) {
                     if (nHeight >= params.nStartSigmaBlacklist) {
-                        std::vector<unsigned char> vch = pubCoinValue.getValue().getvch();
-                        if(sigma_blacklist.count(HexStr(vch.begin(), vch.end())) > 0) {
+                        if (::Params().GetConsensus().sigmaBlacklist.count(pubCoinValue.getValue()) > 0) {
                             continue;
                         }
                     }
@@ -1069,8 +1066,7 @@ int CSigmaState::GetCoinSetForSpend(
                 BOOST_FOREACH(const sigma::PublicCoin& pubCoinValue,
                         block->sigmaMintedPubCoins[denomAndId]) {
                     if (chainActive.Height() >= ::Params().GetConsensus().nStartSigmaBlacklist) {
-                        std::vector<unsigned char> vch = pubCoinValue.getValue().getvch();
-                        if(sigma_blacklist.count(HexStr(vch.begin(), vch.end())) > 0) {
+                        if (::Params().GetConsensus().sigmaBlacklist.count(pubCoinValue.getValue()) > 0) {
                             continue;
                         }
                     }
@@ -1112,8 +1108,7 @@ void CSigmaState::GetAnonymitySet(
                 BOOST_FOREACH(const sigma::PublicCoin& pubCoinValue,
                         block->sigmaMintedPubCoins[denomAndId]) {
                     if (fStartSigmaBlacklist && chainActive.Height() >= params.nStartSigmaBlacklist) {
-                        std::vector<unsigned char> vch = pubCoinValue.getValue().getvch();
-                        if(sigma_blacklist.count(HexStr(vch.begin(), vch.end())) > 0) {
+                        if (::Params().GetConsensus().sigmaBlacklist.count(pubCoinValue.getValue()) > 0) {
                             continue;
                         }
                     }