From b08b67f2115ef3a1aaca0063b4633786ed559f75 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 24 Jul 2018 09:11:32 -1100 Subject: [PATCH] Test --- src/cc/auction.cpp | 6 +++--- src/cc/ponzi.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cc/auction.cpp b/src/cc/auction.cpp index 9676af7cc..a11f66e85 100644 --- a/src/cc/auction.cpp +++ b/src/cc/auction.cpp @@ -185,15 +185,15 @@ std::string AuctionDeliver(uint64_t txfee,uint256 itemhash,uint256 bidtxid) std::string AuctionPost(uint64_t txfee,uint256 itemhash,uint64_t minbid,char *title,char *description) { - CMutableTransaction mtx; CPubKey mypk,Auctionpk; CScript opret; struct CCcontract_info *cp,C; + CMutableTransaction mtx; CPubKey mypk,Auctionpk; uint64_t funds = 0; CScript opret; struct CCcontract_info *cp,C; cp = CCinit(&C,EVAL_AUCTION); if ( txfee == 0 ) txfee = 10000; mypk = pubkey2pk(Mypubkey()); Auctionpk = GetUnspendable(cp,0); - if ( AddNormalinputs(mtx,mypk,funds+txfee,64) > 0 ) + if ( AddNormalinputs(mtx,mypk,txfee,64) > 0 ) { - //mtx.vout.push_back(MakeCC1vout(EVAL_AUCTION,funds,Auctionpk)); + mtx.vout.push_back(MakeCC1vout(EVAL_AUCTION,funds,Auctionpk)); return(FinalizeCCTx(cp,mtx,mypk,txfee,opret)); } return(0); diff --git a/src/cc/ponzi.cpp b/src/cc/ponzi.cpp index 26cf98515..81021209e 100644 --- a/src/cc/ponzi.cpp +++ b/src/cc/ponzi.cpp @@ -165,13 +165,13 @@ std::string PonziBuy(uint64_t txfee,uint64_t amount) std::string PonziClaim(uint64_t txfee) { - CMutableTransaction mtx; CPubKey mypk,ponzipk; CScript opret; struct CCcontract_info *cp,C; + CMutableTransaction mtx; CPubKey mypk,ponzipk; uint64_t funds = 0; CScript opret; struct CCcontract_info *cp,C; cp = CCinit(&C,EVAL_PONZI); if ( txfee == 0 ) txfee = 10000; mypk = pubkey2pk(Mypubkey()); ponzipk = GetUnspendable(cp,0); - if ( AddNormalinputs(mtx,mypk,funds+txfee,64) > 0 ) + if ( AddNormalinputs(mtx,mypk,txfee,64) > 0 ) { mtx.vout.push_back(MakeCC1vout(EVAL_PONZI,funds,ponzipk)); return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));