From dd14cffefd0d21f431d2526c87c041c290e64a1a Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 17:51:03 +0200
Subject: [PATCH 01/38] Test

---
 src/komodo_pax.h | 4 ++--
 src/miner.cpp    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 5ec7fdc1016..3ed33b8e975 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -406,10 +406,10 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re
                 if ( height >= 236000-10 )
                 {
                     usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000;
-                    price = ((uint64_t)10000000000 * MINDENOMS[USD] / MINDENOMS[baseid]) / komodo_paxvol(usdvol,usdkmd);
+                    price = (((uint64_t)10000000000 * MINDENOMS[USD]) / komodo_paxvol(usdvol,usdkmd))  / MINDENOMS[baseid];
                     //fprintf(stderr,"ht.%d kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu\n",height,(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
                     //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)),(long long)price);
-                    //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
+                    fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
                     //price = (uint64_t)((long long)MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]));
                 } else price = (MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100));
                 return(price);
diff --git a/src/miner.cpp b/src/miner.cpp
index 41cbe37911f..fa101049065 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -100,7 +100,7 @@ void UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams,
 
 #define ASSETCHAINS_MINHEIGHT 100
 #define KOMODO_ELECTION_GAP 2000
-#define ROUNDROBIN_DELAY 58
+#define ROUNDROBIN_DELAY 59
 extern int32_t ASSETCHAINS_SEED,IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY,KOMODO_CHOSEN_ONE,ASSETCHAIN_INIT,KOMODO_INITDONE,KOMODO_ON_DEMAND,KOMODO_INITDONE;
 extern char ASSETCHAINS_SYMBOL[16];
 extern std::string NOTARY_PUBKEY;

From 1049be8eb7cdc39c468f31226669417223228cf9 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 18:04:46 +0200
Subject: [PATCH 02/38] Test

---
 src/komodo_pax.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 3ed33b8e975..5ec7fdc1016 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -406,10 +406,10 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re
                 if ( height >= 236000-10 )
                 {
                     usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000;
-                    price = (((uint64_t)10000000000 * MINDENOMS[USD]) / komodo_paxvol(usdvol,usdkmd))  / MINDENOMS[baseid];
+                    price = ((uint64_t)10000000000 * MINDENOMS[USD] / MINDENOMS[baseid]) / komodo_paxvol(usdvol,usdkmd);
                     //fprintf(stderr,"ht.%d kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu\n",height,(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
                     //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)),(long long)price);
-                    fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
+                    //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
                     //price = (uint64_t)((long long)MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]));
                 } else price = (MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100));
                 return(price);

From 7b11fe5d353081cd8704ecfcb90879f42dd3d450 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 20:52:25 +0200
Subject: [PATCH 03/38] Test

---
 src/komodo_pax.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 5ec7fdc1016..abb5a6088eb 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -406,11 +406,11 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re
                 if ( height >= 236000-10 )
                 {
                     usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000;
-                    price = ((uint64_t)10000000000 * MINDENOMS[USD] / MINDENOMS[baseid]) / komodo_paxvol(usdvol,usdkmd);
+                    //price = ((uint64_t)10000000000 * MINDENOMS[USD] / MINDENOMS[baseid]) / komodo_paxvol(usdvol,usdkmd);
+                    price = ((uint64_t)10000000000 * MINDENOMS[USD]) / komodo_paxvol(usdvol,usdkmd);
                     //fprintf(stderr,"ht.%d kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu\n",height,(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
                     //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)),(long long)price);
                     //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
-                    //price = (uint64_t)((long long)MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]));
                 } else price = (MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100));
                 return(price);
             } //else printf("zero val in KMD conv %llu %llu %llu\n",(long long)pvals[USD],(long long)kmdbtc,(long long)btcusd);

From 320a2e35cf67916950fc21dedf7715b27dbf1a8e Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 20:59:10 +0200
Subject: [PATCH 04/38] Test

---
 src/komodo_pax.h | 2 +-
 src/miner.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index abb5a6088eb..0f6b3682887 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -407,7 +407,7 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re
                 {
                     usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000;
                     //price = ((uint64_t)10000000000 * MINDENOMS[USD] / MINDENOMS[baseid]) / komodo_paxvol(usdvol,usdkmd);
-                    price = ((uint64_t)10000000000 * MINDENOMS[USD]) / komodo_paxvol(usdvol,usdkmd);
+                    price = (((uint64_t)10000000000 * MINDENOMS[USD]) / komodo_paxvol(usdvol,usdkmd)) / MINDENOMS[baseid];
                     //fprintf(stderr,"ht.%d kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu\n",height,(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
                     //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)),(long long)price);
                     //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
diff --git a/src/miner.cpp b/src/miner.cpp
index fa101049065..e9ab80741c6 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -728,7 +728,7 @@ void static BitcoinMiner(CWallet *pwallet)
                         int32_t nseconds = Mining_start+ROUNDROBIN_DELAY-time(NULL);
                         if ( nseconds > 0 )
                             sleep(nseconds);
-                        MilliSleep((rand() % 700) + 1);
+                        MilliSleep((rand() % 1700) + 1);
                     }
                     KOMODO_CHOSEN_ONE = 1;
                     // Found a solution

