sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5587 from PastaPastaPasta/backport-uint256-modern

Browse Source 
backport: merge bitcoin#26105, #26345 (uint256 modern)
This commit is contained in:
PastaPastaPasta 2023-10-30 09:50:34 -05:00 committed by GitHub
commit 7440078f5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/consensus/params.h
View File

@ -10,6 +10,7 @@
#include <llmq/params.h>
#include <limits>
#include <vector>
namespace Consensus {

1
src/random.h
View File

@ -13,6 +13,7 @@
#include <chrono> // For std::chrono::microseconds
#include <cstdint>
#include <limits>
#include <vector>
/**
* Overall design of the RNG and entropy sources.

15
src/uint256.cpp
View File

@ -7,15 +7,6 @@
#include <util/strencodings.h>
#include <string.h>
template <unsigned int BITS>
base_blob<BITS>::base_blob(const std::vector<unsigned char>& vch)
{
assert(vch.size() == sizeof(m_data));
memcpy(m_data, vch.data(), sizeof(m_data));
}
template <unsigned int BITS>
std::string base_blob<BITS>::GetHex() const
{
@ -29,7 +20,7 @@ std::string base_blob<BITS>::GetHex() const
template <unsigned int BITS>
void base_blob<BITS>::SetHex(const char* psz)
{
memset(m_data, 0, sizeof(m_data));
std::fill(m_data.begin(), m_data.end(), 0);
// skip leading spaces
while (IsSpace(*psz))
@ -43,7 +34,7 @@ void base_blob<BITS>::SetHex(const char* psz)
size_t digits = 0;
while (::HexDigit(psz[digits]) != -1)
digits++;
unsigned char* p1 = (unsigned char*)m_data;
unsigned char* p1 = m_data.data();
unsigned char* pend = p1 + WIDTH;
while (digits > 0 && p1 < pend) {
*p1 = ::HexDigit(psz[--digits]);
@ -67,14 +58,12 @@ std::string base_blob<BITS>::ToString() const
}
// Explicit instantiations for base_blob<160>
template base_blob<160>::base_blob(const std::vector<unsigned char>&);
template std::string base_blob<160>::GetHex() const;
template std::string base_blob<160>::ToString() const;
template void base_blob<160>::SetHex(const char*);
template void base_blob<160>::SetHex(const std::string&);
// Explicit instantiations for base_blob<256>
template base_blob<256>::base_blob(const std::vector<unsigned char>&);
template std::string base_blob<256>::GetHex() const;
template std::string base_blob<256>::ToString() const;
template void base_blob<256>::SetHex(const char*);

105
src/uint256.h
View File

@ -7,11 +7,15 @@
#ifndef BITCOIN_UINT256_H
#define BITCOIN_UINT256_H
#include <assert.h>
#include <crypto/common.h>
#include <span.h>
#include <algorithm>
#include <array>
#include <cassert>
#include <cstring>
#include <stdint.h>
#include <string>
#include <vector>
/** Template base class for fixed-sized opaque blobs. */
template<unsigned int BITS>
@ -19,7 +23,9 @@ class base_blob
{
protected:
static constexpr int WIDTH = BITS / 8;
uint8_t m_data[WIDTH];
std::array<uint8_t, WIDTH> m_data;
static_assert(WIDTH == sizeof(m_data), "Sanity check");
public:
/* construct 0 value by default */
constexpr base_blob() : m_data() {}
@ -27,83 +33,58 @@ public:
/* constructor for constants between 1 and 255 */
constexpr explicit base_blob(uint8_t v) : m_data{v} {}
explicit base_blob(const std::vector<unsigned char>& vch);
bool IsNull() const
constexpr explicit base_blob(Span<const unsigned char> vch)
{
for (int i = 0; i < WIDTH; i++)
if (m_data[i] != 0)
return false;
return true;
assert(vch.size() == WIDTH);
std::copy(vch.begin(), vch.end(), m_data.begin());
}
void SetNull()
constexpr bool IsNull() const
{
memset(m_data, 0, sizeof(m_data));
return std::all_of(m_data.begin(), m_data.end(), [](uint8_t val) {
return val == 0;
});
}
inline int Compare(const base_blob& other) const { return memcmp(m_data, other.m_data, sizeof(m_data)); }
constexpr void SetNull()
{
std::fill(m_data.begin(), m_data.end(), 0);
}
friend inline bool operator==(const base_blob& a, const base_blob& b) { return a.Compare(b) == 0; }
friend inline bool operator!=(const base_blob& a, const base_blob& b) { return a.Compare(b) != 0; }
friend inline bool operator<(const base_blob& a, const base_blob& b) { return a.Compare(b) < 0; }
constexpr int Compare(const base_blob& other) const { return std::memcmp(m_data.data(), other.m_data.data(), WIDTH); }
friend constexpr bool operator==(const base_blob& a, const base_blob& b) { return a.Compare(b) == 0; }
friend constexpr bool operator!=(const base_blob& a, const base_blob& b) { return a.Compare(b) != 0; }
friend constexpr bool operator<(const base_blob& a, const base_blob& b) { return a.Compare(b) < 0; }
std::string GetHex() const;
void SetHex(const char* psz);
void SetHex(const std::string& str);
std::string ToString() const;
const unsigned char* data() const { return m_data; }
unsigned char* data() { return m_data; }
constexpr const unsigned char* data() const { return m_data.data(); }
constexpr unsigned char* data() { return m_data.data(); }
unsigned char* begin()
{
return &m_data[0];
}
constexpr unsigned char* begin() { return m_data.data(); }
constexpr unsigned char* end() { return m_data.data() + WIDTH; }
unsigned char* end()
{
return &m_data[WIDTH];
}
constexpr const unsigned char* begin() const { return m_data.data(); }
constexpr const unsigned char* end() const { return m_data.data() + WIDTH; }
const unsigned char* begin() const
{
return &m_data[0];
}
static constexpr unsigned int size() { return WIDTH; }
const unsigned char* end() const
{
return &m_data[WIDTH];
}
unsigned int size() const
{
return sizeof(m_data);
}
uint64_t GetUint64(int pos) const
{
const uint8_t* ptr = m_data + pos * 8;
return ((uint64_t)ptr[0]) | \
((uint64_t)ptr[1]) << 8 | \
((uint64_t)ptr[2]) << 16 | \
((uint64_t)ptr[3]) << 24 | \
((uint64_t)ptr[4]) << 32 | \
((uint64_t)ptr[5]) << 40 | \
((uint64_t)ptr[6]) << 48 | \
((uint64_t)ptr[7]) << 56;
}
constexpr uint64_t GetUint64(int pos) const { return ReadLE64(m_data.data() + pos * 8); }
template<typename Stream>
void Serialize(Stream& s) const
{
s.write((char*)m_data, sizeof(m_data));
s.write((char*)m_data.data(), sizeof(m_data));
}
template<typename Stream>
void Unserialize(Stream& s)
{
s.read((char*)m_data, sizeof(m_data));
s.read((char*)m_data.data(), sizeof(m_data));
}
};
@ -113,8 +94,8 @@ public:
*/
class uint160 : public base_blob<160> {
public:
constexpr uint160() {}
explicit uint160(const std::vector<unsigned char>& vch) : base_blob<160>(vch) {}
constexpr uint160() = default;
constexpr explicit uint160(Span<const unsigned char> vch) : base_blob<160>(vch) {}
};
/** 256-bit opaque blob.
@ -124,9 +105,9 @@ public:
*/
class uint256 : public base_blob<256> {
public:
constexpr uint256() {}
constexpr uint256() = default;
constexpr explicit uint256(uint8_t v) : base_blob<256>(v) {}
explicit uint256(const std::vector<unsigned char>& vch) : base_blob<256>(vch) {}
constexpr explicit uint256(Span<const unsigned char> vch) : base_blob<256>(vch) {}
static const uint256 ZERO;
static const uint256 ONE;
static const uint256 TWO;
@ -156,14 +137,14 @@ inline uint256 uint256S(const std::string& str)
/** 512-bit unsigned big integer. */
class uint512 : public base_blob<512> {
public:
uint512() {}
uint512(const base_blob<512>& b) : base_blob<512>(b) {}
explicit uint512(const std::vector<unsigned char>& vch) : base_blob<512>(vch) {}
constexpr uint512() = default;
constexpr uint512(const base_blob<512>& b) : base_blob<512>(b) {}
constexpr explicit uint512(Span<unsigned char> vch) : base_blob<512>(vch) {}
uint256 trim256() const
{
uint256 result;
memcpy((void*)&result, (void*)m_data, 32);
memcpy((void*)&result, (void*)m_data.data(), 32);
return result;
}
};