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

Print in setactivation

Browse Source
This commit is contained in:
jl777
2018-11-23 03:03:38 -11:00
parent 4458e675a2
commit 9c230bbd4c
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/chainparams.cpp
View File

@@ -218,6 +218,7 @@ void komodo_setactivation(int32_t height)
mainParams.consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = height; mainParams.consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = height;
mainParams.consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = height; mainParams.consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = height;
ASSETCHAINS_SAPLING = height; ASSETCHAINS_SAPLING = height;
fprintf(stderr,"SET SAPLING ACTIVATION height.%d\n",height);
} }
void *chainparams_commandline(void *ptr) void *chainparams_commandline(void *ptr)

2
src/main.cpp
View File

@@ -1380,7 +1380,7 @@ bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidatio
if ( ASSETCHAINS_PUBLIC != 0 ) if ( ASSETCHAINS_PUBLIC != 0 )
{ {
return state.DoS(100, error("CheckTransaction(): this is a public chain, no privacy allowed"), return state.DoS(100, error("CheckTransaction(): this is a public chain, no privacy allowed"),
REJECT_INVALID, "bad-txns-acprivacy-chain"); REJECT_INVALID, "bad-txns-acpublic-chain");
} }
if (joinsplit.vpub_old < 0) { if (joinsplit.vpub_old < 0) {
return state.DoS(100, error("CheckTransaction(): joinsplit.vpub_old negative"), return state.DoS(100, error("CheckTransaction(): joinsplit.vpub_old negative"),