From d7da66b4d90d1ad4fea87e8a0ea918ed841f8b6b Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 21:16:51 +0200
Subject: [PATCH 05/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 0f6b3682887..9e69c00e463 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -407,7 +407,7 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re
                 {
                     usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000;
                     //price = ((uint64_t)10000000000 * MINDENOMS[USD] / MINDENOMS[baseid]) / komodo_paxvol(usdvol,usdkmd);
-                    price = (((uint64_t)10000000000 * MINDENOMS[USD]) / komodo_paxvol(usdvol,usdkmd)) / MINDENOMS[baseid];
+                    price = (((uint64_t)10000000000) / komodo_paxvol(usdvol,usdkmd)) / (MINDENOMS[baseid] / MINDENOMS[USD];
                     //fprintf(stderr,"ht.%d kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu\n",height,(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
                     //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)),(long long)price);
                     //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));

From cb15e751ad5d7a792c5ec37b7cc91f50e32f6f6f Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 21:18:22 +0200
Subject: [PATCH 06/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 9e69c00e463..5c1a88c6f39 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -407,7 +407,7 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re
                 {
                     usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000;
                     //price = ((uint64_t)10000000000 * MINDENOMS[USD] / MINDENOMS[baseid]) / komodo_paxvol(usdvol,usdkmd);
-                    price = (((uint64_t)10000000000) / komodo_paxvol(usdvol,usdkmd)) / (MINDENOMS[baseid] / MINDENOMS[USD];
+                    price = (((uint64_t)10000000000) / komodo_paxvol(MINDENOMS[baseid] * usdvol,usdkmd)) / MINDENOMS[USD];
                     //fprintf(stderr,"ht.%d kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu\n",height,(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
                     //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)),(long long)price);
                     //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));

From 07408ac768ee249dd3c07d1a63e01f2fb686f005 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 21:22:54 +0200
Subject: [PATCH 07/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 5c1a88c6f39..45b7035fa76 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -407,7 +407,7 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re
                 {
                     usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000;
                     //price = ((uint64_t)10000000000 * MINDENOMS[USD] / MINDENOMS[baseid]) / komodo_paxvol(usdvol,usdkmd);
-                    price = (((uint64_t)10000000000) / komodo_paxvol(MINDENOMS[baseid] * usdvol,usdkmd)) / MINDENOMS[USD];
+                    price = (((uint64_t)10000000000) / komodo_paxvol(usdvol,usdkmd)) * (MINDENOMS[baseid] / MINDENOMS[USD]);
                     //fprintf(stderr,"ht.%d kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu\n",height,(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
                     //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)),(long long)price);
                     //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));

From 73815360cd44e9fcbadd6dae49c916b33bd108c8 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 21:31:18 +0200
Subject: [PATCH 08/38] Test

---
 src/komodo_pax.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 45b7035fa76..633e0eb9aff 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -370,7 +370,7 @@ uint64_t komodo_paxcorrelation(uint64_t *votes,int32_t numvotes,uint64_t seed)
     return(sum);
 }
 
-uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t relid,uint64_t basevolume,uint64_t refkmdbtc,uint64_t refbtcusd)
+uint64_t _komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t relid,uint64_t basevolume,uint64_t refkmdbtc,uint64_t refbtcusd)
 {
     uint32_t pvalb,pvalr; uint64_t price,kmdbtc,btcusd,usdvol,baseusd,usdkmd,baserel,ranked[32];
     if ( basevolume > KOMODO_PAXMAX )
@@ -406,8 +406,7 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re
                 if ( height >= 236000-10 )
                 {
                     usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000;
-                    //price = ((uint64_t)10000000000 * MINDENOMS[USD] / MINDENOMS[baseid]) / komodo_paxvol(usdvol,usdkmd);
-                    price = (((uint64_t)10000000000) / komodo_paxvol(usdvol,usdkmd)) * (MINDENOMS[baseid] / MINDENOMS[USD]);
+                    price = ((uint64_t)10000000000 * MINDENOMS[USD] / MINDENOMS[baseid]) / komodo_paxvol(usdvol,usdkmd);
                     //fprintf(stderr,"ht.%d kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu\n",height,(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
                     //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)),(long long)price);
                     //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)));
@@ -439,6 +438,11 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re
     return(0);
 }
 
+uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t relid,uint64_t basevolume,uint64_t refkmdbtc,uint64_t refbtcusd)
+{
+    return(_komodo_paxcalc(height,pvals,baseid,relid,basevolume,refkmdbtc,refbtcusd));
+}
+
 uint64_t _komodo_paxprice(uint64_t *kmdbtcp,uint64_t *btcusdp,int32_t height,char *base,char *rel,uint64_t basevolume,uint64_t kmdbtc,uint64_t btcusd)
 {
     int32_t baseid=-1,relid=-1,i; uint32_t *ptr;

From e60221f9c538b0d939df2686376c52f77df3546d Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 21:42:09 +0200
Subject: [PATCH 09/38] Test

---
 src/komodo_pax.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 633e0eb9aff..08e38408c8b 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -440,7 +440,15 @@ uint64_t _komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t r
 
 uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t relid,uint64_t basevolume,uint64_t refkmdbtc,uint64_t refbtcusd)
 {
-    return(_komodo_paxcalc(height,pvals,baseid,relid,basevolume,refkmdbtc,refbtcusd));
+    uint64_t baseusd,usdkmd,basekmd;
+    if ( relid != MAX_CURRENCIES || MINDENOMS[baseid] == MINDENOMS[USD] )
+        return(_komodo_paxcalc(height,pvals,baseid,relid,basevolume,refkmdbtc,refbtcusd));
+    {
+        baseusd = _komodo_paxcalc(height,pvals,baseid,USD,basevolume,refkmdbtc,refbtcusd);
+        usdkmd = _komodo_paxcalc(height,pvals,USD,MAX_CURRENCIES,baseusd,refkmdbtc,refbtcusd));
+        basekmd = komodo_paxvol(usdvol,usdkmd);
+        printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
+    }
 }
 
 uint64_t _komodo_paxprice(uint64_t *kmdbtcp,uint64_t *btcusdp,int32_t height,char *base,char *rel,uint64_t basevolume,uint64_t kmdbtc,uint64_t btcusd)

From 4797fad871457bbc339d8a57d3864af77b40077b Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 21:44:54 +0200
Subject: [PATCH 10/38] Test

---
 src/komodo_pax.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 08e38408c8b..d633cb10f8f 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -445,9 +445,10 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re
         return(_komodo_paxcalc(height,pvals,baseid,relid,basevolume,refkmdbtc,refbtcusd));
     {
         baseusd = _komodo_paxcalc(height,pvals,baseid,USD,basevolume,refkmdbtc,refbtcusd);
-        usdkmd = _komodo_paxcalc(height,pvals,USD,MAX_CURRENCIES,baseusd,refkmdbtc,refbtcusd));
+        usdkmd = _komodo_paxcalc(height,pvals,USD,MAX_CURRENCIES,baseusd,refkmdbtc,refbtcusd);
         basekmd = komodo_paxvol(usdvol,usdkmd);
         printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
+        return(basekmd);
     }
 }
 

From f766a0c10ae1be62448632110d56d0e590bfbeaf Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 21:51:27 +0200
Subject: [PATCH 11/38] Test

---
 src/komodo_pax.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index d633cb10f8f..c7769f314ad 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -445,8 +445,8 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re
         return(_komodo_paxcalc(height,pvals,baseid,relid,basevolume,refkmdbtc,refbtcusd));
     {
         baseusd = _komodo_paxcalc(height,pvals,baseid,USD,basevolume,refkmdbtc,refbtcusd);
-        usdkmd = _komodo_paxcalc(height,pvals,USD,MAX_CURRENCIES,baseusd,refkmdbtc,refbtcusd);
-        basekmd = komodo_paxvol(usdvol,usdkmd);
+        usdkmd = _komodo_paxcalc(height,pvals,USD,MAX_CURRENCIES,100000,refkmdbtc,refbtcusd);
+        basekmd = komodo_paxvol(baseusd,usdkmd);
         printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);
     }

From 71baa190c70343dc4f4eea395a82100794e74385 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 22:01:06 +0200
Subject: [PATCH 12/38] Test

---
 src/komodo_pax.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index c7769f314ad..89af70473f1 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -440,14 +440,13 @@ uint64_t _komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t r
 
 uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t relid,uint64_t basevolume,uint64_t refkmdbtc,uint64_t refbtcusd)
 {
-    uint64_t baseusd,usdkmd,basekmd;
+    uint64_t baseusd,basekmd;
     if ( relid != MAX_CURRENCIES || MINDENOMS[baseid] == MINDENOMS[USD] )
         return(_komodo_paxcalc(height,pvals,baseid,relid,basevolume,refkmdbtc,refbtcusd));
     {
         baseusd = _komodo_paxcalc(height,pvals,baseid,USD,basevolume,refkmdbtc,refbtcusd);
-        usdkmd = _komodo_paxcalc(height,pvals,USD,MAX_CURRENCIES,100000,refkmdbtc,refbtcusd);
-        basekmd = komodo_paxvol(baseusd,usdkmd);
-        printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
+        basekmd = _komodo_paxcalc(height,pvals,USD,MAX_CURRENCIES,1000 * baseusd,refkmdbtc,refbtcusd) / 1000;
+        //printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);
     }
 }

