From 618150c83e1ef47e87c99b41c657a17e9bd02b1f Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 18 Jul 2018 05:31:39 -1100 Subject: [PATCH] Use scriptPubKey.IsPayToCryptoCondition() --- src/cc/assets.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp index 4e66dd4d4..9a3bffd52 100644 --- a/src/cc/assets.cpp +++ b/src/cc/assets.cpp @@ -64,14 +64,14 @@ CC* GetCryptoCondition(CScript const& scriptSig) return cc_readFulfillmentBinary((uint8_t*)ffbin.data(), ffbin.size()-1); } -bool IsCCOutput(CScript const& scriptPubKey) +/*bool IsCCOutput(CScript const& scriptPubKey) { int32_t scriptlen; const uint8_t *script = scriptPubKey.data(); scriptlen = scriptPubKey.size(); if ( script[scriptlen - 1] != OP_CRYPTOCONDITION ) return(false); return(true); -} +}*/ bool IsAssetInput(CScript const& scriptSig) { @@ -142,7 +142,7 @@ bool ProcessAssets(Eval* eval, std::vector paramsNull, const CTransacti return eval->Invalid("no-vouts"); for (i=1; iInvalid("non-CC asset vout"); outputs += tx.vout[i].nValue; } @@ -150,7 +150,7 @@ bool ProcessAssets(Eval* eval, std::vector paramsNull, const CTransacti return eval->Invalid("Invalid opreturn payload"); if ( eval->GetTxUnconfirmed(coinId,createTx,hashBlock) == 0 ) return eval->Invalid("cant find asset create txid"); - if ( createTx.vout.size() == 0 || IsCCOutput(createTx.vout[0].scriptPubKey) == 0 ) + if ( createTx.vout.size() == 0 || createTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 ) return eval->Invalid("asset create txid is not asset CC"); for (i=0; i