getbalance, listtransactions, listunspent via blocktrail for BTC basilisk

iguana/iguana_notary.c

@@ -617,10 +617,17 @@ TWO_STRINGS(dex,listunspent,symbol,address)
 {
     if ( symbol != 0 && strcmp(symbol,"BTC") == 0 && (coin= iguana_coinfind("BTC")) != 0 && coin->FULLNODE == 0 && myinfo->IAMLP != 0 )
     {
-        char url[1024],*retstr;
+        char url[1024],*retstr; int32_t n; cJSON *retjson,*data;
         sprintf(url,"https://api.blocktrail.com/v1/btc/address/%s/unspent-outputs?api_key=%s",address,myinfo->blocktrail_apikey);
         if ( (retstr= issue_curl(url)) != 0 )
         {
+            if ( (retjson= cJSON_Parse(retstr)) != 0 )
+            {
+                data = jarray(&n,retjson,"data");
+                free(retstr);
+                retstr = jprint(data,0);
+                free_json(retjson);
+            }
             return(retstr);
         }
     }
@@ -631,7 +638,7 @@ TWO_STRINGS_AND_TWO_DOUBLES(dex,listtransactions,symbol,address,count,skip)
 {
     if ( symbol != 0 && strcmp(symbol,"BTC") == 0 && (coin= iguana_coinfind("BTC")) != 0 && coin->FULLNODE == 0 && myinfo->IAMLP != 0 )
     {
-        char url[1024],*retstr,*retstr2; cJSON *retjson,*retjson2,*retjson3; int32_t i,n;
+        char url[1024],*retstr,*retstr2; cJSON *retjson,*retjson2,*retjson3,*data,*data2; int32_t i,n;
         sprintf(url,"https://api.blocktrail.com/v1/btc/address/%s/transactions?api_key=%s",address,myinfo->blocktrail_apikey);
         if ( (retstr= issue_curl(url)) != 0 )
         {
@@ -640,11 +647,13 @@ TWO_STRINGS_AND_TWO_DOUBLES(dex,listtransactions,symbol,address,count,skip)
             {
                 if ( (retjson= cJSON_Parse(retstr)) != 0 && (retjson2= cJSON_Parse(retstr2)) != 0 )
                 {
-                    retjson3 = jduplicate(retjson);
-                    if ( (n= cJSON_GetArraySize(retjson2)) > 0 )
+                    data = jarray(&n,retjson,"data");
+                    data2 = jarray(&n,retjson2,"data");
+                    retjson3 = jduplicate(data);
+                    if ( n > 0 )
                     {
                         for (i=0; i<n; i++)
-                            jaddi(retjson3,jduplicate(jitem(retjson2,i)));
+                            jaddi(retjson3,jduplicate(jitem(data2,i)));
                     }
                     printf("combined (%s) and (%s) -> (%s)\n",retstr,retstr2,jprint(retjson3,0));
                     free(retstr);

iguana/tests/dexlisttransactions

@@ -1,5 +1,5 @@
 #!/bin/bash
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listtransactions\",\"address\":\"RDobQ77wnMY8Me7RAL9oiFqVNvwkqqgPRF\",\"count\":100,\"skip\":0,\"symbol\":\"KMD\"}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listtransactions\",\"address\":\"1Pc27firvEwPoDzPzYdJKZ5hoZK4T1tf6z\",\"count\":100,\"skip\":0,\"symbol\":\"BTC\"}"
 #curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listtransactions\",\"address\":\"RRyBxbrAPRUBCUpiJgJZYrkxqrh8x5ta9Z\",\"count\":100,\"skip\":0,\"symbol\":\"MVP\"}"
 #curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listtransactions\",\"address\":\"RMGpGoX82M1ZUUbHxZ3JKHacxY9NYVakqr\",\"count\":100,\"skip\":0,\"symbol\":\"USD\"}"
 #curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listtransactions\",\"address\":\"RMGpGoX82M1ZUUbHxZ3JKHacxY9NYVakqr\",\"count\":100,\"skip\":0,\"symbol\":\"MVP\"}"

iguana/tests/dexlistunspent

@@ -1,2 +1,2 @@
 #!/bin/bash
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RW3gz9fEadohRLZerK9r8zXkugk5swWHrf\",\"symbol\":\"KMD\"}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"19rjYdJtRN3qoammX3r1gxy9bvh8p8DmRc\",\"symbol\":\"BTC\"}"