Split declaration and definition of SPROUT_BRANCH_ID constant

Fixes an initialization-order-fiasco error detected by ASan: https://ci.z.cash/#/builders/7/builds/149
2018-03-09 09:42:20 +00:00
parent d88a12262c
commit a6ae8f55ae
2 changed files with 3 additions and 1 deletions
--- a/src/consensus/upgrades.cpp
+++ b/src/consensus/upgrades.cpp
@@ -26,6 +26,8 @@ const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = {
    }
 };

+const uint32_t SPROUT_BRANCH_ID = NetworkUpgradeInfo[Consensus::BASE_SPROUT].nBranchId;
+
 UpgradeState NetworkUpgradeState(
    int nHeight,
    const Consensus::Params& params,