DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Test

Browse Source
This commit is contained in:
jl777
2018-07-25 10:02:49 -11:00
parent 7b676bd92a
commit b5269aa620
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cc/CCassetstx.cpp
View File

@@ -314,6 +314,9 @@ std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 ask
else inputs = AddNormalinputs(mtx,mypk,fillamount,60); else inputs = AddNormalinputs(mtx,mypk,fillamount,60);
if ( inputs > 0 ) if ( inputs > 0 )
{ {
if ( inputs < fillamount )
fillamount = inputs;
fprintf(stderr,"inputs %llu, fillamount.%llu\n",(long long)inputs,(long long)fillamount);
SetAssetFillamounts(1,paid_amount,remaining_required,askamount,fillamount,totalunits); SetAssetFillamounts(1,paid_amount,remaining_required,askamount,fillamount,totalunits);
if ( assetid2 != zeroid && inputs > fillamount ) if ( assetid2 != zeroid && inputs > fillamount )
CCchange = (inputs - fillamount); CCchange = (inputs - fillamount);

2
src/wallet/rpcwallet.cpp
View File

@@ -5323,7 +5323,7 @@ UniValue tokenfillask(const UniValue& params, bool fHelp)
throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n"); throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
tokenid = Parseuint256((char *)params[0].get_str().c_str()); tokenid = Parseuint256((char *)params[0].get_str().c_str());
asktxid = Parseuint256((char *)params[1].get_str().c_str()); asktxid = Parseuint256((char *)params[1].get_str().c_str());
fillamount = atol(params[2].get_str().c_str()); fillamount = atof(params[2].get_str().c_str()) * COIN;
hex = FillSell(0,tokenid,zeroid,asktxid,fillamount); hex = FillSell(0,tokenid,zeroid,asktxid,fillamount);
if ( hex.size() > 0 ) if ( hex.size() > 0 )
{ {