diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index 76994cb2e..6dfd8ca3d 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -228,14 +228,17 @@ char *_dex_reqsend(struct supernet_info *myinfo,char *handler,uint8_t *data,int3 void dpow_randipbits(struct supernet_info *myinfo,struct iguana_info *coin,cJSON *retjson) { int32_t m; uint32_t ipbits; char *coinstr; - if ( (m= myinfo->numdpowipbits) > 0 ) + if ( is_cJSON_Array(retjson) == 0 ) { - ipbits = myinfo->dpowipbits[(uint32_t)rand() % m]; - jaddnum(retjson,"randipbits",ipbits); - //printf("add randipbits.%08x\n",ipbits); + if ( (m= myinfo->numdpowipbits) > 0 ) + { + ipbits = myinfo->dpowipbits[(uint32_t)rand() % m]; + jaddnum(retjson,"randipbits",ipbits); + //printf("add randipbits.%08x\n",ipbits); + } + if ( (coinstr= jstr(retjson,"coin")) == 0 ) + jaddstr(retjson,"coin",coin->symbol); } - if ( (coinstr= jstr(retjson,"coin")) == 0 ) - jaddstr(retjson,"coin",coin->symbol); } char *dex_response(int32_t *broadcastflagp,struct supernet_info *myinfo,struct dex_nanomsghdr *dexp) @@ -377,7 +380,7 @@ char *dex_reqsend(struct supernet_info *myinfo,char *handler,uint8_t *data,int32 { if ( (retstrs[j]= _dex_reqsend(myinfo,handler,data,datalen)) != 0 ) { - if ( strncmp(retstrs[j],"{\"error\":\"null return\"}",strlen("{\"error\":\"null return\"}")) != 0 ) + if ( strncmp(retstrs[j],"{\"error\":\"null return\"}",strlen("{\"error\":\"null return\"}")) != 0 && strncmp(retstrs[j],"[]",strlen("[]")) != 0 ) { if ( ++j == M ) break; diff --git a/iguana/tests/dexlisttransactions b/iguana/tests/dexlisttransactions index 2db8fd18e..3dbc78aa6 100755 --- a/iguana/tests/dexlisttransactions +++ b/iguana/tests/dexlisttransactions @@ -1,2 +1,5 @@ #!/bin/bash -curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listtransactions\",\"address\":\"15R3C2ZKmak5pCc4duLY2jLtFD3o1jaeNd\",\"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\":\"USD\"}" +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\"}"