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

Test

Browse Source
This commit is contained in:
jl777
2018-07-26 02:15:55 -11:00
parent ddf40bb69e
commit 2e20239906
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cc/CCassetsCore.cpp
View File

@@ -164,7 +164,7 @@ bool ValidateAskRemainder(uint64_t remaining_nValue,uint64_t remaining_assetoshi
bool SetSwapFillamounts(uint64_t &received_assetoshis,uint64_t &remaining_nValue,uint64_t orig_assetoshis,uint64_t &paid_nValue,uint64_t total_nValue) bool SetSwapFillamounts(uint64_t &received_assetoshis,uint64_t &remaining_nValue,uint64_t orig_assetoshis,uint64_t &paid_nValue,uint64_t total_nValue)
{ {
uint64_t remaining_assetoshis,unitprice; uint64_t remaining_assetoshis; double dunitprice;
if ( total_nValue == 0 ) if ( total_nValue == 0 )
{ {
received_assetoshis = remaining_nValue = paid_nValue = 0; received_assetoshis = remaining_nValue = paid_nValue = 0;
@@ -179,14 +179,14 @@ bool SetSwapFillamounts(uint64_t &received_assetoshis,uint64_t &remaining_nValue
return(true); return(true);
} }
remaining_nValue = (total_nValue - paid_nValue); remaining_nValue = (total_nValue - paid_nValue);
unitprice = (double)(total_nValue * COIN) / orig_assetoshis; dunitprice = ((double)total_nValue / orig_assetoshis);
received_assetoshis = (paid_nValue * COIN) / unitprice; received_assetoshis = (paid_nValue / dunitprice);
fprintf(stderr,"remaining_nValue %llu (%llu - %llu)\n",(long long)remaining_nValue,(long long)total_nValue,(long long)paid_nValue); fprintf(stderr,"remaining_nValue %.8f (%.8f - %.8f)\n",(double)remaining_nValue/COIN,(double)total_nValue/COIN,(double)paid_nValue/COIN);
fprintf(stderr,"unitprice %llu received_assetoshis %llu orig %llu\n",(long long)unitprice,(long long)received_assetoshis,(long long)orig_assetoshis); fprintf(stderr,"unitprice %.8f received_assetoshis %llu orig %llu\n",dunitprice/COIN,(long long)received_assetoshis,(long long)orig_assetoshis);
if ( unitprice > 0 && received_assetoshis > 0 && received_assetoshis <= orig_assetoshis ) if ( fabs(dunitprice) > SMALLVAL && received_assetoshis > 0 && received_assetoshis <= orig_assetoshis )
{ {
remaining_assetoshis = (orig_assetoshis - received_assetoshis); remaining_assetoshis = (orig_assetoshis - received_assetoshis);
return(ValidateSwapRemainder(remaining_nValue,remaining_assetoshis,orig_assetoshis,received_assetoshis,paid_nValue,total_nValue)); return(ValidateAskRemainder(remaining_nValue,remaining_assetoshis,orig_assetoshis,received_assetoshis,paid_nValue,total_nValue));
} else return(false); } else return(false);
} }