From 1d7847305c28ea8babb83507a2a2f831803aefdb Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Thu, 7 Nov 2019 12:07:16 -0500 Subject: [PATCH] HF: Dyanfed pruned header now has extra root --- src/dynafed.cpp | 2 +- src/miner.cpp | 4 +-- src/primitives/block.cpp | 32 ++++++++++++++++++---- src/primitives/block.h | 14 ++++++++-- src/test/dynafed_tests.cpp | 8 +++--- test/functional/feature_blocksign.py | 8 ++++-- test/functional/test_framework/messages.py | 11 ++++++-- 7 files changed, 58 insertions(+), 21 deletions(-) diff --git a/src/dynafed.cpp b/src/dynafed.cpp index de7ada67b9..13fbc8c147 100644 --- a/src/dynafed.cpp +++ b/src/dynafed.cpp @@ -94,7 +94,7 @@ DynaFedParamEntry ComputeNextBlockCurrentParameters(const CBlockIndex* pindexPre // Return appropriate format based on epoch age if (epoch_age > 0) { // TODO implement "prune" function to remove fields in place and change serialize type - return DynaFedParamEntry(entry.m_signblockscript, entry.m_signblock_witness_limit); + return DynaFedParamEntry(entry.m_signblockscript, entry.m_signblock_witness_limit, entry.CalculateExtraRoot()); } else { return entry; } diff --git a/src/miner.cpp b/src/miner.cpp index 6d311b74c2..1b0c2bb0fe 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -151,8 +151,8 @@ std::unique_ptr BlockAssembler::CreateNewBlock(const CScript& sc fIncludeWitness = IsWitnessEnabled(pindexPrev, chainparams.GetConsensus()); if (IsDynaFedEnabled(pindexPrev, chainparams.GetConsensus())) { - DynaFedParamEntry current_params = ComputeNextBlockCurrentParameters(chainActive.Tip(), chainparams.GetConsensus()); - DynaFedParams block_params(current_params, proposed_entry ? *proposed_entry : DynaFedParamEntry()); + const DynaFedParamEntry current_params = ComputeNextBlockCurrentParameters(chainActive.Tip(), chainparams.GetConsensus()); + const DynaFedParams block_params(current_params, proposed_entry ? *proposed_entry : DynaFedParamEntry()); pblock->m_dynafed_params = block_params; nBlockWeight += ::GetSerializeSize(block_params, PROTOCOL_VERSION)*WITNESS_SCALE_FACTOR; nBlockWeight += current_params.m_signblock_witness_limit; // Note witness discount diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp index 2b72449740..b17371e50d 100644 --- a/src/primitives/block.cpp +++ b/src/primitives/block.cpp @@ -43,19 +43,39 @@ std::string CBlock::ToString() const uint256 DynaFedParamEntry::CalculateRoot() const { - if (IsNull()) { + if (m_serialize_type == 0) { return uint256(); } + std::vector compact_leaves; + compact_leaves.push_back(SerializeHash(m_signblockscript, SER_GETHASH, 0)); + compact_leaves.push_back(SerializeHash(m_signblock_witness_limit, SER_GETHASH, 0)); + uint256 compact_root(ComputeFastMerkleRoot(compact_leaves)); + + uint256 extra_root; + if (m_serialize_type ==1 ) { + // It's pruned, take the stored value + extra_root = m_elided_root; + } else if (m_serialize_type == 2) { + // It's unpruned, compute the node value + extra_root = CalculateExtraRoot(); + } + std::vector leaves; - leaves.push_back(SerializeHash(m_signblockscript, SER_GETHASH, 0)); - leaves.push_back(SerializeHash(m_signblock_witness_limit, SER_GETHASH, 0)); - leaves.push_back(SerializeHash(m_fedpeg_program, SER_GETHASH, 0)); - leaves.push_back(SerializeHash(m_fedpegscript, SER_GETHASH, 0)); - leaves.push_back(SerializeHash(m_extension_space, SER_GETHASH, 0)); + leaves.push_back(compact_root); + leaves.push_back(extra_root); return ComputeFastMerkleRoot(leaves); } +uint256 DynaFedParamEntry::CalculateExtraRoot() const +{ + std::vector extra_leaves; + extra_leaves.push_back(SerializeHash(m_fedpeg_program, SER_GETHASH, 0)); + extra_leaves.push_back(SerializeHash(m_fedpegscript, SER_GETHASH, 0)); + extra_leaves.push_back(SerializeHash(m_extension_space, SER_GETHASH, 0)); + return ComputeFastMerkleRoot(extra_leaves); +} + uint256 DynaFedParams::CalculateRoot() const { if (IsNull()) { diff --git a/src/primitives/block.h b/src/primitives/block.h index 6c3b1a99c3..9b8575f45d 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -58,18 +58,25 @@ public: class DynaFedParamEntry { public: - unsigned char m_serialize_type; // Determines how it is serialized, defaults to null + // Determines how these entries are serialized and stored + // 0 -> Null. Only used for proposed parameter "null votes" + // 1 -> Pruned. Doesn't have non-signblockscript data. That elided data + // is committed to in m_elided_root, and validated against chainstate. + // 2 -> Full. Typically only consensus-legal at epoch start. + unsigned char m_serialize_type; + CScript m_signblockscript; uint32_t m_signblock_witness_limit; // Max block signature witness serialized size CScript m_fedpeg_program; // The "scriptPubKey" of the fedpegscript CScript m_fedpegscript; // The witnessScript for witness v0 or undefined otherwise. // No consensus meaning to the particular bytes, currently we interpret as PAK keys, details in pak.h std::vector> m_extension_space; + uint256 m_elided_root; // non-zero only when m_serialize_type == 1 // Each constructor sets its own serialization type implicitly based on which // arguments are given DynaFedParamEntry() { m_signblock_witness_limit = 0; m_serialize_type = 0; }; - DynaFedParamEntry(const CScript& signblockscript_in, const uint32_t sbs_wit_limit_in) : m_signblockscript(signblockscript_in), m_signblock_witness_limit(sbs_wit_limit_in) { m_serialize_type = 1; }; + DynaFedParamEntry(const CScript& signblockscript_in, const uint32_t sbs_wit_limit_in, const uint256 elided_root_in) : m_signblockscript(signblockscript_in), m_signblock_witness_limit(sbs_wit_limit_in), m_elided_root(elided_root_in) { m_serialize_type = 1; }; DynaFedParamEntry(const CScript& signblockscript_in, const uint32_t sbs_wit_limit_in, const CScript& fedpeg_program_in, const CScript& fedpegscript_in, const std::vector> extension_space_in) : m_signblockscript(signblockscript_in), m_signblock_witness_limit(sbs_wit_limit_in), m_fedpeg_program(fedpeg_program_in), m_fedpegscript(fedpegscript_in), m_extension_space(extension_space_in) { m_serialize_type = 2; }; ADD_SERIALIZE_METHODS; @@ -84,6 +91,7 @@ public: case 1: READWRITE(m_signblockscript); READWRITE(m_signblock_witness_limit); + READWRITE(m_elided_root); break; case 2: READWRITE(m_signblockscript); @@ -98,6 +106,8 @@ public: } uint256 CalculateRoot() const; + // Calculates root for the non-blocksigning merkle fields + uint256 CalculateExtraRoot() const; bool IsNull() const { diff --git a/src/test/dynafed_tests.cpp b/src/test/dynafed_tests.cpp index 8edfd31d20..8b2d8cb70f 100644 --- a/src/test/dynafed_tests.cpp +++ b/src/test/dynafed_tests.cpp @@ -21,23 +21,23 @@ BOOST_AUTO_TEST_CASE(dynafed_params_root) CScript fp_script(opcodetype(4)); std::vector> ext{ {5, 6}, {7} }; - DynaFedParamEntry compact_entry = DynaFedParamEntry(signblockscript, signblock_wl); + DynaFedParamEntry compact_entry = DynaFedParamEntry(signblockscript, signblock_wl, uint256()); BOOST_CHECK_EQUAL( compact_entry.CalculateRoot().GetHex(), - "dff5f3793abc06a6d75e80fe3cfd47406f732fa4ec9305960ae2a229222a1ad5" + "f98f149fd11da6fbe26d0ee53cadd28372fa9eed2cb7080f41da7ca311531777" ); DynaFedParamEntry full_entry = DynaFedParamEntry(signblockscript, signblock_wl, fp_program, fp_script, ext); BOOST_CHECK_EQUAL( full_entry.CalculateRoot().GetHex(), - "175be2087ba7cc0e33348bef493bd3e34f31f64bf9226e5881ab310dafa432ff" + "8eb1b83cce69a3d8b0bfb7fbe77ae8f1d24b57a9cae047b8c0aba084ad878249" ); DynaFedParams params = DynaFedParams(compact_entry, full_entry); BOOST_CHECK_EQUAL( params.CalculateRoot().GetHex(), - "e56cf79487952dfa85fe6a85829600adc19714ba6ab1157fdff02b25ae60cee2" + "113160f76dc17fe367a2def79aefe06feeea9c795310c9e88aeedc23e145982e" ); } diff --git a/test/functional/feature_blocksign.py b/test/functional/feature_blocksign.py index ecb8f4166c..346dca5d8d 100755 --- a/test/functional/feature_blocksign.py +++ b/test/functional/feature_blocksign.py @@ -218,14 +218,16 @@ class BlockSignTest(BitcoinTestFramework): # Next let's activate dynafed blocks_til_dynafed = 431 - self.nodes[0].getblockcount() + self.log.info("Activating dynafed") self.mine_blocks(blocks_til_dynafed, False) self.check_height(111+blocks_til_dynafed) assert_equal(self.nodes[0].getblockchaininfo()['bip9_softforks']['dynafed']['status'], "active") - self.log.info("Mine some dynamic federation blocks without and with txns") - self.mine_blocks(50, False) - self.mine_blocks(50, True) + self.log.info("Mine some dynamic federation blocks without txns") + self.mine_blocks(10, False) + self.log.info("Mine some dynamic federation blocks with txns") + self.mine_blocks(10, True) if __name__ == '__main__': BlockSignTest().main() diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py index 97b49a3f0d..1de209a299 100755 --- a/test/functional/test_framework/messages.py +++ b/test/functional/test_framework/messages.py @@ -836,13 +836,13 @@ class CProof: % (self.challenge, self.solution) class DynaFedParamEntry: - __slots__ = ("m_serialize_type", "m_signblockscript", "m_signblock_witness_limit", "m_fedpeg_program", "m_fedpegscript", "m_extension_space") + __slots__ = ("m_serialize_type", "m_signblockscript", "m_signblock_witness_limit", "m_fedpeg_program", "m_fedpegscript", "m_extension_space", "m_elided_root") # Constructor args will define serialization type: # null = 0 # signblock-related fields = 1, required for m_current on non-epoch-starts # all fields = 2, required for epoch starts - def __init__(self, m_signblockscript=b"", m_signblock_witness_limit=0, m_fedpeg_program=b"", m_fedpegscript=b"", m_extension_space=[]): + def __init__(self, m_signblockscript=b"", m_signblock_witness_limit=0, m_fedpeg_program=b"", m_fedpegscript=b"", m_extension_space=[], m_elided_root=0): self.m_signblockscript = m_signblockscript self.m_signblock_witness_limit = m_signblock_witness_limit self.m_fedpeg_program = m_fedpeg_program @@ -850,8 +850,10 @@ class DynaFedParamEntry: self.m_extension_space = m_extension_space if self.is_null(): self.m_serialize_type = 0 - elif m_fedpegscript==b"" and m_extension_space == []: + elif m_fedpegscript==b"" and m_fedpeg_program==b"" and m_extension_space == []: self.m_serialize_type = 1 + # We also set the "extra root" in this case + self.m_elided_root = m_elided_root else: self.m_serialize_type = 2 @@ -862,6 +864,7 @@ class DynaFedParamEntry: self.m_fedpegscript = b"" self.m_extension_space = [] self.m_serialize_type = 0 + self.m_elided_root = 0 def is_null(self): return self.m_signblockscript == b"" and self.m_signblock_witness_limit == 0 and \ @@ -874,6 +877,7 @@ class DynaFedParamEntry: if self.m_serialize_type == 1: r += ser_string(self.m_signblockscript) r += struct.pack("