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
2016-10-24 15:22:25 -03:00
parent e137bdc49e
commit 35199465da
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/komodo_pax.h
View File

@@ -227,7 +227,7 @@ uint64_t komodo_paxcalc(uint32_t *pvals,int32_t baseid,int32_t relid,uint64_t ba
baseusd = ((uint64_t)pvalb * 1000000000) / pvals[USD]; baseusd = ((uint64_t)pvalb * 1000000000) / pvals[USD];
kmdusd = ((uint64_t)kmdbtc * 1000000000) / btcusd; kmdusd = ((uint64_t)kmdbtc * 1000000000) / btcusd;
//printf("base -> USD %llu, BTC %llu KMDUSD %llu\n",(long long)baseusd,(long long)btcusd,(long long)kmdusd); //printf("base -> USD %llu, BTC %llu KMDUSD %llu\n",(long long)baseusd,(long long)btcusd,(long long)kmdusd);
return(basevolume * ((baseusd * 1000000000) / kmdusd)); return((basevolume * baseusd) / kmdusd));
} }
} }
else if ( baseid == relid ) else if ( baseid == relid )
@@ -287,7 +287,7 @@ uint64_t PAX_fiatdest(char *destaddr,uint8_t pubkey33[33],char *coinaddr,int32_t
return(0); return(0);
if ( fiatunits < 0 ) if ( fiatunits < 0 )
shortflag = 1, fiatunits = -fiatunits; shortflag = 1, fiatunits = -fiatunits;
komodoshis = komodo_paxprice(height,base,(char *)"KMD",(uint64_t)fiatunits * COIN); komodoshis = komodo_paxprice(height,base,(char *)"KMD",(uint64_t)fiatunits);
if ( bitcoin_addr2rmd160(&addrtype,rmd160,coinaddr) == 20 ) if ( bitcoin_addr2rmd160(&addrtype,rmd160,coinaddr) == 20 )
{ {
PAX_pubkey(pubkey33,addrtype,rmd160,base,shortflag,fiatunits); PAX_pubkey(pubkey33,addrtype,rmd160,base,shortflag,fiatunits);

6
src/wallet/rpcwallet.cpp
View File

@@ -456,7 +456,7 @@ uint64_t PAX_fiatdest(char *destaddr,uint8_t pubkey33[33],char *coinaddr,int32_t
Value paxdeposit(const Array& params, bool fHelp) Value paxdeposit(const Array& params, bool fHelp)
{ {
uint64_t komodoshis = 0; char destaddr[64]; uint8_t pubkey33[33]; uint64_t komodoshis = 0; char destaddr[64]; uint8_t i,pubkey33[33];
bool fSubtractFeeFromAmount = false; bool fSubtractFeeFromAmount = false;
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return Value::null; return Value::null;
@@ -474,7 +474,9 @@ Value paxdeposit(const Array& params, bool fHelp)
CBitcoinAddress destaddress(dest); CBitcoinAddress destaddress(dest);
if (!destaddress.IsValid()) if (!destaddress.IsValid())
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid dest Bitcoin address"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid dest Bitcoin address");
printf("ht.%d srcaddr.(%s) %s fiatunits.%d -> dest.(%s) komodoshis.%llu\n",chainActive.Tip()->nHeight,(char *)params[0].get_str().c_str(),(char *)base.c_str(),fiatunits,destaddr,(long long)komodoshis); for (i=0; i<33; i++)
printf("%02x",pubkey33[i]);
printf(" ht.%d srcaddr.(%s) %s fiatunits.%d -> dest.(%s) komodoshis.%llu\n",chainActive.Tip()->nHeight,(char *)params[0].get_str().c_str(),(char *)base.c_str(),fiatunits,destaddr,(long long)komodoshis);
EnsureWalletIsUnlocked(); EnsureWalletIsUnlocked();
CWalletTx wtx; CWalletTx wtx;