aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/crypto/hmac_sha256.h5
-rw-r--r--src/crypto/scrypt.cpp356
-rw-r--r--src/dogecoin.cpp3
-rw-r--r--src/init.cpp6
-rw-r--r--src/miner.cpp9
-rw-r--r--src/net_processing.cpp2
-rw-r--r--src/policy/feerate.cpp3
-rw-r--r--src/policy/feerate.h23
-rw-r--r--src/test/dogecoin_tests.cpp70
-rw-r--r--src/test/fuzz/coins_view.cpp3
10 files changed, 109 insertions, 371 deletions
diff --git a/src/crypto/hmac_sha256.h b/src/crypto/hmac_sha256.h
index d31fda1dd..5bdc9bc59 100644
--- a/src/crypto/hmac_sha256.h
+++ b/src/crypto/hmac_sha256.h
@@ -9,6 +9,7 @@
#include <stdint.h>
#include <stdlib.h>
+#include <string.h>
/** A hasher class for HMAC-SHA-256. */
class CHMAC_SHA256
@@ -21,6 +22,10 @@ public:
static const size_t OUTPUT_SIZE = 32;
CHMAC_SHA256(const unsigned char* key, size_t keylen);
+ void Copy(CHMAC_SHA256* dest)
+ {
+ memcpy(dest, this, sizeof(CHMAC_SHA256));
+ }
CHMAC_SHA256& Write(const unsigned char* data, size_t len)
{
inner.Write(data, len);
diff --git a/src/crypto/scrypt.cpp b/src/crypto/scrypt.cpp
index 3bdd9d6cb..422aa59c0 100644
--- a/src/crypto/scrypt.cpp
+++ b/src/crypto/scrypt.cpp
@@ -28,6 +28,7 @@
*/
#include <crypto/scrypt.h>
+#include <crypto/hmac_sha256.h>
#include <stdlib.h>
#include <stdint.h>
@@ -61,309 +62,6 @@ static inline void be32enc(void *pp, uint32_t x)
#endif
-typedef struct SHA256_CTXContext {
- uint32_t total[2];
- uint32_t state[8];
- uint8_t buffer[64];
-} SHA256_CTX;
-
-#define GET_UINT32(n, b, i) \
- { \
- (n) = ((uint32_t)(b)[(i)] << 24) \
- | ((uint32_t)(b)[(i) + 1] << 16) \
- | ((uint32_t)(b)[(i) + 2] << 8) \
- | ((uint32_t)(b)[(i) + 3]); \
- }
-
-#define PUT_UINT32(n, b, i) \
- { \
- (b)[(i)] = (uint8_t)((n) >> 24); \
- (b)[(i) + 1] = (uint8_t)((n) >> 16); \
- (b)[(i) + 2] = (uint8_t)((n) >> 8); \
- (b)[(i) + 3] = (uint8_t)((n)); \
- }
-
-#define SHR(x, n) ((x & 0xFFFFFFFF) >> n)
-#define ROTR(x, n) (SHR(x, n) | (x << (32 - n)))
-#define S0(x) (ROTR(x, 7) ^ ROTR(x, 18) ^ SHR(x, 3))
-#define S1(x) (ROTR(x, 17) ^ ROTR(x, 19) ^ SHR(x, 10))
-#define S2(x) (ROTR(x, 2) ^ ROTR(x, 13) ^ ROTR(x, 22))
-#define S3(x) (ROTR(x, 6) ^ ROTR(x, 11) ^ ROTR(x, 25))
-#define F0(x, y, z) ((x & y) | (z & (x | y)))
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define R(t) (W[t] = S1(W[t - 2]) + W[t - 7] + S0(W[t - 15]) + W[t - 16])
-
-#define P(a, b, c, d, e, f, g, h, x, K) \
- { \
- temp1 = h + S3(e) + F1(e, f, g) + K + x; \
- temp2 = S2(a) + F0(a, b, c); \
- d += temp1; \
- h = temp1 + temp2; \
- }
-
-static void
-SHA256_Init(SHA256_CTX* ctx)
-{
- ctx->total[0] = 0;
- ctx->total[1] = 0;
-
- ctx->state[0] = 0x6A09E667;
- ctx->state[1] = 0xBB67AE85;
- ctx->state[2] = 0x3C6EF372;
- ctx->state[3] = 0xA54FF53A;
- ctx->state[4] = 0x510E527F;
- ctx->state[5] = 0x9B05688C;
- ctx->state[6] = 0x1F83D9AB;
- ctx->state[7] = 0x5BE0CD19;
-}
-
-static void
-SHA256_Process(SHA256_CTX* ctx, uint8_t data[64])
-{
- uint32_t temp1, temp2, W[64];
- uint32_t A, B, C, D, E, F, G, H;
-
- GET_UINT32(W[0], data, 0);
- GET_UINT32(W[1], data, 4);
- GET_UINT32(W[2], data, 8);
- GET_UINT32(W[3], data, 12);
- GET_UINT32(W[4], data, 16);
- GET_UINT32(W[5], data, 20);
- GET_UINT32(W[6], data, 24);
- GET_UINT32(W[7], data, 28);
- GET_UINT32(W[8], data, 32);
- GET_UINT32(W[9], data, 36);
- GET_UINT32(W[10], data, 40);
- GET_UINT32(W[11], data, 44);
- GET_UINT32(W[12], data, 48);
- GET_UINT32(W[13], data, 52);
- GET_UINT32(W[14], data, 56);
- GET_UINT32(W[15], data, 60);
-
- A = ctx->state[0];
- B = ctx->state[1];
- C = ctx->state[2];
- D = ctx->state[3];
- E = ctx->state[4];
- F = ctx->state[5];
- G = ctx->state[6];
- H = ctx->state[7];
-
- P(A, B, C, D, E, F, G, H, W[0], 0x428A2F98);
- P(H, A, B, C, D, E, F, G, W[1], 0x71374491);
- P(G, H, A, B, C, D, E, F, W[2], 0xB5C0FBCF);
- P(F, G, H, A, B, C, D, E, W[3], 0xE9B5DBA5);
- P(E, F, G, H, A, B, C, D, W[4], 0x3956C25B);
- P(D, E, F, G, H, A, B, C, W[5], 0x59F111F1);
- P(C, D, E, F, G, H, A, B, W[6], 0x923F82A4);
- P(B, C, D, E, F, G, H, A, W[7], 0xAB1C5ED5);
- P(A, B, C, D, E, F, G, H, W[8], 0xD807AA98);
- P(H, A, B, C, D, E, F, G, W[9], 0x12835B01);
- P(G, H, A, B, C, D, E, F, W[10], 0x243185BE);
- P(F, G, H, A, B, C, D, E, W[11], 0x550C7DC3);
- P(E, F, G, H, A, B, C, D, W[12], 0x72BE5D74);
- P(D, E, F, G, H, A, B, C, W[13], 0x80DEB1FE);
- P(C, D, E, F, G, H, A, B, W[14], 0x9BDC06A7);
- P(B, C, D, E, F, G, H, A, W[15], 0xC19BF174);
- P(A, B, C, D, E, F, G, H, R(16), 0xE49B69C1);
- P(H, A, B, C, D, E, F, G, R(17), 0xEFBE4786);
- P(G, H, A, B, C, D, E, F, R(18), 0x0FC19DC6);
- P(F, G, H, A, B, C, D, E, R(19), 0x240CA1CC);
- P(E, F, G, H, A, B, C, D, R(20), 0x2DE92C6F);
- P(D, E, F, G, H, A, B, C, R(21), 0x4A7484AA);
- P(C, D, E, F, G, H, A, B, R(22), 0x5CB0A9DC);
- P(B, C, D, E, F, G, H, A, R(23), 0x76F988DA);
- P(A, B, C, D, E, F, G, H, R(24), 0x983E5152);
- P(H, A, B, C, D, E, F, G, R(25), 0xA831C66D);
- P(G, H, A, B, C, D, E, F, R(26), 0xB00327C8);
- P(F, G, H, A, B, C, D, E, R(27), 0xBF597FC7);
- P(E, F, G, H, A, B, C, D, R(28), 0xC6E00BF3);
- P(D, E, F, G, H, A, B, C, R(29), 0xD5A79147);
- P(C, D, E, F, G, H, A, B, R(30), 0x06CA6351);
- P(B, C, D, E, F, G, H, A, R(31), 0x14292967);
- P(A, B, C, D, E, F, G, H, R(32), 0x27B70A85);
- P(H, A, B, C, D, E, F, G, R(33), 0x2E1B2138);
- P(G, H, A, B, C, D, E, F, R(34), 0x4D2C6DFC);
- P(F, G, H, A, B, C, D, E, R(35), 0x53380D13);
- P(E, F, G, H, A, B, C, D, R(36), 0x650A7354);
- P(D, E, F, G, H, A, B, C, R(37), 0x766A0ABB);
- P(C, D, E, F, G, H, A, B, R(38), 0x81C2C92E);
- P(B, C, D, E, F, G, H, A, R(39), 0x92722C85);
- P(A, B, C, D, E, F, G, H, R(40), 0xA2BFE8A1);
- P(H, A, B, C, D, E, F, G, R(41), 0xA81A664B);
- P(G, H, A, B, C, D, E, F, R(42), 0xC24B8B70);
- P(F, G, H, A, B, C, D, E, R(43), 0xC76C51A3);
- P(E, F, G, H, A, B, C, D, R(44), 0xD192E819);
- P(D, E, F, G, H, A, B, C, R(45), 0xD6990624);
- P(C, D, E, F, G, H, A, B, R(46), 0xF40E3585);
- P(B, C, D, E, F, G, H, A, R(47), 0x106AA070);
- P(A, B, C, D, E, F, G, H, R(48), 0x19A4C116);
- P(H, A, B, C, D, E, F, G, R(49), 0x1E376C08);
- P(G, H, A, B, C, D, E, F, R(50), 0x2748774C);
- P(F, G, H, A, B, C, D, E, R(51), 0x34B0BCB5);
- P(E, F, G, H, A, B, C, D, R(52), 0x391C0CB3);
- P(D, E, F, G, H, A, B, C, R(53), 0x4ED8AA4A);
- P(C, D, E, F, G, H, A, B, R(54), 0x5B9CCA4F);
- P(B, C, D, E, F, G, H, A, R(55), 0x682E6FF3);
- P(A, B, C, D, E, F, G, H, R(56), 0x748F82EE);
- P(H, A, B, C, D, E, F, G, R(57), 0x78A5636F);
- P(G, H, A, B, C, D, E, F, R(58), 0x84C87814);
- P(F, G, H, A, B, C, D, E, R(59), 0x8CC70208);
- P(E, F, G, H, A, B, C, D, R(60), 0x90BEFFFA);
- P(D, E, F, G, H, A, B, C, R(61), 0xA4506CEB);
- P(C, D, E, F, G, H, A, B, R(62), 0xBEF9A3F7);
- P(B, C, D, E, F, G, H, A, R(63), 0xC67178F2);
-
- ctx->state[0] += A;
- ctx->state[1] += B;
- ctx->state[2] += C;
- ctx->state[3] += D;
- ctx->state[4] += E;
- ctx->state[5] += F;
- ctx->state[6] += G;
- ctx->state[7] += H;
-}
-
-static void
-SHA256_Update(SHA256_CTX* ctx, uint8_t* input, uint32_t length)
-{
- uint32_t left, fill;
-
- if (!length)
- return;
-
- left = ctx->total[0] & 0x3F;
- fill = 64 - left;
-
- ctx->total[0] += length;
- ctx->total[0] &= 0xFFFFFFFF;
-
- if (ctx->total[0] < length)
- ctx->total[1]++;
-
- if (left && length >= fill) {
- memcpy((void*)(ctx->buffer + left),
- (void*)input, fill);
- SHA256_Process(ctx, ctx->buffer);
- length -= fill;
- input += fill;
- left = 0;
- }
-
- while (length >= 64) {
- SHA256_Process(ctx, input);
- length -= 64;
- input += 64;
- }
-
- if (length) {
- memcpy((void*)(ctx->buffer + left),
- (void*)input, length);
- }
-}
-
-static void
-SHA256_Final(SHA256_CTX* ctx, uint8_t digest[32])
-{
- uint32_t last, padn;
- uint32_t high, low;
- uint8_t msglen[8];
-
- high = (ctx->total[0] >> 29)
- | (ctx->total[1] << 3);
- low = (ctx->total[0] << 3);
-
- PUT_UINT32(high, msglen, 0);
- PUT_UINT32(low, msglen, 4);
-
- last = ctx->total[0] & 0x3F;
- padn = (last < 56) ? (56 - last) : (120 - last);
-
- uint8_t sha256_padding[64];
- memset(sha256_padding, 0, 64);
- memset(sha256_padding, 0x80, 1);
-
- SHA256_Update(ctx, sha256_padding, padn);
- SHA256_Update(ctx, msglen, 8);
-
- PUT_UINT32(ctx->state[0], digest, 0);
- PUT_UINT32(ctx->state[1], digest, 4);
- PUT_UINT32(ctx->state[2], digest, 8);
- PUT_UINT32(ctx->state[3], digest, 12);
- PUT_UINT32(ctx->state[4], digest, 16);
- PUT_UINT32(ctx->state[5], digest, 20);
- PUT_UINT32(ctx->state[6], digest, 24);
- PUT_UINT32(ctx->state[7], digest, 28);
-}
-
-typedef struct HMAC_SHA256Context {
- SHA256_CTX ictx;
- SHA256_CTX octx;
-} HMAC_SHA256_CTX;
-
-/* Initialize an HMAC-SHA256 operation with the given key. */
-static void
-HMAC_SHA256_Init(HMAC_SHA256_CTX *ctx, const void *_K, size_t Klen)
-{
- unsigned char pad[64];
- unsigned char khash[32];
- const unsigned char *K = (const unsigned char *)_K;
- size_t i;
-
- /* If Klen > 64, the key is really SHA256(K). */
- if (Klen > 64) {
- SHA256_Init(&ctx->ictx);
- SHA256_Update(&ctx->ictx, (uint8_t*)K, Klen);
- SHA256_Final(&ctx->ictx, (uint8_t*)khash);
- K = khash;
- Klen = 32;
- }
-
- /* Inner SHA256 operation is SHA256(K xor [block of 0x36] || data). */
- SHA256_Init(&ctx->ictx);
- memset(pad, 0x36, 64);
- for (i = 0; i < Klen; i++)
- pad[i] ^= K[i];
- SHA256_Update(&ctx->ictx, pad, 64);
-
- /* Outer SHA256 operation is SHA256(K xor [block of 0x5c] || hash). */
- SHA256_Init(&ctx->octx);
- memset(pad, 0x5c, 64);
- for (i = 0; i < Klen; i++)
- pad[i] ^= K[i];
- SHA256_Update(&ctx->octx, pad, 64);
-
- /* Clean the stack. */
- memset(khash, 0, 32);
-}
-
-/* Add bytes to the HMAC-SHA256 operation. */
-static void
-HMAC_SHA256_Update(HMAC_SHA256_CTX *ctx, const void *in, size_t len)
-{
- /* Feed data to the inner SHA256 operation. */
- SHA256_Update(&ctx->ictx, (uint8_t*)in, len);
-}
-
-/* Finish an HMAC-SHA256 operation. */
-static void
-HMAC_SHA256_Final(unsigned char digest[32], HMAC_SHA256_CTX *ctx)
-{
- unsigned char ihash[32];
-
- /* Finish the inner SHA256 operation. */
- SHA256_Final(&ctx->ictx, ihash);
-
- /* Feed the inner hash to the outer SHA256 operation. */
- SHA256_Update(&ctx->octx, ihash, 32);
-
- /* Finish the outer SHA256 operation. */
- SHA256_Final(&ctx->octx, digest);
-
- /* Clean the stack. */
- memset(ihash, 0, 32);
-}
-
/**
* PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, c, buf, dkLen):
* Compute PBKDF2(passwd, salt, c, dkLen) using HMAC-SHA256 as the PRF, and
@@ -373,18 +71,19 @@ void
PBKDF2_SHA256(const uint8_t *passwd, size_t passwdlen, const uint8_t *salt,
size_t saltlen, uint64_t c, uint8_t *buf, size_t dkLen)
{
- HMAC_SHA256_CTX PShctx, hctx;
+ CHMAC_SHA256 baseCtx = CHMAC_SHA256(passwd, passwdlen);
+ CHMAC_SHA256 PShctx = CHMAC_SHA256(passwd, passwdlen);
+ CHMAC_SHA256 hctx = CHMAC_SHA256(passwd, passwdlen);
size_t i;
uint8_t ivec[4];
- uint8_t U[32];
- uint8_t T[32];
+ uint8_t U[CHMAC_SHA256::OUTPUT_SIZE];
+ uint8_t T[CHMAC_SHA256::OUTPUT_SIZE];
uint64_t j;
- int k;
+ unsigned int k;
size_t clen;
/* Compute HMAC state after processing P and S. */
- HMAC_SHA256_Init(&PShctx, passwd, passwdlen);
- HMAC_SHA256_Update(&PShctx, salt, saltlen);
+ PShctx.Write(salt, saltlen);
/* Iterate through the blocks. */
for (i = 0; i * 32 < dkLen; i++) {
@@ -392,37 +91,37 @@ PBKDF2_SHA256(const uint8_t *passwd, size_t passwdlen, const uint8_t *salt,
be32enc(ivec, (uint32_t)(i + 1));
/* Compute U_1 = PRF(P, S || INT(i)). */
- memcpy(&hctx, &PShctx, sizeof(HMAC_SHA256_CTX));
- HMAC_SHA256_Update(&hctx, ivec, 4);
- HMAC_SHA256_Final(U, &hctx);
+ PShctx.Copy(&hctx);
+ hctx.Write(ivec, 4);
+ hctx.Finalize(U);
/* T_i = U_1 ... */
- memcpy(T, U, 32);
+ memcpy(T, U, CHMAC_SHA256::OUTPUT_SIZE);
for (j = 2; j <= c; j++) {
/* Compute U_j. */
- HMAC_SHA256_Init(&hctx, passwd, passwdlen);
- HMAC_SHA256_Update(&hctx, U, 32);
- HMAC_SHA256_Final(U, &hctx);
+ baseCtx.Copy(&hctx);
+ hctx.Write(U, CHMAC_SHA256::OUTPUT_SIZE);
+ hctx.Finalize(U);
/* ... xor U_j ... */
- for (k = 0; k < 32; k++)
+ for (k = 0; k < CHMAC_SHA256::OUTPUT_SIZE; k++)
T[k] ^= U[k];
}
/* Copy as many bytes as necessary into buf. */
- clen = dkLen - i * 32;
- if (clen > 32)
- clen = 32;
- memcpy(&buf[i * 32], T, clen);
+ clen = dkLen - i * CHMAC_SHA256::OUTPUT_SIZE;
+ if (clen > CHMAC_SHA256::OUTPUT_SIZE)
+ clen = CHMAC_SHA256::OUTPUT_SIZE;
+ memcpy(&buf[i * CHMAC_SHA256::OUTPUT_SIZE], T, clen);
}
-
- /* Clean PShctx, since we never called _Final on it. */
- memset(&PShctx, 0, sizeof(HMAC_SHA256_CTX));
}
#define ROTL(a, b) (((a) << (b)) | ((a) >> (32 - (b))))
+#ifdef __clang__
+__attribute__((no_sanitize("unsigned-integer-overflow")))
+#endif // __clang__
static inline void xor_salsa8(uint32_t B[16], const uint32_t Bx[16])
{
uint32_t x00,x01,x02,x03,x04,x05,x06,x07,x08,x09,x10,x11,x12,x13,x14,x15;
@@ -565,12 +264,3 @@ void scrypt_1024_1_1_256(const char *input, char *output)
char scratchpad[SCRYPT_SCRATCHPAD_SIZE];
scrypt_1024_1_1_256_sp(input, output, scratchpad);
}
-
-void SHA256(unsigned char* input, int len, unsigned char* output)
-{
- SHA256_CTX ctx;
- SHA256_Init(&ctx);
- SHA256_Update(&ctx, (uint8_t*)input, len);
- SHA256_Final(&ctx, (uint8_t*)output);
-}
-
diff --git a/src/dogecoin.cpp b/src/dogecoin.cpp
index 31cd69bfc..3bc6fb932 100644
--- a/src/dogecoin.cpp
+++ b/src/dogecoin.cpp
@@ -9,6 +9,9 @@
#include <dogecoin.h>
#include <logging.h>
+#ifdef __clang__
+__attribute__((no_sanitize("unsigned-integer-overflow")))
+#endif // __clang__
int static generateMTRandom(unsigned int s, int range)
{
boost::mt19937 gen(s);
diff --git a/src/init.cpp b/src/init.cpp
index 36b82c243..b38f192c1 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1118,6 +1118,8 @@ bool AppInitParameterInteraction(const ArgsManager& args)
CAmount n = 0;
if (!ParseMoney(args.GetArg("-incrementalrelayfee", ""), n))
return InitError(AmountErrMsg("incrementalrelayfee", args.GetArg("-incrementalrelayfee", "")));
+ if (n > MAX_FEE_RATE)
+ return InitError(strprintf(Untranslated("-incrementalrelayfee is greater than maximum fee rate of %ld."), MAX_FEE_RATE));
incrementalRelayFee = CFeeRate(n);
}
@@ -1154,6 +1156,8 @@ bool AppInitParameterInteraction(const ArgsManager& args)
if (!ParseMoney(args.GetArg("-minrelaytxfee", ""), n)) {
return InitError(AmountErrMsg("minrelaytxfee", args.GetArg("-minrelaytxfee", "")));
}
+ if (n > MAX_FEE_RATE)
+ return InitError(strprintf(Untranslated("-minrelaytxfee is greater than maximum fee rate of %ld."), MAX_FEE_RATE));
// High fee check is done afterward in CWallet::Create()
::minRelayTxFee = CFeeRate(n);
} else if (incrementalRelayFee > ::minRelayTxFee) {
@@ -1176,6 +1180,8 @@ bool AppInitParameterInteraction(const ArgsManager& args)
CAmount n = 0;
if (!ParseMoney(args.GetArg("-dustrelayfee", ""), n))
return InitError(AmountErrMsg("dustrelayfee", args.GetArg("-dustrelayfee", "")));
+ if (n > MAX_FEE_RATE)
+ return InitError(strprintf(Untranslated("-dustrelayfee is greater than maximum fee rate of %ld."), MAX_FEE_RATE));
dustRelayFee = CFeeRate(n);
}
diff --git a/src/miner.cpp b/src/miner.cpp
index b44cb947d..52b8bac64 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -72,8 +72,13 @@ static BlockAssembler::Options DefaultOptions()
BlockAssembler::Options options;
options.nBlockMaxWeight = gArgs.GetArg("-blockmaxweight", DEFAULT_BLOCK_MAX_WEIGHT);
CAmount n = 0;
- if (gArgs.IsArgSet("-blockmintxfee") && ParseMoney(gArgs.GetArg("-blockmintxfee", ""), n)) {
- options.blockMinFeeRate = CFeeRate(n);
+ if (gArgs.IsArgSet("-blockmintxfee")) {
+ if (ParseMoney(gArgs.GetArg("-blockmintxfee", ""), n) && n <= MAX_FEE_RATE) {
+ options.blockMinFeeRate = CFeeRate(n);
+ } else {
+ LogPrintf("DefaultOptions(): Specified -blockmintxfee is either not a valid amount, or is greater than the maximum fee rate %d.\n", MAX_FEE_RATE);
+ options.blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE);
+ }
} else {
options.blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE);
}
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 4b38767e8..b39e11647 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -3722,7 +3722,7 @@ void PeerManager::ProcessMessage(CNode& pfrom, const std::string& msg_type, CDat
if (msg_type == NetMsgType::FEEFILTER) {
CAmount newFeeFilter = 0;
vRecv >> newFeeFilter;
- if (MoneyRange(newFeeFilter)) {
+ if (FeeRange(newFeeFilter)) {
if (pfrom.m_tx_relay != nullptr) {
LOCK(pfrom.m_tx_relay->cs_feeFilter);
pfrom.m_tx_relay->minFeeFilter = newFeeFilter;
diff --git a/src/policy/feerate.cpp b/src/policy/feerate.cpp
index 04e0e117a..aeeb341ea 100644
--- a/src/policy/feerate.cpp
+++ b/src/policy/feerate.cpp
@@ -13,7 +13,8 @@ CFeeRate::CFeeRate(const CAmount& nFeePaid, size_t nBytes_)
int64_t nSize = int64_t(nBytes_);
if (nSize > 0)
- nSatoshisPerK = nFeePaid * 1000 / nSize;
+ // Dogecoin: Cap the fee paid so we can't overflow.
+ nSatoshisPerK = std::min(MAX_FEE_RATE, nFeePaid) * 1000 / nSize;
else
nSatoshisPerK = 0;
}
diff --git a/src/policy/feerate.h b/src/policy/feerate.h
index 0ef97f63b..18c669b45 100644
--- a/src/policy/feerate.h
+++ b/src/policy/feerate.h
@@ -14,6 +14,12 @@
const std::string CURRENCY_UNIT = "DOGE"; // One formatted unit
const std::string CURRENCY_ATOM = "koinu"; // One indivisible minimum value unit
+// Dogecoin: Bitcoin uses MAX_MONEY as the maximum fee rate, but that leads to
+// overflows with Doge MAX_MONEY, so instead we have it as a distinct value.
+static const CAmount MAX_FEE_RATE = 21000000 * COIN;
+
+inline bool FeeRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_FEE_RATE); }
+
/* Used to determine type of fee estimation requested */
enum class FeeEstimateMode {
UNSET, //!< Use default settings based on other criteria
@@ -29,33 +35,34 @@ enum class FeeEstimateMode {
class CFeeRate
{
private:
- CAmount nSatoshisPerK; // unit is satoshis-per-1,000-bytes
+ CAmount nSatoshisPerK; // unit is Koinu-per-1,000-bytes
public:
- /** Fee rate of 0 satoshis per kB */
+ /** Fee rate of 0 Koinu per kB */
CFeeRate() : nSatoshisPerK(0) { }
template<typename I>
explicit CFeeRate(const I _nSatoshisPerK): nSatoshisPerK(_nSatoshisPerK) {
// We've previously had bugs creep in from silent double->int conversion...
static_assert(std::is_integral<I>::value, "CFeeRate should be used without floats");
}
- /** Constructor for a fee rate in satoshis per kvB (sat/kvB). The size in bytes must not exceed (2^63 - 1).
+ /** Constructor for a fee rate in Koinu per kvB (Koinu/kvB). The fee paid should not exceed MAX_FEE_RATE, and
+ * size in bytes must not exceed (2^63 - 1).
*
- * Passing an nBytes value of COIN (1e8) returns a fee rate in satoshis per vB (sat/vB),
+ * Passing an nBytes value of COIN (1e8) returns a fee rate in Koinu per vB (Koinu/vB),
* e.g. (nFeePaid * 1e8 / 1e3) == (nFeePaid / 1e5),
- * where 1e5 is the ratio to convert from BTC/kvB to sat/vB.
+ * where 1e5 is the ratio to convert from DOGE/kvB to Koinu/vB.
*
- * @param[in] nFeePaid CAmount fee rate to construct with
+ * @param[in] nFeePaid CAmount fee rate to construct with. If this exceeds MAX_FEE_RATE it will be capped at MAX_FEE_RATE.
* @param[in] nBytes size_t bytes (units) to construct with
* @returns fee rate
*/
CFeeRate(const CAmount& nFeePaid, size_t nBytes);
/**
- * Return the fee in satoshis for the given size in bytes.
+ * Return the fee in Koinu for the given size in bytes.
*/
CAmount GetFee(size_t nBytes) const;
/**
- * Return the fee in satoshis for a size of 1000 bytes
+ * Return the fee in Koinu for a size of 1000 bytes
*/
CAmount GetFeePerK() const { return GetFee(1000); }
friend bool operator<(const CFeeRate& a, const CFeeRate& b) { return a.nSatoshisPerK < b.nSatoshisPerK; }
diff --git a/src/test/dogecoin_tests.cpp b/src/test/dogecoin_tests.cpp
index 2932824d3..0322f2584 100644
--- a/src/test/dogecoin_tests.cpp
+++ b/src/test/dogecoin_tests.cpp
@@ -23,42 +23,62 @@ BOOST_AUTO_TEST_CASE(subsidy_test)
BOOST_CHECK_EQUAL(nSubsidy, 228450 * COIN);
}
-BOOST_AUTO_TEST_CASE(subsidy_limit_test)
+BOOST_AUTO_TEST_CASE(subsidy_limit_test_first_100k)
{
- int nHeight = 0;
- int nStepSize= 1;
const auto chainParams = CreateChainParams(*m_node.args, CBaseChainParams::MAIN);
const auto params = chainParams->GetConsensus();
CAmount nSum = 0;
- uint256 prevHash = uint256S("0");
+ arith_uint256 prevHash = UintToArith256(uint256S("0"));
- for (nHeight = 0; nHeight <= 100000; nHeight++) {
- CAmount nSubsidy = GetDogecoinBlockSubsidy(nHeight, params, prevHash);
+ for (int nHeight = 0; nHeight <= 100000; nHeight++) {
+ CAmount nSubsidy = GetDogecoinBlockSubsidy(nHeight, params, ArithToUint256(prevHash));
BOOST_CHECK(MoneyRange(nSubsidy));
BOOST_CHECK(nSubsidy <= 1000000 * COIN);
- nSum += nSubsidy * nStepSize;
+ nSum += nSubsidy;
+ // Use nSubsidy to give us some variation in previous block hash, without requiring full block templates
+ prevHash += nSubsidy;
}
- for (; nHeight <= 145000; nHeight++) {
- CAmount nSubsidy = GetDogecoinBlockSubsidy(nHeight, params, prevHash);
+
+ const CAmount expected = 54894174438 * COIN;
+ BOOST_CHECK_EQUAL(expected, nSum);
+}
+
+BOOST_AUTO_TEST_CASE(subsidy_limit_test_100k_145k)
+{
+ const auto chainParams = CreateChainParams(*m_node.args, CBaseChainParams::MAIN);
+ const auto params = chainParams->GetConsensus();
+ CAmount nSum = 0;
+ arith_uint256 prevHash = UintToArith256(uint256S("0"));
+
+ for (int nHeight = 100000; nHeight <= 145000; nHeight++) {
+ CAmount nSubsidy = GetDogecoinBlockSubsidy(nHeight, params, ArithToUint256(prevHash));
BOOST_CHECK(MoneyRange(nSubsidy));
BOOST_CHECK(nSubsidy <= 500000 * COIN);
- nSum += nSubsidy * nStepSize;
+ nSum += nSubsidy;
+ // Use nSubsidy to give us some variation in previous block hash, without requiring full block templates
+ prevHash += nSubsidy;
}
- for (; nHeight < 600000; nHeight++) {
+
+ const CAmount expected = 12349960000 * COIN;
+ BOOST_CHECK_EQUAL(expected, nSum);
+}
+
+// Check the simplified rewards after block 145,000
+BOOST_AUTO_TEST_CASE(subsidy_limit_test_post_145k)
+{
+ const auto chainParams = CreateChainParams(*m_node.args, CBaseChainParams::MAIN);
+ const auto params = chainParams->GetConsensus();
+ CAmount nSum = 0;
+ const uint256 prevHash = uint256S("0");
+
+ for (int nHeight = 145000; nHeight < 600000; nHeight++) {
CAmount nSubsidy = GetDogecoinBlockSubsidy(nHeight, params, prevHash);
CAmount nExpectedSubsidy = (500000 >> (nHeight / 100000)) * COIN;
BOOST_CHECK(MoneyRange(nSubsidy));
BOOST_CHECK_EQUAL(nSubsidy, nExpectedSubsidy);
- nSum += nSubsidy * nStepSize;
+ nSum += nSubsidy;
}
- //test sum +- ~10billion
- arith_uint256 upperlimit = arith_uint256("95e14ec776380000"); //108 billion doge
- BOOST_CHECK(nSum <= upperlimit);
-
- arith_uint256 lowerlimit = arith_uint256("7a1fe16027700000"); //88 billion doge
- BOOST_CHECK(nSum >= lowerlimit);
-
// Test reward at 600k+ is constant
CAmount nConstantSubsidy = GetDogecoinBlockSubsidy(600000, params, prevHash);
BOOST_CHECK_EQUAL(nConstantSubsidy, 10000 * COIN);
@@ -78,7 +98,7 @@ BOOST_AUTO_TEST_CASE(get_next_work_difficulty_limit)
pindexLast.nHeight = 239;
pindexLast.nTime = 1386475638; // Block #239
pindexLast.nBits = 0x1e0ffff0;
- BOOST_CHECK_EQUAL(CalculateDogecoinNextWorkRequired(&pindexLast, nLastRetargetTime, params), 0x1e00ffff);
+ BOOST_CHECK_EQUAL(CalculateDogecoinNextWorkRequired(&pindexLast, nLastRetargetTime, params), 0x1e00ffffU);
}
BOOST_AUTO_TEST_CASE(get_next_work_pre_digishield)
@@ -92,7 +112,7 @@ BOOST_AUTO_TEST_CASE(get_next_work_pre_digishield)
pindexLast.nHeight = 9599;
pindexLast.nTime = 1386954113;
pindexLast.nBits = 0x1c1a1206;
- BOOST_CHECK_EQUAL(CalculateDogecoinNextWorkRequired(&pindexLast, nLastRetargetTime, params), 0x1c15ea59);
+ BOOST_CHECK_EQUAL(CalculateDogecoinNextWorkRequired(&pindexLast, nLastRetargetTime, params), 0x1c15ea59U);
}
BOOST_AUTO_TEST_CASE(get_next_work_digishield)
@@ -107,7 +127,7 @@ BOOST_AUTO_TEST_CASE(get_next_work_digishield)
pindexLast.nHeight = 145000;
pindexLast.nTime = 1395094679;
pindexLast.nBits = 0x1b499dfd;
- BOOST_CHECK_EQUAL(CalculateDogecoinNextWorkRequired(&pindexLast, nLastRetargetTime, params), 0x1b671062);
+ BOOST_CHECK_EQUAL(CalculateDogecoinNextWorkRequired(&pindexLast, nLastRetargetTime, params), 0x1b671062U);
}
BOOST_AUTO_TEST_CASE(get_next_work_digishield_modulated_upper)
@@ -122,7 +142,7 @@ BOOST_AUTO_TEST_CASE(get_next_work_digishield_modulated_upper)
pindexLast.nHeight = 145107;
pindexLast.nTime = 1395101360;
pindexLast.nBits = 0x1b3439cd;
- BOOST_CHECK_EQUAL(CalculateDogecoinNextWorkRequired(&pindexLast, nLastRetargetTime, params), 0x1b4e56b3);
+ BOOST_CHECK_EQUAL(CalculateDogecoinNextWorkRequired(&pindexLast, nLastRetargetTime, params), 0x1b4e56b3U);
}
BOOST_AUTO_TEST_CASE(get_next_work_digishield_modulated_lower)
@@ -137,7 +157,7 @@ BOOST_AUTO_TEST_CASE(get_next_work_digishield_modulated_lower)
pindexLast.nHeight = 149423;
pindexLast.nTime = 1395380447;
pindexLast.nBits = 0x1b446f21;
- BOOST_CHECK_EQUAL(CalculateDogecoinNextWorkRequired(&pindexLast, nLastRetargetTime, params), 0x1b335358);
+ BOOST_CHECK_EQUAL(CalculateDogecoinNextWorkRequired(&pindexLast, nLastRetargetTime, params), 0x1b335358U);
}
BOOST_AUTO_TEST_CASE(get_next_work_digishield_rounding)
@@ -153,7 +173,7 @@ BOOST_AUTO_TEST_CASE(get_next_work_digishield_rounding)
pindexLast.nHeight = 145001;
pindexLast.nTime = 1395094727;
pindexLast.nBits = 0x1b671062;
- BOOST_CHECK_EQUAL(CalculateDogecoinNextWorkRequired(&pindexLast, nLastRetargetTime, params), 0x1b6558a4);
+ BOOST_CHECK_EQUAL(CalculateDogecoinNextWorkRequired(&pindexLast, nLastRetargetTime, params), 0x1b6558a4U);
}
BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/fuzz/coins_view.cpp b/src/test/fuzz/coins_view.cpp
index ac034809b..77fe98030 100644
--- a/src/test/fuzz/coins_view.cpp
+++ b/src/test/fuzz/coins_view.cpp
@@ -234,6 +234,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
break;
}
case 2: {
+ const Consensus::Params& consensus_params = Params().GetConsensus();
TxValidationState state;
CAmount tx_fee_out;
const CTransaction transaction{random_mutable_transaction};
@@ -243,7 +244,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
break;
}
try {
- (void)Consensus::CheckTxInputs(transaction, state, coins_view_cache, fuzzed_data_provider.ConsumeIntegralInRange<int>(0, std::numeric_limits<int>::max()), tx_fee_out);
+ (void)Consensus::CheckTxInputs(transaction, state, coins_view_cache, fuzzed_data_provider.ConsumeIntegralInRange<int>(0, std::numeric_limits<int>::max()), tx_fee_out, consensus_params);
assert(MoneyRange(tx_fee_out));
} catch (const std::runtime_error&) {
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-11 08:49:32 +0000