Merge bitcoin#19521: Coinstats Index

syscoin · May 1, 2021 · ddf3334 · ddf3334
1 parent fa3f34f
commit ddf3334
Show file tree

Hide file tree

Showing 21 changed files with 1,176 additions and 108 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -203,6 +203,7 @@ SYSCOIN_CORE_H = \
   i2p.h \
   index/base.h \
   index/blockfilterindex.h \
+  index/coinstatsindex.h \
   index/disktxpos.h \
   index/txindex.h \
   indirectmap.h \
@@ -486,6 +487,7 @@ libsyscoin_server_a_SOURCES = \
   i2p.cpp \
   index/base.cpp \
   index/blockfilterindex.cpp \
+  index/coinstatsindex.cpp \
   index/txindex.cpp \
   init.cpp \
   mapport.cpp \

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
@@ -92,6 +92,7 @@ SYSCOIN_TESTS =\
   test/bswap_tests.cpp \
   test/checkqueue_tests.cpp \
   test/coins_tests.cpp \
+  test/coinstatsindex_tests.cpp \
   test/compilerbug_tests.cpp \
   test/compress_tests.cpp \
   test/crypto_tests.cpp \

diff --git a/src/crypto/muhash.cpp b/src/crypto/muhash.cpp
@@ -341,6 +341,6 @@ MuHash3072& MuHash3072::Insert(Span<const unsigned char> in) noexcept {
 }
 
 MuHash3072& MuHash3072::Remove(Span<const unsigned char> in) noexcept {
-    m_numerator.Divide(ToNum3072(in));
+    m_denominator.Multiply(ToNum3072(in));
     return *this;
 }
diff --git a/src/index/base.h b/src/index/base.h
@@ -81,6 +81,8 @@ class BaseIndex : public CValidationInterface
 
     void ChainStateFlushed(const CBlockLocator& locator) override;
 
+    const CBlockIndex* CurrentIndex() { return m_best_block_index.load(); };
+
     /// Initialize internal state from the database and block index.
     virtual bool Init();