From 46400567656ad47e2941ee6c62e351e7ea37bb66 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 29 Oct 2018 13:36:17 -0400
Subject: [PATCH 01/66] Add CProof structure for signed headers

---
 src/primitives/block.h | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/primitives/block.h b/src/primitives/block.h
index 750d42efbc2..70a753e1363 100644
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -7,9 +7,46 @@
 #define BITCOIN_PRIMITIVES_BLOCK_H
 
 #include <primitives/transaction.h>
+#include <script/script.h>
 #include <serialize.h>
 #include <uint256.h>
 
+class CProof
+{
+public:
+    CScript challenge;
+    CScript solution;
+
+    CProof()
+    {
+        SetNull();
+    }
+    CProof(CScript challengeIn, CScript solutionIn) : challenge(challengeIn), solution(solutionIn) {}
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(*(CScriptBase*)(&challenge));
+        if (!(s.GetType() & SER_GETHASH))
+            READWRITE(*(CScriptBase*)(&solution));
+    }
+
+    void SetNull()
+    {
+        challenge.clear();
+        solution.clear();
+    }
+
+    bool IsNull() const
+    {
+        return challenge.empty();
+    }
+
+    std::string ToString() const;
+};
+
 /** 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
  * requirements.  When they solve the proof-of-work, they broadcast the block

From 6b3a5503b195863885b93b25974fa7dae70926ea Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 29 Oct 2018 13:42:55 -0400
Subject: [PATCH 02/66] Add signblockscript custom chain argument

---
 src/chainparams.cpp    | 4 ++++
 src/consensus/params.h | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index b8604e155cb..da1752828dd 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -436,6 +436,10 @@ class CCustomParams : public CRegTestParams {
         std::vector<unsigned char> man_bytes = ParseHex(gArgs.GetArg("-con_mandatorycoinbase", ""));
         consensus.mandatory_coinbase_destination = CScript(man_bytes.begin(), man_bytes.end()); // Blank script allows any coinbase destination
 
+        // Block signing encumberance script
+        std::vector<unsigned char> sign_bytes = ParseHex(gArgs.GetArg("-con_parent_chain_signblockscript", ""));
+        consensus.parent_chain_signblockscript = CScript(sign_bytes.begin(), sign_bytes.end());
+
         // Custom chains connect coinbase outputs to db by default
         consensus.connect_genesis_outputs = gArgs.GetArg("-con_connect_coinbase", true);
 
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 7a217e755d8..e82c134cc8f 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -83,6 +83,7 @@ struct Params {
     CScript mandatory_coinbase_destination;
     CAmount genesis_subsidy;
     bool connect_genesis_outputs;
+    CScript signblockscript;
 };
 } // namespace Consensus
 

From cc7cbb6c48e8932299419ac8718112159524df7f Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 29 Oct 2018 14:12:17 -0400
Subject: [PATCH 03/66] Add non-serialized CProof to block header

---
 src/primitives/block.h | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/primitives/block.h b/src/primitives/block.h
index 70a753e1363..2c37a718a51 100644
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -64,6 +64,7 @@ class CBlockHeader
     uint32_t nTime;
     uint32_t nBits;
     uint32_t nNonce;
+    CProof proof;
 
     CBlockHeader()
     {
@@ -78,8 +79,12 @@ class CBlockHeader
         READWRITE(hashPrevBlock);
         READWRITE(hashMerkleRoot);
         READWRITE(nTime);
-        READWRITE(nBits);
-        READWRITE(nNonce);
+        if (false) {
+            READWRITE(proof);
+        } else {
+            READWRITE(nBits);
+            READWRITE(nNonce);
+        }
     }
 
     void SetNull()
@@ -90,11 +95,16 @@ class CBlockHeader
         nTime = 0;
         nBits = 0;
         nNonce = 0;
+        proof.SetNull();
     }
 
     bool IsNull() const
     {
-        return (nBits == 0);
+        if (false) {
+            return proof.IsNull();
+        } else {
+            return (nBits == 0);
+        }
     }
 
     uint256 GetHash() const;
@@ -150,6 +160,7 @@ class CBlock : public CBlockHeader
         block.nTime          = nTime;
         block.nBits          = nBits;
         block.nNonce         = nNonce;
+        block.proof          = proof;
         return block;
     }
 

From 0108dacf567dcf51f9fe4712d294ad67d0c3c00a Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 29 Oct 2018 14:39:13 -0400
Subject: [PATCH 04/66] Introduce a no sighash byte signature check flag for
 blocks and other sig modes

---
 src/script/interpreter.cpp | 8 ++++++++
 src/script/interpreter.h   | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 95b25b49119..04b280d5a36 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -203,6 +203,14 @@ bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned i
     if (vchSig.size() == 0) {
         return true;
     }
+
+    bool no_hash_byte = (flags & SCRIPT_NO_SIGHASH_BYTE) == SCRIPT_NO_SIGHASH_BYTE;
+    std::vector<unsigned char> vchSigCopy(vchSig.begin(), vchSig.begin() + vchSig.size());
+    // Push a dummy sighash byte to pass checks
+    if (no_hash_byte) {
+        vchSigCopy.push_back(SIGHASH_ALL);
+    }
+
     if ((flags & (SCRIPT_VERIFY_DERSIG | SCRIPT_VERIFY_LOW_S | SCRIPT_VERIFY_STRICTENC)) != 0 && !IsValidSignatureEncoding(vchSig)) {
         return set_error(serror, SCRIPT_ERR_SIG_DER);
     } else if ((flags & SCRIPT_VERIFY_LOW_S) != 0 && !IsLowDERSignature(vchSig, serror)) {
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index 276ff9a58a8..e1bd63bce91 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -115,6 +115,10 @@ enum
     // Making OP_CODESEPARATOR and FindAndDelete fail any non-segwit scripts
     //
     SCRIPT_VERIFY_CONST_SCRIPTCODE = (1U << 16),
+
+    // Signature checking assumes no sighash byte after the DER signature
+    //
+    SCRIPT_NO_SIGHASH_BYTE = (1U << 17),
 };
 
 bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror);

From d8f9470fe23fce7b45fd93c6065b2895a0ae9bc7 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 29 Oct 2018 15:21:55 -0400
Subject: [PATCH 05/66] Add more blocksigning infrastructure

---
 src/Makefile.am          |  1 +
 src/chain.h              |  5 ++++
 src/chainparams.cpp      |  4 +--
 src/pow.cpp              | 51 ++++++++++++++++++++++++++++++++++
 src/pow.h                |  8 ++++++
 src/primitives/block.cpp | 10 +++++--
 src/script/generic.hpp   | 59 ++++++++++++++++++++++++++++++++++++++++
 7 files changed, 134 insertions(+), 4 deletions(-)
 create mode 100644 src/script/generic.hpp

diff --git a/src/Makefile.am b/src/Makefile.am
index c5eddc6cf05..81700addf3d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -159,6 +159,7 @@ BITCOIN_CORE_H = \
   rpc/util.h \
   scheduler.h \
   script/descriptor.h \
+  script/generic.hpp \
   script/ismine.h \
   script/sigcache.h \
   script/sign.h \
diff --git a/src/chain.h b/src/chain.h
index 01011d54f19..7323d04a093 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -212,6 +212,7 @@ class CBlockIndex
     uint32_t nTime;
     uint32_t nBits;
     uint32_t nNonce;
+    CProof proof;
 
     //! (memory only) Sequential id assigned to distinguish order in which blocks are received.
     int32_t nSequenceId;
@@ -240,6 +241,7 @@ class CBlockIndex
         nTime          = 0;
         nBits          = 0;
         nNonce         = 0;
+        proof.SetNull();
     }
 
     CBlockIndex()
@@ -256,6 +258,7 @@ class CBlockIndex
         nTime          = block.nTime;
         nBits          = block.nBits;
         nNonce         = block.nNonce;
+        proof          = block.proof;
     }
 
     CDiskBlockPos GetBlockPos() const {
@@ -405,6 +408,7 @@ class CDiskBlockIndex : public CBlockIndex
         READWRITE(nTime);
         READWRITE(nBits);
         READWRITE(nNonce);
+        READWRITE(proof);
     }
 
     uint256 GetBlockHash() const
@@ -416,6 +420,7 @@ class CDiskBlockIndex : public CBlockIndex
         block.nTime           = nTime;
         block.nBits           = nBits;
         block.nNonce          = nNonce;
+        block.proof           = proof;
         return block.GetHash();
     }
 
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index da1752828dd..480a02f24b8 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -437,8 +437,8 @@ class CCustomParams : public CRegTestParams {
         consensus.mandatory_coinbase_destination = CScript(man_bytes.begin(), man_bytes.end()); // Blank script allows any coinbase destination
 
         // Block signing encumberance script
-        std::vector<unsigned char> sign_bytes = ParseHex(gArgs.GetArg("-con_parent_chain_signblockscript", ""));
-        consensus.parent_chain_signblockscript = CScript(sign_bytes.begin(), sign_bytes.end());
+        std::vector<unsigned char> sign_bytes = ParseHex(gArgs.GetArg("-signblockscript", ""));
+        consensus.signblockscript = CScript(sign_bytes.begin(), sign_bytes.end());
 
         // Custom chains connect coinbase outputs to db by default
         consensus.connect_genesis_outputs = gArgs.GetArg("-con_connect_coinbase", true);
diff --git a/src/pow.cpp b/src/pow.cpp
index 1414d375649..ac97e12345a 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -9,6 +9,19 @@
 #include <chain.h>
 #include <primitives/block.h>
 #include <uint256.h>
+#include <script/interpreter.h>
+#include <script/sign.h>
+#include <script/generic.hpp>
+
+bool CheckChallenge(const CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params& params)
+{
+    return block.proof.challenge == indexLast.proof.challenge;
+}
+
+void ResetChallenge(CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params& params)
+{
+    block.proof.challenge = indexLast.proof.challenge;
+}
 
 unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params)
 {
@@ -89,3 +102,41 @@ bool CheckProofOfWork(uint256 hash, unsigned int nBits, const Consensus::Params&
 
     return true;
 }
+
+static bool CheckProofGeneric(const CBlockHeader& block, const Consensus::Params& params, const CScript& challenge)
+{
+    if (block.GetHash() == params.hashGenesisBlock)
+       return true;
+
+    // Some important anti-DoS flags.
+    // Note: Blockhashes do not commit to the proof.
+    // Therefore we may have a signature be mealleated
+    // to stay valid, but cause the block to fail
+    // validation, in this case, block weight.
+    // In that case, the block will be marked as permanently
+    // invalid and not processed.
+    // NOTE: These have only been deemed sufficient for OP_CMS
+    // ANY OTHER SCRIPT TYPE MAY REQUIRE DIFFERENT FLAGS/CONSIDERATIONS
+    // TODO: Better design to not have to worry about script specifics
+    // i.e. exempt block header solution from weight limit
+    unsigned int proof_flags = SCRIPT_VERIFY_P2SH // Just allows P2SH evaluation
+        | SCRIPT_VERIFY_STRICTENC // Minimally-sized DER sigs
+        | SCRIPT_VERIFY_NULLDUMMY // No extra data stuffed into OP_CMS witness
+        | SCRIPT_VERIFY_CLEANSTACK // No extra pushes leftover in witness
+        | SCRIPT_VERIFY_MINIMALDATA // Pushes are minimally-sized
+        | SCRIPT_VERIFY_SIGPUSHONLY // Witness is push-only
+        | SCRIPT_VERIFY_LOW_S // Stop easiest signature fiddling
+        | SCRIPT_VERIFY_WITNESS // Required for cleanstack eval in VerifyScript
+        | SCRIPT_NO_SIGHASH_BYTE; // non-Check(Multi)Sig signatures will not have sighash byte
+    return GenericVerifyScript(block.proof.solution, challenge, proof_flags, block);
+}
+
+bool CheckProof(const CBlockHeader& block, const Consensus::Params& params)
+{
+    return CheckProofGeneric(block, params, params.signblockscript);
+}
+
+void ResetProof(CBlockHeader& block)
+{
+    block.proof.solution.clear();
+}
diff --git a/src/pow.h b/src/pow.h
index 1d802cd01e4..d5ac0435b3e 100644
--- a/src/pow.h
+++ b/src/pow.h
@@ -13,6 +13,8 @@
 class CBlockHeader;
 class CBlockIndex;
 class uint256;
+class CProof;
+class CScript;
 
 unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params&);
 unsigned int CalculateNextWorkRequired(const CBlockIndex* pindexLast, int64_t nFirstBlockTime, const Consensus::Params&);
@@ -20,4 +22,10 @@ unsigned int CalculateNextWorkRequired(const CBlockIndex* pindexLast, int64_t nF
 /** Check whether a block hash satisfies the proof-of-work requirement specified by nBits */
 bool CheckProofOfWork(uint256 hash, unsigned int nBits, const Consensus::Params&);
 
+// Elements signed chain functionality
+bool CheckProof(const CBlockHeader& block, const Consensus::Params&);
+void ResetProof(CBlockHeader& block);
+bool CheckChallenge(const CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params&);
+void ResetChallenge(CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params&);
+
 #endif // BITCOIN_POW_H
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index fb95a66bde6..ee41cc88d64 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -10,6 +10,12 @@
 #include <utilstrencodings.h>
 #include <crypto/common.h>
 
