test

iguana/iguana777.h

@@ -977,7 +977,7 @@ char *iguana_signunspents(struct supernet_info *myinfo,struct iguana_info *coin,
 bits256 iguana_sendrawtransaction(struct supernet_info *myinfo,struct iguana_info *coin,char *signedtx);
 int32_t iguana_inv2packet(uint8_t *serialized,int32_t maxsize,int32_t type,bits256 *hashes,int32_t n);
 int32_t instantdex_inv2data(struct supernet_info *myinfo,struct iguana_info *coin,struct iguana_peer *addr,struct exchange_info *exchange);
-void instantdex_recvquote(struct iguana_info *coin,struct iguana_peer *addr,bits256 encodedhash);
+struct iguana_bundlereq *instantdex_recvquotes(struct iguana_info *coin,struct iguana_bundlereq *req,bits256 *encodedhash,int32_t n);
 
 extern int32_t HDRnet,netBLOCKS;
 

iguana/iguana_instantdex.c

@@ -826,12 +826,22 @@ struct instantdex_accept *instantdex_quotefind(struct supernet_info *myinfo,stru
     return(instantdex_offerfind(myinfo,exchanges777_find("bitcoin"),0,0,orderid,base,rel,1));
 }
 
-void instantdex_recvquote(struct iguana_info *coin,struct iguana_peer *addr,bits256 encodedhash)
+struct iguana_bundlereq *instantdex_recvquotes(struct iguana_info *coin,struct iguana_bundlereq *req,bits256 *quotes,int32_t n)
 {
-    if ( instantdex_quotefind(0,coin,addr,encodedhash) == 0 )
+    int32_t i,len,m = 0; uint8_t serialized[10000];
+    for (i=0; i<n; i++)
     {
-        
+        if ( instantdex_quotefind(0,coin,req->addr,quotes[i]) != 0 )
+            continue;
+        quotes[m++] = quotes[i];
+    }
+    if ( m > 0 )
+    {
+        len = iguana_getdata(coin,serialized,MSG_QUOTE,quotes,m);
+        printf("send getdata for %d of %d quotes\n",m,n);
+        iguana_send(coin,0,serialized,len);
     }
+    return(req);
 }
 
 int32_t instantdex_quoterequest(struct supernet_info *myinfo,struct iguana_info *coin,uint8_t *serialized,int32_t maxlen,struct iguana_peer *addr,bits256 encodedhash)

iguana/iguana_msg.c

@@ -626,7 +626,7 @@ int32_t iguana_msgparser(struct iguana_info *coin,struct iguana_peer *addr,struc
             } else len = iguana_peergetrequest(coin,addr,data,recvlen,1);
         }
     }
-    else if ( (ishost= (strncmp(H->command,"inv",3) == 0)) || strcmp(H->command,"getdata") == 0 )
+    else if ( (ishost= (strncmp(H->command,"inv",3) == 0)) || strncmp(H->command,"getdata",7) == 0 )
     {
         if ( addr != 0 )
         {

iguana/iguana_recv.c

@@ -1110,14 +1110,6 @@ struct iguana_bundlereq *iguana_recvtxids(struct iguana_info *coin,struct iguana
     return(req);
 }
 
-struct iguana_bundlereq *iguana_recvquotes(struct iguana_info *coin,struct iguana_bundlereq *req,bits256 *quotes,int32_t n)
-{
-    int32_t i;
-    for (i=0; i<n; i++)
-        instantdex_recvquote(coin,req->addr,quotes[i]);
-    return(req);
-}
-
 struct iguana_bundlereq *iguana_recvunconfirmed(struct iguana_info *coin,struct iguana_bundlereq *req,uint8_t *data,int32_t datalen)
 {
     int32_t i;
@@ -1316,7 +1308,7 @@ int32_t iguana_processrecvQ(struct iguana_info *coin,int32_t *newhwmp) // single
         }
         else if ( req->type == 'Q' ) // quotes from inv
         {
-            if ( (req= iguana_recvquotes(coin,req,req->hashes,req->n)) != 0 )
+            if ( (req= instantdex_recvquotes(coin,req,req->hashes,req->n)) != 0 )
                 myfree(req->hashes,(req->n+1) * sizeof(*req->hashes)), req->hashes = 0;
         }
         else printf("iguana_updatebundles unknown type.%c\n",req->type);//, getchar();

iguana/main.c

@@ -53,7 +53,7 @@ int32_t myfclose(FILE *fp)
 // ALL globals must be here!
 char *Iguana_validcommands[] =
 {
-    "SuperNET", "SuperNETb", "inv2", "InstantDEX", "pangea", "quote", "ConnectTo",
+    "SuperNET", "SuperNETb", "inv2", "getdata2", "InstantDEX", "pangea", "quote", "ConnectTo",
     "version", "verack", "getaddr", "addr", "inv", "getdata", "notfound", "getblocks", "getheaders", "headers", "tx", "block", "mempool", "ping", "pong",
     "reject", "filterload", "filteradd", "filterclear", "merkleblock", "alert", ""
 };