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

test invalid on

Browse Source
This commit is contained in:
dimxy
2019-04-19 15:55:34 +05:00
parent 59a02a874e
commit 19c4977056
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cc/import.cpp
View File

@@ -521,7 +521,7 @@ int32_t CheckPUBKEYimport(TxProof proof,std::vector<uint8_t> rawproof,CTransacti
bool CheckMigration(Eval *eval, const CTransaction &importTx, const CTransaction &burnTx, std::vector<CTxOut> & payouts, const ImportProof &proof, const std::vector<uint8_t> &rawproof) bool CheckMigration(Eval *eval, const CTransaction &importTx, const CTransaction &burnTx, std::vector<CTxOut> & payouts, const ImportProof &proof, const std::vector<uint8_t> &rawproof)
{ {
if (strcmp(ASSETCHAINS_SYMBOL, "CFEKDIMXY6") == 0 && chainActive.Height() <= 10699) if (strcmp(ASSETCHAINS_SYMBOL, "CFEKDIMXY6") == 0 && chainActive.Height() <= 44693)
return true; return true;
vscript_t vimportOpret; vscript_t vimportOpret;
@@ -641,6 +641,11 @@ bool CheckMigration(Eval *eval, const CTransaction &importTx, const CTransaction
else { else {
return eval->Invalid("invalid-import-proof"); return eval->Invalid("invalid-import-proof");
} }
if (vimportOpret.begin()[0] == EVAL_TOKENS)
return eval->Invalid("test-invalid-tokens-are-good!!");
else
return eval->Invalid("test-invalid-coins-are-good!!");
return true; return true;
} }
@@ -742,10 +747,5 @@ bool Eval::ImportCoin(const std::vector<uint8_t> params, const CTransaction &imp
// return Invalid("test-invalid"); // return Invalid("test-invalid");
LOGSTREAM("importcoin", CCLOG_DEBUG2, stream << "Valid import tx! txid=" << importTx.GetHash().GetHex() << std::endl); LOGSTREAM("importcoin", CCLOG_DEBUG2, stream << "Valid import tx! txid=" << importTx.GetHash().GetHex() << std::endl);
/*if (vimportOpret.begin()[0] == EVAL_TOKENS)
return Invalid("test-invalid-tokens-are-good!!");
else
return Invalid("test-invalid-coins-are-good!!");*/
return Valid(); return Valid();
} }