This commit is contained in:
jl777
2018-07-22 11:41:26 -11:00
parent 61cbf1c6fb
commit e38fedd89e
2 changed files with 22 additions and 19 deletions

View File

@@ -327,24 +327,27 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
txid = ctx.GetHash();
if ( txid == prevtxid )
return(true);
fprintf(stderr,"ProcessAssets\n");
if ( paramsNull.size() != 0 ) // Don't expect params
return eval->Invalid("Cannot have params");
else if ( (n= ctx.vout.size()) == 0 )
return eval->Invalid("no-vouts");
else if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
return eval->Invalid("Invalid opreturn payload");
if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
return eval->Invalid("cant find asset create txid");
if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
return eval->Invalid("cant find asset2 create txid");
if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
{
prevtxid = txid;
fprintf(stderr,"AssetValidate passed\n");
return(true);
LOCK(cs_main);
fprintf(stderr,"ProcessAssets\n");
if ( paramsNull.size() != 0 ) // Don't expect params
return eval->Invalid("Cannot have params");
else if ( (n= ctx.vout.size()) == 0 )
return eval->Invalid("no-vouts");
else if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
return eval->Invalid("Invalid opreturn payload");
if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
return eval->Invalid("cant find asset create txid");
if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
return eval->Invalid("cant find asset2 create txid");
if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
{
prevtxid = txid;
fprintf(stderr,"AssetValidate passed\n");
return(true);
}
fprintf(stderr,"AssetValidate failed\n");
}
fprintf(stderr,"AssetValidate failed\n");
return(false);
}