diff --git a/src/Makefile.am b/src/Makefile.am index 52a74f9b96..ea1acb958c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -134,6 +134,7 @@ BITCOIN_CORE_H = \ core_io.h \ core_memusage.h \ cuckoocache.h \ + dynafed.h \ fs.h \ httprpc.h \ httpserver.h \ @@ -401,10 +402,13 @@ libbitcoin_consensus_a_SOURCES = \ arith_uint256.cpp \ arith_uint256.h \ asset.cpp \ + chain.h \ + chain.cpp \ consensus/merkle.cpp \ consensus/merkle.h \ consensus/params.h \ consensus/validation.h \ + dynafed.cpp \ hash.cpp \ hash.h \ prevector.h \ @@ -433,6 +437,8 @@ libbitcoin_consensus_a_SOURCES = \ script/script.h \ script/script_error.cpp \ script/script_error.h \ + script/standard.h \ + script/standard.cpp \ serialize.h \ span.h \ tinyformat.h \ diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 0d5081da2e..f3385ef2da 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -482,6 +482,9 @@ class CCustomParams : public CRegTestParams { consensus.nMinimumChainWork = uint256S(args.GetArg("-con_nminimumchainwork", "0x0")); consensus.defaultAssumeValid = uint256S(args.GetArg("-con_defaultassumevalid", "0x00")); + // TODO: pass in serialized vector of byte vectors, parse into extension space + // Junk keys for testing + consensus.first_extension_space = {ParseHex("02fcba7ecf41bc7e1be4ee122d9d22e3333671eb0a3a87b5cdf099d59874e1940f02fcba7ecf41bc7e1be4ee122d9d22e3333671eb0a3a87b5cdf099d59874e1940f")}; nPruneAfterHeight = (uint64_t)args.GetArg("-npruneafterheight", nPruneAfterHeight); fDefaultConsistencyChecks = args.GetBoolArg("-fdefaultconsistencychecks", fDefaultConsistencyChecks); diff --git a/src/consensus/params.h b/src/consensus/params.h index dfe19b5ac8..2840ecf50f 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -99,6 +99,8 @@ struct Params { CScript signblockscript; uint32_t max_block_signature_size; // g_signed_blocks - Whether blocks are signed or not, get around circular dep + // Used to seed the extension space for first dynamic blocks + std::vector> first_extension_space; }; } // namespace Consensus diff --git a/src/dynafed.cpp b/src/dynafed.cpp new file mode 100644 index 0000000000..201ca28867 --- /dev/null +++ b/src/dynafed.cpp @@ -0,0 +1,97 @@ + +#include +#include