This commit is contained in:
jl777
2019-07-12 01:00:10 -11:00
parent 80fd6fee58
commit c9ec6d961d

View File

@@ -18,7 +18,7 @@
******************************************************************************/ ******************************************************************************/
#include "consensus/upgrades.h" #include "consensus/upgrades.h"
#include "komodo_nSPV_defs.h"
/** /**
* General information about each network upgrade. * General information about each network upgrade.
* Ordered by Consensus::UpgradeIndex. * Ordered by Consensus::UpgradeIndex.
@@ -100,7 +100,7 @@ int CurrentEpoch(int nHeight, const Consensus::Params& params) {
uint32_t CurrentEpochBranchId(int nHeight, const Consensus::Params& params) uint32_t CurrentEpochBranchId(int nHeight, const Consensus::Params& params)
{ {
if ( KOMODO_NSPV != 0 ) if ( KOMODO_NSPV != 0 )
return(SAPLING_TX_VERSION); return(NSPV_BRANCHID);
return NetworkUpgradeInfo[CurrentEpoch(nHeight, params)].nBranchId; return NetworkUpgradeInfo[CurrentEpoch(nHeight, params)].nBranchId;
} }