From 35199465da1a722baa435677cb031788a6f3e7ff Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 24 Oct 2016 15:22:25 -0300 Subject: [PATCH] test --- src/komodo_pax.h | 4 ++-- src/wallet/rpcwallet.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/komodo_pax.h b/src/komodo_pax.h index a8e664c44..eb56b1f9b 100644 --- a/src/komodo_pax.h +++ b/src/komodo_pax.h @@ -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]; kmdusd = ((uint64_t)kmdbtc * 1000000000) / btcusd; //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 ) @@ -287,7 +287,7 @@ uint64_t PAX_fiatdest(char *destaddr,uint8_t pubkey33[33],char *coinaddr,int32_t return(0); if ( fiatunits < 0 ) 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 ) { PAX_pubkey(pubkey33,addrtype,rmd160,base,shortflag,fiatunits); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index a054c2729..6f08e69c5 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -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) { - 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; if (!EnsureWalletIsAvailable(fHelp)) return Value::null; @@ -474,7 +474,9 @@ Value paxdeposit(const Array& params, bool fHelp) CBitcoinAddress destaddress(dest); if (!destaddress.IsValid()) 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(); CWalletTx wtx;