blockheaders include block height, nodes validate it

Author: instagibbs

src/chain.h

@@ -14,6 +14,8 @@
 
 #include <vector>
 
+#include <util.h>
+
 /**
  * Maximum amount of time that a block timestamp is allowed to exceed the
  * current network-adjusted time before the block will be accepted.
@@ -210,6 +212,7 @@ class CBlockIndex
     int32_t nVersion;
     uint256 hashMerkleRoot;
     uint32_t nTime;
+    uint32_t block_height;
     uint32_t nBits;
     uint32_t nNonce;
 
@@ -238,6 +241,7 @@ class CBlockIndex
         nVersion       = 0;
         hashMerkleRoot = uint256();
         nTime          = 0;
+        block_height   = 0;
         nBits          = 0;
         nNonce         = 0;
     }
@@ -254,6 +258,7 @@ class CBlockIndex
         nVersion       = block.nVersion;
         hashMerkleRoot = block.hashMerkleRoot;
         nTime          = block.nTime;
+        block_height   = block.block_height;
         nBits          = block.nBits;
         nNonce         = block.nNonce;
     }
@@ -284,6 +289,9 @@ class CBlockIndex
             block.hashPrevBlock = pprev->GetBlockHash();
         block.hashMerkleRoot = hashMerkleRoot;
         block.nTime          = nTime;
+        if (gArgs.GetBoolArg("-con_blockheightinheader", false)) {
+            block.block_height   = block_height;
+        }
         block.nBits          = nBits;
         block.nNonce         = nNonce;
         return block;
@@ -403,6 +411,7 @@ class CDiskBlockIndex : public CBlockIndex
         READWRITE(hashPrev);
         READWRITE(hashMerkleRoot);
         READWRITE(nTime);
+        READWRITE(block_height);
         READWRITE(nBits);
         READWRITE(nNonce);
     }
@@ -414,6 +423,7 @@ class CDiskBlockIndex : public CBlockIndex
         block.hashPrevBlock   = hashPrev;
         block.hashMerkleRoot  = hashMerkleRoot;
         block.nTime           = nTime;
+        block.block_height    = block_height;
         block.nBits           = nBits;
         block.nNonce          = nNonce;
         return block.GetHash();

src/chainparams.cpp

@@ -121,7 +121,6 @@ class CMainParams : public CChainParams {
 
         genesis = CreateGenesisBlock(1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN);
         consensus.hashGenesisBlock = genesis.GetHash();
-        assert(consensus.hashGenesisBlock == uint256S("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"));
         assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));
 
         // Note that of those which support the service bits prefix, most only support a subset of
@@ -230,7 +229,6 @@ class CTestNetParams : public CChainParams {
 
         genesis = CreateGenesisBlock(1296688602, 414098458, 0x1d00ffff, 1, 50 * COIN);
         consensus.hashGenesisBlock = genesis.GetHash();
-        assert(consensus.hashGenesisBlock == uint256S("0x000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943"));
         assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));
 
         vFixedSeeds.clear();
@@ -319,7 +317,6 @@ class CRegTestParams : public CChainParams {
 
         genesis = CreateGenesisBlock(1296688602, 2, 0x207fffff, 1, 50 * COIN);
         consensus.hashGenesisBlock = genesis.GetHash();
-        assert(consensus.hashGenesisBlock == uint256S("0x0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206"));
         assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));
 
         vFixedSeeds.clear(); //!< Regtest mode doesn't have any fixed seeds.

src/init.cpp

@@ -514,6 +514,7 @@ void SetupServerArgs()
     gArgs.AddArg("-rpcuser=<user>", "Username for JSON-RPC connections", false, OptionsCategory::RPC);
     gArgs.AddArg("-rpcworkqueue=<n>", strprintf("Set the depth of the work queue to service RPC calls (default: %d)", DEFAULT_HTTP_WORKQUEUE), true, OptionsCategory::RPC);
     gArgs.AddArg("-server", "Accept command line and JSON-RPC commands", false, OptionsCategory::RPC);
+    gArgs.AddArg("-con_blockheightinheader", "Block headers have height serialized inside them.", false, OptionsCategory::CHAINPARAMS);
 
 #if HAVE_DECL_DAEMON
     gArgs.AddArg("-daemon", "Run in the background as a daemon and accept commands", false, OptionsCategory::OPTIONS);

src/miner.cpp

@@ -168,6 +168,9 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     // Fill in header
     pblock->hashPrevBlock  = pindexPrev->GetBlockHash();
     UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
+    if (gArgs.GetBoolArg("-con_blockheightinheader", false)) {
+        pblock->block_height = nHeight;
+    }
     pblock->nBits          = GetNextWorkRequired(pindexPrev, pblock, chainparams.GetConsensus());
     pblock->nNonce         = 0;
     pblocktemplate->vTxSigOpsCost[0] = WITNESS_SCALE_FACTOR * GetLegacySigOpCount(*pblock->vtx[0]);

src/primitives/block.h

@@ -9,6 +9,7 @@
 #include <primitives/transaction.h>
 #include <serialize.h>
 #include <uint256.h>
+#include <util.h>
 
 /** Nodes collect new transactions into a block, hash them into a hash tree,
  * and scan through nonce values to make the block's hash satisfy proof-of-work
@@ -25,6 +26,9 @@ class CBlockHeader
     uint256 hashPrevBlock;
     uint256 hashMerkleRoot;
     uint32_t nTime;
+    // Height in header as well as in coinbase for easier hsm validation
+    // Is set for serialization with `-con_blockheightinheader=1`
+    uint32_t block_height;
     uint32_t nBits;
     uint32_t nNonce;
 
@@ -41,6 +45,9 @@ class CBlockHeader
         READWRITE(hashPrevBlock);
         READWRITE(hashMerkleRoot);
         READWRITE(nTime);
+        if (gArgs.GetBoolArg("-con_blockheightinheader", true)) {
+            READWRITE(block_height);
+        }
         READWRITE(nBits);
         READWRITE(nNonce);
     }
@@ -51,6 +58,7 @@ class CBlockHeader
         hashPrevBlock.SetNull();
         hashMerkleRoot.SetNull();
         nTime = 0;
+        block_height = 0;
         nBits = 0;
         nNonce = 0;
     }
@@ -111,6 +119,7 @@ class CBlock : public CBlockHeader
         block.hashPrevBlock  = hashPrevBlock;
         block.hashMerkleRoot = hashMerkleRoot;
         block.nTime          = nTime;
+        block.block_height   = block_height;
         block.nBits          = nBits;
         block.nNonce         = nNonce;
         return block;

src/validation.cpp

@@ -3249,6 +3249,11 @@ static bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationSta
     if (block.GetBlockTime() <= pindexPrev->GetMedianTimePast())
         return state.Invalid(false, REJECT_INVALID, "time-too-old", "block's timestamp is too early");
 
+    // Check height in header against prev
+    if (gArgs.GetBoolArg("-con_blockheightinheader", false) && (uint32_t)nHeight != block.block_height)
+        return state.Invalid(error("%s: block height in header is incorrect", __func__),
+                             REJECT_INVALID, "bad-header-height");
+
     // Check timestamp
     if (block.GetBlockTime() > nAdjustedTime + MAX_FUTURE_BLOCK_TIME)
         return state.Invalid(false, REJECT_INVALID, "time-too-new", "block timestamp too far in the future");

test/functional/rpc_getchaintips.py

@@ -16,6 +16,7 @@
 class GetChainTipsTest (BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 4
+        self.extended_args = [["-con_blockheightinheader=1"], ["-con_blockheightinheader=1"], ["-con_blockheightinheader=1"], ["-con_blockheightinheader=1"]]
 
     def run_test (self):
         tips = self.nodes[0].getchaintips ()

test/functional/test_framework/test_framework.py

@@ -14,7 +14,7 @@
 import sys
 import tempfile
 import time
-
+from pdb import set_trace
 from .authproxy import JSONRPCException
 from . import coverage
 from .test_node import TestNode
@@ -237,6 +237,7 @@ def setup_network(self):
         # two halves that can work on competing chains.
         for i in range(self.num_nodes - 1):
             connect_nodes_bi(self.nodes, i, i + 1)
+        set_trace()
         self.sync_all()
 
     def setup_nodes(self):