From 8e21196dff8ef6ea73d51b7831d35771ca37f239 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 22:12:06 +0200
Subject: [PATCH 13/38] Test

---
 src/komodo_pax.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 89af70473f1..8b01de8ddc8 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -443,10 +443,12 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re
     uint64_t baseusd,basekmd;
     if ( relid != MAX_CURRENCIES || MINDENOMS[baseid] == MINDENOMS[USD] )
         return(_komodo_paxcalc(height,pvals,baseid,relid,basevolume,refkmdbtc,refbtcusd));
+    else
     {
-        baseusd = _komodo_paxcalc(height,pvals,baseid,USD,basevolume,refkmdbtc,refbtcusd);
-        basekmd = _komodo_paxcalc(height,pvals,USD,MAX_CURRENCIES,1000 * baseusd,refkmdbtc,refbtcusd) / 1000;
-        //printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
+        baseusd = _komodo_paxcalc(height,pvals,baseid,USD,100000,refkmdbtc,refbtcusd);
+        usdkmd = _komodo_paxcalc(height,pvals,USD,MAX_CURRENCIES,100000,refkmdbtc,refbtcusd);
+        basekmd = (komodo_paxvol(baseusd,usdkmd) * basevolume) / 1000000000;
+        printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);
     }
 }

From 66e9fad7f465ae263848e2fd6749c7e0f7809c4b Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 22:12:55 +0200
Subject: [PATCH 14/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 8b01de8ddc8..9b39583ae0c 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -440,7 +440,7 @@ uint64_t _komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t r
 
 uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t relid,uint64_t basevolume,uint64_t refkmdbtc,uint64_t refbtcusd)
 {
-    uint64_t baseusd,basekmd;
+    uint64_t baseusd,basekmd,usdkmd;
     if ( relid != MAX_CURRENCIES || MINDENOMS[baseid] == MINDENOMS[USD] )
         return(_komodo_paxcalc(height,pvals,baseid,relid,basevolume,refkmdbtc,refbtcusd));
     else

From 5b5af603f2ceb87db2a3ce43e175cf8812bbf796 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 22:22:38 +0200
Subject: [PATCH 15/38] Test

---
 src/komodo_pax.h | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 9b39583ae0c..4a0b3814d4c 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -370,7 +370,7 @@ uint64_t komodo_paxcorrelation(uint64_t *votes,int32_t numvotes,uint64_t seed)
     return(sum);
 }
 
