From ee2ec523178b4541a7818e63dc1833980b93c1e1 Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 10 Jul 2019 03:50:45 -1100 Subject: [PATCH] Test --- src/cc/CCinclude.h | 1 + src/cc/CCtx.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h index c485ffb2d..b51b71323 100644 --- a/src/cc/CCinclude.h +++ b/src/cc/CCinclude.h @@ -288,6 +288,7 @@ extern std::vector NULL_pubkeys; std::string FinalizeCCTx(uint64_t skipmask,struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret,std::vector pubkeys = NULL_pubkeys); void SetCCunspents(std::vector > &unspentOutputs,char *coinaddr,bool CCflag = true); void SetCCtxids(std::vector > &addressIndex,char *coinaddr,bool CCflag = true); +int64_t NSPV_AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,int64_t total,int32_t maxinputs,struct NSPV_CCdata *ptr); int64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,int64_t total,int32_t maxinputs,struct NSPV_CCdata *ptr = 0); int64_t AddNormalinputs2(CMutableTransaction &mtx,int64_t total,int32_t maxinputs,struct NSPV_CCdata *ptr = 0); int64_t CCutxovalue(char *coinaddr,uint256 utxotxid,int32_t utxovout,int32_t CCflag); diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp index e6da6a46b..a8adab849 100644 --- a/src/cc/CCtx.cpp +++ b/src/cc/CCtx.cpp @@ -528,7 +528,7 @@ int64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,int64_t total,int3 const CKeyStore& keystore = *pwalletMain; LOCK2(cs_main, pwalletMain->cs_wallet); pwalletMain->AvailableCoins(vecOutputs, false, NULL, true); - utxos = (struct CC_utxo *)calloc(CC_MAXVINS,sizeof(*utxos)); + utxos = (struct CC_utxosinfo *)calloc(CC_MAXVINS,sizeof(*utxos)); if ( maxinputs > CC_MAXVINS ) maxinputs = CC_MAXVINS; if ( maxinputs > 0 )