Merge 0c82c2743b into merged_master (Elements PR #970)

This commit is contained in:
Andrew Poelstra 2021-03-26 00:27:13 +00:00
commit 59076ca8f3

View file

@ -849,8 +849,8 @@ public:
g_con_blockheightinheader = true;
g_con_elementsmode = true;
consensus.elements_mode = g_con_elementsmode;
// TODO: Pick appropriate value for this network.
consensus.total_valid_epochs = 2;
consensus.dynamic_epoch_length = 20160;
consensus.genesis_subsidy = 0;