From 1e004600c733e7e59fdca5fe66e35be25cd00669 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 7 Nov 2016 15:50:13 -0300
Subject: [PATCH] test

---
 src/komodo_gateway.h     | 35 ++++++++++++++++++++++-------------
 src/komodo_pax.h         |  1 +
 src/wallet/rpcwallet.cpp |  2 +-
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h
index 243385ad8..4a218b4a6 100644
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -274,19 +274,28 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
                 bitcoin_address(coinaddr,addrtype,rmd160,20);
                 checktoshis = PAX_fiatdest(tokomodo,destaddr,pubkey33,coinaddr,kmdheight,base,fiatoshis);
                 typestr = "deposit";
-                //0245555240420f00000000003c8390ec7bac0c84d9ceb39b1f31564c983123b8e4 ht.59480 srcaddr.(RMGrD8DzED6YYT63z1TaF4sVTCB7Qqvj1Z) eur fiatoshis.1000000 -> dest.(RQY5zAq49YYc8knVkBBpxuxbQa3xwhaw5z) komodoshis.7763390
-                //6a22440245555240420f00000000003c8390ec7bac0c84d9ceb39b1f31564c983123b8e4 opretbuf[36]
-                //9b51f402d7f5afde938b96f0c69d4114f2033a7ebd4db11eee7f2b6a94f00bca
-                /*{
-                 "base" : "eur",
-                 "rel" : "kmd",
-                 "height" : 59480,
-                 "timestamp" : 1478540309,
-                 "price" : 7.76339000,
-                 "invprice" : 0.12880971,
-                 "basevolume" : 1.00000000,
-                 "relvolume" : 7.76339000
-                 }*/
+                //paxprice seed.0 sum 0.07766840 densum 1000.00000000 basevol 0.01000000 height.59532
+
+                // 0.07759490
+                /* ./komodo-cli paxdeposit RMGrD8DzED6YYT63z1TaF4sVTCB7Qqvj1Z 0.01 eur
+                0245555240420f00000000003c8390ec7bac0c84d9ceb39b1f31564c983123b8e4 ht.59532 srcaddr.(RMGrD8DzED6YYT63z1TaF4sVTCB7Qqvj1Z) eur fiatoshis.1000000 -> dest.(RQY5zAq49YYc8knVkBBpxuxbQa3xwhaw5z) komodoshis.7759490
+                6a26440245555240420f00000000003c8390ec7bac0c84d9ceb39b1f31564c983123b8e48ce80000 opretbuf[40]
+                b1d7350ef5a9502e1249384abccbc5aa78e3172d182757431f548728583de4a2
+                root@devbox2:~/komodo/src# start CreateNewBlock initdone.1478543278 deposit 0.00000000 mempool.274
+                start CreateNewBlock initdone.1478543372 deposit 0.00000000 mempool.0
+                b1d7350ef5a9502e1249384abccbc5aa78e3172d182757431f548728583de4a2 <- txid.v2 0245555240420f00000000003c8390ec7bac0c84d9ceb39b1f31564c983123b8e4 checkpubkey check 0.07766840 v 0.07759490 dest.(RQY5zAq49YYc8knVkBBpxuxbQa3xwhaw5z) kmdheight.59532 height.59533
+                ./komodo-cli paxprice eur kmd 59532
+                {
+                    "base" : "eur",
+                    "rel" : "kmd",
+                    "height" : 59532,
+                    "timestamp" : 1478543277,
+                    "price" : 7.75949000,
+                    "invprice" : 0.12887445,
+                    "basevolume" : 1.00000000,
+                    "relvolume" : 7.75949000
+                }
+*/
                 if ( tokomodo == 0 && strncmp(ASSETCHAINS_SYMBOL,base,strlen(base)) == 0 && shortflag == ASSETCHAINS_SHORTFLAG )
                 {
                     if ( shortflag == 0 )
diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 77fb30f37..0c9ab121b 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -471,6 +471,7 @@ uint64_t PAX_fiatdest(int32_t tokomodo,char *destaddr,uint8_t pubkey33[33],char
     if ( fiatoshis < 0 )
         shortflag = 1, fiatoshis = -fiatoshis;
     komodoshis = komodo_paxprice(height,base,(char *)"KMD",(uint64_t)fiatoshis);
+    printf("PAX_fiatdest ht.%d price %s %.8f -> KMD %.8f\n",height,base,(double)fiatoshis/COIN,(double)komodoshis/COIN);
     if ( bitcoin_addr2rmd160(&addrtype,rmd160,coinaddr) == 20 )
     {
         PAX_pubkey(1,pubkey33,&addrtype,rmd160,base,&shortflag,tokomodo != 0 ? &komodoshis : &fiatoshis);
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 3beae86c1..302f830e6 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -497,7 +497,7 @@ Value paxdeposit(const Array& params, bool fHelp)
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid dest Bitcoin address");
     for (i=0; i<33; i++)
         printf("%02x",pubkey37[i]);
-    printf(" ht.%d srcaddr.(%s) %s fiatoshis.%lld -> dest.(%s) komodoshis.%llu\n",chainActive.Tip()->nHeight,(char *)params[0].get_str().c_str(),(char *)base.c_str(),(long long)fiatoshis,destaddr,(long long)komodoshis);
+    printf(" ht.%d srcaddr.(%s) %s fiatoshis.%lld -> dest.(%s) komodoshis.%llu\n",height,(char *)params[0].get_str().c_str(),(char *)base.c_str(),(long long)fiatoshis,destaddr,(long long)komodoshis);
     EnsureWalletIsUnlocked();
     CWalletTx wtx;
     uint8_t opretbuf[64]; int32_t opretlen; uint64_t fee = komodoshis / 1000;
-- 
2.42.0