DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

void komodo_setactivation(int32_t height)

Browse Source
This commit is contained in:
jl777
2018-11-22 00:37:37 -11:00
parent 41f1604f29
commit 4556f3da4a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/chainparams.cpp
View File

@@ -213,6 +213,12 @@ void CChainParams::SetCheckpointData(CChainParams::CCheckpointData checkpointDat
CChainParams::checkpointData = checkpointData; CChainParams::checkpointData = checkpointData;
} }
void komodo_setactivation(int32_t height)
{
mainParams.consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = height;
mainParams.consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = height;
}
void *chainparams_commandline(void *ptr) void *chainparams_commandline(void *ptr)
{ {
CChainParams::CCheckpointData checkpointData; CChainParams::CCheckpointData checkpointData;

6
src/main.cpp
View File

@@ -69,6 +69,7 @@ int32_t komodo_block2pubkey33(uint8_t *pubkey33,CBlock *block);
void komodo_broadcast(CBlock *pblock,int32_t limit); void komodo_broadcast(CBlock *pblock,int32_t limit);
void komodo_broadcast(CBlock *pblock,int32_t limit); void komodo_broadcast(CBlock *pblock,int32_t limit);
bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey); bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey);
void komodo_setactivation(int32_t height);
BlockMap mapBlockIndex; BlockMap mapBlockIndex;
CChain chainActive; CChain chainActive;
@@ -3823,8 +3824,9 @@ int32_t komodo_activate_sapling(CBlockIndex *pindex)
} }
if ( activation != 0 ) if ( activation != 0 )
{ {
Params().GetConsensus().vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = activation; komodo_setactivation(activation);
Params().GetConsensus().vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = activation; //Params().GetConsensus().vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = activation;
//Params().GetConsensus().vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = activation;
ASSETCHAINS_SAPLING = activation; ASSETCHAINS_SAPLING = activation;
fprintf(stderr,"%s sapling activation at %d\n",ASSETCHAINS_SYMBOL,activation); fprintf(stderr,"%s sapling activation at %d\n",ASSETCHAINS_SYMBOL,activation);
} }