-uint64_t _komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t relid,uint64_t basevolume,uint64_t refkmdbtc,uint64_t refbtcusd)
+uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t relid,uint64_t basevolume,uint64_t refkmdbtc,uint64_t refbtcusd)
 {
     uint32_t pvalb,pvalr; uint64_t price,kmdbtc,btcusd,usdvol,baseusd,usdkmd,baserel,ranked[32];
     if ( basevolume > KOMODO_PAXMAX )
@@ -438,21 +438,6 @@ uint64_t _komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t r
     return(0);
 }
 
-uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t relid,uint64_t basevolume,uint64_t refkmdbtc,uint64_t refbtcusd)
-{
-    uint64_t baseusd,basekmd,usdkmd;
-    if ( relid != MAX_CURRENCIES || MINDENOMS[baseid] == MINDENOMS[USD] )
-        return(_komodo_paxcalc(height,pvals,baseid,relid,basevolume,refkmdbtc,refbtcusd));
-    else
-    {
-        baseusd = _komodo_paxcalc(height,pvals,baseid,USD,100000,refkmdbtc,refbtcusd);
-        usdkmd = _komodo_paxcalc(height,pvals,USD,MAX_CURRENCIES,100000,refkmdbtc,refbtcusd);
-        basekmd = (komodo_paxvol(baseusd,usdkmd) * basevolume) / 1000000000;
-        printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
-        return(basekmd);
-    }
-}
-
 uint64_t _komodo_paxprice(uint64_t *kmdbtcp,uint64_t *btcusdp,int32_t height,char *base,char *rel,uint64_t basevolume,uint64_t kmdbtc,uint64_t btcusd)
 {
     int32_t baseid=-1,relid=-1,i; uint32_t *ptr;
@@ -511,7 +496,7 @@ int32_t komodo_kmdbtcusd(int32_t rwflag,uint64_t *kmdbtcp,uint64_t *btcusdp,int3
     else return(-1);
 }
 
-uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
+uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
 {
     int32_t i,j,k,ind,zeroes,numvotes,wt,nonz; int64_t delta; uint64_t lastprice,tolerance,den,densum,sum=0,votes[sizeof(Peggy_inds)/sizeof(*Peggy_inds)],btcusds[sizeof(Peggy_inds)/sizeof(*Peggy_inds)],kmdbtcs[sizeof(Peggy_inds)/sizeof(*Peggy_inds)],kmdbtc,btcusd;
     if ( basevolume > KOMODO_PAXMAX )
@@ -560,6 +545,21 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
     return(komodo_paxcorrelation(votes,numvotes,seed) * basevolume / 100000);
 }
 
+uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
+{
+    uint64_t baseusd,basekmd,usdkmd; int32_t baseid = komodo_baseid(base);
+    if ( strcmp(rel,"KMD") != 0 || baseid < 0 || MINDENOMS[baseid] == MINDENOMS[USD] )
+        return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
+    else
+    {
+        baseusd = _komodo_paxpriceB(seed,height,base,rel,SATOSHIDEN);
+        usdkmd = _komodo_paxpriceB(seed,height,"USD","KMD",SATOSHIDEN);
+        basekmd = (komodo_paxvol(baseusd,usdkmd) * basevolume) / 1000000000;
+        printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
+        return(basekmd);
+    }
+}
+
 uint64_t komodo_paxprice(uint64_t *seedp,int32_t height,char *base,char *rel,uint64_t basevolume)
 {
     int32_t i,nonz=0; int64_t diff; uint64_t price,seed,sum = 0;

From 6c14000d2d3f7df7f7a19650fac1ec780af4e732 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 22:26:51 +0200
Subject: [PATCH 16/38] Test

---
 src/komodo_pax.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 4a0b3814d4c..f38f83f31df 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -552,9 +552,9 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
         return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
     else
     {
-        baseusd = _komodo_paxpriceB(seed,height,base,rel,SATOSHIDEN);
-        usdkmd = _komodo_paxpriceB(seed,height,"USD","KMD",SATOSHIDEN);
-        basekmd = (komodo_paxvol(baseusd,usdkmd) * basevolume) / 1000000000;
+        baseusd = _komodo_paxpriceB(seed,height,base,rel,1000 * SATOSHIDEN);
+        usdkmd = _komodo_paxpriceB(seed,height,"USD","KMD",1000 * SATOSHIDEN);
+        basekmd = (komodo_paxvol(baseusd,usdkmd) * basevolume) / 1000000;
         printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);
     }

From 0c3a7abf620a7ac50da8239f327c3b1b5807ac4a Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 22:32:04 +0200
Subject: [PATCH 17/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index f38f83f31df..db87594a552 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -554,7 +554,7 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
     {
         baseusd = _komodo_paxpriceB(seed,height,base,rel,1000 * SATOSHIDEN);
         usdkmd = _komodo_paxpriceB(seed,height,"USD","KMD",1000 * SATOSHIDEN);
-        basekmd = (komodo_paxvol(baseusd,usdkmd) * basevolume) / 1000000;
+        basekmd = (komodo_paxvol(baseusd,usdkmd) * basevolume);
         printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);
     }

From 09905a394374ad0440bf5ff42b7fe3af14443c93 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 22:33:15 +0200
Subject: [PATCH 18/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index db87594a552..2e148562d40 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -553,7 +553,7 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
     else
     {
         baseusd = _komodo_paxpriceB(seed,height,base,rel,1000 * SATOSHIDEN);
-        usdkmd = _komodo_paxpriceB(seed,height,"USD","KMD",1000 * SATOSHIDEN);
+        usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",1000 * SATOSHIDEN);
         basekmd = (komodo_paxvol(baseusd,usdkmd) * basevolume);
         printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);

From a4ce58ce9c63e01bd8426d6a8d69c93170ff0827 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 22:35:48 +0200
Subject: [PATCH 19/38] Test

---
 src/komodo_pax.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 2e148562d40..764c2420a59 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -517,7 +517,7 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
         memset(kmdbtcs,0,sizeof(kmdbtcs));
         for (i=0; i<numvotes; i++)
         {
-            _komodo_paxprice(&kmdbtcs[numvotes-1-i],&btcusds[numvotes-1-i],height-i,base,rel,100000,0,0);
+            _komodo_paxprice(&kmdbtcs[numvotes-1-i],&btcusds[numvotes-1-i],height-i,base,rel,1000000,0,0);
             //printf("(%llu %llu) ",(long long)kmdbtcs[numvotes-1-i],(long long)btcusds[numvotes-1-i]);
         }
         kmdbtc = komodo_paxcorrelation(kmdbtcs,numvotes,seed) * 539;
@@ -526,7 +526,7 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
     }
     for (i=nonz=0; i<numvotes; i++)
     {
-        if ( (votes[numvotes-1-i]= _komodo_paxprice(0,0,height-i,base,rel,100000,kmdbtc,btcusd)) == 0 )
+        if ( (votes[numvotes-1-i]= _komodo_paxprice(0,0,height-i,base,rel,1000000,kmdbtc,btcusd)) == 0 )
             zeroes++;
         else
         {
@@ -542,7 +542,7 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
     {
         return(0);
     }
-    return(komodo_paxcorrelation(votes,numvotes,seed) * basevolume / 100000);
+    return(komodo_paxcorrelation(votes,numvotes,seed) * basevolume / 1000000);
 }
 
 uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
@@ -552,8 +552,8 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
         return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
     else
     {
-        baseusd = _komodo_paxpriceB(seed,height,base,rel,1000 * SATOSHIDEN);
-        usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",1000 * SATOSHIDEN);
+        baseusd = _komodo_paxpriceB(seed,height,base,rel,SATOSHIDEN);
+        usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);
         basekmd = (komodo_paxvol(baseusd,usdkmd) * basevolume);
         printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);

From 6dbeea7c88f53da6aa047eddc05463666b47572b Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 22:38:29 +0200
Subject: [PATCH 20/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 764c2420a59..2f89f08b5c5 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -555,7 +555,7 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
         baseusd = _komodo_paxpriceB(seed,height,base,rel,SATOSHIDEN);
         usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);
         basekmd = (komodo_paxvol(baseusd,usdkmd) * basevolume);
-        printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
+        //printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);
     }
 }

From 4350833c0f903ab07687bab7a3f97e2b7f7bafd9 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 22:43:43 +0200
Subject: [PATCH 21/38] Test

---
 src/komodo_pax.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 2f89f08b5c5..589645612cd 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -517,7 +517,7 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
         memset(kmdbtcs,0,sizeof(kmdbtcs));
         for (i=0; i<numvotes; i++)
         {
-            _komodo_paxprice(&kmdbtcs[numvotes-1-i],&btcusds[numvotes-1-i],height-i,base,rel,1000000,0,0);
+            _komodo_paxprice(&kmdbtcs[numvotes-1-i],&btcusds[numvotes-1-i],height-i,base,rel,100000,0,0);
             //printf("(%llu %llu) ",(long long)kmdbtcs[numvotes-1-i],(long long)btcusds[numvotes-1-i]);
         }
         kmdbtc = komodo_paxcorrelation(kmdbtcs,numvotes,seed) * 539;
@@ -526,7 +526,7 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
     }
     for (i=nonz=0; i<numvotes; i++)
     {
-        if ( (votes[numvotes-1-i]= _komodo_paxprice(0,0,height-i,base,rel,1000000,kmdbtc,btcusd)) == 0 )
+        if ( (votes[numvotes-1-i]= _komodo_paxprice(0,0,height-i,base,rel,100000,kmdbtc,btcusd)) == 0 )
             zeroes++;
         else
         {
@@ -542,7 +542,7 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
     {
         return(0);
     }
-    return(komodo_paxcorrelation(votes,numvotes,seed) * basevolume / 1000000);
+    return(komodo_paxcorrelation(votes,numvotes,seed) * basevolume / 100000);
 }
 
 uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
@@ -552,9 +552,9 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
         return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
     else
     {
-        baseusd = _komodo_paxpriceB(seed,height,base,rel,SATOSHIDEN);
-        usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);
-        basekmd = (komodo_paxvol(baseusd,usdkmd) * basevolume);
+        baseusd = _komodo_paxpriceB(seed,height,base,rel,basevolume);
+        usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",baseusd);
+        //basekmd = (komodo_paxvol(baseusd,usdkmd));
         //printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);
     }

From 23fe87687843ea4870f6370de2251bf90ee2c5e2 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 22:44:15 +0200
Subject: [PATCH 22/38] Test

---
 src/komodo_pax.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 589645612cd..cd4b3422e73 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -547,13 +547,13 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
 
 uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
 {
-    uint64_t baseusd,basekmd,usdkmd; int32_t baseid = komodo_baseid(base);
+    uint64_t baseusd,basekmd; int32_t baseid = komodo_baseid(base);
     if ( strcmp(rel,"KMD") != 0 || baseid < 0 || MINDENOMS[baseid] == MINDENOMS[USD] )
         return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
     else
     {
         baseusd = _komodo_paxpriceB(seed,height,base,rel,basevolume);
-        usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",baseusd);
+        basekmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",baseusd);
         //basekmd = (komodo_paxvol(baseusd,usdkmd));
         //printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);

From fa3d8907fdc717b4b226f5a225f6e162952e5b74 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 22:48:02 +0200
Subject: [PATCH 23/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index cd4b3422e73..a14f78bd2e1 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -552,7 +552,7 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
         return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
     else
     {
-        baseusd = _komodo_paxpriceB(seed,height,base,rel,basevolume);
+        baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",basevolume);
         basekmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",baseusd);
         //basekmd = (komodo_paxvol(baseusd,usdkmd));
         //printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);

From c7ac44576b004d8e19cb34fd0a9bdc116d6e496c Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 22:51:39 +0200
Subject: [PATCH 24/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index a14f78bd2e1..4b8d48e470e 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -553,7 +553,7 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
     else
     {
         baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",basevolume);
-        basekmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",baseusd);
+        basekmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",basevolume);
         //basekmd = (komodo_paxvol(baseusd,usdkmd));
         //printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);

From be320c2385867ae06b97095810ae87e9abd6c19c Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 22:55:34 +0200
Subject: [PATCH 25/38] Test

---
 src/komodo_pax.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 4b8d48e470e..4de8a13d7ce 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -548,9 +548,9 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
 uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
 {
     uint64_t baseusd,basekmd; int32_t baseid = komodo_baseid(base);
-    if ( strcmp(rel,"KMD") != 0 || baseid < 0 || MINDENOMS[baseid] == MINDENOMS[USD] )
-        return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
-    else
+    //if ( strcmp(rel,"KMD") != 0 || baseid < 0 || MINDENOMS[baseid] == MINDENOMS[USD] )
+    //    return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
+    //else
     {
         baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",basevolume);
         basekmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",basevolume);

From 6966ce406bd6778cbed88aa64e00a68d44c5f041 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 23:00:33 +0200
Subject: [PATCH 26/38] Test

---
 src/komodo_pax.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 4de8a13d7ce..366037a1c05 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -552,11 +552,11 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
     //    return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
     //else
     {
-        baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",basevolume);
+        baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",SATOSHIDEN);
         basekmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",basevolume);
         //basekmd = (komodo_paxvol(baseusd,usdkmd));
         //printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
-        return(basekmd);
+        return(baseusd);
     }
 }
 

From ffa1c33f2fbe36b55d599f8baeb7083facda9b82 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 23:11:26 +0200
Subject: [PATCH 27/38] Test

---
 src/komodo_pax.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 366037a1c05..853d8fc84cf 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -553,10 +553,11 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
     //else
     {
         baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",SATOSHIDEN);
-        basekmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",basevolume);
-        //basekmd = (komodo_paxvol(baseusd,usdkmd));
-        //printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
-        return(baseusd);
+        usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);
+        basekmd = (komodo_paxvol(basevolume,baseusd) * usdkmd) / 1000000000;
+        if ( strcmp("KMD",base) == 0 )
+            printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
+        return(basekmd);
     }
 }
 

From a592277ded3adadd173a204a332ae58ab658200b Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 23:12:50 +0200
Subject: [PATCH 28/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 853d8fc84cf..c3d8870a7bc 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -547,7 +547,7 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
 
 uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
 {
-    uint64_t baseusd,basekmd; int32_t baseid = komodo_baseid(base);
+    uint64_t baseusd,basekmd,usdkmd; int32_t baseid = komodo_baseid(base);
     //if ( strcmp(rel,"KMD") != 0 || baseid < 0 || MINDENOMS[baseid] == MINDENOMS[USD] )
     //    return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
     //else

From 770185efac3daf7c37e65251a1b84ba66ba91fe4 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 23:20:54 +0200
Subject: [PATCH 29/38] Test

---
 src/komodo_pax.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index c3d8870a7bc..7bce793c8ef 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -548,15 +548,15 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
 uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
 {
     uint64_t baseusd,basekmd,usdkmd; int32_t baseid = komodo_baseid(base);
-    //if ( strcmp(rel,"KMD") != 0 || baseid < 0 || MINDENOMS[baseid] == MINDENOMS[USD] )
-    //    return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
-    //else
+    if ( strcmp(rel,"KMD") != 0 || baseid < 0 || MINDENOMS[baseid] == MINDENOMS[USD] )
+        return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
+    else
     {
         baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",SATOSHIDEN);
         usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);
-        basekmd = (komodo_paxvol(basevolume,baseusd) * usdkmd) / 1000000000;
-        if ( strcmp("KMD",base) == 0 )
-            printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
+        basekmd = (komodo_paxvol(basevolume,baseusd) * usdkmd) / 10000000;
+        //if ( strcmp("KMD",base) == 0 )
+        //    printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);
     }
 }

From c9cb8bacab9f8cd8225b1eaf27d7dfcd1c9c2f7b Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 23:25:16 +0200
Subject: [PATCH 30/38] Test

---
 src/komodo_pax.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 7bce793c8ef..7861b4bf927 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -548,9 +548,7 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
 uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
 {
     uint64_t baseusd,basekmd,usdkmd; int32_t baseid = komodo_baseid(base);
-    if ( strcmp(rel,"KMD") != 0 || baseid < 0 || MINDENOMS[baseid] == MINDENOMS[USD] )
-        return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
-    else
+    if ( strcmp(rel,"KMD") == 0 && strcmp("RUB",base) != 0 )
     {
         baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",SATOSHIDEN);
         usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);
@@ -558,7 +556,7 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
         //if ( strcmp("KMD",base) == 0 )
         //    printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);
-    }
+    } else return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
 }
 
 uint64_t komodo_paxprice(uint64_t *seedp,int32_t height,char *base,char *rel,uint64_t basevolume)

From 480e3b417f8b1b02c90c712f0b3b1b24dc98697d Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 23:25:58 +0200
Subject: [PATCH 31/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 7861b4bf927..9e05573de2b 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -548,7 +548,7 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
 uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
 {
     uint64_t baseusd,basekmd,usdkmd; int32_t baseid = komodo_baseid(base);
-    if ( strcmp(rel,"KMD") == 0 && strcmp("RUB",base) != 0 )
+    if ( strcmp(rel,"KMD") == 0 && (strcmp("RUB",base) == 0 || strcmp("INR",base) == 0) )
     {
         baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",SATOSHIDEN);
         usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);

From 1d5d7a7e944682eff40cdbc123957bb44d93ed53 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 23:31:12 +0200
Subject: [PATCH 32/38] Test

---
 src/komodo_pax.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 9e05573de2b..86bcf308b6b 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -548,11 +548,13 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
 uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
 {
     uint64_t baseusd,basekmd,usdkmd; int32_t baseid = komodo_baseid(base);
-    if ( strcmp(rel,"KMD") == 0 && (strcmp("RUB",base) == 0 || strcmp("INR",base) == 0) )
+    if ( strcmp(rel,"KMD") == 0 )
     {
-        baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",SATOSHIDEN);
         usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);
-        basekmd = (komodo_paxvol(basevolume,baseusd) * usdkmd) / 10000000;
+        if ( strcmp("USD",base) == 0 )
+            return(komodo_paxvol(basevolume,usdkmd));
+        baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",SATOSHIDEN);
+        basekmd = (komodo_paxvol(usdkmd,baseusd) * basevolume) / 10000000;
         //if ( strcmp("KMD",base) == 0 )
         //    printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);

From 392fbdda1471b5883f9caa6d439551bae2428c44 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 23:31:54 +0200
Subject: [PATCH 33/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 86bcf308b6b..fec81202da4 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -548,7 +548,7 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
 uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
 {
     uint64_t baseusd,basekmd,usdkmd; int32_t baseid = komodo_baseid(base);
-    if ( strcmp(rel,"KMD") == 0 )
+    if ( height >= 236000 || strcmp(rel,"KMD") == 0 )
     {
         usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);
         if ( strcmp("USD",base) == 0 )

From 0d996b3e14f8d75012f28149fa0611b316e0377e Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 23:36:36 +0200
Subject: [PATCH 34/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index fec81202da4..6e37032b2ef 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -554,7 +554,7 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
         if ( strcmp("USD",base) == 0 )
             return(komodo_paxvol(basevolume,usdkmd));
         baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",SATOSHIDEN);
-        basekmd = (komodo_paxvol(usdkmd,baseusd) * basevolume) / 10000000;
+        basekmd = (komodo_paxvol(basevolume,baseusd) * usdkmd) / 1000000000;
         //if ( strcmp("KMD",base) == 0 )
         //    printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);

From 61e3ca369792ae6074819464071ad33284eb6508 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 23:37:01 +0200
Subject: [PATCH 35/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 6e37032b2ef..f31539d75a3 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -548,7 +548,7 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
 uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
 {
     uint64_t baseusd,basekmd,usdkmd; int32_t baseid = komodo_baseid(base);
-    if ( height >= 236000 || strcmp(rel,"KMD") == 0 )
+    if ( height >= 236000 && strcmp(rel,"KMD") == 0 )
     {
         usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);
         if ( strcmp("USD",base) == 0 )

From bc859cee48554a7ece81bff762186bcb73013b5e Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 23:40:19 +0200
Subject: [PATCH 36/38] Test

---
 src/komodo_pax.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index f31539d75a3..c3d8870a7bc 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -548,17 +548,17 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
 uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
 {
     uint64_t baseusd,basekmd,usdkmd; int32_t baseid = komodo_baseid(base);
-    if ( height >= 236000 && strcmp(rel,"KMD") == 0 )
+    //if ( strcmp(rel,"KMD") != 0 || baseid < 0 || MINDENOMS[baseid] == MINDENOMS[USD] )
+    //    return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
+    //else
     {
-        usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);
-        if ( strcmp("USD",base) == 0 )
-            return(komodo_paxvol(basevolume,usdkmd));
         baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",SATOSHIDEN);
+        usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);
         basekmd = (komodo_paxvol(basevolume,baseusd) * usdkmd) / 1000000000;
-        //if ( strcmp("KMD",base) == 0 )
-        //    printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
+        if ( strcmp("KMD",base) == 0 )
+            printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);
-    } else return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
+    }
 }
 
 uint64_t komodo_paxprice(uint64_t *seedp,int32_t height,char *base,char *rel,uint64_t basevolume)

From d4487f059a58bc45fcbebd2b8b87253c90b382f3 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 23:44:30 +0200
Subject: [PATCH 37/38] Test

---
 src/komodo_pax.h | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index c3d8870a7bc..23bb3e32649 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -546,6 +546,22 @@ uint64_t _komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uin
 }
 
 uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
+{
+    uint64_t baseusd,basekmd,usdkmd; int32_t baseid = komodo_baseid(base);
+    if ( height >= 236000 && strcmp(rel,"kmd") == 0 )
+    {
+        usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);
+        if ( strcmp("usd",base) == 0 )
+            return(komodo_paxvol(basevolume,usdkmd));
+        baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",SATOSHIDEN);
+        basekmd = (komodo_paxvol(basevolume,baseusd) * usdkmd) / 10000000;
+        //if ( strcmp("KMD",base) == 0 )
+        //    printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
+        return(basekmd);
+    } else return(_komodo_paxpriceB(seed,height,base,rel,basevolume));
+}
+
+/*uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint64_t basevolume)
 {
     uint64_t baseusd,basekmd,usdkmd; int32_t baseid = komodo_baseid(base);
     //if ( strcmp(rel,"KMD") != 0 || baseid < 0 || MINDENOMS[baseid] == MINDENOMS[USD] )
@@ -554,12 +570,12 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
     {
         baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",SATOSHIDEN);
         usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);
-        basekmd = (komodo_paxvol(basevolume,baseusd) * usdkmd) / 1000000000;
+        basekmd = (komodo_paxvol(basevolume,baseusd) * usdkmd) / 10000000;
         if ( strcmp("KMD",base) == 0 )
             printf("baseusd.%llu usdkmd.%llu %llu\n",(long long)baseusd,(long long)usdkmd,(long long)basekmd);
         return(basekmd);
     }
-}
+}*/
 
 uint64_t komodo_paxprice(uint64_t *seedp,int32_t height,char *base,char *rel,uint64_t basevolume)
 {

From 5484ec2680dd6bf81e5b7055637beb0022993548 Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Wed, 15 Mar 2017 23:48:38 +0200
Subject: [PATCH 38/38] Test

---
 src/komodo_pax.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 23bb3e32649..5662c2f9976 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -552,7 +552,7 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
     {
         usdkmd = _komodo_paxpriceB(seed,height,(char *)"USD",(char *)"KMD",SATOSHIDEN);
         if ( strcmp("usd",base) == 0 )
-            return(komodo_paxvol(basevolume,usdkmd));
+            return(komodo_paxvol(basevolume,usdkmd) * 10);
         baseusd = _komodo_paxpriceB(seed,height,base,(char *)"USD",SATOSHIDEN);
         basekmd = (komodo_paxvol(basevolume,baseusd) * usdkmd) / 10000000;
         //if ( strcmp("KMD",base) == 0 )