typedef uint256 CBLSId

Author: UdjinM6

src/bench/bls_dkg.cpp

@@ -4,6 +4,7 @@
 
 #include "bench.h"
 #include "random.h"
+#include "tinyformat.h"
 #include "bls/bls_worker.h"
 
 extern CBLSWorker blsWorker;
@@ -31,7 +32,7 @@ struct DKG
         ids.resize(quorumSize);
 
         for (int i = 0; i < quorumSize; i++) {
-            members[i].id.SetInt(i + 1);
+            members[i].id.SetHex(strprintf("%x", i + 1));
             ids[i] = members[i].id;
         }
 

src/bls/bls.cpp

@@ -6,7 +6,6 @@
 
 #include "hash.h"
 #include "random.h"
-#include "tinyformat.h"
 
 #ifndef BUILD_BITCOIN_INTERNAL
 #include "support/allocators/secure.h"
@@ -16,50 +15,6 @@
 #include <assert.h>
 #include <string.h>
 
-bool CBLSId::InternalSetBuf(const void* buf, size_t size)
-{
-    assert(size == sizeof(uint256));
-    memcpy(impl.begin(), buf, sizeof(uint256));
-    return true;
-}
-
-bool CBLSId::InternalGetBuf(void* buf, size_t size) const
-{
-    if (size != GetSerSize()) {
-        return false;
-    }
-    memcpy(buf, impl.begin(), sizeof(uint256));
-    return true;
-}
-
-void CBLSId::SetInt(int x)
-{
-    impl.SetHex(strprintf("%x", x));
-    fValid = true;
-    UpdateHash();
-}
-
-void CBLSId::SetHash(const uint256& hash)
-{
-    impl = hash;
-    fValid = true;
-    UpdateHash();
-}
-
-CBLSId CBLSId::FromInt(int64_t i)
-{
-    CBLSId id;
-    id.SetInt(i);
-    return id;
-}
-
-CBLSId CBLSId::FromHash(const uint256& hash)
-{
-    CBLSId id;
-    id.SetHash(hash);
-    return id;
-}
-
 bool CBLSSecretKey::InternalSetBuf(const void* buf, size_t size)
 {
     if (size != GetSerSize()) {
@@ -133,7 +88,7 @@ bool CBLSSecretKey::SecretKeyShare(const std::vector<CBLSSecretKey>& msk, const
     fValid = false;
     UpdateHash();
 
-    if (!_id.IsValid()) {
+    if (_id.IsNull()) {
         return false;
     }
 
@@ -147,7 +102,7 @@ bool CBLSSecretKey::SecretKeyShare(const std::vector<CBLSSecretKey>& msk, const
     }
 
     try {
-        impl = bls::BLS::PrivateKeyShare(mskVec, (const uint8_t*)_id.impl.begin());
+        impl = bls::BLS::PrivateKeyShare(mskVec, (const uint8_t*)_id.begin());
     } catch (...) {
         return false;
     }
@@ -241,7 +196,7 @@ bool CBLSPublicKey::PublicKeyShare(const std::vector<CBLSPublicKey>& mpk, const
     fValid = false;
     UpdateHash();
 
-    if (!_id.IsValid()) {
+    if (_id.IsNull()) {
         return false;
     }
 
@@ -255,7 +210,7 @@ bool CBLSPublicKey::PublicKeyShare(const std::vector<CBLSPublicKey>& mpk, const
     }
 
     try {
-        impl = bls::BLS::PublicKeyShare(mpkVec, (const uint8_t*)_id.impl.begin());
+        impl = bls::BLS::PublicKeyShare(mpkVec, (const uint8_t*)_id.begin());
     } catch (...) {
         return false;
     }
@@ -433,11 +388,11 @@ bool CBLSSignature::Recover(const std::vector<CBLSSignature>& sigs, const std::v
     idsVec.reserve(sigs.size());
 
     for (size_t i = 0; i < sigs.size(); i++) {
-        if (!sigs[i].IsValid() || !ids[i].IsValid()) {
+        if (!sigs[i].IsValid() || ids[i].IsNull()) {
             return false;
         }
         sigsVec.emplace_back(sigs[i].impl);
-        idsVec.emplace_back(ids[i].impl.begin());
+        idsVec.emplace_back(ids[i].begin());
     }
 
     try {

src/bls/bls.h

@@ -188,23 +188,7 @@ class CBLSWrapper
     }
 };
 
-class CBLSId : public CBLSWrapper<uint256, BLS_CURVE_ID_SIZE, CBLSId>
-{
-public:
-    using CBLSWrapper::operator=;
-    using CBLSWrapper::operator==;
-    using CBLSWrapper::operator!=;
-
-    void SetInt(int x);
-    void SetHash(const uint256& hash);
-
-    static CBLSId FromInt(int64_t i);
-    static CBLSId FromHash(const uint256& hash);
-
-protected:
-    bool InternalSetBuf(const void* buf, size_t size);
-    bool InternalGetBuf(void* buf, size_t size) const;
-};
+typedef uint256 CBLSId;
 
 class CBLSSecretKey : public CBLSWrapper<bls::PrivateKey, BLS_CURVE_SECKEY_SIZE, CBLSSecretKey>
 {

src/bls/bls_worker.cpp

@@ -723,7 +723,7 @@ CBLSPublicKey CBLSWorker::BuildPubKeyShare(const BLSVerificationVectorPtr& vvec,
 void CBLSWorker::AsyncVerifyContributionShares(const CBLSId& forId, const std::vector<BLSVerificationVectorPtr>& vvecs, const BLSSecretKeyVector& skShares,
                                                bool parallel, bool aggregated, std::function<void(const std::vector<bool>&)> doneCallback)
 {
-    if (!forId.IsValid() || !VerifyVerificationVectors(vvecs)) {
+    if (forId.IsNull() || !VerifyVerificationVectors(vvecs)) {
         std::vector<bool> result;
         result.assign(vvecs.size(), false);
         doneCallback(result);
@@ -752,7 +752,7 @@ std::future<bool> CBLSWorker::AsyncVerifyContributionShare(const CBLSId& forId,
                                                            const BLSVerificationVectorPtr& vvec,
                                                            const CBLSSecretKey& skContribution)
 {
-    if (!forId.IsValid() || !VerifyVerificationVector(*vvec)) {
+    if (forId.IsNull() || !VerifyVerificationVector(*vvec)) {
         auto p = BuildFutureDoneCallback<bool>();
         p.first(false);
         return std::move(p.second);