From c7814899265e53b3885a0f09619ad6729bfb4776 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 22 Jul 2018 12:00:25 -1100 Subject: [PATCH] Test --- src/cc/assets.cpp | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp index 059e0939c..ee48fe421 100644 --- a/src/cc/assets.cpp +++ b/src/cc/assets.cpp @@ -327,32 +327,29 @@ bool ProcessAssets(Eval* eval, std::vector 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"); + fprintf(stderr,"ProcessAssets2\n"); + if ( (n= ctx.vout.size()) == 0 ) + return eval->Invalid("no-vouts"); + fprintf(stderr,"ProcessAssets3\n"); + if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 ) + return eval->Invalid("Invalid opreturn payload"); + fprintf(stderr,"ProcessAssets4\n"); + if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 ) + return eval->Invalid("cant find asset create txid"); + fprintf(stderr,"ProcessAssets5\n"); + if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 ) + return eval->Invalid("cant find asset2 create txid"); + fprintf(stderr,"AssetValidate skipped\n"); + if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 ) { - fprintf(stderr,"ProcessAssets\n"); - if ( paramsNull.size() != 0 ) // Don't expect params - return eval->Invalid("Cannot have params"); - fprintf(stderr,"ProcessAssets2\n"); - if ( (n= ctx.vout.size()) == 0 ) - return eval->Invalid("no-vouts"); - fprintf(stderr,"ProcessAssets3\n"); - if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 ) - return eval->Invalid("Invalid opreturn payload"); - fprintf(stderr,"ProcessAssets4\n"); - if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 ) - return eval->Invalid("cant find asset create txid"); - fprintf(stderr,"ProcessAssets5\n"); - if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 ) - return eval->Invalid("cant find asset2 create txid"); - fprintf(stderr,"AssetValidate skipped\n"); + prevtxid = txid; + fprintf(stderr,"AssetValidate passed\n"); return(true); - 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); }