From 4d09138ff3e91b7dad20410d920f3cc80d3d16f8 Mon Sep 17 00:00:00 2001 From: pasta Date: Fri, 6 Dec 2024 13:30:14 -0600 Subject: [PATCH] feat: serialize on the stack --- src/bls/bls.h | 34 +++++++++++++++----------- src/bls/bls_ies.cpp | 15 ++++-------- src/coinjoin/coinjoin.cpp | 4 +-- src/coinjoin/coinjoin.h | 5 ++-- src/governance/object.cpp | 2 +- src/governance/vote.cpp | 2 +- src/llmq/dkgsession.cpp | 4 +-- src/serialize.h | 51 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 85 insertions(+), 32 deletions(-) diff --git a/src/bls/bls.h b/src/bls/bls.h index e029b70ae5ea3..71bbc2573604d 100644 --- a/src/bls/bls.h +++ b/src/bls/bls.h @@ -123,7 +123,15 @@ class CBLSWrapper cachedHash.SetNull(); } - std::vector ToByteVector(const bool specificLegacyScheme) const + std::array ToBytes(const bool specificLegacyScheme) const + { + if (!fValid) { + return std::array{}; + } + return impl.SerializeToArray(specificLegacyScheme); + } + + std::vector ToActualByteVector(const bool specificLegacyScheme) const { if (!fValid) { return std::vector(SerSize, 0); @@ -131,9 +139,9 @@ class CBLSWrapper return impl.Serialize(specificLegacyScheme); } - std::vector ToByteVector() const + std::array ToBytes() const { - return ToByteVector(bls::bls_legacy_scheme.load()); + return ToBytes(bls::bls_legacy_scheme.load()); } const uint256& GetHash() const @@ -167,7 +175,7 @@ class CBLSWrapper template inline void Serialize(Stream& s, const bool specificLegacyScheme) const { - s.write(AsBytes(Span{ToByteVector(specificLegacyScheme).data(), SerSize})); + s.write(AsBytes(Span{ToBytes(specificLegacyScheme)})); } template @@ -206,7 +214,7 @@ class CBLSWrapper inline bool CheckMalleable(Span vecBytes, const bool specificLegacyScheme) const { - if (memcmp(vecBytes.data(), ToByteVector(specificLegacyScheme).data(), SerSize)) { + if (memcmp(vecBytes.data(), ToBytes(specificLegacyScheme).data(), SerSize)) { // TODO not sure if this is actually possible with the BLS libs. I'm assuming here that somewhere deep inside // these libs masking might happen, so that 2 different binary representations could result in the same object // representation @@ -222,7 +230,7 @@ class CBLSWrapper inline std::string ToString(const bool specificLegacyScheme) const { - std::vector buf = ToByteVector(specificLegacyScheme); + auto buf = ToBytes(specificLegacyScheme); return HexStr(buf); } @@ -245,10 +253,12 @@ struct CBLSIdImplicit : public uint256 memcpy(instance.begin(), buffer, sizeof(CBLSIdImplicit)); return instance; } - [[nodiscard]] std::vector Serialize(const bool fLegacy) const + [[nodiscard]] std::vector SerializeToVec(const bool fLegacy) const { return {begin(), end()}; } + [[nodiscard]] std::array Serialize(const bool fLegacy) const { return m_data; } + [[nodiscard]] std::array SerializeToArray(const bool fLegacy) const { return Serialize(fLegacy); } }; class CBLSId : public CBLSWrapper @@ -396,7 +406,7 @@ class CBLSLazyWrapper private: mutable std::mutex mutex; - mutable std::vector vecBytes; + mutable std::array vecBytes{}; mutable bool bufValid{false}; mutable bool bufLegacyScheme{true}; @@ -407,7 +417,6 @@ class CBLSLazyWrapper public: CBLSLazyWrapper() : - vecBytes(BLSObject::SerSize, 0), bufLegacyScheme(bls::bls_legacy_scheme.load()) {} @@ -425,7 +434,6 @@ class CBLSLazyWrapper if (r.bufValid) { vecBytes = r.vecBytes; } else { - vecBytes.resize(BLSObject::SerSize); std::fill(vecBytes.begin(), vecBytes.end(), 0); } objInitialized = r.objInitialized; @@ -448,10 +456,9 @@ class CBLSLazyWrapper { std::unique_lock l(mutex); if (!objInitialized && !bufValid) { - vecBytes.resize(BLSObject::SerSize); std::fill(vecBytes.begin(), vecBytes.end(), 0); } else if (!bufValid || (bufLegacyScheme != specificLegacyScheme)) { - vecBytes = obj.ToByteVector(specificLegacyScheme); + vecBytes = obj.ToBytes(specificLegacyScheme); bufValid = true; bufLegacyScheme = specificLegacyScheme; hash.SetNull(); @@ -533,11 +540,10 @@ class CBLSLazyWrapper { std::unique_lock l(mutex); if (!objInitialized && !bufValid) { - vecBytes.resize(BLSObject::SerSize); std::fill(vecBytes.begin(), vecBytes.end(), 0); hash.SetNull(); } else if (!bufValid) { - vecBytes = obj.ToByteVector(bufLegacyScheme); + vecBytes = obj.ToBytes(bufLegacyScheme); bufValid = true; hash.SetNull(); } diff --git a/src/bls/bls_ies.cpp b/src/bls/bls_ies.cpp index 1068e078fc9b2..640e82091021e 100644 --- a/src/bls/bls_ies.cpp +++ b/src/bls/bls_ies.cpp @@ -49,8 +49,7 @@ bool CBLSIESEncryptedBlob::Encrypt(size_t idx, const CBLSPublicKey& peerPubKey, return false; } - std::vector symKey = pk.ToByteVector(); - symKey.resize(32); + auto symKey = pk.ToBytes(); uint256 iv = GetIV(idx); return EncryptBlob(plainTextData, dataSize, data, symKey.data(), iv.begin()); @@ -63,10 +62,9 @@ bool CBLSIESEncryptedBlob::Decrypt(size_t idx, const CBLSSecretKey& secretKey, C return false; } - std::vector symKey = pk.ToByteVector(); - symKey.resize(32); - uint256 iv = GetIV(idx); + auto symKey = pk.ToBytes(); + return DecryptBlob(data.data(), data.size(), decryptedDataRet, symKey.data(), iv.begin()); } @@ -117,8 +115,7 @@ bool CBLSIESMultiRecipientBlobs::Encrypt(size_t idx, const CBLSPublicKey& recipi return false; } - std::vector symKey = pk.ToByteVector(); - symKey.resize(32); + auto symKey = pk.ToBytes(); return EncryptBlob(blob.data(), blob.size(), blobs[idx], symKey.data(), ivVector[idx].begin()); } @@ -134,13 +131,11 @@ bool CBLSIESMultiRecipientBlobs::Decrypt(size_t idx, const CBLSSecretKey& sk, Bl return false; } - std::vector symKey = pk.ToByteVector(); - symKey.resize(32); - uint256 iv = ivSeed; for (size_t i = 0; i < idx; i++) { iv = ::SerializeHash(iv); } + auto symKey = pk.ToBytes(); return DecryptBlob(blobs[idx].data(), blobs[idx].size(), blobRet, symKey.data(), iv.begin()); } diff --git a/src/coinjoin/coinjoin.cpp b/src/coinjoin/coinjoin.cpp index 74fc644a70911..2ac1b3d4367fb 100644 --- a/src/coinjoin/coinjoin.cpp +++ b/src/coinjoin/coinjoin.cpp @@ -55,7 +55,7 @@ bool CCoinJoinQueue::Sign(const CActiveMasternodeManager& mn_activeman) if (!sig.IsValid()) { return false; } - vchSig = sig.ToByteVector(false); + vchSig = sig.ToBytes(false); return true; } @@ -94,7 +94,7 @@ bool CCoinJoinBroadcastTx::Sign(const CActiveMasternodeManager& mn_activeman) if (!sig.IsValid()) { return false; } - vchSig = sig.ToByteVector(false); + vchSig = sig.ToBytes(false); return true; } diff --git a/src/coinjoin/coinjoin.h b/src/coinjoin/coinjoin.h index 68e2f40c05549..18885a328480c 100644 --- a/src/coinjoin/coinjoin.h +++ b/src/coinjoin/coinjoin.h @@ -7,6 +7,7 @@ #include +#include #include #include #include @@ -183,7 +184,7 @@ class CCoinJoinQueue uint256 m_protxHash; int64_t nTime{0}; bool fReady{false}; //ready for submit - std::vector vchSig; + std::array vchSig; // memory only bool fTried{false}; @@ -243,7 +244,7 @@ class CCoinJoinBroadcastTx CTransactionRef tx; COutPoint masternodeOutpoint; uint256 m_protxHash; - std::vector vchSig; + std::array vchSig; int64_t sigTime{0}; CCoinJoinBroadcastTx() : tx(MakeTransactionRef(CMutableTransaction{})) diff --git a/src/governance/object.cpp b/src/governance/object.cpp index 6ae0ed619b464..eb571d23f6854 100644 --- a/src/governance/object.cpp +++ b/src/governance/object.cpp @@ -258,7 +258,7 @@ bool CGovernanceObject::Sign(const CActiveMasternodeManager& mn_activeman) if (!sig.IsValid()) { return false; } - m_obj.vchSig = sig.ToByteVector(false); + m_obj.vchSig = sig.ToActualByteVector(false); return true; } diff --git a/src/governance/vote.cpp b/src/governance/vote.cpp index 5cfa2b1ac1869..bf279d4f89a86 100644 --- a/src/governance/vote.cpp +++ b/src/governance/vote.cpp @@ -175,7 +175,7 @@ bool CGovernanceVote::Sign(const CActiveMasternodeManager& mn_activeman) if (!sig.IsValid()) { return false; } - vchSig = sig.ToByteVector(false); + vchSig = sig.ToActualByteVector(false); return true; } diff --git a/src/llmq/dkgsession.cpp b/src/llmq/dkgsession.cpp index 1c95881efe34f..850756d72f640 100644 --- a/src/llmq/dkgsession.cpp +++ b/src/llmq/dkgsession.cpp @@ -1017,12 +1017,12 @@ void CDKGSession::SendCommitment(CDKGPendingMessages& pendingMessages) if (lieType == 3) { const bool is_bls_legacy = bls::bls_legacy_scheme.load(); - std::vector buf = qc.sig.ToByteVector(is_bls_legacy); + auto buf = qc.sig.ToBytes(is_bls_legacy); buf[5]++; qc.sig.SetByteVector(buf, is_bls_legacy); } else if (lieType == 4) { const bool is_bls_legacy = bls::bls_legacy_scheme.load(); - std::vector buf = qc.quorumSig.ToByteVector(is_bls_legacy); + auto buf = qc.quorumSig.ToBytes(is_bls_legacy); buf[5]++; qc.quorumSig.SetByteVector(buf, is_bls_legacy); } diff --git a/src/serialize.h b/src/serialize.h index 14e56baef48fe..ea4c52b0b6797 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -797,6 +797,9 @@ template inline void Unserialize(St template inline void Serialize(Stream& os, const std::vector& v); template inline void Unserialize(Stream& is, std::vector& v); +template void Serialize(Stream& os, const std::array& a); +template void Unserialize(Stream& is, std::array& a); + /** * pair */ @@ -1028,6 +1031,54 @@ void Unserialize(Stream& is, std::vector& v) } } +/** + * array + */ +template +void Serialize(Stream& os, const std::array& a) +{ + if constexpr (std::is_same_v) { + // Directly write the byte data without writing the size + if (!a.empty()) { + os.write(MakeByteSpan(a)); + } + } + else if constexpr (std::is_same_v) { + // Serialize each bool individually + for (const bool& elem : a) { + ::Serialize(os, elem); + } + } + else { + // Serialize each element using the default Serialize function + for (const T& elem : a) { + ::Serialize(os, elem); + } + } +} + +template +void Unserialize(Stream& is, std::array& a) +{ + if constexpr (std::is_same_v) { + // Directly read the byte data without reading the size + if (N > 0) { + is.read(AsWritableBytes(Span{a})); + } + } + else if constexpr (std::is_same_v) { + // Unserialize each bool individually + for (bool& elem : a) { + ::Unserialize(is, elem); + } + } + else { + // Unserialize each element using the default Unserialize function + for (T& elem : a) { + ::Unserialize(is, elem); + } + } +} /** * pair