+std::string CProof::ToString() const
+{
+    return strprintf("CProof(challenge=%s, solution=%s)",
+                     HexStr(challenge), HexStr(solution));
+}
+
 uint256 CBlockHeader::GetHash() const
 {
     return SerializeHash(*this);
@@ -18,12 +24,12 @@ uint256 CBlockHeader::GetHash() const
 std::string CBlock::ToString() const
 {
     std::stringstream s;
-    s << strprintf("CBlock(hash=%s, ver=0x%08x, hashPrevBlock=%s, hashMerkleRoot=%s, nTime=%u, nBits=%08x, nNonce=%u, vtx=%u)\n",
+    s << strprintf("CBlock(hash=%s, ver=0x%08x, hashPrevBlock=%s, hashMerkleRoot=%s, nTime=%u, nBits=%08x, nNonce=%u, proof=%u, vtx=%u)\n",
         GetHash().ToString(),
         nVersion,
         hashPrevBlock.ToString(),
         hashMerkleRoot.ToString(),
-        nTime, nBits, nNonce,
+        nTime, nBits, nNonce, proof.ToString(),
         vtx.size());
     for (const auto& tx : vtx) {
         s << "  " << tx->ToString() << "\n";
diff --git a/src/script/generic.hpp b/src/script/generic.hpp
new file mode 100644
index 00000000000..e4e66fc7c96
--- /dev/null
+++ b/src/script/generic.hpp
@@ -0,0 +1,59 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2014 The Bitcoin developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef H_BITCOIN_SCRIPT_GENERIC
+#define H_BITCOIN_SCRIPT_GENERIC
+
+#include <hash.h>
+#include <script/interpreter.h>
+#include <script/sign.h>
+#include <keystore.h>
+
+class SimpleSignatureChecker : public BaseSignatureChecker
+{
+public:
+    uint256 hash;
+
+    SimpleSignatureChecker(const uint256& hashIn) : hash(hashIn) {};
+    bool CheckSig(const std::vector<unsigned char>& vchSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const
+    {
+        CPubKey pubkey(vchPubKey);
+        if (!pubkey.IsValid())
+            return false;
+        if (vchSig.empty())
+            return false;
+        return pubkey.Verify(hash, vchSig);
+    }
+};
+
+class SimpleSignatureCreator : public BaseSignatureCreator
+{
+    SimpleSignatureChecker checker;
+
+public:
+    SimpleSignatureCreator(const uint256& hashIn) : checker(hashIn) {};
+    const BaseSignatureChecker& Checker() const { return checker; }
+    bool CreateSig(const SigningProvider& provider, std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode, SigVersion sigversion) const
+    {
+        CKey key;
+        if (!provider.GetKey(keyid, key))
+            return false;
+        return key.Sign(checker.hash, vchSig);
+    }
+};
+
+template<typename T>
+bool GenericVerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, unsigned int flags, const T& data)
+{
+    return VerifyScript(scriptSig, scriptPubKey, NULL, flags, SimpleSignatureChecker(SerializeHash(data)));
+}
+
+template<typename T>
+bool GenericSignScript(const CKeyStore& keystore, const T& data, const CScript& fromPubKey, SignatureData& scriptSig)
+{
+    return ProduceSignature(keystore, SimpleSignatureCreator(SerializeHash(data)), fromPubKey, scriptSig);
+}
+
+#endif // H_BITCOIN_SCRIPT_GENERIC

From cb5571f1e49b338906f86ccd3d33b33c2f0310dc Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 29 Oct 2018 15:51:29 -0400
Subject: [PATCH 06/66] Add signblockscript argument to employ signed blocks

---
 src/chainparams.cpp                                       | 5 +++--
 src/consensus/params.h                                    | 1 +
 src/primitives/block.cpp                                  | 2 ++
 src/primitives/block.h                                    | 6 ++++--
 test/bitcoin_functional/functional/test_framework/util.py | 1 +
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 480a02f24b8..dd53f58232e 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -436,9 +436,10 @@ class CCustomParams : public CRegTestParams {
         std::vector<unsigned char> man_bytes = ParseHex(gArgs.GetArg("-con_mandatorycoinbase", ""));
         consensus.mandatory_coinbase_destination = CScript(man_bytes.begin(), man_bytes.end()); // Blank script allows any coinbase destination
 
-        // Block signing encumberance script
-        std::vector<unsigned char> sign_bytes = ParseHex(gArgs.GetArg("-signblockscript", ""));
+        // 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());
+        g_signed_blocks = !sign_bytes.empty();
 
         // Custom chains connect coinbase outputs to db by default
         consensus.connect_genesis_outputs = gArgs.GetArg("-con_connect_coinbase", true);
diff --git a/src/consensus/params.h b/src/consensus/params.h
index e82c134cc8f..d90901faf4d 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -84,6 +84,7 @@ struct Params {
     CAmount genesis_subsidy;
     bool connect_genesis_outputs;
     CScript signblockscript;
+    // 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 ee41cc88d64..01d20719d47 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -10,6 +10,8 @@
 #include <utilstrencodings.h>
 #include <crypto/common.h>
 
+bool g_signed_blocks = false;
+
 std::string CProof::ToString() const
 {
     return strprintf("CProof(challenge=%s, solution=%s)",
diff --git a/src/primitives/block.h b/src/primitives/block.h
index 2c37a718a51..5c182d426f9 100644
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -11,6 +11,8 @@
 #include <serialize.h>
 #include <uint256.h>
 
+extern bool g_signed_blocks;
+
 class CProof
 {
 public:
@@ -79,7 +81,7 @@ class CBlockHeader
         READWRITE(hashPrevBlock);
         READWRITE(hashMerkleRoot);
         READWRITE(nTime);
-        if (false) {
+        if (g_signed_blocks) {
             READWRITE(proof);
         } else {
             READWRITE(nBits);
@@ -100,7 +102,7 @@ class CBlockHeader
 
     bool IsNull() const
     {
-        if (false) {
+        if (g_signed_blocks) {
             return proof.IsNull();
         } else {
             return (nBits == 0);
diff --git a/test/bitcoin_functional/functional/test_framework/util.py b/test/bitcoin_functional/functional/test_framework/util.py
index e081aab825c..f8689b40c5e 100644
--- a/test/bitcoin_functional/functional/test_framework/util.py
+++ b/test/bitcoin_functional/functional/test_framework/util.py
@@ -307,6 +307,7 @@ def initialize_datadir(dirname, n, chain):
         f.write("printtoconsole=0\n")
         f.write("con_blocksubsidy=5000000000\n")
         f.write("con_connect_coinbase=0\n")
+        f.write("signblockscript=0\n")
         os.makedirs(os.path.join(datadir, 'stderr'), exist_ok=True)
         os.makedirs(os.path.join(datadir, 'stdout'), exist_ok=True)
     return datadir

From 5e33033cdb5bb00c7c4f93b8397599a1e21fe5cf Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 29 Oct 2018 16:00:14 -0400
Subject: [PATCH 07/66] 'f'Add signblockscript argument to employ signed blocks

---
 src/chainparams.cpp                                       | 2 +-
 src/chainparamsbase.cpp                                   | 2 ++
 test/bitcoin_functional/functional/test_framework/util.py | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index dd53f58232e..baf1ef1942e 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -439,7 +439,7 @@ class CCustomParams : public CRegTestParams {
         // 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());
-        g_signed_blocks = !sign_bytes.empty();
+        g_signed_blocks = gArgs.GetBoolArg("-con_signed_blocks", true);
 
         // 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 8db4690b415..b3131aac1b8 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -26,6 +26,8 @@ void SetupChainParamsBaseOptions()
     gArgs.AddArg("-seednode=<ip>", "Use specified node as seed node. This option can be specified multiple times to connect to multiple nodes. (custom only)", true, OptionsCategory::CHAINPARAMS);
     gArgs.AddArg("-con_blocksubsidy", "Defines the amount of block subsidy to start with, at genesis block.", false, OptionsCategory::CHAINPARAMS);
     gArgs.AddArg("-con_connect_coinbase", "Connect outputs in genesis block to utxo database.", false, OptionsCategory::CHAINPARAMS);
+    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_blcoks` set to true.", false, OptionsCategory::CHAINPARAMS);
 }
 
 static std::unique_ptr<CBaseChainParams> globalChainBaseParams;
diff --git a/test/bitcoin_functional/functional/test_framework/util.py b/test/bitcoin_functional/functional/test_framework/util.py
index f8689b40c5e..36e2c308edd 100644
--- a/test/bitcoin_functional/functional/test_framework/util.py
+++ b/test/bitcoin_functional/functional/test_framework/util.py
@@ -307,7 +307,7 @@ def initialize_datadir(dirname, n, chain):
         f.write("printtoconsole=0\n")
         f.write("con_blocksubsidy=5000000000\n")
         f.write("con_connect_coinbase=0\n")
-        f.write("signblockscript=0\n")
+        f.write("con_signed_blocks=0\n")
         os.makedirs(os.path.join(datadir, 'stderr'), exist_ok=True)
         os.makedirs(os.path.join(datadir, 'stdout'), exist_ok=True)
     return datadir

From 5f780bb5176a874a1b3566231c1f60dc0ddfc3ec Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 29 Oct 2018 16:14:31 -0400
Subject: [PATCH 08/66] add functional tests for signed blockchain

---
 test/functional/feature_blocksign.py         | 126 +++++++++++++++++++
 test/functional/feature_signed_blockchain.py | 120 ++++++++++++++++++
 test/functional/test_runner.py               |   2 +
 3 files changed, 248 insertions(+)
 create mode 100755 test/functional/feature_blocksign.py
 create mode 100755 test/functional/feature_signed_blockchain.py

diff --git a/test/functional/feature_blocksign.py b/test/functional/feature_blocksign.py
new file mode 100755
index 00000000000..8d5f845d355
--- /dev/null
+++ b/test/functional/feature_blocksign.py
@@ -0,0 +1,126 @@
+#!/usr/bin/env python3
+
+import codecs
+import hashlib
+import os
+import random
+
+from test_framework import (
+    address,
+    key,
+    test_framework,
+    util,
+)
+
+# Generate wallet import format from private key.
+def wif(pk):
+    # Base58Check version for regtest WIF keys is 0xef = 239
+    return address.byte_to_base58(pk, 239)
+
+# The signblockscript is a Bitcoin Script k-of-n multisig script.
+def make_signblockscript(num_nodes, required_signers, keys):
+    assert(num_nodes >= required_signers)
+    script = "{}".format(50 + required_signers)
+    for i in range(num_nodes):
+        k = keys[i]
+        script += "41"
+        script += codecs.encode(k.get_pubkey(), 'hex_codec').decode("utf-8")
+    script += "{}".format(50 + num_nodes) # num keys
+    script += "ae" # OP_CHECKMULTISIG
+    print('signblockscript', script)
+    return script
+
+class BlockSignTest(test_framework.BitcoinTestFramework):
+
+    # Dynamically generate N keys to be used for block signing.
+    def init_keys(self, num_keys):
+        self.keys = []
+        self.wifs = []
+        for i in range(num_keys):
+            k = key.CECKey()
+            pk_bytes = hashlib.sha256(str(random.getrandbits(256)).encode('utf-8')).digest()
+            k.set_secretbytes(pk_bytes)
+            w = wif(pk_bytes)
+            print("generated key {}: \n pub: {}\n  wif: {}".format(i+1,
+                codecs.encode(k.get_pubkey(), 'hex_codec').decode("utf-8"),
+                w))
+            self.keys.append(k)
+            self.wifs.append(wif(pk_bytes))
+
+    def __init__(self, num_nodes, required_signers):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = num_nodes
+        self.init_keys(self.num_nodes)
+        self.required_signers = required_signers
+        signblockscript = make_signblockscript(num_nodes, required_signers, self.keys)
+        self.extra_args = [[
+            "-chain=blocksign",
+            # We can't validate pegins since this chain doesn't have a parent chain
+            "-con_has_parent_chain=0",
+            "-parentgenesisblockhash=00",
+            "-validatepegin=0",
+            "-signblockscript={}".format(signblockscript)
+        ]] * self.num_nodes
+
+    def setup_network(self, split=False):
+        self.nodes = util.start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args)
+        # Have every node import its block signing private key.
+        for i in range(self.num_nodes):
+            self.nodes[i].importprivkey(self.wifs[i])
+            if i + 1 < self.num_nodes:
+                util.connect_nodes_bi(self.nodes, i, i + 1)
+            else:
+                util.connect_nodes_bi(self.nodes, 0, i)
+        self.is_network_split = False
+        self.sync_all()
+
+    def check_height(self, expected_height):
+        for n in self.nodes:
+            util.assert_equal(n.getblockcount(), expected_height)
+
+    def mine_block(self):
+        # mine block in round robin sense: depending on the block number, a node
+        # is selected to create the block, others sign it and the selected node
+        # broadcasts it
+        mineridx = self.nodes[0].getblockcount() % self.num_nodes # assuming in sync
+        miner = self.nodes[mineridx]
+        blockcount = miner.getblockcount()
+
+        # miner makes a block
+        block = miner.getnewblockhex()
+
+        # collect required_signers signatures
+        sigs = []
+        for i in range(self.required_signers):
+            result = miner.combineblocksigs(block, sigs)
+            util.assert_equal(result["complete"], False)
+            miner.submitblock(result["hex"])
+            self.check_height(blockcount)
+            sigs.append(self.nodes[i].signblock(block))
+
+        # miner submits
+        result = miner.combineblocksigs(block, sigs)
+        util.assert_equal(result["complete"], True)
+        miner.submitblock(result["hex"])
+
+    def mine_blocks(self, num_blocks):
+        for i in range(num_blocks):
+            self.mine_block()
+            self.sync_all()
+
+    def run_test(self):
+        self.check_height(0)
+
+        # mine a block
+        self.mine_block()
+        self.sync_all()
+
+        # mine blocks
+        self.mine_blocks(100)
+        self.sync_all()
+
+        self.check_height(101)
+
+if __name__ == '__main__':
+    BlockSignTest(num_nodes=9, required_signers=7).main()
diff --git a/test/functional/feature_signed_blockchain.py b/test/functional/feature_signed_blockchain.py
new file mode 100755
index 00000000000..966fa5a3dce
--- /dev/null
+++ b/test/functional/feature_signed_blockchain.py
@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# Test RPC calls related to blockchain state. Tests correspond to code in
+# rpc/blockchain.cpp.
+#
+
+from decimal import Decimal
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.authproxy import JSONRPCException
+from test_framework.util import (
+    assert_equal,
+    start_nodes,
+    assert_raises_jsonrpc,
+)
+
+
+class SignedBlockchainTest(BitcoinTestFramework):
+    """
+    Test signed-blockchain-related RPC calls:
+
+        - getnewblockhex
+        - signblock
+        - combineblocksigs
+        - submitblock
+
+    """
+
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 3
+
+    def setup_network(self, split=False):
+        # Keys for signing 2-of-3
+        pubkeys = ["039560e48d4336e40db447fc136ce24ae1dfdefa5701e4d4e57aa1a1a9f47f3faa", "025a66517c1d85adcd909f9f675bf656708edc4da1f614693e347be6baf0fef4ae", "02ca238faeb3b01d26ae8a39869220dbd84cc8516398afa8958fe613fe4fdf1c04"]
+        # Normal multisig scriptPubKey: 1 <33 byte pubkey> <33 byte pubkey> ... 2 OP_CMS
+        sign_script = "-signblockscript=5221"+pubkeys[0]+"21"+pubkeys[1]+"21"+pubkeys[2]+"53ae"
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [[sign_script],[sign_script], [sign_script]])
+        # nodes are disconnected for this test
+        self.is_network_split = True
+
+    def run_test(self):
+        keys = ["cRANrxPMceu8jKAA76xzpA9PtTEhBknyZyaaQZ3Z5FnFTGkCAqmT", "cTJRjDBWo1JXdie31B5wv5eXNrPGCAjQKn48umubhmNLjsnj951V", "cVjTXVgKE8PhvCgDowRJVQW68q7j5kSbDGfAT5CUwt9D8dn2cAwf"]
+        assert_equal(self.nodes[0].getblockcount(), 0)
+        assert_equal(self.nodes[1].getblockcount(), 0)
+
+        block_hex = self.nodes[0].getnewblockhex()
+
+        # Block needs signatures, but valid and extends chaintip otherwise
+        assert_equal(self.nodes[0].testproposedblock(block_hex), None)
+        assert_equal(self.nodes[1].testproposedblock(block_hex), None)
+
+        assert_equal(self.nodes[0].submitblock(block_hex), "block-proof-invalid")
+        assert_equal(self.nodes[1].submitblock(block_hex), "block-proof-invalid")
+
+        assert_equal(self.nodes[0].getblockcount(), 0)
+        assert_equal(self.nodes[1].getblockcount(), 0)
+
+        # combineblocksigs only returns true when signatures are appended and enough
+        # are included to pass validation
+        assert_equal(self.nodes[0].combineblocksigs(block_hex, [])["complete"], False)
+        assert_equal(self.nodes[1].combineblocksigs(block_hex, [])["complete"], False)
+
+        # Now we can try to sign, without key
+        assert_equal(self.nodes[0].signblock(block_hex), "00")
+        assert_equal(self.nodes[1].signblock(block_hex), "00")
+
+        # Import keys
+        self.nodes[0].importprivkey(keys[0])
+        self.nodes[1].importprivkey(keys[1])
+        self.nodes[2].importprivkey(keys[2])
+
+        sig0 = self.nodes[0].signblock(block_hex)
+        sig1 = self.nodes[1].signblock(block_hex)
+
+        combined0 = self.nodes[0].combineblocksigs(block_hex, [sig0])
+        assert(not combined0["complete"])
+        combined1 = self.nodes[0].combineblocksigs(combined0["hex"], [sig1])
+        assert(combined1["complete"])
+
+        # Still haven't moved forward
+        assert_equal(self.nodes[0].getblockcount(), 0)
+        assert_equal(self.nodes[1].getblockcount(), 0)
+
+        self.nodes[0].submitblock(combined1["hex"])
+        # Move his chain along for later
+        self.nodes[2].submitblock(combined1["hex"])
+
+        assert_equal(self.nodes[0].getblockcount(), 1)
+        assert_equal(self.nodes[1].getblockcount(), 0)
+        assert_equal(self.nodes[2].getblockcount(), 1)
+
+        block_too_far = self.nodes[0].getnewblockhex()
+
+        assert_raises_jsonrpc,(JSONRPCException, -25, "proposal was not based on our best chain", self.nodes[1].testproposedblock, block_too_far)
+
+        # Finally, submit block
+        self.nodes[1].submitblock(combined1["hex"])
+        assert_equal(self.nodes[1].getblockcount(), 1)
+
+        # Now proposal is fine, aside from sigs
+        assert_equal(self.nodes[1].testproposedblock(block_too_far), None)
+        sig0 = self.nodes[0].signblock(block_too_far)
+        sig1 = self.nodes[1].signblock(block_too_far)
+        sig2 = self.nodes[2].signblock(block_too_far)
+
+        combined0 = self.nodes[0].combineblocksigs(block_too_far, [sig0])
+        assert(not combined0["complete"])
+        # combining signature from third node this time
+        combined1 = self.nodes[0].combineblocksigs(combined0["hex"], [sig2])
+        assert(combined1["complete"])
+
+        # TODO stuff with too many signatures or junk data manually
+
+if __name__ == '__main__':
+    SignedBlockchainTest().main()
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 00a78f8a5d3..80b97bb2dfc 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -150,6 +150,8 @@
     'rpc_scantxoutset.py',
     'feature_logging.py',
     'p2p_node_network_limited.py',
+    'feature_blocksign.py',
+    'feature_signed_blockchain.py',
     'feature_blocksdir.py',
     'feature_config_args.py',
     'feature_help.py',

From e80e88f42c43be992045453f1358d28c6505d776 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 30 Oct 2018 09:27:11 -0400
Subject: [PATCH 09/66] add signblock fields to blockchain RPC results

---
 src/rpc/blockchain.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 13de2f09afc..7f0216a3b15 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -102,6 +102,8 @@ UniValue blockheaderToJSON(const CBlockIndex* blockindex)
     result.pushKV("difficulty", GetDifficulty(blockindex));
     result.pushKV("chainwork", blockindex->nChainWork.GetHex());
     result.pushKV("nTx", (uint64_t)blockindex->nTx);
+    result.pushKV("signblock_witness_asm", ScriptToAsmStr(blockindex->proof.solution));
+    result.pushKV("signblock_witness_hex", HexStr(blockindex->proof.solution));
 
     if (blockindex->pprev)
         result.pushKV("previousblockhash", blockindex->pprev->GetBlockHash().GetHex());
@@ -148,6 +150,8 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx
     result.pushKV("difficulty", GetDifficulty(blockindex));
     result.pushKV("chainwork", blockindex->nChainWork.GetHex());
     result.pushKV("nTx", (uint64_t)blockindex->nTx);
+    result.pushKV("signblock_witness_asm", ScriptToAsmStr(blockindex->proof.solution));
+    result.pushKV("signblock_witness_hex", HexStr(blockindex->proof.solution));
 
     if (blockindex->pprev)
         result.pushKV("previousblockhash", blockindex->pprev->GetBlockHash().GetHex());
@@ -703,6 +707,8 @@ static UniValue getblockheader(const JSONRPCRequest& request)
             "  \"difficulty\" : x.xxx,  (numeric) The difficulty\n"
             "  \"chainwork\" : \"0000...1f3\"     (string) Expected number of hashes required to produce the current chain (in hex)\n"
             "  \"nTx\" : n,             (numeric) The number of transactions in the block.\n"
+            "  \"signblock_witness_asm\" : \"xxxx\", (string) ASM of sign block witness data.\n"
+            "  \"signblock_witness_hex\" : \"xxxx\", (string) Hex of sign block witness data.\n"
             "  \"previousblockhash\" : \"hash\",  (string) The hash of the previous block\n"
             "  \"nextblockhash\" : \"hash\",      (string) The hash of the next block\n"
             "}\n"
@@ -792,6 +798,8 @@ static UniValue getblock(const JSONRPCRequest& request)
             "  \"difficulty\" : x.xxx,  (numeric) The difficulty\n"
             "  \"chainwork\" : \"xxxx\",  (string) Expected number of hashes required to produce the chain up to this block (in hex)\n"
             "  \"nTx\" : n,             (numeric) The number of transactions in the block.\n"
+            "  \"signblock_witness_asm\" : \"xxxx\", (string) ASM of sign block witness data.\n"
+            "  \"signblock_witness_hex\" : \"xxxx\", (string) Hex of sign block witness data.\n"
             "  \"previousblockhash\" : \"hash\",  (string) The hash of the previous block\n"
             "  \"nextblockhash\" : \"hash\"       (string) The hash of the next block\n"
             "}\n"
@@ -1198,6 +1206,8 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
             "  \"chainwork\": \"xxxx\"           (string) total amount of work in active chain, in hexadecimal\n"
             "  \"size_on_disk\": xxxxxx,       (numeric) the estimated size of the block and undo files on disk\n"
             "  \"pruned\": xx,                 (boolean) if the blocks are subject to pruning\n"
+            "  \"signblock_asm\" : \"xxxx\", (string) ASM of sign block challenge data.\n"
+            "  \"signblock_hex\" : \"xxxx\", (string) Hex of sign block challenge data.\n"
             "  \"pruneheight\": xxxxxx,        (numeric) lowest-height complete block stored (only present if pruning is enabled)\n"
             "  \"automatic_pruning\": xx,      (boolean) whether automatic pruning is enabled (only present if pruning is enabled)\n"
             "  \"prune_target_size\": xxxxxx,  (numeric) the target size used by pruning (only present if automatic pruning is enabled)\n"
@@ -1247,6 +1257,9 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
     obj.pushKV("chainwork",             chainActive.Tip()->nChainWork.GetHex());
     obj.pushKV("size_on_disk",          CalculateCurrentUsage());
     obj.pushKV("pruned",                fPruneMode);
+    obj.pushKV("signblock_asm", ScriptToAsmStr(consensusParams.signblockscript));
+    obj.pushKV("signblock_hex", HexStr(consensusParams.signblockscript));
+
     if (fPruneMode) {
         CBlockIndex* block = chainActive.Tip();
         assert(block);

From 00965260fe5d903403be8c6b362cf2e8ef8f5895 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 30 Oct 2018 09:31:17 -0400
Subject: [PATCH 10/66] fixup rpc results

---
 src/rpc/blockchain.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 7f0216a3b15..8e8e9b6c6f4 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1245,20 +1245,23 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
 
     LOCK(cs_main);
 
+    const CChainParams& chainparams = Params();
+
     UniValue obj(UniValue::VOBJ);
-    obj.pushKV("chain",                 Params().NetworkIDString());
+    obj.pushKV("chain",                 chainparams.NetworkIDString());
     obj.pushKV("blocks",                (int)chainActive.Height());
     obj.pushKV("headers",               pindexBestHeader ? pindexBestHeader->nHeight : -1);
     obj.pushKV("bestblockhash",         chainActive.Tip()->GetBlockHash().GetHex());
     obj.pushKV("difficulty",            (double)GetDifficulty(chainActive.Tip()));
     obj.pushKV("mediantime",            (int64_t)chainActive.Tip()->GetMedianTimePast());
-    obj.pushKV("verificationprogress",  GuessVerificationProgress(Params().TxData(), chainActive.Tip()));
+    obj.pushKV("verificationprogress",  GuessVerificationProgress(chainparams.TxData(), chainActive.Tip()));
     obj.pushKV("initialblockdownload",  IsInitialBlockDownload());
     obj.pushKV("chainwork",             chainActive.Tip()->nChainWork.GetHex());
     obj.pushKV("size_on_disk",          CalculateCurrentUsage());
     obj.pushKV("pruned",                fPruneMode);
-    obj.pushKV("signblock_asm", ScriptToAsmStr(consensusParams.signblockscript));
-    obj.pushKV("signblock_hex", HexStr(consensusParams.signblockscript));
+    CScript sign_block_script = chainparams.GetConsensus().signblockscript;
+    obj.pushKV("signblock_asm", ScriptToAsmStr(sign_block_script));
+    obj.pushKV("signblock_hex", HexStr(sign_block_script));
 
     if (fPruneMode) {
         CBlockIndex* block = chainActive.Tip();

From 07ca9b91770777f3628ef9d4d2857fce7492235e Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 30 Oct 2018 09:31:27 -0400
Subject: [PATCH 11/66] some more functional test stuff

---
 test/functional/feature_signed_blockchain.py | 22 +++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/test/functional/feature_signed_blockchain.py b/test/functional/feature_signed_blockchain.py
index 966fa5a3dce..51f91cb1f44 100755
--- a/test/functional/feature_signed_blockchain.py
+++ b/test/functional/feature_signed_blockchain.py
@@ -17,6 +17,10 @@
     assert_raises_jsonrpc,
 )
 
+# Keys for signing 2-of-3
+pubkeys = ["039560e48d4336e40db447fc136ce24ae1dfdefa5701e4d4e57aa1a1a9f47f3faa", "025a66517c1d85adcd909f9f675bf656708edc4da1f614693e347be6baf0fef4ae", "02ca238faeb3b01d26ae8a39869220dbd84cc8516398afa8958fe613fe4fdf1c04"]
+
+sign_script_pubkey = "5221"+pubkeys[0]+"21"+pubkeys[1]+"21"+pubkeys[2]+"53ae"
 
 class SignedBlockchainTest(BitcoinTestFramework):
     """
@@ -35,10 +39,8 @@ def __init__(self):
         self.num_nodes = 3
 
     def setup_network(self, split=False):
-        # Keys for signing 2-of-3
-        pubkeys = ["039560e48d4336e40db447fc136ce24ae1dfdefa5701e4d4e57aa1a1a9f47f3faa", "025a66517c1d85adcd909f9f675bf656708edc4da1f614693e347be6baf0fef4ae", "02ca238faeb3b01d26ae8a39869220dbd84cc8516398afa8958fe613fe4fdf1c04"]
         # Normal multisig scriptPubKey: 1 <33 byte pubkey> <33 byte pubkey> ... 2 OP_CMS
-        sign_script = "-signblockscript=5221"+pubkeys[0]+"21"+pubkeys[1]+"21"+pubkeys[2]+"53ae"
+        sign_script = "-signblockscript="+sign_script_pubkey
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [[sign_script],[sign_script], [sign_script]])
         # nodes are disconnected for this test
         self.is_network_split = True
@@ -114,6 +116,20 @@ def run_test(self):
         combined1 = self.nodes[0].combineblocksigs(combined0["hex"], [sig2])
         assert(combined1["complete"])
 
+        # Test getblock(header) signed block fields
+        tip = self.nodes[0].getblockhash(self.nodes[0].getblockcount())
+        header = self.nodes[0].getblockheader(tip)
+        block = self.nodes[0].getblock(tip)
+        info = self.nodes[0].getblockchaininfo()
+
+        assert('signblock_witness_asm' in header)
+        assert('signblock_witness_hex' in header)
+        assert('signblock_witness_asm' in block)
+        assert('signblock_witness_hex' in block)
+
+        assert_equal(info['signblock_asm'], "")
+        assert_equal(info['signblock_hex'], sign_script_pubkey)
+
         # TODO stuff with too many signatures or junk data manually
 
 if __name__ == '__main__':

From 89aeade3735206958c54689d69196b8a35e3c0f5 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 30 Oct 2018 15:46:48 -0400
Subject: [PATCH 12/66] break this up! checkin

---
 src/chain.cpp                                 |  5 ++
 src/chain.h                                   |  1 +
 src/chainparams.cpp                           | 17 +++--
 src/chainparamsbase.cpp                       |  1 +
 src/consensus/params.h                        |  1 +
 src/miner.cpp                                 | 10 ++-
 src/pow.cpp                                   | 16 ++++-
 src/pow.h                                     |  2 +
 src/rpc/blockchain.cpp                        | 34 ++++++----
 src/rpc/mining.cpp                            | 22 ++++---
 src/txdb.cpp                                  |  3 +-
 src/validation.cpp                            | 10 +--
 test/functional/feature_block_subsidy.py      |  4 +-
 test/functional/feature_mandatory_coinbase.py |  4 +-
 test/functional/test_framework/messages.py    | 66 +++++++++++++------
 test/functional/wallet_hd.py                  |  1 -
 16 files changed, 132 insertions(+), 65 deletions(-)

diff --git a/src/chain.cpp b/src/chain.cpp
index d462f94ab5e..8e60397eff3 100644
--- a/src/chain.cpp
+++ b/src/chain.cpp
@@ -120,6 +120,11 @@ void CBlockIndex::BuildSkip()
 
 arith_uint256 GetBlockProof(const CBlockIndex& block)
 {
+    // All valid signed blocks have "weight" 1
+    if (g_signed_blocks) {
+        return 1;
+    }
+
     arith_uint256 bnTarget;
     bool fNegative;
     bool fOverflow;
diff --git a/src/chain.h b/src/chain.h
index 7323d04a093..e02ebf7d148 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -289,6 +289,7 @@ class CBlockIndex
         block.nTime          = nTime;
         block.nBits          = nBits;
         block.nNonce         = nNonce;
+        block.proof          = proof;
         return block;
     }
 
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index baf1ef1942e..6d09a91d305 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -17,7 +17,7 @@
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 
-static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesisOutputScript, uint32_t nTime, uint32_t nNonce, uint32_t nBits, int32_t nVersion, const CAmount& genesisReward)
+static CBlock CreateGenesisBlock(const Consensus::Params& params, const char* pszTimestamp, const CScript& genesisOutputScript, uint32_t nTime, uint32_t nNonce, uint32_t nBits, int32_t nVersion, const CAmount& genesisReward)
 {
     CMutableTransaction txNew;
     txNew.nVersion = 1;
@@ -35,6 +35,7 @@ static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesi
     genesis.vtx.push_back(MakeTransactionRef(std::move(txNew)));
     genesis.hashPrevBlock.SetNull();
     genesis.hashMerkleRoot = BlockMerkleRoot(genesis);
+    genesis.proof = CProof(params.signblockscript, CScript());
     return genesis;
 }
 
@@ -49,11 +50,11 @@ static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesi
  *     CTxOut(nValue=50.00000000, scriptPubKey=0x5F1DF16B2B704C8A578D0B)
  *   vMerkleTree: 4a5e1e
  */
-static CBlock CreateGenesisBlock(uint32_t nTime, uint32_t nNonce, uint32_t nBits, int32_t nVersion, const CAmount& genesisReward)
+static CBlock CreateGenesisBlock(uint32_t nTime, uint32_t nNonce, uint32_t nBits, int32_t nVersion, const CAmount& genesisReward, const Consensus::Params& params)
 {
     const char* pszTimestamp = "The Times 03/Jan/2009 Chancellor on brink of second bailout for banks";
     const CScript genesisOutputScript = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
-    return CreateGenesisBlock(pszTimestamp, genesisOutputScript, nTime, nNonce, nBits, nVersion, genesisReward);
+    return CreateGenesisBlock(params, pszTimestamp, genesisOutputScript, nTime, nNonce, nBits, nVersion, genesisReward);
 }
 
 /**
@@ -119,7 +120,7 @@ class CMainParams : public CChainParams {
         nDefaultPort = 8333;
         nPruneAfterHeight = 100000;
 
-        genesis = CreateGenesisBlock(1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN);
+        genesis = CreateGenesisBlock(1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN, consensus);
         consensus.hashGenesisBlock = genesis.GetHash();
         assert(consensus.hashGenesisBlock == uint256S("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"));
         assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));
@@ -231,7 +232,7 @@ class CTestNetParams : public CChainParams {
         nDefaultPort = 18333;
         nPruneAfterHeight = 1000;
 
-        genesis = CreateGenesisBlock(1296688602, 414098458, 0x1d00ffff, 1, 50 * COIN);
+        genesis = CreateGenesisBlock(1296688602, 414098458, 0x1d00ffff, 1, 50 * COIN, consensus);
         consensus.hashGenesisBlock = genesis.GetHash();
         assert(consensus.hashGenesisBlock == uint256S("0x000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943"));
         assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));
@@ -325,7 +326,7 @@ class CRegTestParams : public CChainParams {
 
         UpdateVersionBitsParametersFromArgs(args);
 
-        genesis = CreateGenesisBlock(1296688602, 2, 0x207fffff, 1, 50 * COIN);
+        genesis = CreateGenesisBlock(1296688602, 2, 0x207fffff, 1, 50 * COIN, consensus);
         consensus.hashGenesisBlock = genesis.GetHash();
         assert(consensus.hashGenesisBlock == uint256S("0x0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206"));
         assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));
@@ -439,6 +440,8 @@ class CCustomParams : public CRegTestParams {
         // 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", true);
 
         // Custom chains connect coinbase outputs to db by default
@@ -481,7 +484,7 @@ class CCustomParams : public CRegTestParams {
     {
         strNetworkID = chain;
         UpdateFromArgs(args);
-        genesis = CreateGenesisBlock(strNetworkID.c_str(), CScript(OP_TRUE), 1296688602, 2, 0x207fffff, 1, 50 * COIN);
+        genesis = CreateGenesisBlock(consensus, strNetworkID.c_str(), CScript(OP_TRUE), 1296688602, 2, 0x207fffff, 1, 50 * COIN);
         consensus.hashGenesisBlock = genesis.GetHash();
     }
 };
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index b3131aac1b8..5114c760f67 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -28,6 +28,7 @@ void SetupChainParamsBaseOptions()
     gArgs.AddArg("-con_connect_coinbase", "Connect outputs in genesis block to utxo database.", false, OptionsCategory::CHAINPARAMS);
     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_blcoks` 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 d90901faf4d..69273c0d3fc 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -84,6 +84,7 @@ struct Params {
     CAmount genesis_subsidy;
     bool connect_genesis_outputs;
     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/miner.cpp b/src/miner.cpp
index 6d35f9ac37d..2e78164d271 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -142,6 +142,14 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     // transaction (which in most cases can be a no-op).
     fIncludeWitness = IsWitnessEnabled(pindexPrev, chainparams.GetConsensus()) && fMineWitnessTx;
 
+    // Pad block weight by block proof fields (including upper-bound of signature)
+    nBlockWeight += chainparams.GetConsensus().signblockscript.size() * WITNESS_SCALE_FACTOR;
+    nBlockWeight += chainparams.GetConsensus().max_block_signature_size * WITNESS_SCALE_FACTOR;
+
+    // Reset block proof
+    ResetProof(*pblock);
+    ResetChallenge(*pblock, *pindexPrev, chainparams.GetConsensus());
+
     int nPackagesSelected = 0;
     int nDescendantsUpdated = 0;
     addPackageTxs(nPackagesSelected, nDescendantsUpdated);
@@ -168,7 +176,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     // Fill in header
     pblock->hashPrevBlock  = pindexPrev->GetBlockHash();
     UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
-    pblock->nBits          = GetNextWorkRequired(pindexPrev, pblock, chainparams.GetConsensus());
+    pblock->nBits          = g_signed_blocks ? 0 : GetNextWorkRequired(pindexPrev, pblock, chainparams.GetConsensus());
     pblock->nNonce         = 0;
     pblocktemplate->vTxSigOpsCost[0] = WITNESS_SCALE_FACTOR * GetLegacySigOpCount(*pblock->vtx[0]);
 
diff --git a/src/pow.cpp b/src/pow.cpp
index ac97e12345a..3f6aae52b7d 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -15,7 +15,11 @@
 
 bool CheckChallenge(const CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params& params)
 {
-    return block.proof.challenge == indexLast.proof.challenge;
+    if (g_signed_blocks) {
+        return block.proof.challenge == indexLast.proof.challenge;
+    } else {
+        return block.nBits == GetNextWorkRequired(&indexLast, &block, params);
+    }
 }
 
 void ResetChallenge(CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params& params)
@@ -108,6 +112,10 @@ static bool CheckProofGeneric(const CBlockHeader& block, const Consensus::Params
     if (block.GetHash() == params.hashGenesisBlock)
        return true;
 
+    if (block.proof.solution.size() > params.max_block_signature_size) {
+        return false;
+    }
+
     // Some important anti-DoS flags.
     // Note: Blockhashes do not commit to the proof.
     // Therefore we may have a signature be mealleated
@@ -133,7 +141,11 @@ static bool CheckProofGeneric(const CBlockHeader& block, const Consensus::Params
 
 bool CheckProof(const CBlockHeader& block, const Consensus::Params& params)
 {
-    return CheckProofGeneric(block, params, params.signblockscript);
+    if (g_signed_blocks) {
+        return CheckProofGeneric(block, params, params.signblockscript);
+    } else {
+        return CheckProofOfWork(block.GetHash(), block.nBits, params);
+    }
 }
 
 void ResetProof(CBlockHeader& block)
diff --git a/src/pow.h b/src/pow.h
index d5ac0435b3e..1b897128888 100644
--- a/src/pow.h
+++ b/src/pow.h
@@ -23,6 +23,8 @@ unsigned int CalculateNextWorkRequired(const CBlockIndex* pindexLast, int64_t nF
 bool CheckProofOfWork(uint256 hash, unsigned int nBits, const Consensus::Params&);
 
 // Elements signed chain functionality
+
+/** Check on header proof, depending on chain type, PoW or signed **/
 bool CheckProof(const CBlockHeader& block, const Consensus::Params&);
 void ResetProof(CBlockHeader& block);
 bool CheckChallenge(const CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params&);
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 8e8e9b6c6f4..33fc90dd786 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -97,15 +97,17 @@ UniValue blockheaderToJSON(const CBlockIndex* blockindex)
     result.pushKV("merkleroot", blockindex->hashMerkleRoot.GetHex());
     result.pushKV("time", (int64_t)blockindex->nTime);
     result.pushKV("mediantime", (int64_t)blockindex->GetMedianTimePast());
-    result.pushKV("nonce", (uint64_t)blockindex->nNonce);
-    result.pushKV("bits", strprintf("%08x", blockindex->nBits));
-    result.pushKV("difficulty", GetDifficulty(blockindex));
-    result.pushKV("chainwork", blockindex->nChainWork.GetHex());
+    if (!g_signed_blocks) {
+        result.pushKV("nonce", (uint64_t)blockindex->nNonce);
+        result.pushKV("bits", strprintf("%08x", blockindex->nBits));
+        result.pushKV("difficulty", GetDifficulty(blockindex));
+        result.pushKV("chainwork", blockindex->nChainWork.GetHex());
+    } else {
+        result.pushKV("signblock_witness_asm", ScriptToAsmStr(blockindex->proof.solution));
+        result.pushKV("signblock_witness_hex", HexStr(blockindex->proof.solution));
+    }
     result.pushKV("nTx", (uint64_t)blockindex->nTx);
-    result.pushKV("signblock_witness_asm", ScriptToAsmStr(blockindex->proof.solution));
-    result.pushKV("signblock_witness_hex", HexStr(blockindex->proof.solution));
-
-    if (blockindex->pprev)
+     if (blockindex->pprev)
         result.pushKV("previousblockhash", blockindex->pprev->GetBlockHash().GetHex());
     CBlockIndex *pnext = chainActive.Next(blockindex);
     if (pnext)
@@ -145,13 +147,17 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx
     result.pushKV("tx", txs);
     result.pushKV("time", block.GetBlockTime());
     result.pushKV("mediantime", (int64_t)blockindex->GetMedianTimePast());
-    result.pushKV("nonce", (uint64_t)block.nNonce);
-    result.pushKV("bits", strprintf("%08x", block.nBits));
-    result.pushKV("difficulty", GetDifficulty(blockindex));
-    result.pushKV("chainwork", blockindex->nChainWork.GetHex());
+    if (!g_signed_blocks) {
+        result.pushKV("nonce", (uint64_t)block.nNonce);
+        result.pushKV("bits", strprintf("%08x", block.nBits));
+        result.pushKV("difficulty", GetDifficulty(blockindex));
+        result.pushKV("chainwork", blockindex->nChainWork.GetHex());
+    } else {
+        result.pushKV("signblock_witness_asm", ScriptToAsmStr(blockindex->proof.solution));
+        result.pushKV("signblock_witness_hex", HexStr(blockindex->proof.solution));
+        result.pushKV("signblock_challenge", HexStr(blockindex->proof.challenge));
+    }
     result.pushKV("nTx", (uint64_t)blockindex->nTx);
-    result.pushKV("signblock_witness_asm", ScriptToAsmStr(blockindex->proof.solution));
-    result.pushKV("signblock_witness_hex", HexStr(blockindex->proof.solution));
 
     if (blockindex->pprev)
         result.pushKV("previousblockhash", blockindex->pprev->GetBlockHash().GetHex());
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index cf5ef51b9f2..038caac7a19 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -127,15 +127,19 @@ UniValue generateBlocks(std::shared_ptr<CReserveScript> coinbaseScript, int nGen
             LOCK(cs_main);
             IncrementExtraNonce(pblock, chainActive.Tip(), nExtraNonce);
         }
-        while (nMaxTries > 0 && pblock->nNonce < nInnerLoopCount && !CheckProofOfWork(pblock->GetHash(), pblock->nBits, Params().GetConsensus())) {
-            ++pblock->nNonce;
-            --nMaxTries;
-        }
-        if (nMaxTries == 0) {
-            break;
-        }
-        if (pblock->nNonce == nInnerLoopCount) {
-            continue;
+        // Signed blocks have no PoW requirements, but merkle root computed above in
+        // IncrementExtraNonce
+        if (!g_signed_blocks) {
+            while (nMaxTries > 0 && pblock->nNonce < nInnerLoopCount && !CheckProofOfWork(pblock->GetHash(), pblock->nBits, Params().GetConsensus())) {
+                ++pblock->nNonce;
+                --nMaxTries;
+            }
+            if (nMaxTries == 0) {
+                break;
+            }
+            if (pblock->nNonce == nInnerLoopCount) {
+                continue;
+            }
         }
         std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock);
         if (!ProcessNewBlock(Params(), shared_pblock, true, nullptr))
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 7842829ddb8..cdd14311ccb 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -271,11 +271,12 @@ bool CBlockTreeDB::LoadBlockIndexGuts(const Consensus::Params& consensusParams,
                 pindexNew->nTime          = diskindex.nTime;
                 pindexNew->nBits          = diskindex.nBits;
                 pindexNew->nNonce         = diskindex.nNonce;
+                pindexNew->proof          = diskindex.proof;
                 pindexNew->nStatus        = diskindex.nStatus;
                 pindexNew->nTx            = diskindex.nTx;
 
                 const uint256 block_hash = pindexNew->GetBlockHash();
-                if (!CheckProofOfWork(block_hash, pindexNew->nBits, consensusParams) &&
+                if (!CheckProof(pindexNew->GetBlockHeader(), consensusParams) &&
                     block_hash != consensusParams.hashGenesisBlock) {
                     return error("%s: CheckProofOfWork: %s, %s", __func__, block_hash.ToString(), pindexNew->ToString());
                 }
diff --git a/src/validation.cpp b/src/validation.cpp
index a5e3b564787..10ac55168e5 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1092,7 +1092,7 @@ bool ReadBlockFromDisk(CBlock& block, const CDiskBlockPos& pos, const Consensus:
 
     // Check the header
     const uint256 block_hash = block.GetHash();
-    if (!CheckProofOfWork(block_hash, block.nBits, consensusParams) &&
+    if (!CheckProof(block, consensusParams) &&
         block_hash != consensusParams.hashGenesisBlock) {
         return error("ReadBlockFromDisk: Errors in block header at %s", pos.ToString());
     }
@@ -3101,8 +3101,8 @@ static bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state,
 {
     // Check proof of work matches claimed amount
     if (fCheckPOW && block.GetHash() != consensusParams.hashGenesisBlock
-            && !CheckProofOfWork(block.GetHash(), block.nBits, consensusParams)) {
-        return state.DoS(50, false, REJECT_INVALID, "high-hash", false, "proof of work failed");
+            && !CheckProof(block, consensusParams)) {
+        return state.DoS(50, false, REJECT_INVALID, g_signed_blocks ? "block-proof-invalid" : "high-hash", false, "proof of work failed");
     }
     return true;
 }
@@ -3252,9 +3252,9 @@ static bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationSta
     assert(pindexPrev != nullptr);
     const int nHeight = pindexPrev->nHeight + 1;
 
-    // Check proof of work
+    // Check proof of work if necessary
     const Consensus::Params& consensusParams = params.GetConsensus();
-    if (block.nBits != GetNextWorkRequired(pindexPrev, &block, consensusParams))
+    if (!CheckChallenge(block, *pindexPrev, consensusParams))
         return state.DoS(100, false, REJECT_INVALID, "bad-diffbits", false, "incorrect proof of work");
 
     // Check against checkpoints
diff --git a/test/functional/feature_block_subsidy.py b/test/functional/feature_block_subsidy.py
index 8eafef2d0cc..51ea2191e3b 100755
--- a/test/functional/feature_block_subsidy.py
+++ b/test/functional/feature_block_subsidy.py
@@ -8,7 +8,7 @@
 from decimal import Decimal
 
 from test_framework.blocktools import create_coinbase
-from test_framework.messages import CBlock
+from test_framework.messages import CBlock, CProof
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
 
@@ -34,7 +34,6 @@ def run_test(self):
         # Block will have 10 satoshi output, node 1 will ban
         addr = self.nodes[0].getnewaddress()
         sub_block = self.nodes[0].generatetoaddress(1, addr)
-
         raw_coinbase = self.nodes[0].getrawtransaction(self.nodes[0].getblock(sub_block[0])["tx"][0])
         decoded_coinbase = self.nodes[0].decoderawtransaction(raw_coinbase)
 
@@ -68,6 +67,7 @@ def run_test(self):
         block.nTime = tmpl["curtime"]
         block.nBits = int(tmpl["bits"], 16)
         block.nNonce = 0
+        block.proof = CProof(bytearray.fromhex('51'))
         block.vtx = [coinbase_tx]
 
         assert_template(self.nodes[0], block, "bad-cb-amount")
diff --git a/test/functional/feature_mandatory_coinbase.py b/test/functional/feature_mandatory_coinbase.py
index 0cca617bd1a..e0ede1e875f 100755
--- a/test/functional/feature_mandatory_coinbase.py
+++ b/test/functional/feature_mandatory_coinbase.py
@@ -7,7 +7,7 @@
 from binascii import b2a_hex
 
 from test_framework.blocktools import create_coinbase
-from test_framework.messages import CBlock
+from test_framework.messages import CBlock, CProof
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal, assert_raises_rpc_error
 
@@ -39,7 +39,6 @@ def run_test(self):
         node0.importprivkey(mandatory_privkey)
 
         self.log.info("generatetoaddress: Making blocks of various kinds, checking for rejection")
-
         # Create valid blocks to get out of IBD and get some funds (subsidy goes to permitted addr)
         node0.generatetoaddress(101, mandatory_address)
 
@@ -62,6 +61,7 @@ def run_test(self):
         block.nTime = tmpl["curtime"]
         block.nBits = int(tmpl["bits"], 16)
         block.nNonce = 0
+        block.proof = CProof(bytearray.fromhex('51'))
         block.vtx = [coinbase_tx]
 
         self.log.info("getblocktemplate: Test block on both nodes")
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
index 7276f6b450b..32521606342 100755
--- a/test/functional/test_framework/messages.py
+++ b/test/functional/test_framework/messages.py
@@ -496,6 +496,34 @@ def __repr__(self):
             % (self.nVersion, repr(self.vin), repr(self.vout), repr(self.wit), self.nLockTime)
 
 
+class CProof(object):
+    def __init__(self, challenge=b"", solution=b""):
+        self.challenge = challenge
+        self.solution = solution
+
+    def set_null(self):
+        self.challenge = b""
+        self.solution = b""
+
+    def deserialize(self, f):
+        self.challenge = deser_string(f)
+        self.solution = deser_string(f)
+
+    def serialize(self):
+        r = b""
+        r += ser_string(self.challenge)
+        r += ser_string(self.solution)
+        return r
+
+    def serialize_for_hash(self):
+        r = b""
+        r += ser_string(self.challenge)
+        return r
+
+    def __repr__(self):
+        return "CProof(challenge=%s solution=%s)" \
+            % (self.challenge, self.solution)
+
 class CBlockHeader():
     def __init__(self, header=None):
         if header is None:
@@ -505,8 +533,7 @@ def __init__(self, header=None):
             self.hashPrevBlock = header.hashPrevBlock
             self.hashMerkleRoot = header.hashMerkleRoot
             self.nTime = header.nTime
-            self.nBits = header.nBits
-            self.nNonce = header.nNonce
+            self.proof = header.proof
             self.sha256 = header.sha256
             self.hash = header.hash
             self.calc_sha256()
@@ -516,8 +543,7 @@ def set_null(self):
         self.hashPrevBlock = 0
         self.hashMerkleRoot = 0
         self.nTime = 0
-        self.nBits = 0
-        self.nNonce = 0
+        self.proof = CProof()
         self.sha256 = None
         self.hash = None
 
@@ -526,8 +552,7 @@ def deserialize(self, f):
         self.hashPrevBlock = deser_uint256(f)
         self.hashMerkleRoot = deser_uint256(f)
         self.nTime = struct.unpack("<I", f.read(4))[0]
-        self.nBits = struct.unpack("<I", f.read(4))[0]
-        self.nNonce = struct.unpack("<I", f.read(4))[0]
+        self.proof.deserialize(f)
         self.sha256 = None
         self.hash = None
 
@@ -537,8 +562,7 @@ def serialize(self):
         r += ser_uint256(self.hashPrevBlock)
         r += ser_uint256(self.hashMerkleRoot)
         r += struct.pack("<I", self.nTime)
-        r += struct.pack("<I", self.nBits)
-        r += struct.pack("<I", self.nNonce)
+        r += self.proof.serialize()
         return r
 
     def calc_sha256(self):
@@ -548,8 +572,7 @@ def calc_sha256(self):
             r += ser_uint256(self.hashPrevBlock)
             r += ser_uint256(self.hashMerkleRoot)
             r += struct.pack("<I", self.nTime)
-            r += struct.pack("<I", self.nBits)
-            r += struct.pack("<I", self.nNonce)
+            r += self.proof.serialize_for_hash()
             self.sha256 = uint256_from_str(hash256(r))
             self.hash = encode(hash256(r)[::-1], 'hex_codec').decode('ascii')
 
@@ -559,9 +582,9 @@ def rehash(self):
         return self.sha256
 
     def __repr__(self):
-        return "CBlockHeader(nVersion=%i hashPrevBlock=%064x hashMerkleRoot=%064x nTime=%s nBits=%08x nNonce=%08x)" \
+        return "CBlockHeader(nVersion=%i hashPrevBlock=%064x hashMerkleRoot=%064x nTime=%s)" \
             % (self.nVersion, self.hashPrevBlock, self.hashMerkleRoot,
-               time.ctime(self.nTime), self.nBits, self.nNonce)
+               time.ctime(self.nTime))
 
 
 class CBlock(CBlockHeader):
@@ -613,9 +636,10 @@ def calc_witness_merkle_root(self):
 
     def is_valid(self):
         self.calc_sha256()
-        target = uint256_from_compact(self.nBits)
-        if self.sha256 > target:
-            return False
+# TODO: check signatures
+#        target = uint256_from_compact(self.nBits)
+#        if self.sha256 > target:
+#            return False
         for tx in self.vtx:
             if not tx.is_valid():
                 return False
@@ -625,15 +649,15 @@ def is_valid(self):
 
     def solve(self):
         self.rehash()
-        target = uint256_from_compact(self.nBits)
-        while self.sha256 > target:
-            self.nNonce += 1
-            self.rehash()
+#        target = uint256_from_compact(self.nBits)
+#        while self.sha256 > target:
+#            self.nNonce += 1
+#            self.rehash()
 
     def __repr__(self):
-        return "CBlock(nVersion=%i hashPrevBlock=%064x hashMerkleRoot=%064x nTime=%s nBits=%08x nNonce=%08x vtx=%s)" \
+        return "CBlock(nVersion=%i hashPrevBlock=%064x hashMerkleRoot=%064x nTime=%s vtx=%s)" \
             % (self.nVersion, self.hashPrevBlock, self.hashMerkleRoot,
-               time.ctime(self.nTime), self.nBits, self.nNonce, repr(self.vtx))
+               time.ctime(self.nTime), repr(self.vtx))
 
 
 class PrefilledTransaction():
diff --git a/test/functional/wallet_hd.py b/test/functional/wallet_hd.py
index 9a03cc3d17b..912fca6aed4 100755
--- a/test/functional/wallet_hd.py
+++ b/test/functional/wallet_hd.py
@@ -14,7 +14,6 @@
     assert_raises_rpc_error
 )
 
-
 class WalletHDTest(BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True

From d35e6153dffa0b8c2b09be497dedd139aa798a05 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 5 Nov 2018 15:13:39 -0500
Subject: [PATCH 13/66] more fixes

---
 src/rpc/blockchain.cpp                       | 16 +++++++++----
 test/functional/rpc_blockchain.py            | 25 +++-----------------
 test/functional/test_framework/blocktools.py |  2 ++
 3 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 33fc90dd786..8be2147d10f 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1258,16 +1258,22 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
     obj.pushKV("blocks",                (int)chainActive.Height());
     obj.pushKV("headers",               pindexBestHeader ? pindexBestHeader->nHeight : -1);
     obj.pushKV("bestblockhash",         chainActive.Tip()->GetBlockHash().GetHex());
-    obj.pushKV("difficulty",            (double)GetDifficulty(chainActive.Tip()));
+    if (!g_signed_blocks) {
+        obj.pushKV("difficulty",            (double)GetDifficulty(chainActive.Tip()));
+    }
     obj.pushKV("mediantime",            (int64_t)chainActive.Tip()->GetMedianTimePast());
     obj.pushKV("verificationprogress",  GuessVerificationProgress(chainparams.TxData(), chainActive.Tip()));
     obj.pushKV("initialblockdownload",  IsInitialBlockDownload());
-    obj.pushKV("chainwork",             chainActive.Tip()->nChainWork.GetHex());
+    if (!g_signed_blocks) {
+        obj.pushKV("chainwork",             chainActive.Tip()->nChainWork.GetHex());
+    }
     obj.pushKV("size_on_disk",          CalculateCurrentUsage());
     obj.pushKV("pruned",                fPruneMode);
-    CScript sign_block_script = chainparams.GetConsensus().signblockscript;
-    obj.pushKV("signblock_asm", ScriptToAsmStr(sign_block_script));
-    obj.pushKV("signblock_hex", HexStr(sign_block_script));
+    if (g_signed_blocks) {
+        CScript sign_block_script = chainparams.GetConsensus().signblockscript;
+        obj.pushKV("signblock_asm", ScriptToAsmStr(sign_block_script));
+        obj.pushKV("signblock_hex", HexStr(sign_block_script));
+    }
 
     if (fPruneMode) {
         CBlockIndex* block = chainActive.Tip();
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
index d681cdc8abc..cfb067bc15d 100755
--- a/test/functional/rpc_blockchain.py
+++ b/test/functional/rpc_blockchain.py
@@ -7,17 +7,14 @@
 Test the following RPCs:
     - getblockchaininfo
     - gettxoutsetinfo
-    - getdifficulty
     - getbestblockhash
     - getblockhash
     - getblockheader
     - getchaintxstats
-    - getnetworkhashps
     - verifychain
 
 Tests correspond to code in rpc/blockchain.cpp.
 """
-
 from decimal import Decimal
 import http.client
 import subprocess
@@ -54,8 +51,6 @@ def run_test(self):
         self._test_getchaintxstats()
         self._test_gettxoutsetinfo()
         self._test_getblockheader()
-        self._test_getdifficulty()
-        self._test_getnetworkhashps()
         self._test_stopatheight()
         self._test_waitforblockheight()
         assert self.nodes[0].verifychain(4, 0)
@@ -68,17 +63,18 @@ def _test_getblockchaininfo(self):
             'bip9_softforks',
             'blocks',
             'chain',
-            'chainwork',
-            'difficulty',
             'headers',
             'initialblockdownload',
             'mediantime',
             'pruned',
+            'signblock_asm',
+            'signblock_hex',
             'size_on_disk',
             'softforks',
             'verificationprogress',
             'warnings',
         ]
+
         res = self.nodes[0].getblockchaininfo()
 
         # result should have these additional pruning keys if manual pruning is enabled
@@ -212,29 +208,14 @@ def _test_getblockheader(self):
         assert_equal(header['height'], 200)
         assert_equal(header['confirmations'], 1)
         assert_equal(header['previousblockhash'], secondbesthash)
-        assert_is_hex_string(header['chainwork'])
         assert_equal(header['nTx'], 1)
         assert_is_hash_string(header['hash'])
         assert_is_hash_string(header['previousblockhash'])
         assert_is_hash_string(header['merkleroot'])
-        assert_is_hash_string(header['bits'], length=None)
         assert isinstance(header['time'], int)
         assert isinstance(header['mediantime'], int)
-        assert isinstance(header['nonce'], int)
         assert isinstance(header['version'], int)
         assert isinstance(int(header['versionHex'], 16), int)
-        assert isinstance(header['difficulty'], Decimal)
-
-    def _test_getdifficulty(self):
-        difficulty = self.nodes[0].getdifficulty()
-        # 1 hash in 2 should be valid, so difficulty should be 1/2**31
-        # binary => decimal => binary math is why we do this check
-        assert abs(difficulty * 2**31 - 1) < 0.0001
-
-    def _test_getnetworkhashps(self):
-        hashes_per_second = self.nodes[0].getnetworkhashps()
-        # This should be 2 hashes every 10 minutes or 1/300
-        assert abs(hashes_per_second * 300 - 1) < 0.0001
 
     def _test_stopatheight(self):
         assert_equal(self.nodes[0].getblockcount(), 200)
diff --git a/test/functional/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py
index 987ade4044f..88490d51c1d 100644
--- a/test/functional/test_framework/blocktools.py
+++ b/test/functional/test_framework/blocktools.py
@@ -27,6 +27,7 @@
     ser_uint256,
     sha256,
     uint256_from_str,
+    CProof,
 )
 from .script import (
     CScript,
@@ -55,6 +56,7 @@ def create_block(hashprev, coinbase, ntime=None):
     block.hashPrevBlock = hashprev
     block.nBits = 0x207fffff  # difficulty retargeting is disabled in REGTEST chainparams
     block.vtx.append(coinbase)
+    block.proof = CProof(bytearray.fromhex('51'), bytearray.fromhex(''))
     block.hashMerkleRoot = block.calc_merkle_root()
     block.calc_sha256()
     return block

From 9176ff035f474042d0fc3b075310810f7d437eaf Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 5 Nov 2018 16:51:41 -0500
Subject: [PATCH 14/66] fixup

---
 test/functional/feature_block.py           | 33 +++++++++++-----------
 test/functional/test_framework/messages.py |  3 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py
index 79ed9028716..c052238561b 100755
--- a/test/functional/feature_block.py
+++ b/test/functional/feature_block.py
@@ -533,7 +533,6 @@ def run_test(self):
         b44 = CBlock()
         b44.nTime = self.tip.nTime + 1
         b44.hashPrevBlock = self.tip.sha256
-        b44.nBits = 0x207fffff
         b44.vtx.append(coinbase)
         b44.hashMerkleRoot = b44.calc_merkle_root()
         b44.solve()
@@ -547,7 +546,6 @@ def run_test(self):
         b45 = CBlock()
         b45.nTime = self.tip.nTime + 1
         b45.hashPrevBlock = self.tip.sha256
-        b45.nBits = 0x207fffff
         b45.vtx.append(non_coinbase)
         b45.hashMerkleRoot = b45.calc_merkle_root()
         b45.calc_sha256()
@@ -562,7 +560,6 @@ def run_test(self):
         b46 = CBlock()
         b46.nTime = b44.nTime + 1
         b46.hashPrevBlock = b44.sha256
-        b46.nBits = 0x207fffff
         b46.vtx = []
         b46.hashMerkleRoot = 0
         b46.solve()
@@ -572,14 +569,15 @@ def run_test(self):
         self.blocks[46] = b46
         self.sync_blocks([b46], False, 16, b'bad-blk-length', reconnect=True)
 
-        self.log.info("Reject a block with invalid work")
-        self.move_tip(44)
-        b47 = self.next_block(47, solve=False)
-        target = uint256_from_compact(b47.nBits)
-        while b47.sha256 < target:
-            b47.nNonce += 1
-            b47.rehash()
-        self.sync_blocks([b47], False, request_block=False)
+        # No testing PoW
+#        self.log.info("Reject a block with invalid work")
+#        self.move_tip(44)
+#        b47 = self.next_block(47, solve=False)
+#        target = uint256_from_compact(b47.nBits)
+#        while b47.sha256 < target:
+#            b47.nNonce += 1
+#            b47.rehash()
+#        self.sync_blocks([b47], False, request_block=False)
 
         self.log.info("Reject a block with a timestamp >2 hours in the future")
         self.move_tip(44)
@@ -595,12 +593,13 @@ def run_test(self):
         b49.solve()
         self.sync_blocks([b49], False, 16, b'bad-txnmrklroot', reconnect=True)
 
-        self.log.info("Reject a block with incorrect POW limit")
-        self.move_tip(44)
-        b50 = self.next_block(50)
-        b50.nBits = b50.nBits - 1
-        b50.solve()
-        self.sync_blocks([b50], False, request_block=False, reconnect=True)
+        # No testing PoW
+#        self.log.info("Reject a block with incorrect POW limit")
+#        self.move_tip(44)
+#        b50 = self.next_block(50)
+#        b50.nBits = b50.nBits - 1
+#        b50.solve()
+#        self.sync_blocks([b50], False, request_block=False, reconnect=True)
 
         self.log.info("Reject a block with two coinbase transactions")
         self.move_tip(44)
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
index 32521606342..be69946a5db 100755
--- a/test/functional/test_framework/messages.py
+++ b/test/functional/test_framework/messages.py
@@ -497,7 +497,8 @@ def __repr__(self):
 
 
 class CProof(object):
-    def __init__(self, challenge=b"", solution=b""):
+    # Default allows OP_TRUE blocks
+    def __init__(self, challenge=bytearray.fromhex('51'), solution=b""):
         self.challenge = challenge
         self.solution = solution
 

From 1ac92155ae276f6cb772af4523f701be76c9ea23 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 5 Nov 2018 16:52:38 -0500
Subject: [PATCH 15/66] fixup

---
 test/functional/feature_minchainwork.py | 89 -------------------------
 test/functional/test_runner.py          |  1 -
 2 files changed, 90 deletions(-)
 delete mode 100755 test/functional/feature_minchainwork.py

diff --git a/test/functional/feature_minchainwork.py b/test/functional/feature_minchainwork.py
deleted file mode 100755
index a1cced0bc72..00000000000
--- a/test/functional/feature_minchainwork.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (c) 2017-2018 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-"""Test logic for setting nMinimumChainWork on command line.
-
-Nodes don't consider themselves out of "initial block download" until
-their active chain has more work than nMinimumChainWork.
-
-Nodes don't download blocks from a peer unless the peer's best known block
-has more work than nMinimumChainWork.
-
-While in initial block download, nodes won't relay blocks to their peers, so
-test that this parameter functions as intended by verifying that block relay
-only succeeds past a given node once its nMinimumChainWork has been exceeded.
-"""
-
-import time
-
-from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import connect_nodes, assert_equal
-
-# 2 hashes required per regtest block (with no difficulty adjustment)
-REGTEST_WORK_PER_BLOCK = 2
-
-class MinimumChainWorkTest(BitcoinTestFramework):
-    def set_test_params(self):
-        self.setup_clean_chain = True
-        self.num_nodes = 3
-
-        self.extra_args = [[], ["-minimumchainwork=0x65"], ["-minimumchainwork=0x65"]]
-        self.node_min_work = [0, 101, 101]
-
-    def setup_network(self):
-        # This test relies on the chain setup being:
-        # node0 <- node1 <- node2
-        # Before leaving IBD, nodes prefer to download blocks from outbound
-        # peers, so ensure that we're mining on an outbound peer and testing
-        # block relay to inbound peers.
-        self.setup_nodes()
-        for i in range(self.num_nodes-1):
-            connect_nodes(self.nodes[i+1], i)
-
-    def run_test(self):
-        # Start building a chain on node0.  node2 shouldn't be able to sync until node1's
-        # minchainwork is exceeded
-        starting_chain_work = REGTEST_WORK_PER_BLOCK # Genesis block's work
-        self.log.info("Testing relay across node %d (minChainWork = %d)", 1, self.node_min_work[1])
-
-        starting_blockcount = self.nodes[2].getblockcount()
-
-        num_blocks_to_generate = int((self.node_min_work[1] - starting_chain_work) / REGTEST_WORK_PER_BLOCK)
-        self.log.info("Generating %d blocks on node0", num_blocks_to_generate)
-        hashes = self.nodes[0].generate(num_blocks_to_generate)
-
-        self.log.info("Node0 current chain work: %s", self.nodes[0].getblockheader(hashes[-1])['chainwork'])
-
-        # Sleep a few seconds and verify that node2 didn't get any new blocks
-        # or headers.  We sleep, rather than sync_blocks(node0, node1) because
-        # it's reasonable either way for node1 to get the blocks, or not get
-        # them (since they're below node1's minchainwork).
-        time.sleep(3)
-
-        self.log.info("Verifying node 2 has no more blocks than before")
-        self.log.info("Blockcounts: %s", [n.getblockcount() for n in self.nodes])
-        # Node2 shouldn't have any new headers yet, because node1 should not
-        # have relayed anything.
-        assert_equal(len(self.nodes[2].getchaintips()), 1)
-        assert_equal(self.nodes[2].getchaintips()[0]['height'], 0)
-
-        assert self.nodes[1].getbestblockhash() != self.nodes[0].getbestblockhash()
-        assert_equal(self.nodes[2].getblockcount(), starting_blockcount)
-
-        self.log.info("Generating one more block")
-        self.nodes[0].generate(1)
-
-        self.log.info("Verifying nodes are all synced")
-
-        # Because nodes in regtest are all manual connections (eg using
-        # addnode), node1 should not have disconnected node0. If not for that,
-        # we'd expect node1 to have disconnected node0 for serving an
-        # insufficient work chain, in which case we'd need to reconnect them to
-        # continue the test.
-
-        self.sync_all()
-        self.log.info("Blockcounts: %s", [n.getblockcount() for n in self.nodes])
-
-if __name__ == '__main__':
-    MinimumChainWorkTest().main()
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 80b97bb2dfc..e0e7ae4fa46 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -141,7 +141,6 @@
     'rpc_uptime.py',
     'wallet_resendwallettransactions.py',
     'wallet_fallbackfee.py',
-    'feature_minchainwork.py',
     'rpc_getblockstats.py',
     'p2p_fingerprint.py',
     'feature_uacomment.py',

From 40c794bb561c141ba321f21fc1987980075f0023 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 5 Nov 2018 17:20:25 -0500
Subject: [PATCH 16/66] more fixes

---
 src/rpc/mining.cpp                          |   6 +-
 test/functional/data/rpc_getblockstats.json | 228 ++++++++++----------
 test/functional/interface_bitcoin_cli.py    |   1 -
 test/functional/interface_rest.py           |  19 +-
 test/functional/mining_basic.py             |  13 +-
 5 files changed, 135 insertions(+), 132 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 038caac7a19..adc883d03f9 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -219,8 +219,10 @@ static UniValue getmininginfo(const JSONRPCRequest& request)
     obj.pushKV("blocks",           (int)chainActive.Height());
     obj.pushKV("currentblockweight", (uint64_t)nLastBlockWeight);
     obj.pushKV("currentblocktx",   (uint64_t)nLastBlockTx);
-    obj.pushKV("difficulty",       (double)GetDifficulty(chainActive.Tip()));
-    obj.pushKV("networkhashps",    getnetworkhashps(request));
+    if (!g_signed_blocks) {
+        obj.pushKV("difficulty",       (double)GetDifficulty(chainActive.Tip()));
+        obj.pushKV("networkhashps",    getnetworkhashps(request));
+    }
     obj.pushKV("pooledtx",         (uint64_t)mempool.size());
     obj.pushKV("chain",            Params().NetworkIDString());
     obj.pushKV("warnings",         GetWarnings("statusbar"));
diff --git a/test/functional/data/rpc_getblockstats.json b/test/functional/data/rpc_getblockstats.json
index 8b90bb584e5..bb7238f37ac 100644
--- a/test/functional/data/rpc_getblockstats.json
+++ b/test/functional/data/rpc_getblockstats.json
@@ -1,117 +1,117 @@
 {
   "blocks": [
-    "010000000000000000000000000000000000000000000000000000000000000000000000bdb84e02590a29888f409285dfe25361bbd5560efa5a2dd6996c53488bf37e8edae5494dffff7f20020000000101000000010000000000000000000000000000000000000000000000000000000000000000ffffffff1004ffff001d0104087265677465737432ffffffff0100f2052a01000000015100000000",
-    "000000201efa9847cbf19fecf953162d44654d1f31cce9cf6b56733b78fe7d35074ad2659af3e3c30250eb66bb8a19c33c0218eb424cd1b9be05de619b8f41de7335cb16f72fc25bffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03510101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002064b7a9880694336ca474f767e7afe5ee4b2efa98b18383f8395d1287456b7b530eee938a165f636bbbc6d47306c53f88c561701c6354b9a86c5eb786bca76fb6f82fc25bffff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03520101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020a0bf8197f74b5b25933fc5a63f091dc2f97e0bd14f3023180550620e7c99b6575fb1bf8c26de694116f3f16fe34ff0bbb9ce4f483b459b75c3ef201d09e3d54df82fc25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03530101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002047ca7c8c2da20b3bf9b21d2adf3213ce033e0c098aac45942c8ba4a5a75ed8055ac7c23e108fb7cfd1c0364ce009057a4cd33aaa681ca8705ec2b0de2f7ae418f92fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03540101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020b59309952f460e93392a97fe33ac429a89af4a40b06130f3908fa3afcfec690b92fdf523501d4d4e9cabbf95ffb35f36ce748e098822895e9ff1a7701e53e07af92fc25bffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03550101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020d761428dbebbda64457361f643c6d1403c46e70a7d12ea506e0d5a15ffb99b42d63bb67fa94884a0681297569cc71c4246c2a969e3e335a15e2cd686d7dc5e53f92fc25bffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03560101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002006b6e172bfa65832803a4a80396bb1848c576a780c21bd76f270834643d3d3265982bc55425a993799c4dca0906f0f3b73401bd2ee654aa562cf814b7ea40b94f92fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03570101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002009d6b24422c899e472782b47e7249a9737fbf23b81625a4e2d4b0de7b2f8085e56fa4c3da04a45d578ede057f0fc7d54c6d88272e0fd41025822b6c1ba5ba93ffa2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03580101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020eb05749fc2c2ba17e9814923fc13d2c590794555719b72ecf29e0a3a1b1b5112ccf61f775b4d53e747491ce1d51650484da37f4b20f6839b80d7e186a89503cdfa2fc25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03590101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002027ad35f49006c67d90f39a8d59d0de476eb34dd5b3963a964c3ec8c6a4ff9902298290acd6c91035e93eeb4822c6f1b9edfc59980c72e28ad211d884a465414ffa2fc25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff035a0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020e8a0095ecad211dd8053789bb8ed1fb6dc0caea748fbf1efc358e39c07e90c25676e3ad5deec39620087c2d9a4fb0dc0b658b75f01392025ecaebd00d5ee150afa2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff035b0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020ad74c4753fafe05c7a6baaf696e2fda8c8ce2348a47342a3228fd31608a9e4661f3d510151f056e81a8fde0999f9eb00deef71293d85696d311b8871007c08affa2fc25bffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff035c0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000200c944440d0f3750a06f3a8d258c4313e74b074dc0d0141f8425bc3ba81757254017a5f2a3ede4889bad2f1ebf94e2d457beb2e9018cb52b0e233c73ed5c5e67ffa2fc25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff035d0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000207e013d1448f1a35419089ff6d9b0a6e63b4afbcb978e87907b1c50bd59b3123daafecf2edcf961edec7f8530105ebdd591b463a79fb6f2f17801c412c864e773fb2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff035e0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020b506d22723b16c6e9d71f5be4d93f7626550873a4e2cfac22b57de5b9eb7e06f31246c3d5ccad1a726e7b4d8dc068588d69527a3e334b7075ba009b8e986c14dfb2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff035f0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000205c1d6f4da7dbae09408ec5345e21384729767d8854cf3c70fd7d09a44fc5eb461ebc63d9add5b73cc51846a28b46613c991d21022145e0aa161f25f5d1dafc8ffb2fc25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03600101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020ab3f8207d9767dbe5d142253cf36d53603c0600562ef7c27e640df55c11a125372737c0417503ed446f7314fbacc8e40e0c8a6a3e39e9440025b5cf1dc37c1ddfb2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401110101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020e4bc674d097a77155d156791c8da5ca651361cdd46442a94725371603d94c5570b4ec77edd8d70432f6fed5836b4cee92cb2c2a5cca160a4ebbe720b90c7ecc5fb2fc25bffff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401120101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000206b9ff4ebf57fff1fa77c0a6e45fbac68ddae006e1b9b1b5469ae90bef5a442241385695a41c4235504b1ab8fe682764a6bb9908f905869ab9b6a0e9e259a4a31fb2fc25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401130101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000205dad510cbe418b38c07ab5a8c4ceb011684627fc152191b02eeb8d4dc5e16c5129a13ffdc2bb4a8f8a79bab0ed3d59b417206b51738a664bb2e4c60198e627a0fc2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401140101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020ab66555a94ebd8b0edbfeeeddd3e4a1d169f77768174973941d59b02f2645b69e89259df6141973b674899f0bccdd1c1cab297859d25702d1d05f536fafe71fffc2fc25bffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401150101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020da0b740629a811d95936d9914c663d07a053a4d74b6dfdc0ba92fdca2159677d7ba6da84ece4d25520f8c152df4d377f8711017dbd871fbe782fa3db9c2fe385fc2fc25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401160101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002082ad4472815e332e8c2d05005ea3ebe9e1e6c4cdcf1e835f65f3e2218e4f714f29e4f93d64411a834d509683ca769403529ac5a5fcd6df77348815458c0ab3a0fc2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401170101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020449ee5906e01173573249fd0d22c9758f3490d26bd41137d5fa5d5e1881ae937049ced669e509f9e068aee3905a16bbc85afde975364013f3a63d8810a518af4fc2fc25bffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401180101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020f7bef3311ade9bf87947196c7e1784ad62175774e3beb0beb8b6089da24c906f55acccdc920f982986e2512830142372de42e4f4482b8583ea3987af3ddafedafc2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401190101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020c3d44b4dfbdef4554d3441134eb58585f80d2be6724c89ef3d8ca7b8f1ce9a033262d3ebf04b9532555653db810fe89f8a55a1232789a356fc10ff6e9da4867afd2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04011a0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020a522488c459137a3811efcbbbef8aee68d77612f799244fbddae24806b95b365bda60296c66147c6519067c3fbde001a3100c5f07030067a5381be9e4233cdc3fd2fc25bffff7f200500000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04011b0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000205a091cac7814e82bc7a1300d36094520dd9ab9dbc61e3b502d16fca528868029c925443da15ae3fc0ed1bad68b6d68dcb1a9b788c4d37dc7a4d8fad16eabc5a4fd2fc25bffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04011c0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020bf951664febd7e7ece54cd7040076018c778f5d9cddef1bcd7abdec96e7f4964825a33b7bdeb8c3674b745feaa3b08a69487e8eb687b840a00a058b8bd514ab6fd2fc25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04011d0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002027948c54de0a0f118ac29fb79d4cbe299017324775921e19dc8582ed2158623e224ff6ec0ab1c4a1f2ac8769bcf89ffec7eee2eb85d6fd5093df6db3c0d9e62ffd2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04011e0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002071ebcbb17886537af2ecc44fa201b113ecb7c5d16a32a6ec90a4727bda55293fa9057063fdc93c0300dde0d423175946186cd73a756a904dedca7f1c35e4185afd2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04011f0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020f68227194676aa9f2f5e88123541efd8e056c561f191041ca5a93665f53c7272f771a3d724951bfbb66dde1e5b8bcdef97953e312794ea3380e59f93a551a115fe2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401200101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020983b73ba2033157674a4d9e2bdd28060509a5ea61699292fbc95c9b74afbc77fb794f7ba4f4ae77c887caf32ed5da81988da2e3e21fcd974b20561597349ca3efe2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401210101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020511899610a2bc827d379c172e4861a8b39a1302cef6147d607339b568ebc0a21bc891e0e40718064b2db7dd1fe89e351bc3a0c6b0b04ebe031c1b7d9c06f6089fe2fc25bffff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401220101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000204e733b966b529bde705c7baa8bd8f9c17be1686f96d240f4e44b0bf1e78a88419b8bb1ccf6ece94e4b404d8c85a565c76af56b40cd0fde8a051bcff5b4398ee3fe2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401230101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002048a934692fa06c5a4d14e179f6c700d532313f91013d8aeddf29bce9012e4a5a14995086d2669f3ad3a3f95617a55682000afcc81f22a10e3d441ad4a04a08d7fe2fc25bffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401240101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020f203e8b033820bbde6307fe778ee3ccb0694db36b11678eee729b8d31e6d7f42f036ee2b654180b2dca0496ab92369653962bf38b6c61312bd0f9c3e6e651f6bfe2fc25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401250101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000203cf0fbfb63e3d074f1ecd646dfcab3942bad27fc57a4c66c6d7e10c045249a1902463f460b6e0753ffc432f3c6197d95d9e5a6f5a2b4382583ad291ee0d0bea9ff2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401260101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000206a5ce9fc23d633c21300850bc3df7c16d632c1b82fd4f33ea31ed24174d4e042a2e5eba7ab9dfde6b5898468ed10d1d678662d43d664e70f70e2d9ecf243b0aeff2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401270101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020c4ec50dc4424a7bcf2e842e1f32112609973a9df8252397887cd0be286b264614aac409458a8e0d8055fd360a341d5ff0bc0fff9900ec72400e3ebd85b6b3ce0ff2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401280101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020dc857e6b74fe77f2c19b5e4a460d45f7589192d09f2bbba450727b015580f04faf464eb1b1437c2352648f697fb5738c2632b12de59aa6ee5dfb16923a4b8af8ff2fc25bffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401290101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000203bf267240738378b7c466a3108f4c43ff3a32350bc25f93b87519f23932dad232f781ea654a986694878aba72e9aa4ee3a7017db16a8aa222a96dd1b0ad9bdbdff2fc25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04012a0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020f20e20f6317e1d0d1c4f080998dd4a2d54b47c5a9c360d1a89daa48405be7733852f18d76c6bf1c3c21b8d77784b4afbb60d3203f7a529dff7bafca74a9f665bff2fc25bffff7f200500000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04012b0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020317e4d1d78827eeb2264cf872844556a0009fe72e863f0a7c955e61a497c42256a1bb530e7955ce65d513d8edcf3b4045f1e2eae41165196cfcb946f09454d5e0030c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04012c0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000206760b726eceb61ac5dfece5c9fc9fe466348f76bd965f216303f80e5a4fa013dee504188541b40005bbace8383d986cf77c45d4de13bba067b08646228b5ed7f0030c25bffff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04012d0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020b14216de6d09f948597bed9b5eb9a78c1ef2918625bd0485a23cd02b9eb5e63230db0ebaff45393583c881b245b08f3f7c7c68c62e8774673d38c7e9ba19e9660030c25bffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04012e0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020d6eb696eef7642c99a3400984d9486397dbc9f11fef975c5bc3cb1fef28404507df9219b26f4d1b13a6067a89f799f32cb504b0a2b9c124b3f27704c75fa5eac0030c25bffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04012f0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000204abbf04db79dc922396bc8b978a6022f086d4b6ba92c48f399d209adf7e10c28a888cb43e58cdb5bf23618323763a7a08667760ab3bda039ba6f1a691a2fc4090030c25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401300101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020eb9b674c637f51a8d09d3b4820478071a097e227e7e569a453b9d9acac2e2342e79c560c8b2acd5e3f109b855f31e6dbfbcdd8b92d3ca3b083467e5dcf24491c0030c25bffff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401310101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000209d0baffddd18fd003f32009f5612c2b5e4bc1b1de570768bf6e5f412709e5052349147dccd6fa88e1a508b2875e1bfc88fc133497f6179abb97e4ef3d81b2a8b0130c25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401320101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000201a4446b0cf1ad80491c66e105c58a442c277933b38aeec29dcc84d78d3887c6ba88f38e4cda126a571e00fef82f8faecccb87dcc179da60701db2c06d5df8ced0130c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401330101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000201fdeea94bd4e6f1bbfea525ab8cfaac3ddd877f793d6aa2cabd90e5b87f519137e2ace526f925266685fcaf22a875447555f557a1732f5ba4d68e6cd4eea7c3a0130c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401340101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000206118ce408c02a43b7cd489728ccd57b48812252f5412281474524c6744682b1acf0fee448a94f74f5f0084b5c4777c7a8ab2bdc6722951cafc22d2391d44f3ba0130c25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401350101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000208a46d3ae6110ed6aebfa2e145dba2890a55328ab65b653061a30845f467f7b13eacb2f8ca94cbf119d6a72e10d3c98fe8bc863577191570c6087456c5b2f95980130c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401360101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020fc74860138f55ee9f2395c6eead78247f13af08e11c0d285a25b176ddbafbc122972980b5d06a4035c50032d505232e4016ea2534c41b8917e0836014d2234a50130c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401370101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000206523fbbb8b2337a9af684a05a2ca44a95b02e140e7d89873f54be3eb9e154d12da85b0eb12b5f6ebf790498907e698a82014b064596087eaa4bd187e536bd2c30230c25bffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401380101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000200e58dea2995a978d1787702983fee578950d30e31e31646850bffd0de2b7ca3049119dac3c89dd80b4aed7d4e29b8bb5774b4fc669ada0566cf86185e0345f320230c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401390101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020b9259eedacdf670799d178fb95285cf5ee388570f3c960c12c044ff08a99953cf2d70a9d3efd5749a419767335b9ae47e0ef9079d428537733ef494ae032d2d60230c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04013a0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000209468c5b68a997b030e6ff7199d7332e7510edbb50ef4639018e846a4bb28ff5d5a69b8c30ece23d02ac1e49c8f51d2dacb170a19a0035168339dd1fb8cb428aa0230c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04013b0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000208cf1d6ac812030d93db610c86613760f240b01d80b3176b407bc068a09bc0745f0fb2c7dcffe30117f330e7e79507225a0e02bca5c09adc62705f1d7e052e2010230c25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04013c0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002090cae0cf0e1b04b1d1b1e34b63962f0da779e0a9997bcd0d7a694f66c27f646cb11d9b12e16dcefd5a7b81b954887497ebe38d7054b5c6638a1603cd3a314b040230c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04013d0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002024e213434b2b4ef416bb8a60a9d27ba256c2d913acc2e11f30350ca2c7491a478bb045b74bef66fa0d4997d6644d3e539cc32b2c19d2b55c6e5e4d56e56a21360330c25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04013e0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020f91560a8ccd503e3949fe5c55ed35d173ad71a75626006f9f8f718eeb95b9842d91c687f74e2647bbb69ff5c1f1c77a9c0500a535ab1de0c3d3d55513dbbf9940330c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04013f0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020595504c910c83b8351e7a967421616b57009d630cc69a5428169b232fd885465eb0efb5a824cd9c865c45e53ffcf2e5130e6f01ee24bc843ea9b974936822b170330c25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401400101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000207b0cb679b3f72dea5c5be59a10710c8aabf25b7f2601abd6b17f1fde2c74cd0c77f56add334abcca7ce42288f5672437bc9b7f6ac967b1258dbc7ee9a859cd970330c25bffff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401410101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002009dfabc49a4af50746cf09558228bd362cef68cdb01f9f815246016547e19701af1b8da0e9803ded4b1236b72a4867becea1916ac04111f701d6c854bab89e800330c25bffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401420101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020f991aec9c092614d7cdc0473aef7abb7bfc68df8708664a9e8229f40f52d362b64e96aa64ada8487e882ec30c7a25d72118f663ea98ef95533c9c37ef9313c810330c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401430101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000207041c6136956a711b1a6e8ddf39b1d31b04e53084171238dda1613e186a2333e42ab1b0bae51b33ca849262af928bb868e139d75d26b1b9e47dc6aaecb1280290430c25bffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401440101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020a27c3a42e7795ccc88cad076475def8ef5ac04cd32e19d943087f23781957871a1e4cc14698f0a45fbf7fa149bd8773e601f3262247afc6a09bc4910fa4c1e4f0430c25bffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401450101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002055f459d06fe68898eb974faa57e52988af8e7e82ebc0aa4160f1d4a09076cb446394bfb45286719f4a9c03c7753c15e26603f306232a120ee951bf04ce99331b0430c25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401460101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020d01fc4b43459ea1d17f345b85b6e367d7a1448a6a56373c82ea16ccebac46a5f34b59760cb29d5d9055d81010d4c499d9e4552148dd7b6a7880a600ee639d3ce0430c25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401470101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002020b8f5f7f9a07ca3d257908592b2d8c2d9b90a09334beb434043f8bb69dced6d05850869e91dcfd5c354cace00245421d7fc6c5709cc7b5453f798b77ed3ae710430c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401480101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020aec382cd352c555992456744a0913e6a58f8438b45b3acbaccf74d9f5ef6c246c8b6df56a9a66f11de7bb5bd07c46fc605373528a0348103d904402c373e2cb50430c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401490101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020e8dd9880101dc43b7f7aef9fe9591f5336c2d474615c793822aca3375e49f6052520e3417561f9fe1bb68010b07c9419ad39a376c5955c3a7846cc7c6219e57a0530c25bffff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04014a0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020989f4a8e556b091c507311a4beb5bad8b465c1f44a275580d2efff2a5c9362714a07e724b810a4d2bd626b748caca0129fe6b0a98abbcb88616e2324925391480530c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04014b0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020c9c92fc32d533de29d52f05de0f50327518cd9e1578ea9f3ea73781ca0ab2b0a671727bc14925143ac36ab62c9df98a3f694b413fcbfa2b1ac79121f05f58c620530c25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04014c0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000201513fe6da7e35fa9ce49f9e331f7c4fe90e7c5dd4a750ade36aee3bcad846446c06841e90791614a9b241c0e7e0b5252128dd28a571e01886d719df09cde88d00530c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04014d0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002008c42ba91414bf300ba54d52033a8368e7817fa4ec432e23bfbe562bce150366c989e0c4122e0be619768b37590057229a50cae7b4a02c2465f355f774ee86720530c25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04014e0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002090ce8a9b0917da8ca212e3dbcc36c421e527df6ce23028eab815e439e4114855d945b558ebb7965ab4eac3a423b48421b85e6533313e75685a12bdb7880437990530c25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04014f0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020327d12bd0aea9c843147eab5a0eda95457b14b220528b9540961fc884326472f75b1fc617b6b0b3678564b47128b6058855dbff4a965bfd7c2bb0e7675352e500630c25bffff7f200500000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401500101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020e38920a0b3975dbbb838b0508d21aed85e1c9ad4c833a3239e2b6d49e895c23db61f884137237fe0bf72a80da93c07864abf5dac1a7aa90e78c3695e695b4dab0630c25bffff7f200400000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401510101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000204e996b63a3a8877abd0f96523ef1bb65ccf59e87d4d58df7dc1c996d4549c65d836af503c874166d9ee8ac1e9d80c491a96c4af12b05bae479b4121f04f2fbc20630c25bffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401520101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020c59940c8f0d481d0bb3974461a5558d6e5c5d4f081f598012a1ab36e5a1bcc521a007576acb1929694bd757c4c2f95795b67948ac876e9abd6fc710a805d13510630c25bffff7f200300000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401530101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000209fa40d3fc02685672e5e00986f0fae81ecdf9d9c723218529f69878cc4507a52d0bd63d32b39d52a0385e1557c7e73d4431882683aa0d44a9d368c5525328bab0630c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401540101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020224987476b07fb797b5042e9079895372f3a4d6c72106750d3a81044a828101e202ac8849298ab948edf92e88a1c348886d58f5a0380782e7be25ac24773bd220630c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401550101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020646b6f43f9b28704ced5bb942fb46c9da768ef7db6982e7cd77707a5b648c57a75db88fbf1570b6bdadc4d2e3560311e03e3bfb4668e5fd3008fdc6aadf03d530730c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401560101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000204390c178371af555a49b98f20b90b4045789e8e7746b68430c15475cf8154b3134fe9b25e173a8c81e8fe18a85f90bd5d12f2a417a6f0a894140967728ab643f0730c25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401570101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020e6af965acbd8b6910d2998fbd4de777afab64cd657b51eebfe1d7aa524e9183c342e7c4d5ed3fa566fa1b59b62f5c556aca515f406f3e054be9e5aadc9eecd680730c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401580101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020b55483e123615982a884dbd64fcede4fc5826492ede2044ad5c692017189e9033ac84fe931ee628446b9ca348192226535a89fb01397420b999bc1a7c4efe0a70730c25bffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401590101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000206fdb25ee1beb9c55fd10995d64785fe8c3dfa74b7c1aa8783bca66ab832b5842fb862752b1dfdcaa0cf29b58d83a6960a2bc2741c3e9e827f1604c254bff1ca60730c25bffff7f200500000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04015a0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020b89f0b6ca6ac433b214f4d6aa3aad630e30a191f09a87a3afff406a04c934335ccea7d1f37e953cc27399d455d7198f6a641842903850a0e6f1347544c0834360730c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04015b0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020294ac4c6fceae72c604250ec88156194a95a7968361f026a71775576f1d39e7dcb267dc3206862a4722a7b7445655d2942d972c7a9fa694ba25ee37847b9eee20830c25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04015c0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020bf98e931e9e95a7cfea62fd9569194b70ac4018cebabe00a11cf1152ac4ee25f2a52176fc5927532d467524be009825e5e2d338d55de80fd4c3185d74cf6e2070830c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04015d0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000201883dadd68958cb72b2e2c64416b3deffe12dca653ae10b9762c0f6529f43c7ab78f6ee4fc41218b376c0c348e2d77cb3bbdc069dcdc3fb7f70e38b17981d2470830c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04015e0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020c230ca06f98f5f198de49eecd6da20189b65f7874a9f225d0ad66d58b5c5c213497b6da42f81f15a0ee9d5d32eb529bfffee053081975f9edf36c9eb28fd4b980830c25bffff7f200200000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04015f0101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002080b7db7633839f2389cc94ea9a1a59a0f746dc4f56518a613cd243012a1dc1216aeb930224a028ed7f5c2af8adbc144075d6acd8175a7020ec461aef790869340830c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401600101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020dfa2754e0729e5df568bac6e2789641f79e84f620fe680bf07bda03ada5f9c088bb5bd0c1d50d6b2137f6b9f78506de971b26762021ebaba66cf6ed602f7c7290830c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401610101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020a1b9c8f4d433672880a35fc63e4c84ea8a306f9bf73f5688a22e228916ee1f2c920764d6c3a9ce8fc6cf056be2f89e5ef11611ef22d525eb56a625a71f298f140930c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401620101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020853f78fb0b5ed18a319af6a1a1ae7d823123468c7450dca29149e9d85457a15f4e2fc7538e5874feb8c574a23b29e82e5eabdcdd33bbaed7a06acfd9eff1c66e0930c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401630101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "0000002020ac9ca224501acda2967c53cf987eca040862a6a992cea9ec0d05ff48794c49d71354b6d5db908278d3093684eb1dce395f61fa35101332b0d728a60b725a890930c25bffff7f200100000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401640101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "000000206b1ce5937e6b737dccc7d523a2b45ac30492179563e00fd9a8e0cdfbe62f8c46f0ca95dce14c5451ee044dcd594ddea986972a8e76386bb740199fd97526177a0930c25bffff7f200000000001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401650101ffffffff0200f2052a01000000232103c16e13001fbf4ed4c374913dc8132f0413435123ece4ac69d15d44b6e188e3abac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
-    "00000020fe320f935c41219709068310c00f2250f6773c79e5b1ad5209536dbd9c260d4ddaf898cac93ba39f13299af7ebfe94b4c774e0e5a0ef675e934c40430f251ced0930c25bffff7f200000000002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401660101ffffffff029c00062a01000000232103a2ce2bacd18a610890e96e17654ffabcd1eb5a84981fdc9345eb278364df468cac0000000000000000266a24aa21a9ed9b72cb4627b7c4829a9c2cf2c0d3f050a97b097f5e8227cafaadbb78e8d8e236012000000000000000000000000000000000000000000000000000000000000000000000000002000000019af3e3c30250eb66bb8a19c33c0218eb424cd1b9be05de619b8f41de7335cb16000000004847304402204dbb696b8668e4aa2f3f9a0ae9fc2ca9ff2281b941bb7fe84a0c42e1a465be90022026f8595012c9fc6449cd5e8d9d6293cf5fb5d5391e1db04cd319b2bcf237b37701feffffff0200286bee0000000017a9149717d1d690e8b1f3aa0433fbfdcdec6fad9565208764bb9a3b0000000017a914e74b7856f19f28a47bd66269dccd4c2ed91eac49874c000000",
-    "00000020cd4b6edfafbe49810f072c6ad74f3afec1af2e1b91a849bfabe6ed34a656fb4fdd0de4c932ccdb3e9ce91fec39f1fb0e0a262b1e89ba061638af046f8c056a280930c25bffff7f200000000004020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401670101ffffffff021cd0062a010000002321034aa086b4bca870674d9dda72d53613e2c339d1ef058482f28570fbd64f86a7faac0000000000000000266a24aa21a9ed1b218e95b5b334bd92553097e50482004585feff9a6e4e49ad02c16952b0bcc3012000000000000000000000000000000000000000000000000000000000000000000000000002000000000101fa7a45a11903ba04f5882a80bc3ae92874d3593f6ac6ec5df1c3e36c71193e040100000017160014c72bedbeb7b7ea275ebf1d73e3f2eeaccc6d118ffeffffff0264daa4350000000017a914c0b9b4592a30caf048b15ab42b43f7816dd686aa87781ef5050000000017a91461d85e5311e800c8573fc5e7af7579147943c1cd870247304402206cc4d5f4745eca4fa74e2a5c0ae3c983d97df5c7abf613e8da9ac6a12d2f3e95022026efa2970cad0d835922ac7c9277ba4c042f927d17f85b52c4c6b3321414cd07012103bb0897853295c8f47a5cf3ffdd7dc4000367b4132a2b644a549a4169826cbb1f6600000002000000010eee938a165f636bbbc6d47306c53f88c561701c6354b9a86c5eb786bca76fb6000000004847304402203ee1dd25e9aa6642fa0b5c99be75282d2e17c8cf27237d4c92f703042e911c930220266d5fcc69004bd74972dababfad6a8ad7fb9db43091b4946c5178c3648c132601feffffff0264196bee0000000017a9148e94bb1f33fbfdb0819aa787caa211927962c7de8700ca9a3b0000000017a914e9e54b5c0ebd9e6a4ea7df3717d18699bca735d0876600000002000000000101fa7a45a11903ba04f5882a80bc3ae92874d3593f6ac6ec5df1c3e36c71193e04000000001716001476b4d8d5e8f2f91731524ac5e268dc8dacf4c949feffffff0208bd9a3b0000000017a914321761128c5ebb7be0d022523425e81a2b1865e387005ed0b20000000017a9148b73920aead2e0277f83e514ed61e502095732e8870247304402200d65b4394e74fd41af194fab0e3e43ebe3e01853d7dcafc7b5bf8f44ec238e8f02200253d636882103071d865665992c8a4bf25f6449d66ecfc8caccd1f6da0f6571012102b5c4c0b603440b189549045d101075058d3a2ec3da9a10e41942b830899796d566000000"
+    "010000000000000000000000000000000000000000000000000000000000000000000000bdb84e02590a29888f409285dfe25361bbd5560efa5a2dd6996c53488bf37e8edae5494d0151000101000000010000000000000000000000000000000000000000000000000000000000000000ffffffff1004ffff001d0104087265677465737432ffffffff0100f2052a01000000015100000000",
+    "0000002089260cfcef76aced9fb272f03a0928a5414d9e0be3efc511eb94d9d160691f6bd092e1c22d71ef4c8d54693d90ade02798e70d895e4132f643d2c6fb4a47bb7860c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03510101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020276d949a1f6464b381105bb2b31a1a30ca19afe68e46a923b3426fbe4ef8144720840aba06cc727b5a83a4e11ffa228b94f1776176e494985ea6b658b344f27961c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03520101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020ebb4db63446ed1a117536bcbfcb8660fd0b47e91bb14d3227ccb7754ef9df36759648c2b620c221d13d865fc585fd9e5e6cf8aaec227c8925bd3f91a41d6856261c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03530101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020045babb1fc0326771a4879b348663442cd173ff0900b81a80f03a2afe2c8bf7e8afbae97c863d38e7d0b185991cddb238496c546befff753fb84034f7ddc232962c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03540101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020f5956fc3b593c929dc5efccc76e25ebde1fde7fed94bb03693091ffb3be887cf386b29e76bf87a6b9082915ea8ee2058a3793d21263771c3b34ac5c80a1c5d8e62c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03550101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000209c9bc643f19a859ee5df6d4de4f75641a3702409b85f19aa196bf026f2835d4637df302611d347c79efaaa22285c1f5159cd3718e379047a3cb49a8081cc175c62c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03560101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020b68d2ae40b3af49cf046671b21c7affe917c5a1297353b54de9843bc336205e51027e9127bac29eea3b2450f54737278411bc3f4487440f265d62e2d056da36962c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03570101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002060a72f29afecfcdb77e46aed4dd236960882cb6e2af2b2d845f7af13d895276ffc7472852659d6c1f2da295af3f8fb6730f7fe263a0b9037386b90b99859debf63c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03580101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020eb231c86a9eae36da36bb760a426b3c622f10b0e5ad176da413fe3f59419841b97e138af79e4d226ce15a5f2eeadc2f74439073c09551f127f9dd60fd463f19563c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03590101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020244436fc6a84af35adf6ae68d7c7fc88b79c35fdefce36b8225e7941ca598479b2a32f4c16a8db0d487f550ff7738360ad21a210e106e6d77ce4ee07c327613463c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff035a0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020ac9483a1cd2cff2970cd305961c5e46bbb1254982ff570ec980f9ec92252eb5b22e129b0dcc9a83980a45af43435077a206aeb284daaa59197bb5bcc5919aae163c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff035b0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000204eb9f190f5b721450d2076f2f78b454e7b093bd0bbefde27aa61f5892a26ca48eda0d262444ca3b102cc139cd162151eadfa4b4307f50f56fbf47b3a70cd14ee63c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff035c0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020eb85007810bd01b6bfc8227b8243579b374e78bf6c975c18c7dff881da66a167e9dbea022ae948983e1ee52103017c5471c7d0ff1fbdb4646af3ed79b03c7d2963c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff035d0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002079422989f207e067e054f1daf29fe283bf6e53614593be9eb65c3a9e6f3ee635b955831bb99f1fffccf0851c6fe634476e9213d5835de094efdca472689048d964c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff035e0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000204ca3cebf5a2a15ec7e795690a06b1a0a212eebe59bcf0ff36838ec818440d06f5936cede20a53737231755dc3ff0ccd7a872ff5894ccc693f87c8f43bdad3b1d64c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff035f0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000205052003784620d5c60c98f9cc7de2f7c381b1ef8a3c638f08bb1e08a17d3d035802870c391bd66ef1260c15e65fd8d71dc2c0666a0e0885f18c9248dda9d193d64c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff03600101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020ae7ef3a4dd55c8026cbf29b3ba5d040046164bc9c372c8150687dcade91cecdcda1370bc9548a283cf91f85a8437067af16ae339badf9d781a1a945c83514a0964c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401110101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002071d7356f7776982b5fd16939b4acc19d18797a942ab39aa627f3c031fb902f91c6cecf8a1e72a730a35ee0f9e28132bb38a2a7902d13aed8c4c26652937b2c9b64c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401120101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020cc53f0ae3f3dc77a9c85106b0e480c620dfcafc1ec9d82b8a493429ade2113914fe06baa90878e2b61a9b79cbc1bc8db1de3c66c9dc5a69a7a8c46f5a7ad572c64c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401130101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020d4f56ddc69c417c6ddb2d268d1d75aacdcf614fcc8b1c66ebb9bc9676b3f20a2357aa5c89e57f89425eaaad7337467fba1723f22ba838ff4ca40362456ad82fb65c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401140101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000205186b86c447bc18aa0338c1ffed26664792ecec44ae38acb4b3deaff84f40515d270197947702d6368620652200c3d074840b7dbce2330724a4e08e072f0fbf065c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401150101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002054ae765d0a1773eea85ec1751b5417e1767c66b1b0fc43ceec37cf6165372f61d4524717c7ce2593cc1b47889a3d952599502fe2087a65e1ee20714cb40e1eb965c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401160101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020658e9f911ff5d212ae46260ad72bff2cf3e47423c8664b555d43e9fef4935d01dc32c8eb5f58022614e45c38b6dc7a18de7324ea1e9fb3f59d14161e472d8b9165c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401170101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002005cf83a0154e8fcfec0d47fde6fdb384ff2a2c1f9214cb0d6eb37c2d704173865957eb824441b34ebe396cc0989445e6d421de8c7566a2ba0367909b0966814e65c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401180101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020f1749c471b3aa66f9ecd079c1685a7372f693b0a209795273b946c5370f3cf0006b223dabac4e6e5bede54bc4b41ac810fd0f230a8112ab3ffd7d15cffc4ff8d65c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401190101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020dca203355775af28e3cf3b8fa23b4966dda7fe053724022597af31ba2c507db1796055a0bfd35475ddf89f157d5c33db8f242674cbd228661757c82df18f0baf66c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04011a0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002074467c9548dcf6b1135ecdf382a287dfdf2c9e27f1edbe78e7fe8b12b21f11e447e144e3be4791a226640b3d387b02e8483e6a9f7c2a87ad1ed13b98c23b8ca866c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04011b0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020a47c44b1523d923541c272d1e9d0d91bce53f567677d1d2cf8c33efa8d43b60e4f7f431867043c95c5793066b70d6de28a3b1cea4848885f4c714777c2a983e266c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04011c0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020b2fc67a35b78eb4b80f252708068c06eabd87d3d70210d15b7284e14a94b7debe135196ca3ed51983d571b16062445e91cf204e85b3152053baf54d0d900e43f66c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04011d0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000201e0e001bfd444e55f187d3d4f69af7a5df930c4c789fc59a4c7346e6a6ae4dca9429a799e5c0acf9bdfe2f42eeac3996edf1cda779b92eae8a617f34477bbf9066c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04011e0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000202fce4e148707e01670db47b39920806ea46b0e6e3034d7fec6ee0f0d95a8948d5ce16a4c7f17da0c6a94ce531b7f83b84d95696f78935ec73fb370ff0b1df2da66c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04011f0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000208e816b141bdf1ecd6c39a0454ade5e190cd65c3818bf7674f50d40917aa88ef7fb6ffb0271436034b553f46ae65678f6f82547df8825df59b720c2d1e6d2a92d67c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401200101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020fce3f6d34da936b3d99f92fb9d868749866d1ca9d6ada750069aa0b27c6a6bf8fb96451d67a12de4ac174c435633bbe97734046ac23a13fbf2dcecb0df4c598667c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401210101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020525de50f60dac6771f0d2170145f409e644efe5aa8c058a72cec218c3869dc0a4e4a188f764af0e312186b2580b2da7f4f33bc182da02719c5e6038a6bde9a1b67c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401220101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020b2fac97064253c48e41a01ff2b4b295e7fcd89240cca3da983e6d50a4351de89d3389aa07b2f9b60fc6189d6e46ffd49f79f068799b16af0ba474cda4fb044ff67c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401230101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020b068c8eb7ea4de7e18e7d4de34ac38ba88aba41b0b2d7c7538b1c1d722eb841879a5250219407a80e033f032ae5bcfeb1fc4aaf458e7e3513bc89f600a6aa9ce67c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401240101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020f144d2c205bbef7b25a8d55d850e068eedfa97bd7ebb2681d752f9f16fed9ac5e23f5120d75faeaff2edf3d4049845b2717949faea304c1ae8f3d23fafc63a4767c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401250101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000201658c8e8a92b817f3836dce856348b8d6d3aafb2893e10ed0ac555bd06fbee5fe04bdd9cbc64d88394937e02c01356771d961f943b4ca1d95311191eb4bb7ede68c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401260101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020bcb83b43db204f54fa9aafdde47e4bd6e18eaa53cd19101b9e4ea39e37c1f8cbe7208a8730559a0b2fefcfdb6a6f3226b52ae3faa2a7fe18ee0ff1dda44e14ca68c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401270101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000201cf6d754ce951eb9d585e1502de33341b109464959ae8527a713d7cdcb19fd004838a0d2fd08a3f6f8c60d5aa77a4c5d0522a5bef4c8a33b94a3a28111bfefdb68c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401280101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002069c8ec8493b39385276a5f9e7d39cece8bace8b416ec6969938927cee9b7164bd470b46d911e7f89279e2a22266de72cd07fb747725663429e0c83445ea1cd7a68c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401290101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020e78705a47d963ff67f6166f9a75c157d29c35cf6aa43dd5b445ed639823afdb241b96c800f3e997857ba2b046371eb85602b3ab103a35a9b108fa30dc8473afa68c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04012a0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000202b5f7dd360ecbc14603805563b6501c2b5bc05adbb3e18ed7918ea6b38471604137fd14fd8383f5cc59c2aff3d56dd52bc91aa50c553664311bcf0b45c55bc3e68c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04012b0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020866b3b1c389fba0cc3458d01c85555ab190e92e85404917be0ef11c9a16fc9aaf0356d0b97f51c232015d5ba10c69381fec54bdc164a7b01c976f13664dc583669c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04012c0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020676eb94f9e01b703bb64858552f6296bad345bba33bc741ba21c6faedbaa30f30c6c307ca64f728fba08a88f8a9763478f1954cab749dd5e23e7ef960812a39069c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04012d0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000206f5a89943cc721cef17a958c391f68834b2c4efe6a707e2d73f74e82a01ce8ece0996843a8048e93dd8c2074e00fae675c9ef17886a0c3cfa58f3af5a7ca710c69c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04012e0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000205a77b8b6f9fcc810359e19e158ef12a18e7896f40977068d95f8fb49a71c3f02cc5b54506fd58f1216a1778877d2916e51b37acbfb6fd3a5a2a8a2b795a3781069c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04012f0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020b3c375a58cb94921083a10d2cbb922d0369c96db2f9b68064e2578e422d2de4008cedba3fa7f963779ddd07504852d0c0afe87f7c59fac83e356dfe00ff69b8b69c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401300101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000205731ba4f99f04a81792e28fc41c5a82cffc4e92fcc1057b89b6c2f17b72435f3ed2ed8511d207f408c90a31d2749d79cd83040b0ae8e6a2192d6e94094ac42da69c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401310101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002053e2c6a574535eb1b2daad8f9d0ce03517f31b951ca07764f02de0b8b1a195b499b484ca497a77c19c2063888ab9561cb21cb063a5e34047cbcd3d2ad6e9543c6ac1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401320101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000200b34e3bbfec6a75e3038653831d01a912500bdb1721bc13899c0335644281e8252787441403af405d7304022caf937f5ac12984059f53d3b57a25eecef797d3d6ac1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401330101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020d56d5b62cd1c1a669e3b711d5eb4a33ab9af1ce08bb283b5516ef391709f8f68d659b6c0ac76aa2b97b8ec9f2c48025cbf0b34c7f7f0d3f8eaa118917aea414d6ac1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401340101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020a76216c7bd819f79d110b84373a51d3c637a7635157f044c2f140cb0b7f8db6c4c02b8182750b68596c6ce7b2ca3e2eea23c9f49056c670d44893a8180599ba86ac1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401350101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020c7dc3f89fce2eb41c583738d1455c2f76e84625ecb1df5ac509474f2dae488252ee8bf5d3c5b7b0df6723c8a93fab320d0f0ae0afa0e4887f24d24a0e6236b406ac1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401360101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020644a524aff4eee751b42eed17af70ce09000accc436d3caff672a651350ea9c0d4c3cb9111af7226ac7b325c627cd7392be9ce4f0ac22a12db2b2fe87ad39e496ac1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401370101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020f44caad2827e45e4b1bfc287b9d57e825194387a2c044cfc96832fe83fa9804529dc3f04440200bec93cfe5201e543b3813e0f83ecbaa30fba7630322a0b6ddd6bc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401380101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000208034bc0a0624040d6e8f3234c02617277172583f44b0457d28620175add14fa332768e2a1e8fbd6c21288a5ef817926e479560c3d5e6ea27a1f89b9c25245cc86bc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401390101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020b9190acf9f8e7c890ef70d636457d5a0859ec9cc91ca773ac042ccaa4a21d18848c2625376680b0f915f6dbe0a40dd2be635a237b8f8416b2b86fd0e2085f0f26bc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04013a0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020489224cd70b9d69b614145449d295865061ecc8c887a3681f96b1af54b8386966f666f198d45b0ea89cd4c8688601fc54bbea2ef0f5e32030992de0124b94a4b6bc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04013b0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002000f76f59c283a4b73ca526008e4b9ba8d740b85cc4241b552611a8bd09673021ac99ee4a815152bb247b792b72cc9864278a17c4e38c6e909a64623569813cc86bc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04013c0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002089709b2b7e9f4b9dda19efbf8a7cdff9dbe1a9cea4d5a686085bdd95b072ef1c013a4bbcaa7c9a0585a608f5c9232ac455397d0cd7603076d4d3bc48e9af20b66bc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04013d0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020a9647ab88a1483306973e2f6f2d31ff33125eaba2d337d92162b756d72cffa940f002e4b0a0c19dbf7c003d12eef4e6d1fc5d30bae3907ffb59b832bc450fb6c6cc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04013e0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020dda5564442f69d3bd7dd1f1ab491bf931d1c26d49fb67a5ac6750c79c6f063829844a0176396eb6779b9af8a04f0f281f2ab4420deb25f51d89f82d6ba64d3b66cc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04013f0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000205caf3441bbff268d2bf504f3b780cdb067474a8f10ef73cc6933129c8bb1a232998b1dd67e9ca1f8344444dd8a2eb3234a58f70fcd7700ee810b5ad9b0c0b2ef6cc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401400101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000207addbbfdfa509a3f04269096225a45d46e0d6284224e69eb70a8a74854423789f36730c2493b4a7db5fe7478c6c9cd704ce541903d219f0fac5338381a5b9a6a6cc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401410101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000203a2f75f355b076d95d9869646ef5faf6cd08ef0283bf9f4d3fb7acab72da24626cf3a595857331deed4ba00c7d9f9587adcd817ed942032badf5a07c39a326226cc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401420101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000208a53748979345ee81f41c198c6bbc273dcea5006e80fb8aa56f565f06fa0eb8fe0340520f78474740d3feb8dbae34a455eb7b76428a379d2fd003d6ba11424896cc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401430101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000205b7ab004e42fee45f9ccc755e2db6b7fb50db21e81dd078af9fc032e7037d3f9a265caa00418b6b791c4197367ac26fc34a2035fa9e8777adca27544f27897196dc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401440101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000203af47cd134ca23fbafa696e81fe812d58903fe3ce4fbc90f436f4afc38161ff95d96608b1f02246d74abf69f1cff72a773f21d8a7ae5395f25d363fdc95305df6dc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401450101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020eaf052d83f4259cfa3d93633eebce0e55cc31008cb4546733f9f0243156fe5972f672a42d15add072340afb895a538e4c41eccc1d7d6207f370bc07c19488bee6dc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401460101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020c2895ff03fe674f38ea43fdfe4ff5ee5d693d8a44912501f2ff2ea9d071a4dab9d31b688d9ce6348f911418ff954d5ded372f1cb8753a6bda9154aa4d3f8d3df6dc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401470101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020ab1184bde539b55eaa87492355d02ecb669bb8facd8632d86aab03c41df0066c4acb299de10ecffed5f0ba1e6a38a1e75555fcf8f63c89d1cf759e1b6c93f4676dc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401480101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000205713b78c71a36e901796469a06cce8bbef61d28f8f33750b9d093f41330efbb57469b8c9b44d8a72d0a5b26317581ede6eaf5b9d4d521188dccf13ce9b6510096dc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401490101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000203ba5181d7111db88bf1caddd545fa4f5fb1b9f1e70b9b87ea75ccc3649e41837cf6ea84a54181e9995abd3e86f516730142ce3105ad2e5176291667b38df86da6ec1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04014a0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020bb1d04ddf27d6c7d10d22ea37bb14e23ba031f136fb61ccfbcae70424aaf658278dbc1b7984d591d8be7f3c3f6a745056f01a7072b4a2a00936639c0101189626ec1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04014b0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020879014c8fbb77036d5970740f9cc2de346c4fa9b727c6f30f2c4bee3a9a2ec4234568aca4273fe29e779b7ec76e313fc74b9366b67f8745cc3b485aa147f2b0b6ec1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04014c0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000205a89bf2fe54d1afac6c6146b689ed88a7325098f960f02ea66458d32193a55dcca5815655f37fe67287ac728a98ad039d628676c5a22b43783847582b3857bd26ec1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04014d0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000209346443b4bf8afeda7d27d5cde390438c946e1101271672c23d219f081ee299811f91144a7174a5b1f8414ba3b6643c216eca885c2151b1f3d6bdbf36113d3846ec1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04014e0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020530fd2a8429810000a80d0cf299e0e593af1bc8b214af01b3c2cc5b864d8c9529e95711daf355e5b61bc503a9af352692d0bc65997174ffd146093009889cb3a6ec1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04014f0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000207b91134ed7e6f1855fd5f9e1e2fc8f71419f167113ffaa37565d01ac9bd2f6687e4eb9dc5c143b5ba290326860601099384d5bd9dda00aab3b2d89f4799c611e6fc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401500101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000200d98c90a5ab2c928b28f7cd3d5f3fcc65eb54155d83be17484b16b2b192a2ee0d517436090043cff69a90fbf394c4247e132728a90c80a60300d745d6bcad71b6fc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401510101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020703989de909fd8a604d95f0865e4d36dd2ffeb1725a18a874f099f6a99f7ed72f11300c0b054c904ef11d1ae92d69e79ebf854d62c9a6f971590894f90fd95776fc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401520101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020af4bd47ba946a421a8504980712da0633108e6fa57c22a3aa36eb987321d0a89218744b4bce362cd8811dd7e00a31060955b214e06ac49d6a4c7ba0e00baca6c6fc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401530101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000202d8b00e520c9c3ff7344c6aceec575dfbe3867eb820fcdc78cb0e8d372a2b8fb6f4320927fbecf64aa633a1e1d2ba1926fb73f47824f85b53eaa11d9166cfd6d6fc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401540101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020598d4c64bc69e19ebd02018f215565ed4189861451c07f7a3e78dd8ace1c9f8b833caa992019e81c35b8c6aab328ddfbc322059c368d3e61c5be4b80e459fad96fc1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401550101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020c073d9d7a470384bd39ca77d0630097cd7ec1f466f078fd6fbca9ed179600222302050dcc0e2e4135137465d23a0538079b811b0ee05094c06968c00afd5659c70c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401560101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020a4672d4ca9b1033f17e956d03fb8013498deda78bf7a4097842151cdc70850217c9e443d5f5d4a3e3669d3e24e2b5678defb03896a2ba0a103db4f0cb17f92f070c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401570101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002083a3b51a2ffbfbf0f9f909c35b0c3b346ece8d98cc37b5e058ba8ea5624228fa7462369f15f59e2f8c54b2f3eb0838441ff974457e1245091f8a26812c5f20ad70c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401580101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020d62a22b5e8a5dd602edf8c7afd0e7d88da88cd8814957108fc7875b9f67c77d84ea32a931a1ec53cd096e1856457045a37ee3c5ebfc396b2956ab076308b8ee970c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401590101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000205624c2cd3860ef1b937883036b1114a9b11e419283d5d15df26c6f29115d2bba7329da750213e6833b12e001c598af7c0a5acd758ed6801bb8eb43b114c0ac0a70c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04015a0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002079fd01582164f2802611505602a4b125aef48552b205912046c5d600e1ffe45056b7212a63c5da40028f8980b856793089a49a02368016d96884064dfedf7e2470c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04015b0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002070f2408794bb31d2900e20a7f25108356db98d4dbcc3a926ea397f7a5d504bada8b512a0361bc37d9bd49e34b12959b41872ca2b724c60b95d7f7cb8f397b02b71c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04015c0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020461c45bc04d044553a0277a483ad221392bb29bbbbca32192a8309fe276be02b5fca69c3eb1add506b2904ba223ce1c04e75b6f2bffb441be321c050b18f1b5271c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04015d0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002031f3725fc703c16c8d7da2a3fa28149d8cd236617fa87f5f7780269bf9492e50ed5501597d7610625ad1691399411f847f841f3b6f61e40d3fa384f3348811eb71c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04015e0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000206d60df2d7bb3a00f564dc6f7f5d4166edec3881f4fdf442be48612cd8774ecb78a574a2cb59a1f1ea2eaccf1fcbd4bc4cedd7200ef2d355dc3a37ccae9df664671c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff04015f0101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000208759ca4a8bb0748327b29849727b9cf4e83e28d3da11ce3c2d659d4a099ff01ae73a358eb01d75a0badbd1265eb81d9f3c39598fd4b3b72c183e6a6df6d4dfab71c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401600101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020554f45ae62f2e68a7f3024a2c039829eece1d37c57447ef66ed4f93908b5fdfb6f5c7d7040a06d4c00fb65cbfaeaf05f3eb37a4f8e1cc6ccb06c8a5f7248280b71c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401610101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002061f455082361df38216e4e0dae25b461e041c205e105bd2fc5b8b456a0da0999c56850ec0060c9eef42908e04850c714ff359e7cbdff1015c7a0b367e4b12e9672c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401620101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "000000202cf713d9427f07f4e1286598d49b85e70bc83b50e889d7d4deec5d524606a5adabb7b9297d90f431060a4e58f9796429ce661ecea0db011c586cf26b91c3b15772c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401630101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002083622d6a65be82fe6aefdc109da302740e868eb7d11df1e92335132b7877aeebf88290c630d81532cd43dd34adb1c026eb44b2ddebee1f7b875cd2f381d95cb272c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401640101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "0000002036010683b0fd13e9fda3cb1eddf91dfa465b23d1cc8434d42c793604446666f0877e461ccba782514e5bb1681ea4879a02a99290283d9c5ee10c71ab72a1166972c1e05b01510001020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401650101ffffffff0200f2052a01000000232102e17a33e584d6270d90a625ad0b0c23a874784cf6e9816a8082e6669c849c964fac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000",
+    "00000020a84354507159e27defde8b968ca29163f996737d67527ecfbf43dd6212d21a678fe704dafd1b9e19164205a33d9592b66ee0f1c4b54a4b04e28844508781457a72c1e05b01510002020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401660101ffffffff029c00062a01000000232103d058e196b6e9888aaaa9e3a43c6e4d16b30a318f7ea6cc9826e6f28a87dea897ac0000000000000000266a24aa21a9edac33c2b3381a7f7ec6b73e6080dd8b08e11b201a1d6e4050b82396200cc0f73f01200000000000000000000000000000000000000000000000000000000000000000000000000200000001d092e1c22d71ef4c8d54693d90ade02798e70d895e4132f643d2c6fb4a47bb78000000004847304402201c15f40d1707fb260a3e25585d18b0f2c188b9c10370371c3ceeb5efa91dde46022005d29cb8ed5dad179231b0902f68b49c5a44bc28479644428b9dc296993c27bd01feffffff0200286bee0000000017a9148b0d9428b66a722be4bd3e1d273918eaf943f64f8764bb9a3b0000000017a914dee56b0d1b897f23ae38bfab7e438c973ef213df8765000000",
+    "00000020fb05c699b64b9afc01e13f2977dd01379d086f1141262d2bcb999c0e5278e3524b2a588e0e0c9b0e612f508b0f90237c3d4af50d758fb1719c7155eeb2a4a15372c1e05b01510004020000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff0401670101ffffffff021cd0062a01000000232103fa457223a550839b90ca199a196120e698d4401559a6fd8a1c7c34fb2f512050ac0000000000000000266a24aa21a9ed55194c0e9fdbd31bc20a3de5bccfff26475e1d946b4a4015ae1dde4fbe4323ad0120000000000000000000000000000000000000000000000000000000000000000000000000020000000001010431266e51ffe4a01b1adc01b3298d9d6517f28f0cacf2fa4839a06ed32a43b701000000171600143ce1aabb3225cdbc3efd0861933f368d363598dafeffffff02781ef5050000000017a914a3164f48c6e7a933e12de6d0599f68d881df099b8764daa4350000000017a914c0e8c83dac1c88f8536865770de0c95d64378ca18702473044022012bfae72859fbfd98afa5145ff79869e6026d41c74d06fa3c973e8e11e52c34c022008132689899dded8a9ca5edcca3c4ed157b77e5e0118bc813eb07ebdaf7a663d0121025cc8ff2278df0ae2acf7b3156714d1d2324c59dbc42b1140e01b89585e06a4b765000000020000000001010431266e51ffe4a01b1adc01b3298d9d6517f28f0cacf2fa4839a06ed32a43b7000000001716001436dcdc554def6f31ba60c8203a3fba3f08e798b7feffffff0208bd9a3b0000000017a9146e1425dabb2ec7509c10f717865e7b18b40e796a87005ed0b20000000017a9149a1fa9db234c67a0f768754ffc16b552e7aa2820870247304402205bdcd4876d866d838056f6d39b175ce0bc3eb4c9d558288bbcead4aeee3361c102205a0ff17fbd8aadd34d004fb5d19d3d32b0e54d60de2a6419e37c989597813bc50121036a391e3ce967a6cda915e8c03516d13cfc55e1216ace81a03546507a5988d7b966000000020000000120840aba06cc727b5a83a4e11ffa228b94f1776176e494985ea6b658b344f27900000000484730440220347ebf7e8d24f9b8bf5c38ec93b88404b9676c1232a80e9b12f0c22d501b097502205ec44f054cb31fcf3135badf86a10fc703fbe166dc212a5029bee4aa560437ee01feffffff0200ca9a3b0000000017a914c43c1c49388ffc56af8111177f4d72db2911a2388764196bee0000000017a914c96b1fb65c6f4ec42a8417ea087e1b7afe354da08766000000"
   ],
-  "mocktime": 1539452919,
+  "mocktime": 1541456224,
   "stats": [
     {
       "avgfee": 0,
       "avgfeerate": 0,
       "avgtxsize": 0,
-      "blockhash": "4d0d269cbd6d530952adb1e5793c77f650220fc0108306099721415c930f32fe",
+      "blockhash": "671ad21262dd43bfcf7e52677d7396f96391a28c968bdeef7de25971505443a8",
       "feerate_percentiles": [
         0,
         0,
@@ -125,7 +125,7 @@
       "maxfeerate": 0,
       "maxtxsize": 0,
       "medianfee": 0,
-      "mediantime": 1539452936,
+      "mediantime": 1541456241,
       "mediantxsize": 0,
       "minfee": 0,
       "minfeerate": 0,
@@ -135,7 +135,7 @@
       "swtotal_size": 0,
       "swtotal_weight": 0,
       "swtxs": 0,
-      "time": 1539452937,
+      "time": 1541456242,
       "total_out": 0,
       "total_size": 0,
       "total_weight": 0,
@@ -148,7 +148,7 @@
       "avgfee": 3740,
       "avgfeerate": 20,
       "avgtxsize": 187,
-      "blockhash": "4ffb56a634ede6abbf49a8911b2eafc1fe3a4fd76a2c070f8149beafdf6e4bcd",
+      "blockhash": "52e378520e9c99cb2b2d2641116f089d3701dd77293fe101fc9a4bb699c605fb",
       "feerate_percentiles": [
         20,
         20,
@@ -162,7 +162,7 @@
       "maxfeerate": 20,
       "maxtxsize": 187,
       "medianfee": 3740,
-      "mediantime": 1539452936,
+      "mediantime": 1541456241,
       "mediantxsize": 187,
       "minfee": 3740,
       "minfeerate": 20,
@@ -172,7 +172,7 @@
       "swtotal_size": 0,
       "swtotal_weight": 0,
       "swtxs": 0,
-      "time": 1539452937,
+      "time": 1541456242,
       "total_out": 4999996260,
       "total_size": 187,
       "total_weight": 748,
@@ -185,7 +185,7 @@
       "avgfee": 18953,
       "avgfeerate": 109,
       "avgtxsize": 227,
-      "blockhash": "212bc4fff83c9c749d637e82a0a4336b6bbd594a43d269ecbf87832499761cc0",
+      "blockhash": "f776d8ecaada45488b86fd72ab7ef45a5a963724f86748b6689c160a7bdea349",
       "feerate_percentiles": [
         20,
         20,
@@ -199,7 +199,7 @@
       "maxfeerate": 301,
       "maxtxsize": 247,
       "medianfee": 3740,
-      "mediantime": 1539452937,
+      "mediantime": 1541456242,
       "mediantxsize": 247,
       "minfee": 3320,
       "minfeerate": 20,
@@ -209,7 +209,7 @@
       "swtotal_size": 494,
       "swtotal_weight": 1322,
       "swtxs": 2,
-      "time": 1539452937,
+      "time": 1541456242,
       "total_out": 9999939400,
       "total_size": 681,
       "total_weight": 2070,
diff --git a/test/functional/interface_bitcoin_cli.py b/test/functional/interface_bitcoin_cli.py
index 251ee0dcc4b..ac37097f024 100755
--- a/test/functional/interface_bitcoin_cli.py
+++ b/test/functional/interface_bitcoin_cli.py
@@ -61,7 +61,6 @@ def run_test(self):
         assert_equal(cli_get_info['timeoffset'], network_info['timeoffset'])
         assert_equal(cli_get_info['connections'], network_info['connections'])
         assert_equal(cli_get_info['proxy'], network_info['networks'][0]['proxy'])
-        assert_equal(cli_get_info['difficulty'], blockchain_info['difficulty'])
         assert_equal(cli_get_info['testnet'], blockchain_info['chain'] == "test")
         assert_equal(cli_get_info['balance'], wallet_info['balance'])
         assert_equal(cli_get_info['keypoololdest'], wallet_info['keypoololdest'])
diff --git a/test/functional/interface_rest.py b/test/functional/interface_rest.py
index 41a1b4a35df..40f56d363a3 100755
--- a/test/functional/interface_rest.py
+++ b/test/functional/interface_rest.py
@@ -198,28 +198,31 @@ def run_test(self):
         self.log.info("Test the /block and /headers URIs")
         bb_hash = self.nodes[0].getbestblockhash()
 
+        # Elements note: We stripped nBits and nNonce from headers when in signed block mode
+        # Each header has a OP_TRUE challenge script
+
         # Check binary format
         response = self.test_rest_request("/block/{}".format(bb_hash), req_type=ReqType.BIN, ret_type=RetType.OBJ)
-        assert_greater_than(int(response.getheader('content-length')), 80)
+        assert_greater_than(int(response.getheader('content-length')), 75)
         response_bytes = response.read()
 
         # Compare with block header
         response_header = self.test_rest_request("/headers/1/{}".format(bb_hash), req_type=ReqType.BIN, ret_type=RetType.OBJ)
-        assert_equal(int(response_header.getheader('content-length')), 80)
+        assert_equal(int(response_header.getheader('content-length')), 75)
         response_header_bytes = response_header.read()
-        assert_equal(response_bytes[:80], response_header_bytes)
+        assert_equal(response_bytes[:75], response_header_bytes)
 
         # Check block hex format
         response_hex = self.test_rest_request("/block/{}".format(bb_hash), req_type=ReqType.HEX, ret_type=RetType.OBJ)
-        assert_greater_than(int(response_hex.getheader('content-length')), 160)
+        assert_greater_than(int(response_hex.getheader('content-length')), 151)
         response_hex_bytes = response_hex.read().strip(b'\n')
         assert_equal(binascii.hexlify(response_bytes), response_hex_bytes)
 
         # Compare with hex block header
         response_header_hex = self.test_rest_request("/headers/1/{}".format(bb_hash), req_type=ReqType.HEX, ret_type=RetType.OBJ)
-        assert_greater_than(int(response_header_hex.getheader('content-length')), 160)
-        response_header_hex_bytes = response_header_hex.read(160)
-        assert_equal(binascii.hexlify(response_bytes[:80]), response_header_hex_bytes)
+        assert_greater_than(int(response_header_hex.getheader('content-length')), 75*2)
+        response_header_hex_bytes = response_header_hex.read(75*2)
+        assert_equal(binascii.hexlify(response_bytes[:75]), response_header_hex_bytes)
 
         # Check json format
         block_json_obj = self.test_rest_request("/block/{}".format(bb_hash))
@@ -232,7 +235,7 @@ def run_test(self):
 
         # Compare with normal RPC block response
         rpc_block_json = self.nodes[0].getblock(bb_hash)
-        for key in ['hash', 'confirmations', 'height', 'version', 'merkleroot', 'time', 'nonce', 'bits', 'difficulty', 'chainwork', 'previousblockhash']:
+        for key in ['hash', 'confirmations', 'height', 'version', 'merkleroot', 'time', 'previousblockhash']:
             assert_equal(json_obj[0][key], rpc_block_json[key])
 
         # See if we can get 5 headers in one response
diff --git a/test/functional/mining_basic.py b/test/functional/mining_basic.py
index a99c2fc8d4d..8bc3b96275d 100755
--- a/test/functional/mining_basic.py
+++ b/test/functional/mining_basic.py
@@ -40,8 +40,6 @@ def run_test(self):
         assert_equal(mining_info['chain'], self.chain)
         assert_equal(mining_info['currentblocktx'], 0)
         assert_equal(mining_info['currentblockweight'], 0)
-        assert_equal(mining_info['difficulty'], Decimal('4.656542373906925E-10'))
-        assert_equal(mining_info['networkhashps'], Decimal('0.003333333333333334'))
         assert_equal(mining_info['pooledtx'], 0)
 
         # Mine a block to leave initial block download
@@ -60,7 +58,7 @@ def run_test(self):
         block.nVersion = tmpl["version"]
         block.hashPrevBlock = int(tmpl["previousblockhash"], 16)
         block.nTime = tmpl["curtime"]
-        block.nBits = int(tmpl["bits"], 16)
+        block.nBits = 0
         block.nNonce = 0
         block.vtx = [coinbase_tx]
 
@@ -109,10 +107,11 @@ def run_test(self):
         bad_block_sn[TX_COUNT_OFFSET] += 1
         assert_raises_rpc_error(-22, "Block decode failed", node.getblocktemplate, {'data': b2x(bad_block_sn), 'mode': 'proposal'})
 
-        self.log.info("getblocktemplate: Test bad bits")
-        bad_block = copy.deepcopy(block)
-        bad_block.nBits = 469762303  # impossible in the real world
-        assert_template(node, bad_block, 'bad-diffbits')
+        # No PoW test
+#        self.log.info("getblocktemplate: Test bad bits")
+#        bad_block = copy.deepcopy(block)
+#        bad_block.nBits = 469762303  # impossible in the real world
+#        assert_template(node, bad_block, 'bad-diffbits')
 
         self.log.info("getblocktemplate: Test bad merkle root")
         bad_block = copy.deepcopy(block)

From a3493276d8905a4ab3ddb7957bf947b44d301629 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 6 Nov 2018 13:41:25 -0500
Subject: [PATCH 17/66] fix zmq test

---
 test/functional/interface_zmq.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/functional/interface_zmq.py b/test/functional/interface_zmq.py
index 72de6962590..b3272631d64 100755
--- a/test/functional/interface_zmq.py
+++ b/test/functional/interface_zmq.py
@@ -96,7 +96,8 @@ def _zmq_test(self):
 
             # Should receive the generated raw block.
             block = self.rawblock.receive()
-            assert_equal(genhashes[x], bytes_to_hex_str(hash256(block[:80])))
+            # 75 bytes, last byte is saying block solution is "", ellide this for hash
+            assert_equal(genhashes[x], bytes_to_hex_str(hash256(block[:74])))
 
         self.log.info("Wait for tx from second node")
         payment_txid = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1.0)

From c933511300083a4573d935af037389a2c03b35b0 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 6 Nov 2018 20:46:16 -0500
Subject: [PATCH 18/66] add blocksigning RPC calls

---
 src/rpc/mining.cpp       | 87 +++++++++++++++++++++++++++++++++++++++-
 src/wallet/rpcwallet.cpp | 55 +++++++++++++++++++++++++
 2 files changed, 141 insertions(+), 1 deletion(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index adc883d03f9..5e6b6283ad1 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -939,6 +939,89 @@ static UniValue estimaterawfee(const JSONRPCRequest& request)
     return result;
 }
 
+UniValue getnewblockhex(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() > 1)
+        throw runtime_error(
+            "getnewblockhex\n"
+            "\nGets hex representation of a proposed, unmined new block\n"
+            "\nArguments:\n"
+            "1. required_age    (numeric, optional, default=0) How many seconds a transaction must have been in the mempool to be inluded in the block proposal. This may help with faster block convergence among functionaries using compact blocks.\n"
+            "\nResult\n"
+            "blockhex      (hex) The block hex\n"
+            "\nExamples:\n"
+            + HelpExampleCli("getnewblockhex", "")
+        );
+
+    int required_wait = !request.params[0].isNull() ? request.params[0].get_int() : 0;
+    if (required_wait < 0) {
+        throw JSONRPCError(RPC_INVALID_PARAMS, "required_wait must be non-negative.");
+    }
+
+    CScript feeDestinationScript = Params().GetConsensus().mandatory_coinbase_destination;
+    if (feeDestinationScript == CScript()) feeDestinationScript = CScript() << OP_TRUE;
+    std::unique_ptr<CBlockTemplate> pblocktemplate(BlockAssembler(Params()).CreateNewBlock(feeDestinationScript, true, required_wait));
+    if (!pblocktemplate.get())
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "Wallet keypool empty");
+    {
+        // IncrementExtraNonce sets coinbase flags and builds merkle tree
+        LOCK(cs_main);
+        unsigned int nExtraNonce = 0;
+        IncrementExtraNonce(&pblocktemplate->block, chainActive.Tip(), nExtraNonce);
+    }
+
+    CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION);
+    ssBlock << pblocktemplate->block;
+    return HexStr(ssBlock.begin(), ssBlock.end());
+}
+
+UniValue combineblocksigs(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 2)
+        throw runtime_error(
+            "combineblocksigs \"blockhex\" [\"signature\",...]\n"
+            "\nMerges signatures on a block proposal\n"
+            "\nArguments:\n"
+            "1. \"blockhex\"       (string, required) The hex-encoded block from getnewblockhex\n"
+            "2. \"signatures\"     (string) A json array of signatures\n"
+            "    [\n"
+            "      \"signature\"   (string) A signature (in the form of a hex-encoded scriptSig)\n"
+            "      ,...\n"
+            "    ]\n"
+            "\nResult\n"
+            "{\n"
+            "  \"hex\": \"value\",   (string) The signed block\n"
+            "  \"complete\": n       (numeric) if block is complete \n"
+            "}\n"
+            "\nExamples:\n"
+            + HelpExampleCli("combineblocksigs", "<hex> [\"signature1\", \"signature2\", ...]")
+        );
+
+    CBlock block;
+    if (!DecodeHexBlk(block, request.params[0].get_str()))
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed");
+
+    UniValue result(UniValue::VOBJ);
+    const Consensus::Params& params = Params().GetConsensus();
+    const UniValue& sigs = request.params[1].get_array();
+    for (unsigned int i = 0; i < sigs.size(); i++) {
+        const std::string& sig = sigs[i].get_str();
+        if (!IsHex(sig))
+            continue;
+        std::vector<unsigned char> vchScript = ParseHex(sig);
+        block.proof.solution = CombineBlockSignatures(params, block, block.proof.solution, CScript(vchScript.begin(), vchScript.end()));
+        if (CheckProof(block, params)) {
+            result.push_back(Pair("hex", EncodeHexBlock(block)));
+            result.push_back(Pair("complete", true));
+            return result;
+        }
+    }
+
+    result.push_back(Pair("hex", EncodeHexBlock(block)));
+    result.push_back(Pair("complete", false));
+    return result;
+}
+
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         argNames
   //  --------------------- ------------------------  -----------------------  ----------
@@ -946,8 +1029,10 @@ static const CRPCCommand commands[] =
     { "mining",             "getmininginfo",          &getmininginfo,          {} },
     { "mining",             "prioritisetransaction",  &prioritisetransaction,  {"txid","dummy","fee_delta"} },
     { "mining",             "getblocktemplate",       &getblocktemplate,       {"template_request"} },
-    { "mining",             "submitblock",            &submitblock,            {"hexdata","dummy"} },
+    { "generating",         "combineblocksigs",       &combineblocksigs,       true,  {"blockhex","signatures"} },
+    { "generating",         "getnewblockhex",         &getnewblockhex,         true,  {"required_age"} },
 
+    { "mining",             "submitblock",            &submitblock,            {"hexdata","dummy"} },
 
     { "generating",         "generatetoaddress",      &generatetoaddress,      {"nblocks","address","maxtries"} },
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index bb7ceb424c1..d611bdb5742 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -3879,6 +3879,60 @@ static UniValue bumpfee(const JSONRPCRequest& request)
     return result;
 }
 
+bool MaybeGenerateProof(const Consensus::Params& params, CBlockHeader *pblock, CWallet *pwallet)
+{
+    SignatureData solution(pblock->proof.solution);
+    bool res = GenericSignScript(*pwallet, *pblock, params.signblockscript, solution);
+    pblock->proof.solution = solution.scriptSig;
+    return res;
+}
+
+UniValue signblock(const JSONRPCRequest& request)
+{
+    if (!EnsureWalletIsAvailable(request.fHelp))
+        return NullUniValue;
+
+    if (request.fHelp || request.params.size() != 1)
+        throw runtime_error(
+            "signblock \"blockhex\"\n"
+            "\nSigns a block proposal, checking that it would be accepted first\n"
+            "\nArguments:\n"
+            "1. \"blockhex\"    (string, required) The hex-encoded block from getnewblockhex\n"
+            "\nResult\n"
+            " sig      (hex) The signature\n"
+            "\nExamples:\n"
+            + HelpExampleCli("signblock", "0000002018c6f2f913f9902aeab...5ca501f77be96de63f609010000000000000000015100000000")
+        );
+
+    CBlock block;
+    if (!DecodeHexBlk(block, request.params[0].get_str()))
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed");
+
+    LOCK(cs_main);
+
+    uint256 hash = block.GetHash();
+    BlockMap::iterator mi = mapBlockIndex.find(hash);
+    if (mi != mapBlockIndex.end())
+        throw JSONRPCError(RPC_VERIFY_ERROR, "already have block");
+
+    CBlockIndex* const pindexPrev = chainActive.Tip();
+    // TestBlockValidity only supports blocks built on the current Tip
+    if (block.hashPrevBlock != pindexPrev->GetBlockHash())
+        throw JSONRPCError(RPC_VERIFY_ERROR, "proposal was not based on our best chain");
+
+    CValidationState state;
+    if (!TestBlockValidity(state, Params(), block, pindexPrev, false, true) || !state.IsValid()) {
+        std::string strRejectReason = state.GetRejectReason();
+        if (strRejectReason.empty())
+            throw JSONRPCError(RPC_VERIFY_ERROR, state.IsInvalid() ? "Block proposal was invalid" : "Error checking block proposal");
+        throw JSONRPCError(RPC_VERIFY_ERROR, strRejectReason);
+    }
+
+    block.proof.solution = CScript();
+    MaybeGenerateProof(Params().GetConsensus(), &block, pwalletMain);
+    return HexStr(block.proof.solution.begin(), block.proof.solution.end());
+}
+
 UniValue generate(const JSONRPCRequest& request)
 {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
@@ -4838,6 +4892,7 @@ static const CRPCCommand commands[] =
     { "wallet",             "setlabel",                         &setlabel,                      {"address","label"} },
 
     { "generating",         "generate",                         &generate,                      {"nblocks","maxtries"} },
+    { "wallet",             "signblock",                        &signblock,                     { }},
 };
 
 void RegisterWalletRPCCommands(CRPCTable &t)

From 4d1e511afc4ad12f0a18306f6bb990e8504c9614 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 6 Nov 2018 20:47:35 -0500
Subject: [PATCH 19/66] fixup rpc mining call

---
 src/rpc/mining.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 5e6b6283ad1..e67f8e46305 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -1029,8 +1029,8 @@ static const CRPCCommand commands[] =
     { "mining",             "getmininginfo",          &getmininginfo,          {} },
     { "mining",             "prioritisetransaction",  &prioritisetransaction,  {"txid","dummy","fee_delta"} },
     { "mining",             "getblocktemplate",       &getblocktemplate,       {"template_request"} },
-    { "generating",         "combineblocksigs",       &combineblocksigs,       true,  {"blockhex","signatures"} },
-    { "generating",         "getnewblockhex",         &getnewblockhex,         true,  {"required_age"} },
+    { "generating",         "combineblocksigs",       &combineblocksigs,       {"blockhex","signatures"} },
+    { "generating",         "getnewblockhex",         &getnewblockhex,         {"required_age"} },
 
     { "mining",             "submitblock",            &submitblock,            {"hexdata","dummy"} },
 

From 7c80bce46341c1ea9f48ba6d51b3be27f56b53ee Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 6 Nov 2018 20:50:52 -0500
Subject: [PATCH 20/66] add compact block rpc calls

---
 src/rpc/mining.cpp | 201 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 201 insertions(+)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index e67f8e46305..4c233d0507e 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -1022,6 +1022,202 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
     return result;
 }
 
+UniValue getcompactsketch(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 1)
+        throw runtime_error(
+            "getcompactsketch block_hex\n"
+            "\nGets hex representation of a proposed compact block sketch.\n"
+            "It is consumed by `consumecompactsketch.`\n"
+            "Arguments:\n"
+            "1. \"block_hex\" (string, required), Hex serialized block proposal from `getnewblockhex`.\n"
+            "\nResult\n"
+            "blockhex      (hex) The block hex\n"
+            "\nExamples:\n"
+            + HelpExampleCli("getcompactsketch", "")
+        );
+
+    CBlock block;
+    std::vector<unsigned char> block_bytes(ParseHex(request.params[0].get_str()));
+    CDataStream ssBlock(block_bytes, SER_NETWORK, PROTOCOL_VERSION);
+    ssBlock >> block;
+
+    CBlockHeaderAndShortTxIDs cmpctblock(block, true);
+
+    CDataStream ssCompactBlock(SER_NETWORK, PROTOCOL_VERSION);
+    ssCompactBlock << cmpctblock;
+    return HexStr(ssCompactBlock.begin(), ssCompactBlock.end());
+
+}
+
+UniValue consumecompactsketch(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 1)
+        throw runtime_error(
+            "consumecompactsketch sketch\n"
+            "\nTakes hex representation of a proposed compact block sketch and fills it in\n"
+            "using mempool. Returns the block if complete, and a list\n"
+            "of missing transaction indices serialized as a native structure."
+            "NOTE: The latest instance of this call will have a partially filled block\n"
+            "cached in memory to be used in `consumegetblocktxn` to finalize the block.\n"
+            "Arguments:\n"
+            "1. \"sketch\" (string, required), Hex string of compact block sketch.\n"
+            "\nResult\n"
+            "{\n"
+            "   blockhex            (hex) The filled block hex. Only returns when block is final\n"
+            "   block_tx_req        (hex) The serialized structure of missing transaction indices, given to serving node\n"
+            "   found_transactions  (hex) The serialized list of found transactions to be used in finalizecompactblock\n"
+            "}\n"
+            "\nExamples:\n"
+            + HelpExampleCli("consumecompactsketch", "<sketch>")
+        );
+
+    UniValue ret(UniValue::VOBJ);
+
+    std::vector<unsigned char> compact_block_bytes(ParseHex(request.params[0].get_str()));
+    CDataStream ssBlock(compact_block_bytes, SER_NETWORK, PROTOCOL_VERSION);
+    CBlockHeaderAndShortTxIDs cmpctblock;
+    ssBlock >> cmpctblock;
+
+    PartiallyDownloadedBlock partialBlock(&mempool);
+    const std::vector<std::pair<uint256, CTransactionRef>> dummy;
+    ReadStatus status = partialBlock.InitData(cmpctblock, dummy);
+    if (status != READ_STATUS_OK) {
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Compact block decode failed");
+    }
+
+    BlockTransactionsRequest req;
+    std::vector<CTransactionRef> found(partialBlock.GetAvailableTx());
+    for (size_t i = 0; i < cmpctblock.BlockTxCount(); i++) {
+        if (!partialBlock.IsTxAvailable(i)) {
+            req.indexes.push_back(i);
+        }
+    }
+
+    CDataStream ssReq(SER_NETWORK, PROTOCOL_VERSION);
+    ssReq << req;
+
+    CDataStream ssFound(SER_NETWORK, PROTOCOL_VERSION);
+    ssFound << found;
+
+    if (req.indexes.empty()) {
+        std::shared_ptr<CBlock> pblock = std::make_shared<CBlock>();
+        std::vector<CTransactionRef> dummy;
+        ReadStatus status = partialBlock.FillBlock(*pblock, dummy, false /* don't get pow */);
+        if (status == READ_STATUS_INVALID) {
+            throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Bogus crap sketch.");
+        } else if (status == READ_STATUS_FAILED) {
+            throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Failed to complete block though all transactions were apparently found. Could be random short ID collision; requires full block instead.");
+        } else if (status == READ_STATUS_CHECKBLOCK_FAILED) {
+            throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Checkblock failed.");
+        }
+        CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION);
+        ssBlock << *pblock;
+
+        ret.pushKV("blockhex", HexStr(ssBlock.begin(), ssBlock.end()));
+    } else {
+        ret.pushKV("block_tx_req", HexStr(ssReq.begin(), ssReq.end()));
+        ret.pushKV("found_transactions", HexStr(ssFound.begin(), ssFound.end()));
+    }
+    return ret;
+}
+
+UniValue consumegetblocktxn(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 2)
+        throw runtime_error(
+            "consumegetblocktxn full_block block_tx_req\n"
+            "Consumes a transaction request for a compact block sketch."
+            "Arguments:\n"
+            "1. \"full_block\" (string, required), Hex serialied block that corresponds to the block request `block_tx_req`.\n"
+            "2. \"block_tx_req\" (string, required), Hex serialied BlockTransactionsRequest, aka getblocktxn network message.\n"
+            "\nResult\n"
+            "block_transactions  (hex) The serialized list of found transactions aka BlockTransactions\n"
+            "\nExamples:\n"
+            + HelpExampleCli("consumegetblocktxn", "<block_tx_req>")
+        );
+
+
+    CBlock block;
+    std::vector<unsigned char> block_bytes(ParseHex(request.params[0].get_str()));
+    CDataStream ssBlock(block_bytes, SER_NETWORK, PROTOCOL_VERSION);
+    ssBlock >> block;
+
+    // Take in BlockTransactionsRequest, return BlockTransactions
+    std::vector<unsigned char> block_req(ParseHex(request.params[1].get_str()));
+    CDataStream ssReq(block_req, SER_NETWORK, PROTOCOL_VERSION);
+
+    BlockTransactionsRequest req;
+    ssReq >> req;
+
+    BlockTransactions resp(req);
+    for (size_t i = 0; i < req.indexes.size(); i++) {
+        if (req.indexes[i] >= block.vtx.size()) {
+            throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Peer sent us a getblocktxn with out-of-bounds tx indices");
+        }
+        resp.txn[i] = block.vtx[req.indexes[i]];
+    }
+
+    CDataStream ssResp(SER_NETWORK, PROTOCOL_VERSION);
+    ssResp << resp;
+
+    return HexStr(ssResp.begin(), ssResp.end());
+}
+
+UniValue finalizecompactblock(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 3)
+        throw runtime_error(
+            "finalizecompactblock compact_hex block_transactions found_transactions\n"
+            "Takes the two transaction lists, fills out the compact block and attempts to validate it."
+            "Arguments:\n"
+            "1. \"compact_hex\" (string, required), Hex serialized compact block.\n"
+            "2. \"block_transactions\" (string, required), Hex serialized BlockTransactions, the response to getblocktxn.\n"
+            "3. \"found_transactions\" (string, required), Hex serialized list of transactions that were found in response to receiving a compact sketch in `consumecompactsketch`.\n"
+            "\nResult\n"
+            "block             (hex) The serialized final block.\n"
+            "\nExamples:\n"
+            + HelpExampleCli("finalizecompactblock", "<compact_hex> <block_transactions> <found_transactions>")
+        );
+
+    // Compact block
+    std::vector<unsigned char> compact_block_bytes(ParseHex(request.params[0].get_str()));
+    CDataStream ssCompactBlock(compact_block_bytes, SER_NETWORK, PROTOCOL_VERSION);
+    CBlockHeaderAndShortTxIDs cmpctblock;
+    ssCompactBlock >> cmpctblock;
+
+    // BlockTransactions from the server
+    std::vector<unsigned char> block_tx(ParseHex(request.params[1].get_str()));
+    CDataStream ssResp(block_tx, SER_NETWORK, PROTOCOL_VERSION);
+
+    BlockTransactions transactions;
+    ssResp >> transactions;
+
+    // Cached transactions
+    std::vector<unsigned char> found_tx(ParseHex(request.params[2].get_str()));
+    CDataStream ssFound(block_tx, SER_NETWORK, PROTOCOL_VERSION);
+
+    std::vector<CTransactionRef> found;
+    ssFound >> found;
+
+    // Make mega-list
+    found.insert(found.end(), transactions.txn.begin(), transactions.txn.end());
+
+    // Now construct the final block!
+    PartiallyDownloadedBlock partialBlock(&mempool);
+
+    const std::vector<std::pair<uint256, CTransactionRef>> dummy;
+    std::shared_ptr<CBlock> pblock = std::make_shared<CBlock>();
+    if (partialBlock.InitData(cmpctblock, dummy) != READ_STATUS_OK || partialBlock.FillBlock(*pblock, found, false /* pow_check*/) != READ_STATUS_OK) {
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Failed to complete block though all transactions were apparently found. Could be random short ID collision; requires full block instead.");
+    }
+
+    CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION);
+    ssBlock << *pblock;
+
+    return HexStr(ssBlock.begin(), ssBlock.end());
+}
+
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         argNames
   //  --------------------- ------------------------  -----------------------  ----------
@@ -1031,6 +1227,11 @@ static const CRPCCommand commands[] =
     { "mining",             "getblocktemplate",       &getblocktemplate,       {"template_request"} },
     { "generating",         "combineblocksigs",       &combineblocksigs,       {"blockhex","signatures"} },
     { "generating",         "getnewblockhex",         &getnewblockhex,         {"required_age"} },
+    { "generating",         "getcompactsketch",       &getcompactsketch,       {"block_hex"} },
+    { "generating",         "consumecompactsketch",   &consumecompactsketch,   {"sketch"} },
+    { "generating",         "consumegetblocktxn",     &consumegetblocktxn,     {"full_block", "block_tx_req"} },
+    { "generating",         "finalizecompactblock",   &finalizecompactblock,   {"compact_hex","block_transactions","found_transactions"} },
+
 
     { "mining",             "submitblock",            &submitblock,            {"hexdata","dummy"} },
 

From 98527830f74eb7c97619294ac1f2fff9d3471bd8 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 6 Nov 2018 20:52:12 -0500
Subject: [PATCH 21/66] checkin feature_blocksign.py fixup

---
 test/functional/feature_blocksign.py | 31 ++++++++--------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/test/functional/feature_blocksign.py b/test/functional/feature_blocksign.py
index 8d5f845d355..fadeefc685a 100755
--- a/test/functional/feature_blocksign.py
+++ b/test/functional/feature_blocksign.py
@@ -30,8 +30,7 @@ def make_signblockscript(num_nodes, required_signers, keys):
     print('signblockscript', script)
     return script
 
-class BlockSignTest(test_framework.BitcoinTestFramework):
-
+class BlockSignTest(BitcoinTestFramework):
     # Dynamically generate N keys to be used for block signing.
     def init_keys(self, num_keys):
         self.keys = []
@@ -47,33 +46,17 @@ def init_keys(self, num_keys):
             self.keys.append(k)
             self.wifs.append(wif(pk_bytes))
 
-    def __init__(self, num_nodes, required_signers):
-        super().__init__()
+    def set_test_params(self):
+        self.num_nodes = 9
+        self.require_signers = 7
         self.setup_clean_chain = True
-        self.num_nodes = num_nodes
         self.init_keys(self.num_nodes)
-        self.required_signers = required_signers
         signblockscript = make_signblockscript(num_nodes, required_signers, self.keys)
         self.extra_args = [[
             "-chain=blocksign",
-            # We can't validate pegins since this chain doesn't have a parent chain
-            "-con_has_parent_chain=0",
-            "-parentgenesisblockhash=00",
-            "-validatepegin=0",
             "-signblockscript={}".format(signblockscript)
         ]] * self.num_nodes
-
-    def setup_network(self, split=False):
-        self.nodes = util.start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args)
-        # Have every node import its block signing private key.
-        for i in range(self.num_nodes):
-            self.nodes[i].importprivkey(self.wifs[i])
-            if i + 1 < self.num_nodes:
-                util.connect_nodes_bi(self.nodes, i, i + 1)
-            else:
-                util.connect_nodes_bi(self.nodes, 0, i)
         self.is_network_split = False
-        self.sync_all()
 
     def check_height(self, expected_height):
         for n in self.nodes:
@@ -110,6 +93,10 @@ def mine_blocks(self, num_blocks):
             self.sync_all()
 
     def run_test(self):
+        # Have every node import its block signing private key.
+        for i in range(self.num_nodes):
+            self.nodes[i].importprivkey(self.wifs[i])
+
         self.check_height(0)
 
         # mine a block
@@ -123,4 +110,4 @@ def run_test(self):
         self.check_height(101)
 
 if __name__ == '__main__':
-    BlockSignTest(num_nodes=9, required_signers=7).main()
+    BlockSignTest().main()

From 450276a42b88a65a7b52fa58f7b9d576e0b9f278 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 12 Sep 2018 14:54:02 -0700
Subject: [PATCH 22/66] test compact block rpcs

---
 test/functional/feature_blocksign.py | 49 ++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/test/functional/feature_blocksign.py b/test/functional/feature_blocksign.py
index fadeefc685a..017cdb00280 100755
--- a/test/functional/feature_blocksign.py
+++ b/test/functional/feature_blocksign.py
@@ -56,23 +56,45 @@ def set_test_params(self):
             "-chain=blocksign",
             "-signblockscript={}".format(signblockscript)
         ]] * self.num_nodes
-        self.is_network_split = False
+        self.is_network_split = True
 
     def check_height(self, expected_height):
         for n in self.nodes:
             util.assert_equal(n.getblockcount(), expected_height)
 
-    def mine_block(self):
+    def mine_block(self, make_transactions):
         # mine block in round robin sense: depending on the block number, a node
         # is selected to create the block, others sign it and the selected node
         # broadcasts it
         mineridx = self.nodes[0].getblockcount() % self.num_nodes # assuming in sync
+        mineridx_next = (self.nodes[0].getblockcount() + 1) % self.num_nodes
         miner = self.nodes[mineridx]
+        miner_next = self.nodes[mineridx_next]
         blockcount = miner.getblockcount()
 
+        # Make a few transactions to make non-empty blocks for compact transmission
+        if make_transactions:
+            for i in range(5):
+                miner.sendtoaddress(miner_next.getnewaddress(), int(miner.getbalance()["bitcoin"]/10), "", "", True)
         # miner makes a block
         block = miner.getnewblockhex()
 
+        # other nodes get fed compact blocks
+        for i in range(self.required_signers):
+            if i == mineridx:
+                continue
+            sketch = miner.getcompactsketch(block)
+            compact_response = self.nodes[i].consumecompactsketch(sketch)
+            if make_transactions:
+                block_txn =  self.nodes[i].consumegetblocktxn(block, compact_response["block_tx_req"])
+                final_block = self.nodes[i].finalizecompactblock(sketch, block_txn, compact_response["found_transactions"])
+            else:
+                # If there's only coinbase, it should succeed immediately
+                final_block = compact_response["blockhex"]
+            # Block should be complete, sans signatures
+            self.nodes[i].testproposedblock(final_block)
+
+
         # collect required_signers signatures
         sigs = []
         for i in range(self.required_signers):
@@ -82,15 +104,16 @@ def mine_block(self):
             self.check_height(blockcount)
             sigs.append(self.nodes[i].signblock(block))
 
-        # miner submits
         result = miner.combineblocksigs(block, sigs)
         util.assert_equal(result["complete"], True)
-        miner.submitblock(result["hex"])
+
+        # All must submit... we're not connected!
+        for node in self.nodes:
+            node.submitblock(result["hex"])
 
     def mine_blocks(self, num_blocks):
         for i in range(num_blocks):
-            self.mine_block()
-            self.sync_all()
+            self.mine_block(True)
 
     def run_test(self):
         # Have every node import its block signing private key.
@@ -99,15 +122,15 @@ def run_test(self):
 
         self.check_height(0)
 
-        # mine a block
-        self.mine_block()
-        self.sync_all()
+        # mine a block with no transactions
+        print("Mining and signing a single empty block")
+        self.mine_block(False)
 
-        # mine blocks
-        self.mine_blocks(100)
-        self.sync_all()
+        # mine blocks with transactions
+        print("Mining and signing non-empty blocks")
+        self.mine_blocks(10)
 
-        self.check_height(101)
+        self.check_height(11)
 
 if __name__ == '__main__':
     BlockSignTest().main()

From 9003d468076837c5595d5ae76566d02abd31c3d5 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 7 Nov 2018 13:32:28 -0500
Subject: [PATCH 23/66] f'add blocksigning RPC calls'

---
 src/rpc/mining.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 4c233d0507e..74b8e100140 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -942,7 +942,7 @@ static UniValue estimaterawfee(const JSONRPCRequest& request)
 UniValue getnewblockhex(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() > 1)
-        throw runtime_error(
+        throw std::runtime_error(
             "getnewblockhex\n"
             "\nGets hex representation of a proposed, unmined new block\n"
             "\nArguments:\n"
@@ -978,7 +978,7 @@ UniValue getnewblockhex(const JSONRPCRequest& request)
 UniValue combineblocksigs(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 2)
-        throw runtime_error(
+        throw std::runtime_error(
             "combineblocksigs \"blockhex\" [\"signature\",...]\n"
             "\nMerges signatures on a block proposal\n"
             "\nArguments:\n"

From 166ea7182fae373cf125686611b83c8b95aa23ec Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 7 Nov 2018 13:33:01 -0500
Subject: [PATCH 24/66] f'add compact block rpc calls'

---
 src/rpc/mining.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 74b8e100140..0b1dc901b32 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -1025,7 +1025,7 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
 UniValue getcompactsketch(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 1)
-        throw runtime_error(
+        throw std::runtime_error(
             "getcompactsketch block_hex\n"
             "\nGets hex representation of a proposed compact block sketch.\n"
             "It is consumed by `consumecompactsketch.`\n"
@@ -1053,7 +1053,7 @@ UniValue getcompactsketch(const JSONRPCRequest& request)
 UniValue consumecompactsketch(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 1)
-        throw runtime_error(
+        throw std::runtime_error(
             "consumecompactsketch sketch\n"
             "\nTakes hex representation of a proposed compact block sketch and fills it in\n"
             "using mempool. Returns the block if complete, and a list\n"
@@ -1125,7 +1125,7 @@ UniValue consumecompactsketch(const JSONRPCRequest& request)
 UniValue consumegetblocktxn(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 2)
-        throw runtime_error(
+        throw std::runtime_error(
             "consumegetblocktxn full_block block_tx_req\n"
             "Consumes a transaction request for a compact block sketch."
             "Arguments:\n"
@@ -1167,7 +1167,7 @@ UniValue consumegetblocktxn(const JSONRPCRequest& request)
 UniValue finalizecompactblock(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() != 3)
-        throw runtime_error(
+        throw std::runtime_error(
             "finalizecompactblock compact_hex block_transactions found_transactions\n"
             "Takes the two transaction lists, fills out the compact block and attempts to validate it."
             "Arguments:\n"

From fbc08970b903e286f35aea4e25c27a75f689abbf Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 7 Nov 2018 13:39:09 -0500
Subject: [PATCH 25/66] fixup miner rpc call

---
 src/miner.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 2e78164d271..7dfecc3fce6 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -96,7 +96,7 @@ void BlockAssembler::resetBlock()
     nFees = 0;
 }
 
-std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn, bool fMineWitnessTx)
+std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn, bool fMineWitnessTx, int required_age_in_secs)
 {
     int64_t nTimeStart = GetTimeMicros();
 
@@ -152,7 +152,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
 
     int nPackagesSelected = 0;
     int nDescendantsUpdated = 0;
-    addPackageTxs(nPackagesSelected, nDescendantsUpdated);
+    addPackageTxs(nPackagesSelected, nDescendantsUpdated, required_age_in_secs);
 
     int64_t nTime1 = GetTimeMicros();
 
@@ -311,7 +311,7 @@ void BlockAssembler::SortForBlock(const CTxMemPool::setEntries& package, std::ve
 // Each time through the loop, we compare the best transaction in
 // mapModifiedTxs with the next transaction in the mempool to decide what
 // transaction package to work on next.
-void BlockAssembler::addPackageTxs(int &nPackagesSelected, int &nDescendantsUpdated)
+void BlockAssembler::addPackageTxs(int &nPackagesSelected, int &nDescendantsUpdated, int required_age_in_secs)
 {
     // mapModifiedTx will store sorted packages after they are modified
     // because some of their txs are already in the block
@@ -367,6 +367,11 @@ void BlockAssembler::addPackageTxs(int &nPackagesSelected, int &nDescendantsUpda
             }
         }
 
+        // Skip transactions that are under X seconds in mempool
+        if (iter->GetTime() > current_time - required_age_in_secs) {
+            continue;
+        }
+
         // We skip mapTx entries that are inBlock, and mapModifiedTx shouldn't
         // contain anything that is inBlock.
         assert(!inBlock.count(iter));

From 61620150d612dfdf6de78f5b30f980858ddd0fe9 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 7 Nov 2018 13:39:45 -0500
Subject: [PATCH 26/66] add RPC test for getnewblockhex required_wait

---
 test/functional/mempool_packages.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/functional/mempool_packages.py b/test/functional/mempool_packages.py
index da254181fec..c63246596cf 100755
--- a/test/functional/mempool_packages.py
+++ b/test/functional/mempool_packages.py
@@ -34,6 +34,23 @@ def chain_transaction(self, node, parent_txid, vout, value, fee, num_outputs):
         return (txid, send_value)
 
     def run_test(self):
+
+        # Create transaction with 3-second block delay, should fail to enter the template
+        txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)
+        block = self.nodes[0].getnewblockhex(required_age=3)
+        self.nodes[0].submitblock(block)
+        assert(txid in self.nodes[0].getrawmempool())
+        time.sleep(3)
+        block = self.nodes[0].getnewblockhex(required_age=3)
+        self.nodes[0].submitblock(block)
+        assert(txid not in self.nodes[0].getrawmempool())
+        # Once more with no delay (default is 0, just testing default arg)
+        txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)
+        block = self.nodes[0].getnewblockhex(required_age=0)
+        self.nodes[0].submitblock(block)
+        assert(txid not in self.nodes[0].getrawmempool())
+        assert_raises_message(JSONRPCException, "required_wait must be non-negative.", self.nodes[0].getnewblockhex, -1)
+
         ''' Mine some blocks and have them mature. '''
         self.nodes[0].generate(101)
         utxo = self.nodes[0].listunspent(10)

From 3c50b84b4594f6f8da746e33e1725551cc99c44e Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 7 Nov 2018 13:42:53 -0500
Subject: [PATCH 27/66] f'c933511300083a4573d935af037389a2c03b35b0'

---
 src/miner.cpp | 2 +-
 src/miner.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 7dfecc3fce6..bf71162ea6a 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -368,7 +368,7 @@ void BlockAssembler::addPackageTxs(int &nPackagesSelected, int &nDescendantsUpda
         }
 
         // Skip transactions that are under X seconds in mempool
-        if (iter->GetTime() > current_time - required_age_in_secs) {
+        if (iter->GetTime() > GetTime() - required_age_in_secs) {
             continue;
         }
 
diff --git a/src/miner.h b/src/miner.h
index 8cdcf7133ba..814875f6a84 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -157,7 +157,7 @@ class BlockAssembler
     BlockAssembler(const CChainParams& params, const Options& options);
 
     /** Construct a new block template with coinbase to scriptPubKeyIn */
-    std::unique_ptr<CBlockTemplate> CreateNewBlock(const CScript& scriptPubKeyIn, bool fMineWitnessTx=true);
+    std::unique_ptr<CBlockTemplate> CreateNewBlock(const CScript& scriptPubKeyIn, bool fMineWitnessTx=true, int required_wait=0);
 
 private:
     // utility functions
@@ -170,7 +170,7 @@ class BlockAssembler
     /** Add transactions based on feerate including unconfirmed ancestors
       * Increments nPackagesSelected / nDescendantsUpdated with corresponding
       * statistics from the package selection (for logging statistics). */
-    void addPackageTxs(int &nPackagesSelected, int &nDescendantsUpdated) EXCLUSIVE_LOCKS_REQUIRED(mempool.cs);
+    void addPackageTxs(int &nPackagesSelected, int &nDescendantsUpdated, int required_wait=0) EXCLUSIVE_LOCKS_REQUIRED(mempool.cs);
 
     // helper functions for addPackageTxs()
     /** Remove confirmed (inBlock) entries from given set */

From ee717e7bcc8812f4eb6505b925a242c02667c036 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 8 Nov 2018 14:11:05 -0500
Subject: [PATCH 28/66] fixup combineblocksigs

---
 src/rpc/mining.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 0b1dc901b32..42fafc45e9d 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -27,6 +27,9 @@
 #include <versionbitsinfo.h>
 #include <warnings.h>
 
+#include <keystore.h> // combineblocksigs
+#include <script/generic.hpp> // combineblocksigs
+
 #include <memory>
 #include <stdint.h>
 
@@ -1004,21 +1007,21 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
     UniValue result(UniValue::VOBJ);
     const Consensus::Params& params = Params().GetConsensus();
     const UniValue& sigs = request.params[1].get_array();
+    CBasicKeyStore keystore;
+    SignatureData sig_data;
+    SimpleSignatureCreator signature_creator(block.GetHash());
     for (unsigned int i = 0; i < sigs.size(); i++) {
         const std::string& sig = sigs[i].get_str();
         if (!IsHex(sig))
             continue;
         std::vector<unsigned char> vchScript = ParseHex(sig);
-        block.proof.solution = CombineBlockSignatures(params, block, block.proof.solution, CScript(vchScript.begin(), vchScript.end()));
-        if (CheckProof(block, params)) {
-            result.push_back(Pair("hex", EncodeHexBlock(block)));
-            result.push_back(Pair("complete", true));
-            return result;
-        }
+        block.proof.solution = ProduceSignature(keystore, signature_creator, block.proof.challenge, sig_data);
     }
 
-    result.push_back(Pair("hex", EncodeHexBlock(block)));
-    result.push_back(Pair("complete", false));
+    CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION | RPCSerializationFlags());
+    ssBlock << block;
+    result.pushKV("hex", HexStr(ssBlock.begin(), ssBlock.end()));
+    result.pushKV("complete", CheckProof(block, params));
     return result;
 }
 

From 90d6bbcab4540cf1e7fefc930ef8e18d7b631f76 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 8 Nov 2018 15:03:50 -0500
Subject: [PATCH 29/66] fixup signblock

---
 src/wallet/rpcwallet.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index d611bdb5742..87573742b56 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -38,6 +38,8 @@
 
 #include <functional>
 
+#include <script/generic.hpp> // signblock
+
 static const std::string WALLET_ENDPOINT_BASE = "/wallet/";
 
 bool GetWalletNameFromJSONRPCRequest(const JSONRPCRequest& request, std::string& wallet_name)
@@ -3889,11 +3891,14 @@ bool MaybeGenerateProof(const Consensus::Params& params, CBlockHeader *pblock, C
 
 UniValue signblock(const JSONRPCRequest& request)
 {
-    if (!EnsureWalletIsAvailable(request.fHelp))
+    std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
+    CWallet* const pwallet = wallet.get();
+
+    if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
         return NullUniValue;
 
     if (request.fHelp || request.params.size() != 1)
-        throw runtime_error(
+        throw std::runtime_error(
             "signblock \"blockhex\"\n"
             "\nSigns a block proposal, checking that it would be accepted first\n"
             "\nArguments:\n"
@@ -3929,7 +3934,7 @@ UniValue signblock(const JSONRPCRequest& request)
     }
 
     block.proof.solution = CScript();
-    MaybeGenerateProof(Params().GetConsensus(), &block, pwalletMain);
+    MaybeGenerateProof(Params().GetConsensus(), &block, pwallet);
     return HexStr(block.proof.solution.begin(), block.proof.solution.end());
 }
 

From f21925c6bbbab10ff374cea758670bd817a6dd03 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 8 Nov 2018 15:04:06 -0500
Subject: [PATCH 30/66] fixup compact block rpcs

---
 src/blockencodings.cpp | 12 +++++++++---
 src/blockencodings.h   |  3 ++-
 src/rpc/mining.cpp     |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index b17ff3507d9..2f756f5467a 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -43,7 +43,13 @@ uint64_t CBlockHeaderAndShortTxIDs::GetShortID(const uint256& txhash) const {
     return SipHashUint256(shorttxidk0, shorttxidk1, txhash) & 0xffffffffffffL;
 }
 
-
+std::vector<CTransactionRef> PartiallyDownloadedBlock::GetAvailableTx() {
+    std::vector<CTransactionRef> found_tx;
+    for (unsigned int i = 0; i < txn_available.size(); i++) {
+        if (txn_available[i]) found_tx.push_back(txn_available[i]);
+    }
+    return found_tx;
+}
 
 ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& cmpctblock, const std::vector<std::pair<uint256, CTransactionRef>>& extra_txn) {
     if (cmpctblock.header.IsNull() || (cmpctblock.shorttxids.empty() && cmpctblock.prefilledtxn.empty()))
@@ -173,7 +179,7 @@ bool PartiallyDownloadedBlock::IsTxAvailable(size_t index) const {
     return txn_available[index] != nullptr;
 }
 
-ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing) {
+ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing, bool check_pow) {
     assert(!header.IsNull());
     uint256 hash = header.GetHash();
     block = header;
@@ -197,7 +203,7 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<
         return READ_STATUS_INVALID;
 
     CValidationState state;
-    if (!CheckBlock(block, state, Params().GetConsensus())) {
+    if (!CheckBlock(block, state, Params().GetConsensus(), check_pow)) {
         // TODO: We really want to just check merkle tree manually here,
         // but that is expensive, and CheckBlock caches a block's
         // "checked-status" (in the CBlock?). CBlock should be able to
diff --git a/src/blockencodings.h b/src/blockencodings.h
index fad1f56f547..75c9c698bf5 100644
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -200,10 +200,11 @@ class PartiallyDownloadedBlock {
     CBlockHeader header;
     explicit PartiallyDownloadedBlock(CTxMemPool* poolIn) : pool(poolIn) {}
 
+    std::vector<CTransactionRef> GetAvailableTx();
     // extra_txn is a list of extra transactions to look at, in <witness hash, reference> form
     ReadStatus InitData(const CBlockHeaderAndShortTxIDs& cmpctblock, const std::vector<std::pair<uint256, CTransactionRef>>& extra_txn);
     bool IsTxAvailable(size_t index) const;
-    ReadStatus FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing);
+    ReadStatus FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing, bool check_pow = true);
 };
 
 #endif // BITCOIN_BLOCKENCODINGS_H
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 42fafc45e9d..fda53478249 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -29,6 +29,7 @@
 
 #include <keystore.h> // combineblocksigs
 #include <script/generic.hpp> // combineblocksigs
+#include<blockencodings.h> // getcompactsketch
 
 #include <memory>
 #include <stdint.h>

From 10da603006325331186b056a94f7580fa757e022 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 13 Nov 2018 10:11:26 -0500
Subject: [PATCH 31/66] fixup signblock rpc

---
 src/rpc/client.cpp       | 1 +
 src/wallet/rpcwallet.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index c7f3e38ac09..9e37aee7f6e 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -172,6 +172,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "rescanblockchain", 0, "start_height"},
     { "rescanblockchain", 1, "stop_height"},
     { "createwallet", 1, "disable_private_keys"},
+    { "combineblocksigs", 1, "signatures"},
 };
 
 class CRPCConvertTable
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 87573742b56..da282bfdef5 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -3904,7 +3904,7 @@ UniValue signblock(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. \"blockhex\"    (string, required) The hex-encoded block from getnewblockhex\n"
             "\nResult\n"
-            " sig      (hex) The signature\n"
+            " sig      (hex) The signature script\n"
             "\nExamples:\n"
             + HelpExampleCli("signblock", "0000002018c6f2f913f9902aeab...5ca501f77be96de63f609010000000000000000015100000000")
         );

From ed5bc2365c963ff496c209c7acd8124f47595932 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 13 Nov 2018 21:43:15 -0500
Subject: [PATCH 32/66] fixup signblock RPC

---
 src/wallet/rpcwallet.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index da282bfdef5..34235b7da83 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -3904,11 +3904,15 @@ UniValue signblock(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. \"blockhex\"    (string, required) The hex-encoded block from getnewblockhex\n"
             "\nResult\n"
-            " sig      (hex) The signature script\n"
+            " sig      (hex) The signature script, or null byte on failure to sign\n"
             "\nExamples:\n"
             + HelpExampleCli("signblock", "0000002018c6f2f913f9902aeab...5ca501f77be96de63f609010000000000000000015100000000")
         );
 
+    if (!g_signed_blocks) {
+        throw JSONRPCError(RPC_MISC_ERROR, "Signed blocks are not active for this network.");
+    }
+
     CBlock block;
     if (!DecodeHexBlk(block, request.params[0].get_str()))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed");
@@ -3934,7 +3938,9 @@ UniValue signblock(const JSONRPCRequest& request)
     }
 
     block.proof.solution = CScript();
-    MaybeGenerateProof(Params().GetConsensus(), &block, pwallet);
+    if (!MaybeGenerateProof(Params().GetConsensus(), &block, pwallet)) {
+        return "00"; // Failure to sign results in null byte
+    }
     return HexStr(block.proof.solution.begin(), block.proof.solution.end());
 }
 

From 9d383f5a51731bd3a0254c7a58546b0d43c0a892 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 13 Nov 2018 21:43:34 -0500
Subject: [PATCH 33/66] fixup combineblocksig (still not working)

---
 src/rpc/mining.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index fda53478249..470b7210da7 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -1011,14 +1011,25 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
     CBasicKeyStore keystore;
     SignatureData sig_data;
     SimpleSignatureCreator signature_creator(block.GetHash());
+    Stack big_stack;
     for (unsigned int i = 0; i < sigs.size(); i++) {
         const std::string& sig = sigs[i].get_str();
-        if (!IsHex(sig))
+        if (!IsHex(sig)) {
             continue;
-        std::vector<unsigned char> vchScript = ParseHex(sig);
-        block.proof.solution = ProduceSignature(keystore, signature_creator, block.proof.challenge, sig_data);
+        }
+        std::vector<unsigned char> sig_bytes = ParseHex(sig);
+        sig_data.scriptSig = CScript(sig_bytes.begin(), sig_bytes.end());
+        Stack stack(sig_data);
+        for (const auto& item : stack.script) {
+            big_stack.script.push_back(item);
+        }
+        //if (ProduceSignature(keystore, signature_creator, block.proof.challenge, sig_data)) {
+        //    Stacks stack(sig_data);
+        //}
     }
 
+    block.proof.solution = sig_data.scriptSig;
+
     CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION | RPCSerializationFlags());
     ssBlock << block;
     result.pushKV("hex", HexStr(ssBlock.begin(), ssBlock.end()));

From 2dfd03a701ad09973987b43803e2a610b5306da7 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 13 Nov 2018 21:44:26 -0500
Subject: [PATCH 34/66] fixup generic signing

---
 src/script/sign.cpp | 4 ++--
 src/script/sign.h   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index 1ab5051ff70..c4921ae0650 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -177,7 +177,7 @@ static CScript PushAll(const std::vector<valtype>& values)
     return result;
 }
 
-bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreator& creator, const CScript& fromPubKey, SignatureData& sigdata)
+bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreator& creator, const CScript& fromPubKey, SignatureData& sigdata, unsigned int flags)
 {
     if (sigdata.complete) return true;
 
@@ -229,7 +229,7 @@ bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreato
     sigdata.scriptSig = PushAll(result);
 
     // Test solution
-    sigdata.complete = solved && VerifyScript(sigdata.scriptSig, fromPubKey, &sigdata.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS, creator.Checker());
+    sigdata.complete = solved && VerifyScript(sigdata.scriptSig, fromPubKey, &sigdata.scriptWitness, flags, creator.Checker());
     return sigdata.complete;
 }
 
diff --git a/src/script/sign.h b/src/script/sign.h
index 7ade715ee29..9e2c3dbc889 100644
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -11,6 +11,7 @@
 #include <pubkey.h>
 #include <script/interpreter.h>
 #include <streams.h>
+#include <policy/policy.h>
 
 class CKey;
 class CKeyID;
@@ -680,7 +681,7 @@ struct PartiallySignedTransaction
 };
 
 /** Produce a script signature using a generic signature creator. */
-bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreator& creator, const CScript& scriptPubKey, SignatureData& sigdata);
+bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreator& creator, const CScript& scriptPubKey, SignatureData& sigdata, unsigned int flags = STANDARD_SCRIPT_VERIFY_FLAGS);
 
 /** Produce a script signature for a transaction. */
 bool SignSignature(const SigningProvider &provider, const CScript& fromPubKey, CMutableTransaction& txTo, unsigned int nIn, const CAmount& amount, int nHashType);

From 06c4ca3bd16dd750effc404228158d71ff3faec9 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 13 Nov 2018 21:44:39 -0500
Subject: [PATCH 35/66] fixup generic signing

---
 src/script/generic.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/script/generic.hpp b/src/script/generic.hpp
index e4e66fc7c96..aaaf8151c25 100644
--- a/src/script/generic.hpp
+++ b/src/script/generic.hpp
@@ -10,6 +10,7 @@
 #include <script/interpreter.h>
 #include <script/sign.h>
 #include <keystore.h>
+#include <policy/policy.h> // Flags for block production checks
 
 class SimpleSignatureChecker : public BaseSignatureChecker
 {
@@ -53,7 +54,7 @@ bool GenericVerifyScript(const CScript& scriptSig, const CScript& scriptPubKey,
 template<typename T>
 bool GenericSignScript(const CKeyStore& keystore, const T& data, const CScript& fromPubKey, SignatureData& scriptSig)
 {
-    return ProduceSignature(keystore, SimpleSignatureCreator(SerializeHash(data)), fromPubKey, scriptSig);
+    return ProduceSignature(keystore, SimpleSignatureCreator(SerializeHash(data)), fromPubKey, scriptSig, STANDARD_SCRIPT_VERIFY_FLAGS|SCRIPT_NO_SIGHASH_BYTE);
 }
 
 #endif // H_BITCOIN_SCRIPT_GENERIC

From caf8ba621449ef63505b448ce06279f7a17b3c81 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 13 Nov 2018 21:45:08 -0500
Subject: [PATCH 36/66] fixup CheckSignatureEncoding for non-sighash-byte based
 sigs

---
 src/script/interpreter.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 04b280d5a36..b553cc69323 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -211,12 +211,12 @@ bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned i
         vchSigCopy.push_back(SIGHASH_ALL);
     }
 
-    if ((flags & (SCRIPT_VERIFY_DERSIG | SCRIPT_VERIFY_LOW_S | SCRIPT_VERIFY_STRICTENC)) != 0 && !IsValidSignatureEncoding(vchSig)) {
+    if ((flags & (SCRIPT_VERIFY_DERSIG | SCRIPT_VERIFY_LOW_S | SCRIPT_VERIFY_STRICTENC)) != 0 && !IsValidSignatureEncoding(vchSigCopy)) {
         return set_error(serror, SCRIPT_ERR_SIG_DER);
-    } else if ((flags & SCRIPT_VERIFY_LOW_S) != 0 && !IsLowDERSignature(vchSig, serror)) {
+    } else if ((flags & SCRIPT_VERIFY_LOW_S) != 0 && !IsLowDERSignature(vchSigCopy, serror)) {
         // serror is set
         return false;
-    } else if ((flags & SCRIPT_VERIFY_STRICTENC) != 0 && !IsDefinedHashtypeSignature(vchSig)) {
+    } else if ((flags & SCRIPT_VERIFY_STRICTENC) != 0 && !IsDefinedHashtypeSignature(vchSigCopy)) {
         return set_error(serror, SCRIPT_ERR_SIG_HASHTYPE);
     }
     return true;

From 3902a2902bd6707abaab7dea2ec3f4bfad7c0a1b Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 14 Nov 2018 09:56:50 -0500
Subject: [PATCH 37/66] fixup combineblocksigs

---
 src/rpc/mining.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 470b7210da7..82f90084099 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -1011,7 +1011,6 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
     CBasicKeyStore keystore;
     SignatureData sig_data;
     SimpleSignatureCreator signature_creator(block.GetHash());
-    Stack big_stack;
     for (unsigned int i = 0; i < sigs.size(); i++) {
         const std::string& sig = sigs[i].get_str();
         if (!IsHex(sig)) {
@@ -1019,13 +1018,10 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
         }
         std::vector<unsigned char> sig_bytes = ParseHex(sig);
         sig_data.scriptSig = CScript(sig_bytes.begin(), sig_bytes.end());
-        Stack stack(sig_data);
-        for (const auto& item : stack.script) {
-            big_stack.script.push_back(item);
+        SignatureData sig_data_inner;
+        if (ProduceSignature(keystore, signature_creator, block.proof.challenge, sig_data_inner)) {
+            sig_data.MergeSignatureData(sig_data_inner);
         }
-        //if (ProduceSignature(keystore, signature_creator, block.proof.challenge, sig_data)) {
-        //    Stacks stack(sig_data);
-        //}
     }
 
     block.proof.solution = sig_data.scriptSig;

From 8f287d410040246a0aa68f5e5b2d44994625ae30 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 14 Nov 2018 12:02:40 -0500
Subject: [PATCH 38/66] fixup CreateNewBlock required age of transactions

---
 src/miner.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index bf71162ea6a..3c96e4aa9fe 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -98,6 +98,7 @@ void BlockAssembler::resetBlock()
 
 std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn, bool fMineWitnessTx, int required_age_in_secs)
 {
+    assert(required_age_in_secs >= 0);
     int64_t nTimeStart = GetTimeMicros();
 
     resetBlock();
@@ -368,7 +369,8 @@ void BlockAssembler::addPackageTxs(int &nPackagesSelected, int &nDescendantsUpda
         }
 
         // Skip transactions that are under X seconds in mempool
-        if (iter->GetTime() > GetTime() - required_age_in_secs) {
+        // required_age_in_secs value of 0 is considered "inactive", in case of mocktime
+        if (required_age_in_secs > 0 && iter->GetTime() > GetTime() - required_age_in_secs) {
             continue;
         }
 

From 5ac003ea6ecb7b06ce44750baef389b42e5b1956 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 14 Nov 2018 16:17:32 -0500
Subject: [PATCH 39/66] add testproposedblock rpc call

---
 src/rpc/mining.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 82f90084099..7fd91b7da74 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -1229,6 +1229,59 @@ UniValue finalizecompactblock(const JSONRPCRequest& request)
     return HexStr(ssBlock.begin(), ssBlock.end());
 }
 
+UniValue testproposedblock(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
+        throw std::runtime_error(
+            "testproposedblock \"blockhex\"\n"
+            "\nChecks a block proposal for validity, and that it extends chaintip\n"
+            "\nArguments:\n"
+            "1. \"blockhex\"    (string, required) The hex-encoded block from getnewblockhex\n"
+            "2. \"acceptnonstd\" (bool, optional) If set false, returns error if block contains non-standard transaction. Default is set via `-acceptnonstdtxn`\n"
+            "\nResult\n"
+            "\nExamples:\n"
+            + HelpExampleCli("testproposedblock", "<hex>")
+        );
+
+    CBlock block;
+    if (!DecodeHexBlk(block, request.params[0].get_str()))
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed");
+
+    LOCK(cs_main);
+
+    uint256 hash = block.GetHash();
+    BlockMap::iterator mi = mapBlockIndex.find(hash);
+    if (mi != mapBlockIndex.end())
+        throw JSONRPCError(RPC_VERIFY_ERROR, "already have block");
+
+    CBlockIndex* const pindexPrev = chainActive.Tip();
+    // TestBlockValidity only supports blocks built on the current Tip
+    if (block.hashPrevBlock != pindexPrev->GetBlockHash())
+        throw JSONRPCError(RPC_VERIFY_ERROR, "proposal was not based on our best chain");
+
+    CValidationState state;
+    if (!TestBlockValidity(state, Params(), block, pindexPrev, false, true) || !state.IsValid()) {
+        std::string strRejectReason = state.GetRejectReason();
+        if (strRejectReason.empty())
+            throw JSONRPCError(RPC_VERIFY_ERROR, state.IsInvalid() ? "Block proposal was invalid" : "Error checking block proposal");
+        throw JSONRPCError(RPC_VERIFY_ERROR, strRejectReason);
+    }
+
+    const CChainParams& chainparams = Params();
+    if ((!request.params[1].isNull() && !request.params[1].get_bool()) ||
+            (request.params[1].isNull() && !gArgs.GetBoolArg("-acceptnonstdtxn", !chainparams.RequireStandard()))) {
+        for (auto& transaction : block.vtx) {
+            if (transaction->IsCoinBase()) continue;
+            std::string reason;
+            if (!IsStandardTx(*transaction, reason)) {
+                throw JSONRPCError(RPC_VERIFY_ERROR, "Block proposal included a non-standard transaction: " + reason);
+            }
+        }
+    }
+
+    return NullUniValue;
+}
+
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         argNames
   //  --------------------- ------------------------  -----------------------  ----------
@@ -1242,6 +1295,7 @@ static const CRPCCommand commands[] =
     { "generating",         "consumecompactsketch",   &consumecompactsketch,   {"sketch"} },
     { "generating",         "consumegetblocktxn",     &consumegetblocktxn,     {"full_block", "block_tx_req"} },
     { "generating",         "finalizecompactblock",   &finalizecompactblock,   {"compact_hex","block_transactions","found_transactions"} },
+    { "mining",             "testproposedblock",      &testproposedblock,      {"blockhex", "acceptnonstd"} },
 
 
     { "mining",             "submitblock",            &submitblock,            {"hexdata","dummy"} },

From 817f68362e40ba8d8b2f08c229ad92084d02ff16 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 14 Nov 2018 16:17:55 -0500
Subject: [PATCH 40/66] fixup combineblocksigs

---
 src/rpc/mining.cpp | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 7fd91b7da74..9ad296d6a7a 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -987,10 +987,13 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
             "\nMerges signatures on a block proposal\n"
             "\nArguments:\n"
             "1. \"blockhex\"       (string, required) The hex-encoded block from getnewblockhex\n"
-            "2. \"signatures\"     (string) A json array of signatures\n"
+            "2. \"signatures\"     (string) A json array of pubkey/signature pairs\n"
             "    [\n"
-            "      \"signature\"   (string) A signature (in the form of a hex-encoded scriptSig)\n"
-            "      ,...\n"
+            "        {\n"
+            "            \"pubkey\":\"hex\",      (string) The pubkey for the signature in hex\n"
+            "            \"sig\":\"hex\"   (string) A signature (in the form of a hex-encoded scriptSig)\n"
+            "             ,...\n"
+            "        },\n"
             "    ]\n"
             "\nResult\n"
             "{\n"
@@ -1012,24 +1015,32 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
     SignatureData sig_data;
     SimpleSignatureCreator signature_creator(block.GetHash());
     for (unsigned int i = 0; i < sigs.size(); i++) {
-        const std::string& sig = sigs[i].get_str();
-        if (!IsHex(sig)) {
+        UniValue pubkey_sig = sigs[i];
+        const std::string& pubkey_str = pubkey_sig["pubkey"].get_str();
+        const std::string& sig_str = pubkey_sig["sig"].get_str();
+        if (!IsHex(sig_str) || !IsHex(pubkey_str)) {
             continue;
         }
-        std::vector<unsigned char> sig_bytes = ParseHex(sig);
-        sig_data.scriptSig = CScript(sig_bytes.begin(), sig_bytes.end());
-        SignatureData sig_data_inner;
-        if (ProduceSignature(keystore, signature_creator, block.proof.challenge, sig_data_inner)) {
-            sig_data.MergeSignatureData(sig_data_inner);
+        std::vector<unsigned char> pubkey_bytes = ParseHex(pubkey_str);
+        std::vector<unsigned char> sig_bytes = ParseHex(sig_str);
+        //CScript signature(sig_bytes.begin(), sig_bytes.end());
+        CPubKey pubkey(pubkey_bytes.begin(), pubkey_bytes.end());
+        if (!pubkey.IsFullyValid()) {
+            throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Bad pubkey");
         }
+        sig_data.signatures[pubkey.GetID()] = std::make_pair(pubkey, sig_bytes);
     }
 
+    // Finalizes the signatures, has no access to keys
+    ProduceSignature(keystore, signature_creator, block.proof.challenge, sig_data, STANDARD_SCRIPT_VERIFY_FLAGS|SCRIPT_NO_SIGHASH_BYTE);
     block.proof.solution = sig_data.scriptSig;
 
     CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION | RPCSerializationFlags());
     ssBlock << block;
+    result.pushKV("final scriptSig", HexStr(block.proof.solution.begin(), block.proof.solution.end()));
     result.pushKV("hex", HexStr(ssBlock.begin(), ssBlock.end()));
     result.pushKV("complete", CheckProof(block, params));
+    result.pushKV("sigdata_complete", sig_data.complete);
     return result;
 }
 

From c01f8a5e0117d301afbc78685cb6efbdb58e3807 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 14 Nov 2018 16:18:12 -0500
Subject: [PATCH 41/66] fixup signblock

---
 src/wallet/rpcwallet.cpp | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 34235b7da83..be0c8095387 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -3881,14 +3881,6 @@ static UniValue bumpfee(const JSONRPCRequest& request)
     return result;
 }
 
-bool MaybeGenerateProof(const Consensus::Params& params, CBlockHeader *pblock, CWallet *pwallet)
-{
-    SignatureData solution(pblock->proof.solution);
-    bool res = GenericSignScript(*pwallet, *pblock, params.signblockscript, solution);
-    pblock->proof.solution = solution.scriptSig;
-    return res;
-}
-
 UniValue signblock(const JSONRPCRequest& request)
 {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
@@ -3900,11 +3892,17 @@ UniValue signblock(const JSONRPCRequest& request)
     if (request.fHelp || request.params.size() != 1)
         throw std::runtime_error(
             "signblock \"blockhex\"\n"
-            "\nSigns a block proposal, checking that it would be accepted first\n"
+            "\nSigns a block proposal, checking that it would be accepted first. Errors if it cannot sign the block.\n"
             "\nArguments:\n"
             "1. \"blockhex\"    (string, required) The hex-encoded block from getnewblockhex\n"
             "\nResult\n"
-            " sig      (hex) The signature script, or null byte on failure to sign\n"
+            "[\n"
+            "    {\n"
+            "        pubkeys,   (hex) The signature's pubkey\n"
+            "        sig      (hex) The signature script\n"
+            "    },\n"
+            "    ...\n"
+            "]\n"
             "\nExamples:\n"
             + HelpExampleCli("signblock", "0000002018c6f2f913f9902aeab...5ca501f77be96de63f609010000000000000000015100000000")
         );
@@ -3937,11 +3935,22 @@ UniValue signblock(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_VERIFY_ERROR, strRejectReason);
     }
 
-    block.proof.solution = CScript();
-    if (!MaybeGenerateProof(Params().GetConsensus(), &block, pwallet)) {
-        return "00"; // Failure to sign results in null byte
+    // Expose SignatureData internals in return value in lieu of "Partially Signed Bitcoin Blocks"
+    SignatureData block_sigs;
+    GenericSignScript(*pwallet, block, block.proof.challenge, block_sigs);
+
+    // Error if sig data didn't "grow"
+    if (!block_sigs.complete && block_sigs.signatures.empty()) {
+        throw JSONRPCError(RPC_VERIFY_ERROR, "Could not sign the block.");
     }
-    return HexStr(block.proof.solution.begin(), block.proof.solution.end());
+    UniValue ret(UniValue::VARR);
+    for (const auto& signature : block_sigs.signatures) {
+        UniValue obj(UniValue::VOBJ);
+        obj.pushKV("pubkey", HexStr(signature.second.first.begin(), signature.second.first.end()));
+        obj.pushKV("sig", HexStr(signature.second.second.begin(), signature.second.second.end()));
+        ret.push_back(obj);
+    }
+    return ret;
 }
 
 UniValue generate(const JSONRPCRequest& request)

From 1648fb9488a5edbf91e4a78c754e746ace6d8fe9 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 14 Nov 2018 16:18:24 -0500
Subject: [PATCH 42/66] fixup signed block rpc functional tests

---
 test/functional/feature_blocksign.py         | 15 +++++++++------
 test/functional/feature_signed_blockchain.py |  1 -
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/test/functional/feature_blocksign.py b/test/functional/feature_blocksign.py
index 017cdb00280..10d6e6ee838 100755
--- a/test/functional/feature_blocksign.py
+++ b/test/functional/feature_blocksign.py
@@ -5,6 +5,7 @@
 import os
 import random
 
+from test_framework.test_framework import BitcoinTestFramework
 from test_framework import (
     address,
     key,
@@ -47,14 +48,14 @@ def init_keys(self, num_keys):
             self.wifs.append(wif(pk_bytes))
 
     def set_test_params(self):
-        self.num_nodes = 9
-        self.require_signers = 7
+        self.num_nodes = 4
+        self.required_signers = 3
         self.setup_clean_chain = True
         self.init_keys(self.num_nodes)
-        signblockscript = make_signblockscript(num_nodes, required_signers, self.keys)
+        signblockscript = make_signblockscript(self.num_nodes, self.required_signers, self.keys)
         self.extra_args = [[
-            "-chain=blocksign",
-            "-signblockscript={}".format(signblockscript)
+            "-signblockscript={}".format(signblockscript),
+            "-con_max_block_sig_size={}".format(self.num_nodes*74)
         ]] * self.num_nodes
         self.is_network_split = True
 
@@ -94,6 +95,8 @@ def mine_block(self, make_transactions):
             # Block should be complete, sans signatures
             self.nodes[i].testproposedblock(final_block)
 
+        import pdb
+        pdb.set_trace()
 
         # collect required_signers signatures
         sigs = []
@@ -102,7 +105,7 @@ def mine_block(self, make_transactions):
             util.assert_equal(result["complete"], False)
             miner.submitblock(result["hex"])
             self.check_height(blockcount)
-            sigs.append(self.nodes[i].signblock(block))
+            sigs = sigs + self.nodes[i].signblock(block)
 
         result = miner.combineblocksigs(block, sigs)
         util.assert_equal(result["complete"], True)
diff --git a/test/functional/feature_signed_blockchain.py b/test/functional/feature_signed_blockchain.py
index 51f91cb1f44..4960ad4e22e 100755
--- a/test/functional/feature_signed_blockchain.py
+++ b/test/functional/feature_signed_blockchain.py
@@ -13,7 +13,6 @@
 from test_framework.authproxy import JSONRPCException
 from test_framework.util import (
     assert_equal,
-    start_nodes,
     assert_raises_jsonrpc,
 )
 

From 4d249f352170cf7b919391a13b63525d600d65ee Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 14 Nov 2018 22:12:16 -0500
Subject: [PATCH 43/66] signblock: use blockheader hash not entire serialized
 block

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index be0c8095387..bca2682d617 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -3937,7 +3937,7 @@ UniValue signblock(const JSONRPCRequest& request)
 
     // Expose SignatureData internals in return value in lieu of "Partially Signed Bitcoin Blocks"
     SignatureData block_sigs;
-    GenericSignScript(*pwallet, block, block.proof.challenge, block_sigs);
+    GenericSignScript(*pwallet, block.GetBlockHeader(), block.proof.challenge, block_sigs);
 
     // Error if sig data didn't "grow"
     if (!block_sigs.complete && block_sigs.signatures.empty()) {

From f56f3d5638f92bcd0b0f80862f9e050746bf7c9a Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 14 Nov 2018 22:12:31 -0500
Subject: [PATCH 44/66] fixup rpc test

---
 test/functional/feature_blocksign.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/feature_blocksign.py b/test/functional/feature_blocksign.py
index 10d6e6ee838..03db7b3809c 100755
--- a/test/functional/feature_blocksign.py
+++ b/test/functional/feature_blocksign.py
@@ -76,7 +76,7 @@ def mine_block(self, make_transactions):
         # Make a few transactions to make non-empty blocks for compact transmission
         if make_transactions:
             for i in range(5):
-                miner.sendtoaddress(miner_next.getnewaddress(), int(miner.getbalance()["bitcoin"]/10), "", "", True)
+                miner.sendtoaddress(miner_next.getnewaddress(), int(miner.getbalance()/10), "", "", True)
         # miner makes a block
         block = miner.getnewblockhex()
 

From f15dcf98c58b85308f249681885b29e1bc78f6f6 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 14 Nov 2018 22:50:48 -0500
Subject: [PATCH 45/66] Add TX_TRUE output format, accept in wallet with

---
 src/chainparams.cpp                                       | 5 +++++
 src/chainparams.h                                         | 1 +
 src/init.cpp                                              | 1 +
 src/script/ismine.cpp                                     | 5 +++++
 src/script/sign.cpp                                       | 5 +++++
 src/script/standard.cpp                                   | 8 ++++++++
 src/script/standard.h                                     | 1 +
 test/bitcoin_functional/functional/test_framework/util.py | 1 +
 test/functional/test_framework/util.py                    | 1 +
 9 files changed, 28 insertions(+)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 6d09a91d305..9a3367a5aaa 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -107,6 +107,7 @@ class CMainParams : public CChainParams {
 
         consensus.genesis_subsidy = 50*COIN;
         consensus.connect_genesis_outputs = false;
+        anyonecanspend_aremine = false;
 
         /**
          * The message start string is designed to be unlikely to occur in normal data.
@@ -224,6 +225,7 @@ class CTestNetParams : public CChainParams {
 
         consensus.genesis_subsidy = 50*COIN;
         consensus.connect_genesis_outputs = false;
+        anyonecanspend_aremine = false;
 
         pchMessageStart[0] = 0x0b;
         pchMessageStart[1] = 0x11;
@@ -316,6 +318,7 @@ class CRegTestParams : public CChainParams {
 
         consensus.genesis_subsidy = 50*COIN;
         consensus.connect_genesis_outputs = false;
+        anyonecanspend_aremine = false;
 
         pchMessageStart[0] = 0xfa;
         pchMessageStart[1] = 0xbf;
@@ -447,6 +450,8 @@ class CCustomParams : public CRegTestParams {
         // Custom chains connect coinbase outputs to db by default
         consensus.connect_genesis_outputs = gArgs.GetArg("-con_connect_coinbase", true);
 
+        anyonecanspend_aremine = gArgs.GetBoolArg("-anyonecanspendaremine", true);
+
         nPruneAfterHeight = (uint64_t)args.GetArg("-npruneafterheight", nPruneAfterHeight);
         fDefaultConsistencyChecks = args.GetBoolArg("-fdefaultconsistencychecks", fDefaultConsistencyChecks);
         fMineBlocksOnDemand = args.GetBoolArg("-fmineblocksondemand", fMineBlocksOnDemand);
diff --git a/src/chainparams.h b/src/chainparams.h
index 19818b40aff..6692e07050e 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -80,6 +80,7 @@ class CChainParams
     const std::vector<SeedSpec6>& FixedSeeds() const { return vFixedSeeds; }
     const CCheckpointData& Checkpoints() const { return checkpointData; }
     const ChainTxData& TxData() const { return chainTxData; }
+    bool anyonecanspend_aremine;
 protected:
     CChainParams() {}
 
diff --git a/src/init.cpp b/src/init.cpp
index 6a260108820..40c373eb599 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -495,6 +495,7 @@ void SetupServerArgs()
         CURRENCY_UNIT, FormatMoney(DEFAULT_MIN_RELAY_TX_FEE)), false, OptionsCategory::NODE_RELAY);
     gArgs.AddArg("-whitelistforcerelay", strprintf("Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)", DEFAULT_WHITELISTFORCERELAY), false, OptionsCategory::NODE_RELAY);
     gArgs.AddArg("-whitelistrelay", strprintf("Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)", DEFAULT_WHITELISTRELAY), false, OptionsCategory::NODE_RELAY);
+    gArgs.AddArg("-anyonecanspendaremine", strprintf("Treat OP_TRUE outputs as funds for the wallet. Default true for custom chains."), true, OptionsCategory::DEBUG_TEST);
 
 
     gArgs.AddArg("-blockmaxweight=<n>", strprintf("Set maximum BIP141 block weight (default: %d)", DEFAULT_BLOCK_MAX_WEIGHT), false, OptionsCategory::BLOCK_CREATION);
diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp
index e3a6278c756..d7bd72132ae 100644
--- a/src/script/ismine.cpp
+++ b/src/script/ismine.cpp
@@ -9,6 +9,7 @@
 #include <keystore.h>
 #include <script/script.h>
 #include <script/sign.h>
+#include <chainparams.h>
 
 
 typedef std::vector<unsigned char> valtype;
@@ -163,6 +164,10 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,
         }
         break;
     }
+    case TX_TRUE:
+        if (Params().anyonecanspend_aremine) {
+            return IsMineResult::SPENDABLE;
+        }
     }
 
     if (ret == IsMineResult::NO && keystore.HaveWatchOnly(scriptPubKey)) {
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index c4921ae0650..1a89d23dd78 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -11,6 +11,8 @@
 #include <script/standard.h>
 #include <uint256.h>
 
+#include <chainparams.h>
+
 typedef std::vector<unsigned char> valtype;
 
 MutableTransactionSignatureCreator::MutableTransactionSignatureCreator(const CMutableTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn, int nHashTypeIn) : txTo(txToIn), nIn(nInIn), nHashType(nHashTypeIn), amount(amountIn), checker(txTo, nIn, amountIn) {}
@@ -157,6 +159,9 @@ static bool SignStep(const SigningProvider& provider, const BaseSignatureCreator
         }
         return false;
 
+    case TX_TRUE:
+        return Params().anyonecanspend_aremine;
+
     default:
         return false;
     }
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index bfbf9f13db7..0b0bee05fca 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -11,6 +11,8 @@
 #include <util.h>
 #include <utilstrencodings.h>
 
+#include <chainparams.h>
+
 
 typedef std::vector<unsigned char> valtype;
 
@@ -37,6 +39,7 @@ const char* GetTxnOutputType(txnouttype t)
     case TX_WITNESS_V0_KEYHASH: return "witness_v0_keyhash";
     case TX_WITNESS_V0_SCRIPTHASH: return "witness_v0_scripthash";
     case TX_WITNESS_UNKNOWN: return "witness_unknown";
+    case TX_TRUE: return "true";
     }
     return nullptr;
 }
@@ -91,6 +94,11 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<std::v
 {
     vSolutionsRet.clear();
 
+    if (Params().anyonecanspend_aremine && scriptPubKey == CScript() << OP_TRUE) {
+        typeRet = TX_TRUE;
+        return true;
+    }
+
     // Shortcut for pay-to-script-hash, which are more constrained than the other types:
     // it is always OP_HASH160 20 [20 byte hash] OP_EQUAL
     if (scriptPubKey.IsPayToScriptHash())
diff --git a/src/script/standard.h b/src/script/standard.h
index b16ac83e773..cae9ac6d37a 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -65,6 +65,7 @@ enum txnouttype
     TX_WITNESS_V0_SCRIPTHASH,
     TX_WITNESS_V0_KEYHASH,
     TX_WITNESS_UNKNOWN, //!< Only for Witness versions not already defined above
+    TX_TRUE, // For testing purposes only
 };
 
 class CNoDestination {
diff --git a/test/bitcoin_functional/functional/test_framework/util.py b/test/bitcoin_functional/functional/test_framework/util.py
index 36e2c308edd..f765bfd3200 100644
--- a/test/bitcoin_functional/functional/test_framework/util.py
+++ b/test/bitcoin_functional/functional/test_framework/util.py
@@ -308,6 +308,7 @@ def initialize_datadir(dirname, n, chain):
         f.write("con_blocksubsidy=5000000000\n")
         f.write("con_connect_coinbase=0\n")
         f.write("con_signed_blocks=0\n")
+        f.write("anyonecanspendaremine=0\n")
         os.makedirs(os.path.join(datadir, 'stderr'), exist_ok=True)
         os.makedirs(os.path.join(datadir, 'stdout'), exist_ok=True)
     return datadir
diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
index e081aab825c..7630e32266a 100644
--- a/test/functional/test_framework/util.py
+++ b/test/functional/test_framework/util.py
@@ -307,6 +307,7 @@ def initialize_datadir(dirname, n, chain):
         f.write("printtoconsole=0\n")
         f.write("con_blocksubsidy=5000000000\n")
         f.write("con_connect_coinbase=0\n")
+        f.write("anyonecanspendaremine=0\n")
         os.makedirs(os.path.join(datadir, 'stderr'), exist_ok=True)
         os.makedirs(os.path.join(datadir, 'stdout'), exist_ok=True)
     return datadir

From 3c9aabe8d30c2bcd235db6b01feba9de2bb7faa7 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 14 Nov 2018 22:51:18 -0500
Subject: [PATCH 46/66] checking functional test

---
 test/functional/feature_blocksign.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/functional/feature_blocksign.py b/test/functional/feature_blocksign.py
index 03db7b3809c..9df06a01f11 100755
--- a/test/functional/feature_blocksign.py
+++ b/test/functional/feature_blocksign.py
@@ -55,7 +55,8 @@ def set_test_params(self):
         signblockscript = make_signblockscript(self.num_nodes, self.required_signers, self.keys)
         self.extra_args = [[
             "-signblockscript={}".format(signblockscript),
-            "-con_max_block_sig_size={}".format(self.num_nodes*74)
+            "-con_max_block_sig_size={}".format(self.num_nodes*74),
+            "-con_blocksubsidy=5000000000",
         ]] * self.num_nodes
         self.is_network_split = True
 
@@ -75,6 +76,8 @@ def mine_block(self, make_transactions):
 
         # Make a few transactions to make non-empty blocks for compact transmission
         if make_transactions:
+            import pdb
+            pdb.set_trace()
             for i in range(5):
                 miner.sendtoaddress(miner_next.getnewaddress(), int(miner.getbalance()/10), "", "", True)
         # miner makes a block
@@ -95,8 +98,6 @@ def mine_block(self, make_transactions):
             # Block should be complete, sans signatures
             self.nodes[i].testproposedblock(final_block)
 
-        import pdb
-        pdb.set_trace()
 
         # collect required_signers signatures
         sigs = []
@@ -114,9 +115,9 @@ def mine_block(self, make_transactions):
         for node in self.nodes:
             node.submitblock(result["hex"])
 
-    def mine_blocks(self, num_blocks):
+    def mine_blocks(self, num_blocks, transactions):
         for i in range(num_blocks):
-            self.mine_block(True)
+            self.mine_block(transactions)
 
     def run_test(self):
         # Have every node import its block signing private key.
@@ -126,14 +127,14 @@ def run_test(self):
         self.check_height(0)
 
         # mine a block with no transactions
-        print("Mining and signing a single empty block")
-        self.mine_block(False)
+        print("Mining and signing 101 blocks to unlock funds")
+        self.mine_blocks(101, False)
 
         # mine blocks with transactions
         print("Mining and signing non-empty blocks")
-        self.mine_blocks(10)
+        self.mine_blocks(10, True)
 
-        self.check_height(11)
+        self.check_height(111)
 
 if __name__ == '__main__':
     BlockSignTest().main()

From d1c17499f3a143fce7fd5cd6ad9275b04d02bdb6 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 13:28:21 -0500
Subject: [PATCH 47/66] finally fixed feature_blocksign.py

---
 test/functional/feature_blocksign.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/functional/feature_blocksign.py b/test/functional/feature_blocksign.py
index 9df06a01f11..5ff34a0cccf 100755
--- a/test/functional/feature_blocksign.py
+++ b/test/functional/feature_blocksign.py
@@ -58,7 +58,9 @@ def set_test_params(self):
             "-con_max_block_sig_size={}".format(self.num_nodes*74),
             "-con_blocksubsidy=5000000000",
         ]] * self.num_nodes
-        self.is_network_split = True
+
+    def setup_network(self):
+        self.setup_nodes()
 
     def check_height(self, expected_height):
         for n in self.nodes:
@@ -76,8 +78,6 @@ def mine_block(self, make_transactions):
 
         # Make a few transactions to make non-empty blocks for compact transmission
         if make_transactions:
-            import pdb
-            pdb.set_trace()
             for i in range(5):
                 miner.sendtoaddress(miner_next.getnewaddress(), int(miner.getbalance()/10), "", "", True)
         # miner makes a block

From 7f2302b3655d0bb63fa63bf9541c2a409dc12619 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 14:28:56 -0500
Subject: [PATCH 48/66] finalize functional test for blocksigning

---
 test/functional/feature_blocksign.py         |  83 +++++++++---
 test/functional/feature_signed_blockchain.py | 135 -------------------
 2 files changed, 65 insertions(+), 153 deletions(-)
 delete mode 100755 test/functional/feature_signed_blockchain.py

diff --git a/test/functional/feature_blocksign.py b/test/functional/feature_blocksign.py
index 5ff34a0cccf..b31e4643591 100755
--- a/test/functional/feature_blocksign.py
+++ b/test/functional/feature_blocksign.py
@@ -6,11 +6,12 @@
 import random
 
 from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (assert_raises_rpc_error, assert_equal, connect_nodes_bi)
+from test_framework.authproxy import JSONRPCException
 from test_framework import (
     address,
     key,
     test_framework,
-    util,
 )
 
 # Generate wallet import format from private key.
@@ -32,6 +33,22 @@ def make_signblockscript(num_nodes, required_signers, keys):
     return script
 
 class BlockSignTest(BitcoinTestFramework):
+    """
+    Test signed-blockchain-related RPC calls and functionality:
+
+        - getnewblockhex
+        - signblock
+        - combineblocksigs
+        - submitblock
+        - testproposedblock
+        - getcompactsketch
+        - consumecompactsketch
+        - consumegetblocktxn
+        - finalizecompactblock
+
+        As well as syncing blocks over p2p
+
+    """
     # Dynamically generate N keys to be used for block signing.
     def init_keys(self, num_keys):
         self.keys = []
@@ -48,23 +65,26 @@ def init_keys(self, num_keys):
             self.wifs.append(wif(pk_bytes))
 
     def set_test_params(self):
-        self.num_nodes = 4
+        self.num_nodes = 5
+        self.num_keys = 4
         self.required_signers = 3
         self.setup_clean_chain = True
-        self.init_keys(self.num_nodes)
-        signblockscript = make_signblockscript(self.num_nodes, self.required_signers, self.keys)
+        self.init_keys(self.num_nodes-1) # Last node cannot sign and is connected to all via p2p
+        signblockscript = make_signblockscript(self.num_keys, self.required_signers, self.keys)
         self.extra_args = [[
             "-signblockscript={}".format(signblockscript),
-            "-con_max_block_sig_size={}".format(self.num_nodes*74),
+            "-con_max_block_sig_size={}".format(self.required_signers*74),
             "-con_blocksubsidy=5000000000",
         ]] * self.num_nodes
 
     def setup_network(self):
         self.setup_nodes()
+        # Connect non-signing node to a single signing one (to not pass blocks between signers)
+        connect_nodes_bi(self.nodes, 0, self.num_nodes-1)
 
     def check_height(self, expected_height):
         for n in self.nodes:
-            util.assert_equal(n.getblockcount(), expected_height)
+            assert_equal(n.getblockcount(), expected_height)
 
     def mine_block(self, make_transactions):
         # mine block in round robin sense: depending on the block number, a node
@@ -84,7 +104,7 @@ def mine_block(self, make_transactions):
         block = miner.getnewblockhex()
 
         # other nodes get fed compact blocks
-        for i in range(self.required_signers):
+        for i in range(self.num_nodes):
             if i == mineridx:
                 continue
             sketch = miner.getcompactsketch(block)
@@ -98,30 +118,41 @@ def mine_block(self, make_transactions):
             # Block should be complete, sans signatures
             self.nodes[i].testproposedblock(final_block)
 
+        # non-signing node can not sign
+        assert_raises_rpc_error(-25, "Could not sign the block.", self.nodes[-1].signblock, block)
 
-        # collect required_signers signatures
+        # collect num_keys signatures from signers, reduce to required_signers sigs during combine
         sigs = []
-        for i in range(self.required_signers):
+        for i in range(self.num_keys):
             result = miner.combineblocksigs(block, sigs)
-            util.assert_equal(result["complete"], False)
-            miner.submitblock(result["hex"])
-            self.check_height(blockcount)
             sigs = sigs + self.nodes[i].signblock(block)
+            assert_equal(result["complete"], i >= self.required_signers)
+            # submitting should have no effect pre-threshhold
+            if i < self.required_signers:
+                miner.submitblock(result["hex"])
+                self.check_height(blockcount)
 
         result = miner.combineblocksigs(block, sigs)
-        util.assert_equal(result["complete"], True)
+        assert_equal(result["complete"], True)
+
+        # All signing nodes must submit... we're not connected!
+        self.nodes[0].submitblock(result["hex"])
+        early_proposal = self.nodes[0].getnewblockhex() # testproposedblock should reject
+        # Submit blocks to all other signing nodes next, as well as too-early block proposal
+        for i in range(1, self.num_keys):
+            assert_raises_rpc_error(-25, "proposal was not based on our best chain", self.nodes[i].testproposedblock, early_proposal)
+            self.nodes[i].submitblock(result["hex"])
 
-        # All must submit... we're not connected!
-        for node in self.nodes:
-            node.submitblock(result["hex"])
+        # All nodes should be synced in blocks and transactions(mempool should be empty)
+        self.sync_all()
 
     def mine_blocks(self, num_blocks, transactions):
         for i in range(num_blocks):
             self.mine_block(transactions)
 
     def run_test(self):
-        # Have every node import its block signing private key.
-        for i in range(self.num_nodes):
+        # Have every node except last import its block signing private key.
+        for i in range(self.num_keys):
             self.nodes[i].importprivkey(self.wifs[i])
 
         self.check_height(0)
@@ -134,7 +165,23 @@ def run_test(self):
         print("Mining and signing non-empty blocks")
         self.mine_blocks(10, True)
 
+        # Height check also makes sure non-signing, p2p connected node gets block
         self.check_height(111)
 
+        # signblock rpc field stuff
+        tip = self.nodes[0].getblockhash(self.nodes[0].getblockcount())
+        header = self.nodes[0].getblockheader(tip)
+        block = self.nodes[0].getblock(tip)
+        info = self.nodes[0].getblockchaininfo()
+
+        assert('signblock_witness_asm' in header)
+        assert('signblock_witness_hex' in header)
+        assert('signblock_witness_asm' in block)
+        assert('signblock_witness_hex' in block)
+
+        signblockscript = make_signblockscript(self.num_keys, self.required_signers, self.keys)
+        assert_equal(info['signblock_asm'], self.nodes[0].decodescript(signblockscript)['asm'])
+        assert_equal(info['signblock_hex'], signblockscript)
+
 if __name__ == '__main__':
     BlockSignTest().main()
diff --git a/test/functional/feature_signed_blockchain.py b/test/functional/feature_signed_blockchain.py
deleted file mode 100755
index 4960ad4e22e..00000000000
--- a/test/functional/feature_signed_blockchain.py
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (c) 2014-2016 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#
-# Test RPC calls related to blockchain state. Tests correspond to code in
-# rpc/blockchain.cpp.
-#
-
-from decimal import Decimal
-from test_framework.test_framework import BitcoinTestFramework
-from test_framework.authproxy import JSONRPCException
-from test_framework.util import (
-    assert_equal,
-    assert_raises_jsonrpc,
-)
-
-# Keys for signing 2-of-3
-pubkeys = ["039560e48d4336e40db447fc136ce24ae1dfdefa5701e4d4e57aa1a1a9f47f3faa", "025a66517c1d85adcd909f9f675bf656708edc4da1f614693e347be6baf0fef4ae", "02ca238faeb3b01d26ae8a39869220dbd84cc8516398afa8958fe613fe4fdf1c04"]
-
-sign_script_pubkey = "5221"+pubkeys[0]+"21"+pubkeys[1]+"21"+pubkeys[2]+"53ae"
-
-class SignedBlockchainTest(BitcoinTestFramework):
-    """
-    Test signed-blockchain-related RPC calls:
-
-        - getnewblockhex
-        - signblock
-        - combineblocksigs
-        - submitblock
-
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.setup_clean_chain = True
-        self.num_nodes = 3
-
-    def setup_network(self, split=False):
-        # Normal multisig scriptPubKey: 1 <33 byte pubkey> <33 byte pubkey> ... 2 OP_CMS
-        sign_script = "-signblockscript="+sign_script_pubkey
-        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [[sign_script],[sign_script], [sign_script]])
-        # nodes are disconnected for this test
-        self.is_network_split = True
-
-    def run_test(self):
-        keys = ["cRANrxPMceu8jKAA76xzpA9PtTEhBknyZyaaQZ3Z5FnFTGkCAqmT", "cTJRjDBWo1JXdie31B5wv5eXNrPGCAjQKn48umubhmNLjsnj951V", "cVjTXVgKE8PhvCgDowRJVQW68q7j5kSbDGfAT5CUwt9D8dn2cAwf"]
-        assert_equal(self.nodes[0].getblockcount(), 0)
-        assert_equal(self.nodes[1].getblockcount(), 0)
-
-        block_hex = self.nodes[0].getnewblockhex()
-
-        # Block needs signatures, but valid and extends chaintip otherwise
-        assert_equal(self.nodes[0].testproposedblock(block_hex), None)
-        assert_equal(self.nodes[1].testproposedblock(block_hex), None)
-
-        assert_equal(self.nodes[0].submitblock(block_hex), "block-proof-invalid")
-        assert_equal(self.nodes[1].submitblock(block_hex), "block-proof-invalid")
-
-        assert_equal(self.nodes[0].getblockcount(), 0)
-        assert_equal(self.nodes[1].getblockcount(), 0)
-
-        # combineblocksigs only returns true when signatures are appended and enough
-        # are included to pass validation
-        assert_equal(self.nodes[0].combineblocksigs(block_hex, [])["complete"], False)
-        assert_equal(self.nodes[1].combineblocksigs(block_hex, [])["complete"], False)
-
-        # Now we can try to sign, without key
-        assert_equal(self.nodes[0].signblock(block_hex), "00")
-        assert_equal(self.nodes[1].signblock(block_hex), "00")
-
-        # Import keys
-        self.nodes[0].importprivkey(keys[0])
-        self.nodes[1].importprivkey(keys[1])
-        self.nodes[2].importprivkey(keys[2])
-
-        sig0 = self.nodes[0].signblock(block_hex)
-        sig1 = self.nodes[1].signblock(block_hex)
-
-        combined0 = self.nodes[0].combineblocksigs(block_hex, [sig0])
-        assert(not combined0["complete"])
-        combined1 = self.nodes[0].combineblocksigs(combined0["hex"], [sig1])
-        assert(combined1["complete"])
-
-        # Still haven't moved forward
-        assert_equal(self.nodes[0].getblockcount(), 0)
-        assert_equal(self.nodes[1].getblockcount(), 0)
-
-        self.nodes[0].submitblock(combined1["hex"])
-        # Move his chain along for later
-        self.nodes[2].submitblock(combined1["hex"])
-
-        assert_equal(self.nodes[0].getblockcount(), 1)
-        assert_equal(self.nodes[1].getblockcount(), 0)
-        assert_equal(self.nodes[2].getblockcount(), 1)
-
-        block_too_far = self.nodes[0].getnewblockhex()
-
-        assert_raises_jsonrpc,(JSONRPCException, -25, "proposal was not based on our best chain", self.nodes[1].testproposedblock, block_too_far)
-
-        # Finally, submit block
-        self.nodes[1].submitblock(combined1["hex"])
-        assert_equal(self.nodes[1].getblockcount(), 1)
-
-        # Now proposal is fine, aside from sigs
-        assert_equal(self.nodes[1].testproposedblock(block_too_far), None)
-        sig0 = self.nodes[0].signblock(block_too_far)
-        sig1 = self.nodes[1].signblock(block_too_far)
-        sig2 = self.nodes[2].signblock(block_too_far)
-
-        combined0 = self.nodes[0].combineblocksigs(block_too_far, [sig0])
-        assert(not combined0["complete"])
-        # combining signature from third node this time
-        combined1 = self.nodes[0].combineblocksigs(combined0["hex"], [sig2])
-        assert(combined1["complete"])
-
-        # Test getblock(header) signed block fields
-        tip = self.nodes[0].getblockhash(self.nodes[0].getblockcount())
-        header = self.nodes[0].getblockheader(tip)
-        block = self.nodes[0].getblock(tip)
-        info = self.nodes[0].getblockchaininfo()
-
-        assert('signblock_witness_asm' in header)
-        assert('signblock_witness_hex' in header)
-        assert('signblock_witness_asm' in block)
-        assert('signblock_witness_hex' in block)
-
-        assert_equal(info['signblock_asm'], "")
-        assert_equal(info['signblock_hex'], sign_script_pubkey)
-
-        # TODO stuff with too many signatures or junk data manually
-
-if __name__ == '__main__':
-    SignedBlockchainTest().main()

From bdb173729d41149df6b2b9ce9bcb281d962a9a11 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 14:51:32 -0500
Subject: [PATCH 49/66] fixup blocksign functional tests again...

---
 test/functional/feature_blocksign.py | 6 +++---
 test/functional/test_runner.py       | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/functional/feature_blocksign.py b/test/functional/feature_blocksign.py
index b31e4643591..b2bbef77a12 100755
--- a/test/functional/feature_blocksign.py
+++ b/test/functional/feature_blocksign.py
@@ -74,7 +74,7 @@ def set_test_params(self):
         self.extra_args = [[
             "-signblockscript={}".format(signblockscript),
             "-con_max_block_sig_size={}".format(self.required_signers*74),
-            "-con_blocksubsidy=5000000000",
+            "-anyonecanspendaremine=1"
         ]] * self.num_nodes
 
     def setup_network(self):
@@ -103,8 +103,8 @@ def mine_block(self, make_transactions):
         # miner makes a block
         block = miner.getnewblockhex()
 
-        # other nodes get fed compact blocks
-        for i in range(self.num_nodes):
+        # other signing nodes get fed compact blocks
+        for i in range(self.num_keys):
             if i == mineridx:
                 continue
             sketch = miner.getcompactsketch(block)
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index e0e7ae4fa46..5eff42193ee 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -150,7 +150,6 @@
     'feature_logging.py',
     'p2p_node_network_limited.py',
     'feature_blocksign.py',
-    'feature_signed_blockchain.py',
     'feature_blocksdir.py',
     'feature_config_args.py',
     'feature_help.py',

From cca86c0c1bcfa5667eee5cd5cd05d2759ec430dd Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 15:24:14 -0500
Subject: [PATCH 50/66] ProduceSignature should have additional flags only

---
 src/rpc/mining.cpp  | 2 +-
 src/script/sign.cpp | 4 ++--
 src/script/sign.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 9ad296d6a7a..13208994638 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -1032,7 +1032,7 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
     }
 
     // Finalizes the signatures, has no access to keys
-    ProduceSignature(keystore, signature_creator, block.proof.challenge, sig_data, STANDARD_SCRIPT_VERIFY_FLAGS|SCRIPT_NO_SIGHASH_BYTE);
+    ProduceSignature(keystore, signature_creator, block.proof.challenge, sig_data, SCRIPT_NO_SIGHASH_BYTE);
     block.proof.solution = sig_data.scriptSig;
 
     CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION | RPCSerializationFlags());
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index 1a89d23dd78..4f646f89a20 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -182,7 +182,7 @@ static CScript PushAll(const std::vector<valtype>& values)
     return result;
 }
 
-bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreator& creator, const CScript& fromPubKey, SignatureData& sigdata, unsigned int flags)
+bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreator& creator, const CScript& fromPubKey, SignatureData& sigdata, unsigned int additional_flags)
 {
     if (sigdata.complete) return true;
 
@@ -234,7 +234,7 @@ bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreato
     sigdata.scriptSig = PushAll(result);
 
     // Test solution
-    sigdata.complete = solved && VerifyScript(sigdata.scriptSig, fromPubKey, &sigdata.scriptWitness, flags, creator.Checker());
+    sigdata.complete = solved && VerifyScript(sigdata.scriptSig, fromPubKey, &sigdata.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS|additional_flags, creator.Checker());
     return sigdata.complete;
 }
 
diff --git a/src/script/sign.h b/src/script/sign.h
index 9e2c3dbc889..32b6ce3c012 100644
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -681,7 +681,7 @@ struct PartiallySignedTransaction
 };
 
 /** Produce a script signature using a generic signature creator. */
-bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreator& creator, const CScript& scriptPubKey, SignatureData& sigdata, unsigned int flags = STANDARD_SCRIPT_VERIFY_FLAGS);
+bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreator& creator, const CScript& scriptPubKey, SignatureData& sigdata, unsigned int additional_flags=0);
 
 /** Produce a script signature for a transaction. */
 bool SignSignature(const SigningProvider &provider, const CScript& fromPubKey, CMutableTransaction& txTo, unsigned int nIn, const CAmount& amount, int nHashType);

From 6e3285750ffd9b109cbf38fb3ef1b9dc26226089 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 15:24:32 -0500
Subject: [PATCH 51/66] fixup include spacing for compact block rpcs

---
 src/rpc/mining.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 13208994638..a9be2608bc6 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -29,7 +29,7 @@
 
 #include <keystore.h> // combineblocksigs
 #include <script/generic.hpp> // combineblocksigs
-#include<blockencodings.h> // getcompactsketch
+#include <blockencodings.h> // getcompactsketch
 
 #include <memory>
 #include <stdint.h>

From 6edf1373913fb049f3a85745a4805771d2c6d9a1 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 15:32:02 -0500
Subject: [PATCH 52/66] remove circular dep from generic signer

---
 src/script/generic.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/script/generic.hpp b/src/script/generic.hpp
index aaaf8151c25..9ac54a1a1c5 100644
--- a/src/script/generic.hpp
+++ b/src/script/generic.hpp
@@ -10,7 +10,6 @@
 #include <script/interpreter.h>
 #include <script/sign.h>
 #include <keystore.h>
-#include <policy/policy.h> // Flags for block production checks
 
 class SimpleSignatureChecker : public BaseSignatureChecker
 {

From fe156a6b04ec9690289d2504a6285bc0ef6b1dc0 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 15:34:53 -0500
Subject: [PATCH 53/66] remove unneeded STANDARD_VERIFY flag causing circular
 dep

---
 src/script/generic.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script/generic.hpp b/src/script/generic.hpp
index 9ac54a1a1c5..fe20ee95536 100644
--- a/src/script/generic.hpp
+++ b/src/script/generic.hpp
@@ -53,7 +53,7 @@ bool GenericVerifyScript(const CScript& scriptSig, const CScript& scriptPubKey,
 template<typename T>
 bool GenericSignScript(const CKeyStore& keystore, const T& data, const CScript& fromPubKey, SignatureData& scriptSig)
 {
-    return ProduceSignature(keystore, SimpleSignatureCreator(SerializeHash(data)), fromPubKey, scriptSig, STANDARD_SCRIPT_VERIFY_FLAGS|SCRIPT_NO_SIGHASH_BYTE);
+    return ProduceSignature(keystore, SimpleSignatureCreator(SerializeHash(data)), fromPubKey, scriptSig, SCRIPT_NO_SIGHASH_BYTE);
 }
 
 #endif // H_BITCOIN_SCRIPT_GENERIC

From b3004aded489d48439395dff88333b1ac3c924a5 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 15:41:55 -0500
Subject: [PATCH 54/66] remove policy include for block signature production

---
 src/script/sign.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/script/sign.h b/src/script/sign.h
index 32b6ce3c012..def95906f16 100644
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -11,7 +11,6 @@
 #include <pubkey.h>
 #include <script/interpreter.h>
 #include <streams.h>
-#include <policy/policy.h>
 
 class CKey;
 class CKeyID;

From 1b7559e44d5ed575885ad0757a0134d675f3da7c Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 15:42:06 -0500
Subject: [PATCH 55/66] fixup testproposedblock include

---
 src/rpc/mining.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index a9be2608bc6..6b89c479fc9 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -30,6 +30,7 @@
 #include <keystore.h> // combineblocksigs
 #include <script/generic.hpp> // combineblocksigs
 #include <blockencodings.h> // getcompactsketch
+#include <policy/policy.h> // testproposedblock
 
 #include <memory>
 #include <stdint.h>

From ad8814f4ecfb920882613d31aa1e69f26af383da Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 15:47:57 -0500
Subject: [PATCH 56/66] remove sign.h include from pow.cpp

---
 src/pow.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pow.cpp b/src/pow.cpp
index 3f6aae52b7d..adefe19a589 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -10,7 +10,6 @@
 #include <primitives/block.h>
 #include <uint256.h>
 #include <script/interpreter.h>
-#include <script/sign.h>
 #include <script/generic.hpp>
 
 bool CheckChallenge(const CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params& params)

From fcf77ab170324c29a8e0f0f33a7e047fa4ee56a2 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 15:58:39 -0500
Subject: [PATCH 57/66] fixup getnewblcokhex

---
 src/rpc/mining.cpp                  | 2 +-
 test/functional/mempool_packages.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 6b89c479fc9..1c2c7ceccb4 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -960,7 +960,7 @@ UniValue getnewblockhex(const JSONRPCRequest& request)
 
     int required_wait = !request.params[0].isNull() ? request.params[0].get_int() : 0;
     if (required_wait < 0) {
-        throw JSONRPCError(RPC_INVALID_PARAMS, "required_wait must be non-negative.");
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "required_wait must be non-negative.");
     }
 
     CScript feeDestinationScript = Params().GetConsensus().mandatory_coinbase_destination;
diff --git a/test/functional/mempool_packages.py b/test/functional/mempool_packages.py
index c63246596cf..5cb35d0e0bc 100755
--- a/test/functional/mempool_packages.py
+++ b/test/functional/mempool_packages.py
@@ -9,6 +9,7 @@
 from test_framework.messages import COIN
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal, assert_raises_rpc_error, satoshi_round, sync_blocks, sync_mempools
+import time
 
 MAX_ANCESTORS = 25
 MAX_DESCENDANTS = 25
@@ -49,7 +50,7 @@ def run_test(self):
         block = self.nodes[0].getnewblockhex(required_age=0)
         self.nodes[0].submitblock(block)
         assert(txid not in self.nodes[0].getrawmempool())
-        assert_raises_message(JSONRPCException, "required_wait must be non-negative.", self.nodes[0].getnewblockhex, -1)
+        assert_raises_rpc_error(-8, "required_wait must be non-negative.", self.nodes[0].getnewblockhex, -1)
 
         ''' Mine some blocks and have them mature. '''
         self.nodes[0].generate(101)

From 1abaed35bfe0901f090a5d0e39741de52867e59f Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 15:58:57 -0500
Subject: [PATCH 58/66] remove unused includes in blocksign test

---
 test/functional/feature_blocksign.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/functional/feature_blocksign.py b/test/functional/feature_blocksign.py
index b2bbef77a12..6c305e0357f 100755
--- a/test/functional/feature_blocksign.py
+++ b/test/functional/feature_blocksign.py
@@ -2,12 +2,10 @@
 
 import codecs
 import hashlib
-import os
 import random
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (assert_raises_rpc_error, assert_equal, connect_nodes_bi)
-from test_framework.authproxy import JSONRPCException
 from test_framework import (
     address,
     key,

From e456e1eba1f1352eb446fb4bf8959d646572460b Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 16:00:28 -0500
Subject: [PATCH 59/66] remove unused decimal in rpc test

---
 test/functional/mining_basic.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/functional/mining_basic.py b/test/functional/mining_basic.py
index 8bc3b96275d..b66ed93cd4b 100755
--- a/test/functional/mining_basic.py
+++ b/test/functional/mining_basic.py
@@ -10,7 +10,6 @@
 
 import copy
 from binascii import b2a_hex
-from decimal import Decimal
 
 from test_framework.blocktools import create_coinbase
 from test_framework.messages import CBlock

From 561f56dbf2be03848cfc997c96a7eca4c5c48065 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 16:01:27 -0500
Subject: [PATCH 60/66] remove unused include rpc_blockchain.py

---
 test/functional/rpc_blockchain.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
index cfb067bc15d..c6731d683dc 100755
--- a/test/functional/rpc_blockchain.py
+++ b/test/functional/rpc_blockchain.py
@@ -26,7 +26,6 @@
     assert_greater_than_or_equal,
     assert_raises,
     assert_raises_rpc_error,
-    assert_is_hex_string,
     assert_is_hash_string,
 )
 from test_framework.blocktools import (

From 413701668df96328d7f5505a7a1e89dae9ea3be9 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 16:05:02 -0500
Subject: [PATCH 61/66] fixup functional test

---
 test/functional/feature_blocksign.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/functional/feature_blocksign.py b/test/functional/feature_blocksign.py
index 6c305e0357f..e337fcd8893 100755
--- a/test/functional/feature_blocksign.py
+++ b/test/functional/feature_blocksign.py
@@ -9,7 +9,6 @@
 from test_framework import (
     address,
     key,
-    test_framework,
 )
 
 # Generate wallet import format from private key.

From f26b992d8adf7ba3fb20a15306f4b40fecde381e Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 15 Nov 2018 16:08:01 -0500
Subject: [PATCH 62/66] fixup functional test

---
 test/functional/feature_block.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py
index c052238561b..7a6dcbf793c 100755
--- a/test/functional/feature_block.py
+++ b/test/functional/feature_block.py
@@ -17,7 +17,6 @@
     CTxIn,
     CTxOut,
     MAX_BLOCK_BASE_SIZE,
-    uint256_from_compact,
     uint256_from_str,
 )
 from test_framework.mininode import P2PDataStore

From 18a804c09cc53b8bb946edd5e5f16ef5ec220b73 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Fri, 16 Nov 2018 09:02:36 -0500
Subject: [PATCH 63/66] CreateNewBlock: Only do signed block stuff when active

---
 src/miner.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 3c96e4aa9fe..03353692a42 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -143,13 +143,14 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     // transaction (which in most cases can be a no-op).
     fIncludeWitness = IsWitnessEnabled(pindexPrev, chainparams.GetConsensus()) && fMineWitnessTx;
 
-    // Pad block weight by block proof fields (including upper-bound of signature)
-    nBlockWeight += chainparams.GetConsensus().signblockscript.size() * WITNESS_SCALE_FACTOR;
-    nBlockWeight += chainparams.GetConsensus().max_block_signature_size * WITNESS_SCALE_FACTOR;
-
-    // Reset block proof
-    ResetProof(*pblock);
-    ResetChallenge(*pblock, *pindexPrev, chainparams.GetConsensus());
+    if (g_signed_blocks) {
+        // Pad block weight by block proof fields (including upper-bound of signature)
+        nBlockWeight += chainparams.GetConsensus().signblockscript.size() * WITNESS_SCALE_FACTOR;
+        nBlockWeight += chainparams.GetConsensus().max_block_signature_size * WITNESS_SCALE_FACTOR;
+        // Reset block proof
+        ResetProof(*pblock);
+        ResetChallenge(*pblock, *pindexPrev, chainparams.GetConsensus());
+    }
 
     int nPackagesSelected = 0;
     int nDescendantsUpdated = 0;

From 6df5c863bff756dd1af48e677a8ff01731b149dc Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Fri, 16 Nov 2018 12:56:29 -0500
Subject: [PATCH 64/66] fixup combineblocksigs results

---
 src/rpc/mining.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 1c2c7ceccb4..10a4c81e863 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -1009,7 +1009,6 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
     if (!DecodeHexBlk(block, request.params[0].get_str()))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed");
 
-    UniValue result(UniValue::VOBJ);
     const Consensus::Params& params = Params().GetConsensus();
     const UniValue& sigs = request.params[1].get_array();
     CBasicKeyStore keystore;
@@ -1038,10 +1037,9 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
 
     CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION | RPCSerializationFlags());
     ssBlock << block;
-    result.pushKV("final scriptSig", HexStr(block.proof.solution.begin(), block.proof.solution.end()));
+    UniValue result(UniValue::VOBJ);
     result.pushKV("hex", HexStr(ssBlock.begin(), ssBlock.end()));
     result.pushKV("complete", CheckProof(block, params));
-    result.pushKV("sigdata_complete", sig_data.complete);
     return result;
 }
 

From 52cfdca0f72658a38b3e72c80aee9b5297c61e5c Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Fri, 16 Nov 2018 12:56:53 -0500
Subject: [PATCH 65/66] Clarify block validation flags in light of
 max_block_signature_size

---
 src/pow.cpp | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/pow.cpp b/src/pow.cpp
index adefe19a589..5844a57bb5c 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -115,18 +115,9 @@ static bool CheckProofGeneric(const CBlockHeader& block, const Consensus::Params
         return false;
     }
 
-    // Some important anti-DoS flags.
-    // Note: Blockhashes do not commit to the proof.
-    // Therefore we may have a signature be mealleated
-    // to stay valid, but cause the block to fail
-    // validation, in this case, block weight.
-    // In that case, the block will be marked as permanently
-    // invalid and not processed.
-    // NOTE: These have only been deemed sufficient for OP_CMS
-    // ANY OTHER SCRIPT TYPE MAY REQUIRE DIFFERENT FLAGS/CONSIDERATIONS
-    // TODO: Better design to not have to worry about script specifics
-    // i.e. exempt block header solution from weight limit
-    unsigned int proof_flags = SCRIPT_VERIFY_P2SH // Just allows P2SH evaluation
+    // Some anti-DoS flags, though consensus.max_block_signature_size caps the possible
+    // danger in malleation of the block witness data.
+    unsigned int proof_flags = SCRIPT_VERIFY_P2SH // For cleanstack evalution under segwit flag
         | SCRIPT_VERIFY_STRICTENC // Minimally-sized DER sigs
         | SCRIPT_VERIFY_NULLDUMMY // No extra data stuffed into OP_CMS witness
         | SCRIPT_VERIFY_CLEANSTACK // No extra pushes leftover in witness

From 3e785f2bcc139dde84bd351628fcc098366e0d31 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Fri, 16 Nov 2018 13:02:30 -0500
Subject: [PATCH 66/66] combineblocksigs should check if signed blocks are
 active

---
 src/rpc/mining.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 10a4c81e863..ff6695bce63 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -1005,6 +1005,10 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
             + HelpExampleCli("combineblocksigs", "<hex> [\"signature1\", \"signature2\", ...]")
         );
 
+    if (!g_signed_blocks) {
+        throw JSONRPCError(RPC_MISC_ERROR, "Signed blocks are not active for this network.");
+    }
+
     CBlock block;
     if (!DecodeHexBlk(block, request.params[0].get_str()))
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed");