etherscan-io
diff --git a/‎packages/bitcore-client/bin/wallet-tx
+24-5 b/‎packages/bitcore-client/bin/wallet-tx
+24-5
diff --git a/‎packages/bitcore-client/lib/client.js
+9-1 b/‎packages/bitcore-client/lib/client.js
+9-1
diff --git a/‎packages/bitcore-client/lib/wallet.js
+6-1 b/‎packages/bitcore-client/lib/wallet.js
+6-1
@@ -8,23 +8,42 @@ program
   .option('--name <name>', 'REQUIRED - Wallet Name')
   .option(
     '--recipients <recipients>',
-    'REQUIRED - Address of receiver, or json array \'[{"address": "abc1234", "amount": xxxxxx}]\''
+    'REQUIRED - JSON array \'[{"address": "abc1234", "amount": xxxxxx}]\''
   )
-  .option('--fee <fee>', 'REQUIRED - The transaction fee to pay')
   .option('--utxos <utxos>', 'REQUIRED - Unspent transactions that can be spent')
   .option('--change <change>', 'REQUIRED - Change addresses')
+  .option('--fee [fee]', 'optional - custom transaction fee to pay')
+  .option('--target [target]', 'optional - custom target block for confirmation')
   .option('--path [path]', 'optional - Custom wallet storage path')
   .parse(process.argv);
 
 const main = async () => {
   const { name, path } = program;
   let wallet;
   try {
-    const { recipients, utxos, change, fee } = program;
+    const { recipients, utxos, change, fee, target } = program;
     wallet = await Wallet.loadWallet({ name, path });
+
+    const parsedUtxos = utxos.includes('[') ? JSON.parse(utxos) : [];
+    const parsedRecipients = recipients.includes('[') ? JSON.parse(recipients) : [];
+
+    if (!parsedRecipients.length || !parsedUtxos.length) {
+      throw new Error('invalid arguments');
+    }
+
+    const utxoBytes = 148;
+    const outputBytes = 34;
+    const transactionHeader = 10;
+    const calculatedNetworkFeeKb = await wallet.getNetworkFee({ target });
+    const netWorkFeeSat = calculatedNetworkFeeKb.feerate * 1E8/1000;
+
+    const transactionSize = (parsedUtxos.length * utxoBytes + parsedRecipients.length * outputBytes + transactionHeader + parsedUtxos.length);
+    const totalTransactionFee = transactionSize * netWorkFeeSat;
+
     let params = { recipients, utxos, change, fee };
-    params.recipients = recipients.includes('[') ? JSON.parse(recipients) : recipients;
-    params.utxos = params.utxos ? JSON.parse(params.utxos) : [];
+    params.fee = Number(fee) || totalTransactionFee;
+    params.recipients = parsedRecipients;
+    params.utxos = parsedUtxos;
     const tx = await wallet.newTx(params);
     console.log(tx.uncheckedSerialize());
   } catch (e) {
 
@@ -59,8 +59,16 @@ Client.prototype.getCoins = async function (params) {
   });
 };
 
+Client.prototype.getFee = async function (params) {
+  const { target } = params;
+  const url = `${this.baseUrl}/fee/${target}`;
+  return request.get(url, {
+    json: true
+  });
+}
+
 Client.prototype.importAddresses = async function(params) {
-  const {  payload, pubKey } = params;
+  const { payload, pubKey } = params;
   const url = `${this.baseUrl}/wallet/${pubKey}`;
   const signature = this.sign({ method: 'POST', url, payload});
 
 
@@ -11,7 +11,7 @@ class Wallet {
     if (!this.masterKey) {
       return new Wallet(this.create(params));
     }
-    this.baseUrl = this.baseUrl || `http://127.0.0.1:3000/api/${this.chain}/${this.network}`;
+    this.baseUrl = this.baseUrl || `https://api.bitcore.io/api/${this.chain}/${this.network}`;
     this.client = new Client({
       baseUrl: this.baseUrl,
       authKey: this.getAuthSigningKey()
@@ -129,6 +129,11 @@ class Wallet {
     return this.client.getBalance({ pubKey: this.xPubKey});
   }
 
+  getNetworkFee(params) {
+    const target = params.target || 2;
+    return this.client.getFee({ target });
+  }
+
   getUtxos() {
     return this.client.getCoins({
       pubKey: this.xPubKey,