From 4255005f4de9980c4f5a62d2a743c084d1e79b1f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 11 Apr 2019 04:42:00 -1100
Subject: [PATCH] Tweak prices

---
 src/komodo_gateway.h   | 13 +++++++------
 src/rpc/blockchain.cpp |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h
index 0de71291f..cf6f13174 100644
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -2565,11 +2565,12 @@ int64_t komodo_priceave(int64_t *buf,int64_t *correlated,int32_t cskip)
     {
         if ( (price= correlated[i*cskip]) != 0 )
             nonzprice = price;
-        buf[i] = nonzprice;
+        buf[PRICES_DAYWINDOW+i] = nonzprice;
         sum += nonzprice;
         if ( i == PRICES_DAYWINDOW/2 )
             halfave = (sum / (PRICES_DAYWINDOW/2));
     }
+    memcp(buf,&buf[PRICES_DAYWINDOW],PRICES_DAYWINDOW*sizeof(*buf));
     price = sum / PRICES_DAYWINDOW;
     if ( halfave == price )
         return(price);
@@ -2579,11 +2580,11 @@ int64_t komodo_priceave(int64_t *buf,int64_t *correlated,int32_t cskip)
     decayprice = buf[0];
     for (i=0; i<PRICES_DAYWINDOW; i++)
     {
-        decayprice = ((decayprice * 9) + (buf[i] * 1)) / 10;
-        fprintf(stderr,"%.4f ",(double)buf[i]/COIN);
+        decayprice = ((decayprice * 2) + (buf[i] * 1)) / 3;
+        //fprintf(stderr,"%.4f ",(double)buf[i]/COIN);
     }
-    fprintf(stderr,"%ssort half %.4f vs %.4f -> %.4f\n",halfave<price?"rev":"",(double)halfave/COIN,(double)price/COIN,(double)decayprice/COIN);
-    return(decayprice);
+    //fprintf(stderr,"%ssort half %.4f vs %.4f -> %.4f\n",halfave<price?"rev":"",(double)halfave/COIN,(double)price/COIN,(double)decayprice/COIN);
+    return((decayprice*2 + price*7 + halfave*3 + buf[PRICES_DAYWINDOW-1]) / 13);
 }
 
 void komodo_pricesinit()
@@ -2626,7 +2627,7 @@ void komodo_pricesupdate(int32_t height,CBlock *pblock)
         numprices = (int32_t)(komodo_cbopretsize(ASSETCHAINS_CBOPRET) / sizeof(uint32_t));
         ptr32 = (uint32_t *)calloc(sizeof(uint32_t),numprices * width);
         ptr64 = (int64_t *)calloc(sizeof(int64_t),PRICES_DAYWINDOW*3);
-        tmpbuf = (int64_t *)calloc(sizeof(int64_t),PRICES_DAYWINDOW);
+        tmpbuf = (int64_t *)calloc(sizeof(int64_t),2*PRICES_DAYWINDOW);
         fprintf(stderr,"prices update: numprices.%d %p %p\n",numprices,ptr32,ptr64);
     }
     if ( _komodo_heightpricebits(&seed,rawprices,pblock) == numprices )
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 0d1e7acb3..78b7e45ef 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1210,7 +1210,7 @@ int32_t prices_extract(int64_t *pricedata,int32_t firstheight,int32_t numblocks,
         if ( (pricedata[i*3+1]= komodo_pricecorrelated(rngval,ind,(uint32_t *)&pricedata[i*3],6,0,PRICES_SMOOTHWIDTH)) < 0 )
             return(-3);
     }
-    tmpbuf = (int64_t *)calloc(sizeof(int64_t),PRICES_DAYWINDOW);
+    tmpbuf = (int64_t *)calloc(sizeof(int64_t),2*PRICES_DAYWINDOW);
     for (i=0; i<numblocks; i++)
         pricedata[i*3+2] = komodo_priceave(tmpbuf,&pricedata[i*3+1],3);
     free(tmpbuf);
@@ -1283,7 +1283,7 @@ UniValue prices(const UniValue& params, bool fHelp)
                     if ( (correlated[i]= komodo_pricecorrelated(rngval,j,&prices[offset],1,0,PRICES_SMOOTHWIDTH)) < 0 )
                         throw JSONRPCError(RPC_INVALID_PARAMETER, "null correlated price");
                 }
-                tmpbuf = (int64_t *)calloc(sizeof(int64_t),PRICES_DAYWINDOW);
+                tmpbuf = (int64_t *)calloc(sizeof(int64_t),2*PRICES_DAYWINDOW);
                 for (i=0; i<maxsamples&&i<numsamples; i++)
                 {
                     offset = j*width + i;