Update Std_op

docs/scripts/btcOperator.js

@@ -1,4 +1,4 @@
-(function(EXPORTS) { //btcOperator v1.0.10a
+(function (EXPORTS) { //btcOperator v1.0.11
     /* BTC Crypto and API Operator */
     const btcOperator = EXPORTS;
 
@@ -39,7 +39,7 @@
                 "tx_hex": rawTxHex
             },
             dataType: "json",
-            error: e => reject(e.responseJSON),
+            error: e => reject((e.responseJSON && e.responseJSON.status === "fail") ? null : e.responseJSON),
             success: r => r.status === "success" ? resolve(r.data.txid) : reject(r)
         })
     });
@@ -340,7 +340,7 @@
                     let net_fee = BASE_TX_SIZE * fee_rate;
                     net_fee += (output_size * fee_rate);
                     addUTXOs(tx, senders, redeemScripts, total_amount + net_fee, fee_rate).then(result => {
-                        result.fee_amount = parseFloat((net_fee + (result.input_size * fee_rate)).toFixed(8));
+                        result.fee = parseFloat((net_fee + (result.input_size * fee_rate)).toFixed(8));
                         result.fee_rate = fee_rate;
                         resolve(result);
                     }).catch(error => reject(error))
@@ -451,6 +451,17 @@
     */
 
     btcOperator.sendTx = function (senders, privkeys, receivers, amounts, fee, change_addr = null) {
+        return new Promise((resolve, reject) => {
+            createSignedTx(senders, privkeys, receivers, amounts, fee, change_addr).then(result => {
+                debugger;
+                broadcastTx(result.transaction.serialize())
+                    .then(txid => resolve(txid))
+                    .catch(error => reject(error));
+            }).catch(error => reject(error))
+        })
+    }
+
+    const createSignedTx = btcOperator.createSignedTx = function (senders, privkeys, receivers, amounts, fee, change_addr = null) {
         return new Promise((resolve, reject) => {
             try {
                 ({
@@ -484,10 +495,7 @@
                 console.debug("Unsigned:", tx.serialize());
                 new Set(wif_keys).forEach(key => console.debug("Signing key:", key, tx.sign(key, 1 /*sighashtype*/))); //Sign the tx using private key WIF
                 console.debug("Signed:", tx.serialize());
-                debugger;
+                resolve(result);
-                broadcastTx(tx.serialize())
-                    .then(txid => resolve(txid))
-                    .catch(error => reject(error));
             }).catch(error => reject(error));
         })
     }
@@ -664,8 +672,17 @@
         })
     }
 
+    btcOperator.transactionID = function (tx) {
+        tx = deserializeTx(tx);
+        let clone = coinjs.clone(tx);
+        clone.witness = null;
+        let raw_bytes = Crypto.util.hexToBytes(clone.serialize());
+        let txid = Crypto.SHA256(Crypto.SHA256(raw_bytes, { asBytes: true }), { asBytes: true }).reverse();
+        return Crypto.util.bytesToHex(txid);
+    }
+
     btcOperator.getTx = txid => new Promise((resolve, reject) => {
-        fetch_api(`get_tx/BTC/${txid}`)
+        fetch_api(`tx/BTC/${txid}`)
             .then(result => resolve(result.data))
             .catch(error => reject(error))
     });

docs/scripts/floBlockchainAPI.js

@@ -1,4 +1,4 @@
-(function(EXPORTS) { //floBlockchainAPI v2.3.3b
+(function (EXPORTS) { //floBlockchainAPI v2.3.3c
     /* FLO Blockchain Operator to send/receive data from blockchain using API calls*/
     'use strict';
     const floBlockchainAPI = EXPORTS;
@@ -11,6 +11,7 @@
         },
         sendAmt: 0.001,
         fee: 0.0005,
+        minChangeAmt: 0.0005,
         receiverID: floGlobals.adminID
     };
 
@@ -171,7 +172,7 @@
                             else {
                                 trx.addoutput(receiverAddr, sendAmt);
                                 var change = utxoAmt - sendAmt - fee;
-                                if (change > 0)
+                                if (change > DEFAULT.minChangeAmt)
                                     trx.addoutput(senderAddr, change);
                                 trx.addflodata(floData.replace(/\n/g, ' '));
                                 var signedTxHash = trx.sign(privKey, 1);
@@ -555,6 +556,8 @@
                             d.txid = response.items[i].txid;
                             d.time = response.items[i].time;
                             d.blockheight = response.items[i].blockheight;
+                            d.senders = new Set(response.items[i].vin.map(v => v.addr));
+                            d.receivers = new Set(response.items[i].vout.map(v => v.scriptPubKey.addresses[0]));
                             d.data = response.items[i].floData;
                             filteredData.push(d);
                         } else

docs/scripts/floCrypto.js

@@ -1,4 +1,4 @@
-(function(EXPORTS) { //floCrypto v2.3.3d
+(function (EXPORTS) { //floCrypto v2.3.3e
     /* FLO Crypto Operators */
     'use strict';
     const floCrypto = EXPORTS;
@@ -276,12 +276,18 @@
     }
 
     //Convert the given address (any blockchain) to equivalent floID
-    floCrypto.toFloID = function(address) {
+    floCrypto.toFloID = function (address, options = null) {
         if (!address)
             return;
         let raw = decodeAddress(address);
         if (!raw)
             return;
+        else if (options) {
+            if (typeof raw.version !== 'undefined' && (!options.std || !options.std.includes(raw.version)))
+                return;
+            if (typeof raw.bech_version !== 'undefined' && (!options.bech || !options.bech.includes(raw.bech_version)))
+                return;
+        }
         raw.bytes.unshift(bitjs.pub);
         let hash = Crypto.SHA256(Crypto.SHA256(raw.bytes, {
             asBytes: true