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

Merge branch 'dev' into FSM

Browse Source 
# Conflicts:
#	depends/packages/zeromq.mk
#	src/assetchains.json
This commit is contained in:
jl777
2019-02-27 04:31:00 -11:00
parent 1da0a1710d
commit 53e66f1170
11 changed files with 96 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cc/assets.cpp
View File

@@ -146,6 +146,13 @@ bool AssetsValidate(struct CCcontract_info *cpAssets,Eval* eval,const CTransacti
numvouts = tx.vout.size();
outputsDummy = inputs = 0;
preventCCvins = preventCCvouts = -1;
// add specific chains exceptions for old token support:
if (strcmp(ASSETCHAINS_SYMBOL, "SEC") == 0 && chainActive.Height() <= 144073)
return true;
if (strcmp(ASSETCHAINS_SYMBOL, "MGNX") == 0 && chainActive.Height() <= 210190)
return true;
// add specific chains exceptions for old token support:
if (strcmp(ASSETCHAINS_SYMBOL, "SEC") == 0 && chainActive.Height() <= 144073)