Rollback get nonce and sendRawTxWaitConfirm changes.

iguana/exchanges/etomicswap/etomiccurl.c

@@ -114,17 +114,12 @@ char* sendRawTxWaitConfirm(char* rawTx)
     cJSON_Delete(params);
     char *txId = NULL;
     if (resultJson != NULL && is_cJSON_String(resultJson) && resultJson->valuestring != NULL) {
-        char* tmp = resultJson->valuestring;
-        txId = (char *) malloc(strlen(tmp) + 1);
-        strcpy(txId, tmp);
-    }
-    /*if (resultJson != NULL && is_cJSON_String(resultJson) && resultJson->valuestring != NULL) {
         char* tmp = resultJson->valuestring;
         if (waitForConfirmation(tmp) > 0) {
             txId = (char *) malloc(strlen(tmp) + 1);
             strcpy(txId, tmp);
         }
-    }*/
+    }
     cJSON_Delete(resultJson);
     pthread_mutex_unlock(&sendTxMutex);
     return txId;
@@ -156,9 +151,9 @@ int64_t getNonce(char* address)
     };
     cJSON *params = cJSON_CreateArray();
     cJSON_AddItemToArray(params, cJSON_CreateString(address));
-    //cJSON_AddItemToArray(params, cJSON_CreateString("pending"));
+    cJSON_AddItemToArray(params, cJSON_CreateString("pending"));
     int64_t nonce = -1;
-    cJSON *nonceJson = sendRpcRequest("parity_nextNonce", params);
+    cJSON *nonceJson = sendRpcRequest("eth_getTransactionCount", params);
     cJSON_Delete(params);
     if (nonceJson != NULL && is_cJSON_String(nonceJson) && nonceJson != NULL) {
         nonce = (int64_t) strtol(nonceJson->valuestring, NULL, 0);

iguana/exchanges/etomicswap/etomiccurl.h

@@ -12,7 +12,7 @@ extern "C"{
 #endif
 
 #ifdef ETOMIC_TESTNET
-#define ETOMIC_URL "http://195.201.0.6:8545"
+#define ETOMIC_URL "https://ropsten.infura.io/y07GHxUyTgeN2mdfOonu"
 #define DEFAULT_GAS_PRICE 100
 #else
 #define ETOMIC_URL "https://mainnet.infura.io/y07GHxUyTgeN2mdfOonu"