rpc: show coinbase reservations in getblocktemplate

Sjors · Sjors · commit f1afd72a94ae · 2023-10-11T10:36:44.000+02:00
Behind the debug flag.
diff --git a/src/node/miner.cpp b/src/node/miner.cpp
@@ -95,8 +95,8 @@ void BlockAssembler::resetBlock()
     inBlock.clear();
 
     // Reserve space for coinbase tx
-    nBlockWeight = 4000;
-    nBlockSigOpsCost = 400;
+    nBlockWeight = COINBASE_RESERVED_WEIGHT;
+    nBlockSigOpsCost = COINBASE_RESERVED_SIGOPS;
 
     // These counters do not include coinbase tx
     nBlockTx = 0;
diff --git a/src/node/miner.h b/src/node/miner.h
@@ -29,6 +29,9 @@ class ChainstateManager;
 
 namespace Consensus { struct Params; };
 
+static const uint64_t COINBASE_RESERVED_WEIGHT = 4000;
+static const uint64_t COINBASE_RESERVED_SIGOPS = 400;
+
 namespace node {
 static const bool DEFAULT_PRINTPRIORITY = false;
 
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -623,9 +623,11 @@ static RPCHelpMan getblocktemplate()
                 }},
                 {RPCResult::Type::STR_HEX, "noncerange", "A range of valid nonces"},
                 {RPCResult::Type::NUM, "sigops", /*optional=*/true, "number of sigops in the next block (debug only)"},
+                {RPCResult::Type::NUM, "coinbase_reserved_sigops", /*optional=*/true, "number of sigops the coinbase can safely use (debug only)"},
                 {RPCResult::Type::NUM, "sigoplimit", "limit of sigops in blocks"},
                 {RPCResult::Type::NUM, "sizelimit", "limit of block size"},
-                {RPCResult::Type::NUM, "weightlimit", /*optional=*/true, "limit of block weight"},
+                {RPCResult::Type::NUM, "weightlimit", "limit of block weight"},
+                {RPCResult::Type::NUM, "coinbase_reserved_weight", /*optional=*/true, "maximum weight the coinbase can safely use (debug only)"},
                 {RPCResult::Type::NUM_TIME, "curtime", "current timestamp in " + UNIX_EPOCH_TIME},
                 {RPCResult::Type::STR, "bits", "compressed target of next block"},
                 {RPCResult::Type::NUM, "height", "The height of the next block"},
@@ -930,13 +932,15 @@ static RPCHelpMan getblocktemplate()
 
     // Belt-and-suspenders check for the sigops limit:
     const int64_t nSigOpLimit = MAX_BLOCK_SIGOPS_COST;
-    CHECK_NONFATAL(block_sigops <= MAX_BLOCK_SIGOPS_COST);
+    CHECK_NONFATAL(block_sigops + COINBASE_RESERVED_SIGOPS <= MAX_BLOCK_SIGOPS_COST);
     if (debug) result.pushKV("sigops", block_sigops);
+    if (debug) result.pushKV("coinbase_reserved_sigops", COINBASE_RESERVED_SIGOPS);
     result.pushKV("sigoplimit", nSigOpLimit);
 
     int64_t nSizeLimit = MAX_BLOCK_SERIALIZED_SIZE;
     result.pushKV("sizelimit", nSizeLimit);
     result.pushKV("weightlimit", (int64_t)MAX_BLOCK_WEIGHT);
+    if (debug) result.pushKV("coinbase_reserved_weight", COINBASE_RESERVED_WEIGHT);
     result.pushKV("curtime", pblock->GetBlockTime());
     result.pushKV("bits", strprintf("%08x", pblock->nBits));
     result.pushKV("height", (int64_t)(pindexPrev->nHeight+1));
