From f7c5cf7d9232c6383fc2d976e0fc827bbd895745 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 5 Dec 2018 20:31:36 +0100
Subject: [PATCH] Add not yet enforced chainparam arguments for signed blocks

---
 src/chainparams.cpp      | 7 +++++++
 src/chainparamsbase.cpp  | 3 +++
 src/consensus/params.h   | 3 +++
 src/primitives/block.cpp | 1 +
 4 files changed, 14 insertions(+)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index b43acb9228..ee290020b8 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -478,6 +478,13 @@ class CCustomParams : public CRegTestParams {
         // Determines type of genesis block
         consensus.genesis_style = gArgs.GetArg("-con_genesis_style", "elements");
 
+        // Block signing encumberance script, default of 51 aka OP_TRUE
+        std::vector<unsigned char> sign_bytes = ParseHex(gArgs.GetArg("-signblockscript", "51"));
+        consensus.signblockscript = CScript(sign_bytes.begin(), sign_bytes.end());
+        // Default signature size is the size of dummy push, and single 72 byte DER signature
+        consensus.max_block_signature_size = gArgs.GetArg("-con_max_block_sig_size", 74);
+        g_signed_blocks = gArgs.GetBoolArg("-con_signed_blocks", false);
+
         // Custom chains connect coinbase outputs to db by default
         consensus.connect_genesis_outputs = gArgs.GetArg("-con_connect_coinbase", true);
 
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index b3f72dbe18..228d09ee51 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -28,6 +28,9 @@ void SetupChainParamsBaseOptions()
     gArgs.AddArg("-con_connect_coinbase", "Connect outputs in genesis block to utxo database.", false, OptionsCategory::ELEMENTS);
     gArgs.AddArg("-con_blockheightinheader", "Whether the chain includes the block height directly in the header, for easier validation of block height in low-resource environments. (default: true)", false, OptionsCategory::CHAINPARAMS);
     gArgs.AddArg("-con_genesis_style=<style>", "Use genesis style <style> (default: elements). Results in genesis block compatibility with various networks. Allowed values: elements, bitcoin", true, OptionsCategory::ELEMENTS);
+    gArgs.AddArg("-con_signed_blocks", "Signed blockchain. Uses input of `-signblockscript` to define what signatures are necessary to solve it.", false, OptionsCategory::CHAINPARAMS);
+    gArgs.AddArg("-signblockscript", "Signed blockchain enumberance. Only active when `-con_signed_blocks` set to true.", false, OptionsCategory::CHAINPARAMS);
+    gArgs.AddArg("-con_max_block_sig_size", "Max allowed witness data for the signed block header.", false, OptionsCategory::CHAINPARAMS);
 }
 
 static std::unique_ptr<CBaseChainParams> globalChainBaseParams;
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 3da78d39c9..8c39a241a0 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -84,6 +84,9 @@ struct Params {
     bool connect_genesis_outputs;
     // g_con_blockheightinheader global hack instead of proper arg due to circular dep
     std::string genesis_style;
+    CScript signblockscript;
+    uint32_t max_block_signature_size;
+    // g_signed_blocks - Whether blocks are signed or not, get around circular dep
 };
 } // namespace Consensus
 
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index a1c731ff39..09639351a8 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -11,6 +11,7 @@
 #include <crypto/common.h>
 
 bool g_con_blockheightinheader = false;
+bool g_signed_blocks = false;
 
 uint256 CBlockHeader::GetHash() const
 {