From d2aba1d67b252aba2fba202a71a23df93d38de8f Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 27 Jul 2018 07:41:57 -1100 Subject: [PATCH] Test --- src/cc/CCtx.cpp | 2 +- src/cc/auction.cpp | 4 ++-- src/cc/dice.cpp | 2 +- src/cc/faucet.cpp | 2 +- src/cc/lotto.cpp | 2 +- src/cc/ponzi.cpp | 2 +- src/cc/rewards.cpp | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp index e1cf715d3..d41b72632 100644 --- a/src/cc/CCtx.cpp +++ b/src/cc/CCtx.cpp @@ -55,7 +55,7 @@ std::string FinalizeCCTx(uint64_t CCmask,struct CCcontract_info *cp,CMutableTran return(0); } nmask = (1LL << n) - 1; - if ( (mask & nmask) != (CCmask & mask) ) + if ( (mask & nmask) != (CCmask & nmask) ) fprintf(stderr,"mask.%llx vs CCmask.%llx\n",(long long)(mask & nmask),(long long)(CCmask & mask)); Myprivkey(myprivkey); unspendablepk = GetUnspendable(cp,unspendablepriv); diff --git a/src/cc/auction.cpp b/src/cc/auction.cpp index 18e4acbe3..1bcf2ecd8 100644 --- a/src/cc/auction.cpp +++ b/src/cc/auction.cpp @@ -159,7 +159,7 @@ std::string AuctionBid(uint64_t txfee,uint256 itemhash,uint64_t amount) if ( CCchange != 0 ) mtx.vout.push_back(MakeCC1vout(EVAL_AUCTION,CCchange,Auctionpk)); mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(-1,cp,mtx,mypk,txfee,opret)); + return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,opret)); } else fprintf(stderr,"cant find Auction inputs\n"); return(0); } @@ -179,7 +179,7 @@ std::string AuctionDeliver(uint64_t txfee,uint256 itemhash,uint256 bidtxid) if ( CCchange != 0 ) mtx.vout.push_back(MakeCC1vout(EVAL_AUCTION,CCchange,Auctionpk)); mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(-1,cp,mtx,mypk,txfee,opret)); + return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,opret)); } else fprintf(stderr,"cant find Auction inputs\n"); return(0); } diff --git a/src/cc/dice.cpp b/src/cc/dice.cpp index ec6e0528b..159ac7a8c 100644 --- a/src/cc/dice.cpp +++ b/src/cc/dice.cpp @@ -159,7 +159,7 @@ std::string DiceBet(uint64_t txfee,uint64_t amount,uint64_t odds) if ( CCchange != 0 ) mtx.vout.push_back(MakeCC1vout(EVAL_DICE,CCchange,dicepk)); mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(-1,cp,mtx,mypk,txfee,opret)); + return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,opret)); } else fprintf(stderr,"cant find dice inputs\n"); return(0); } diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp index 7b2c33705..3891a3f9e 100644 --- a/src/cc/faucet.cpp +++ b/src/cc/faucet.cpp @@ -166,7 +166,7 @@ std::string FaucetGet(uint64_t txfee) if ( CCchange != 0 ) mtx.vout.push_back(MakeCC1vout(EVAL_FAUCET,CCchange,faucetpk)); mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(-1,cp,mtx,mypk,txfee,opret)); + return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,opret)); } else fprintf(stderr,"cant find faucet inputs\n"); return(0); } diff --git a/src/cc/lotto.cpp b/src/cc/lotto.cpp index abe11f46c..f15650f5e 100644 --- a/src/cc/lotto.cpp +++ b/src/cc/lotto.cpp @@ -159,7 +159,7 @@ std::string LottoTicket(uint64_t txfee,uint64_t numtickets) if ( CCchange != 0 ) mtx.vout.push_back(MakeCC1vout(EVAL_LOTTO,CCchange,Lottopk)); mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(-1,cp,mtx,mypk,txfee,opret)); + return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,opret)); } else fprintf(stderr,"cant find Lotto inputs\n"); return(0); } diff --git a/src/cc/ponzi.cpp b/src/cc/ponzi.cpp index 2eef28dd6..c29f63ebc 100644 --- a/src/cc/ponzi.cpp +++ b/src/cc/ponzi.cpp @@ -159,7 +159,7 @@ std::string PonziBuy(uint64_t txfee,uint64_t amount) if ( CCchange != 0 ) mtx.vout.push_back(MakeCC1vout(EVAL_PONZI,CCchange,ponzipk)); mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(-1,cp,mtx,mypk,txfee,opret)); + return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,opret)); } else fprintf(stderr,"cant find ponzi inputs\n"); return(0); } diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp index f8fd40210..16b53fa16 100644 --- a/src/cc/rewards.cpp +++ b/src/cc/rewards.cpp @@ -437,7 +437,7 @@ std::string RewardsUnlock(uint64_t txfee,char *planstr,uint256 fundingtxid,uint2 CCchange = (inputs - (amount + reward + txfee)); mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange,rewardspk)); mtx.vout.push_back(CTxOut(amount+reward,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(-1,cp,mtx,mypk,txfee,EncodeRewardsOpRet('U',sbits,fundingtxid))); + return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,EncodeRewardsOpRet('U',sbits,fundingtxid))); } fprintf(stderr,"cant find enough rewards inputs\n"); }