#57. Add "broadcast" parameter to eth_withdraw method.

iguana/exchanges/LP_commands.c

@@ -120,6 +120,7 @@ cancel(uuid)\n\
 buy(base, rel, price, relvolume, timeout=10, duration=3600, nonce)\n\
 sell(base, rel, price, basevolume, timeout=10, duration=3600, nonce)\n\
 withdraw(coin, outputs[], broadcast=0)\n\
+eth_withdraw(coin, to, amount, gas, gas_price, broadcast=0)\n\
 txblast(coin, utxotxid, utxovout, utxovalue, txfee, passphrase, outputs[], broadcast=0)\n\
 sendrawtransaction(coin, signedtx)\n\
 swapstatus(pending=0, fast=0)\n\

iguana/exchanges/LP_transaction.c

@@ -2046,13 +2046,49 @@ char *LP_movecoinbases(char *symbol)
 
 #ifndef NOTETOMIC
 
+char *LP_eth_tx_fee(struct iguana_info *coin, char *dest_addr, char *amount, int64_t gas, int64_t gas_price)
+{
+    bits256 privkey;
+    cJSON *retjson = cJSON_CreateObject();
+    int64_t actual_gas_price = 0, actual_gas = 0;
+    char privkey_str[70];
+
+    if (gas_price > 0) {
+        actual_gas_price = gas_price;
+    } else {
+        actual_gas_price = getGasPriceFromStation(0);
+        if (actual_gas_price == 0) {
+            return (clonestr("{\"error\":\"Couldn't get gas price from station!\"}"));
+        }
+    }
+    cJSON_AddNumberToObject(retjson, "gas_price", actual_gas_price);
+
+    if (gas > 0) {
+        actual_gas = gas;
+    } else if (strcmp(coin->symbol, "ETH") == 0) {
+        actual_gas = 21000;
+    } else {
+        privkey = LP_privkey(coin->symbol, coin->smartaddr, coin->taddr);
+        uint8arrayToHex(privkey_str, privkey.bytes, 32);
+        actual_gas = estimate_erc20_gas(coin->etomic, dest_addr, amount, privkey_str, coin->decimals);
+        if (actual_gas == 0) {
+            return (clonestr("{\"error\":\"Couldn't estimate erc20 transfer gas usage!\"}"));
+        }
+    }
+    cJSON_AddNumberToObject(retjson, "gas", actual_gas);
+
+    double_t eth_fee = (actual_gas_price * actual_gas) / 1000000000.0;
+    cJSON_AddNumberToObject(retjson, "eth_fee", eth_fee);
+    return(jprint(retjson,1));
+}
+
 char *LP_eth_withdraw(struct iguana_info *coin,cJSON *argjson)
 {
     cJSON *retjson = cJSON_CreateObject();
     cJSON *gas_json = cJSON_GetObjectItem(argjson, "gas");
     cJSON *gas_price_json = cJSON_GetObjectItem(argjson, "gas_price");
     char *dest_addr, *tx_id, privkey_str[70], amount_str[100];
-    int64_t amount = 0, gas = 0, gas_price = 0;
+    int64_t amount = 0, gas = 0, gas_price = 0, broadcast = 0;
     bits256 privkey;
 
     dest_addr = jstr(argjson, "to");
@@ -2075,21 +2111,27 @@ char *LP_eth_withdraw(struct iguana_info *coin,cJSON *argjson)
             return (clonestr("{\"error\":\"'gas_price' can't be lower than 1!\"}"));
         }
     }
-    privkey = LP_privkey(coin->symbol, coin->smartaddr, coin->taddr);
-    uint8arrayToHex(privkey_str, privkey.bytes, 32);
+
+    broadcast = jint(argjson, "broadcast");
     satoshisToWei(amount_str, amount);
-    if (strcmp(coin->symbol, "ETH") == 0) {
-        tx_id = sendEth(dest_addr, amount_str, privkey_str, 0, gas, gas_price, 0);
+    if (broadcast == 1) {
+        privkey = LP_privkey(coin->symbol, coin->smartaddr, coin->taddr);
+        uint8arrayToHex(privkey_str, privkey.bytes, 32);
+        if (strcmp(coin->symbol, "ETH") == 0) {
+            tx_id = sendEth(dest_addr, amount_str, privkey_str, 0, gas, gas_price, 0);
+        } else {
+            tx_id = sendErc20(coin->etomic, dest_addr, amount_str, privkey_str, 0, gas, gas_price, 0, coin->decimals);
+        }
+        if (tx_id != NULL) {
+            jaddstr(retjson, "tx_id", tx_id);
+            free(tx_id);
+        } else {
+            jaddstr(retjson, "error", "Error sending transaction");
+        }
+        return (jprint(retjson, 1));
     } else {
-        tx_id = sendErc20(coin->etomic, dest_addr, amount_str, privkey_str, 0, gas, gas_price, 0, coin->decimals);
+        return LP_eth_tx_fee(coin, dest_addr, amount_str, gas, gas_price);
     }
-    if (tx_id != NULL) {
-        jaddstr(retjson, "tx_id", tx_id);
-        free(tx_id);
-    } else {
-        jaddstr(retjson, "error", "Error sending transaction");
-    }
-    return(jprint(retjson,1));
 }
 
 char *LP_eth_gas_price()

iguana/exchanges/etomicswap/etomiclib.cpp

@@ -704,6 +704,21 @@ std::stringstream getErc20TransferData(char *tokenAddress, char *to, char *amoun
     return ss;
 }
 
+uint64_t estimate_erc20_gas(
+    char *tokenAddress,
+    char *to,
+    char *amount,
+    char *privKey,
+    uint8_t decimals
+)
+{
+    std::stringstream ss = getErc20TransferData(tokenAddress, to, amount, decimals);
+    char *from = privKey2Addr(privKey);
+    uint64_t result = estimateGas(from, tokenAddress, ss.str().c_str());
+    free(from);
+    return result;
+}
+
 char *sendErc20(
         char *tokenAddress,
         char *to,

iguana/exchanges/etomicswap/etomiclib.h

@@ -205,6 +205,14 @@ uint8_t alicePaymentStatus(char *paymentId);
 uint8_t bobDepositStatus(char *depositId);
 uint8_t bobPaymentStatus(char *paymentId);
 
+uint64_t estimate_erc20_gas(
+        char *tokenAddress,
+        char *to,
+        char *amount,
+        char *privKey,
+        uint8_t decimals
+);
+
 #ifdef __cplusplus
 }
 #endif