diff --git a/src/cc/import.cpp b/src/cc/import.cpp index 674b024e3..675b9771e 100644 --- a/src/cc/import.cpp +++ b/src/cc/import.cpp @@ -521,7 +521,7 @@ int32_t CheckPUBKEYimport(TxProof proof,std::vector rawproof,CTransacti bool CheckMigration(Eval *eval, const CTransaction &importTx, const CTransaction &burnTx, std::vector & payouts, const ImportProof &proof, const std::vector &rawproof) { - if (strcmp(ASSETCHAINS_SYMBOL, "CFEKDIMXY6") == 0 && chainActive.Height() <= 10699) + if (strcmp(ASSETCHAINS_SYMBOL, "CFEKDIMXY6") == 0 && chainActive.Height() <= 44693) return true; vscript_t vimportOpret; @@ -641,6 +641,11 @@ bool CheckMigration(Eval *eval, const CTransaction &importTx, const CTransaction else { 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; } @@ -741,11 +746,6 @@ bool Eval::ImportCoin(const std::vector params, const CTransaction &imp // return Invalid("test-invalid"); 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(); }