test

basilisk/tradebots_liquidity.c

@@ -956,7 +956,11 @@ void _default_liquidity_command(struct supernet_info *myinfo,char *base,bits256
     safecopy(li.exchange,exchange,sizeof(li.exchange));
     li.profit = jdouble(vals,"profit");
     li.refprice = jdouble(vals,"refprice");
+    li.bid = jdouble(vals,"bid");
+    li.ask = jdouble(vals,"ask");
+    li.maxvol = jdouble(vals,"maxvol");
     li.dir = jint(vals,"dir"); // positive -> buy, negative -> sell, 0 or missing -> both
+    li.onetime = jint(vals,"onetime");
     // li.theoretical = ... dotproduct
     // li.filter = ...
     // li.trigger = ...
@@ -1007,7 +1011,7 @@ void _default_liquidity_command(struct supernet_info *myinfo,char *base,bits256
                 } else tradebot_monitor(myinfo,0,0,0,li.exchange,li.base,li.rel,0.);
             }
             myinfo->linfos[i] = li;
-            printf("Set linfo[%d] %s (%s/%s) %.6f %.8f\n",i,li.exchange,li.base,li.rel,li.profit,li.refprice);
+            printf("Set linfo[%d] %s (%s/%s) profitmargin %.6f bid %.6f ask %.8f maxvol %.f ref %.8f\n",i,li.exchange,li.base,li.rel,li.profit,li.bid,li.ask,li.maxvol,li.refprice);
             return;
         }
     }
@@ -1043,6 +1047,8 @@ double _default_liquidity_active(struct supernet_info *myinfo,double *refpricep,
         }
         //printf(">>>>>>>> %s %s/%s [%d] dir.%d refli.dir %d vs %s/%s\n",exchange,base,rel,i,dir,refli.dir,refli.base,refli.rel);
         if ( dir != 0 && dir * refli.dir <= 0 )
+        {
+            if ( refli.profit != 0. )
             {
                 if ( _default_volume_ok(myinfo,&refli,dir,volume) == 0 )
                 {
@@ -1050,6 +1056,11 @@ double _default_liquidity_active(struct supernet_info *myinfo,double *refpricep,
                     return(refli.profit);
                 } else break;
             }
+            else
+            {
+                //bid, ask, track pending, recover expired, onetime
+            }
+        }
     }
     return(0.);
 }

iguana/dPoW.h

@@ -22,7 +22,7 @@
 #define DPOW_MINSIGS 17
 //#define DPOW_M(bp) ((bp)->minsigs)  // (((bp)->numnotaries >> 1) + 1)
 #define DPOW_MODIND(bp,offset) (((((bp)->height / DPOW_CHECKPOINTFREQ) % (bp)->numnotaries) + (offset)) % (bp)->numnotaries)
-#define DPOW_VERSION 0x0777
+#define DPOW_VERSION 0x0778
 #define DPOW_UTXOSIZE 10000
 #define DPOW_MINOUTPUT 6000
 #define DPOW_DURATION 600

iguana/iguana777.h

@@ -88,7 +88,14 @@ struct supernet_address
     char NXTADDR[32],BTC[64],BTCD[64];
 };
 
-struct liquidity_info { char base[16],rel[16],exchange[16]; uint64_t assetid; double profit,refprice; int dir; };
+struct liquidity_info
+{
+    char base[16],rel[16],exchange[16];
+    uint64_t assetid;
+    double profit,refprice,bid,ask,maxvol;
+    int8_t dir,onetime;
+};
+
 struct message_info { int32_t msgcount; bits256 refhash,msghashes[64]; uint32_t timestamps[64]; };
 
 struct supernet_info

iguana/tests/LPinit

@@ -1,2 +1,4 @@
 #!/bin/bash
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"tradebot\",\"method\":\"liquidity\",\"targetcoin\":\"KMD\",\"vals\":{\"profit\":0.01}}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"tradebot\",\"method\":\"amlp\"}"
+#curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"tradebot\",\"method\":\"liquidity\",\"targetcoin\":\"KMD\",\"vals\":{\"profit\":0.01}}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"tradebot\",\"method\":\"liquidity\",\"targetcoin\":\"MVP\",\"vals\":{\"rel\":\"USD\",\"bid\":0.09,\"ask\":0.11,\"maxvol\":100}}"