From bffb130bd4acd529ffc86fbcb8c25058f01936b8 Mon Sep 17 00:00:00 2001
From: sairajzero <sairaj0630@gmail.com>
Date: Wed, 26 Oct 2022 04:58:41 +0530
Subject: [PATCH] floBlockchainAPI v2.3.3d

- renamed sender and receiver options to senders and receivers (bug fix)
---
 floBlockchainAPI.js | 14 +++++++-------
 floTokenAPI.js      | 18 +++++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/floBlockchainAPI.js b/floBlockchainAPI.js
index 5bb3cbb..473b192 100644
--- a/floBlockchainAPI.js
+++ b/floBlockchainAPI.js
@@ -1,4 +1,4 @@
-(function (EXPORTS) { //floBlockchainAPI v2.3.3c
+(function (EXPORTS) { //floBlockchainAPI v2.3.3d
     /* FLO Blockchain Operator to send/receive data from blockchain using API calls*/
     'use strict';
     const floBlockchainAPI = EXPORTS;
@@ -485,8 +485,8 @@
     floBlockchainAPI.readData = function (addr, options = {}) {
         options.limit = options.limit || 0;
         options.ignoreOld = options.ignoreOld || 0;
-        if (typeof options.sender === "string") options.sender = [options.sender];
-        if (typeof options.receiver === "string") options.receiver = [options.receiver];
+        if (typeof options.senders === "string") options.senders = [options.senders];
+        if (typeof options.receivers === "string") options.receivers = [options.receivers];
         return new Promise((resolve, reject) => {
             promisedAPI(`api/addrs/${addr}/txs?from=0&to=1`).then(response => {
                 var newItems = response.totalItems - options.ignoreOld;
@@ -521,10 +521,10 @@
                                 }
                             if (!flag) continue;
                         }
-                        if (Array.isArray(options.sender)) {
+                        if (Array.isArray(options.senders)) {
                             let flag = false;
                             for (let vin of response.items[i].vin)
-                                if (options.sender.includes(vin.addr)) {
+                                if (options.senders.includes(vin.addr)) {
                                     flag = true;
                                     break;
                                 }
@@ -539,10 +539,10 @@
                                 }
                             if (!flag) continue;
                         }
-                        if (Array.isArray(options.receiver)) {
+                        if (Array.isArray(options.receivers)) {
                             let flag = false;
                             for (let vout of response.items[i].vout)
-                                if (options.receiver.includes(vout.scriptPubKey.addresses[0])) {
+                                if (options.receivers.includes(vout.scriptPubKey.addresses[0])) {
                                     flag = true;
                                     break;
                                 }
diff --git a/floTokenAPI.js b/floTokenAPI.js
index 7378f43..efbd2ae 100644
--- a/floTokenAPI.js
+++ b/floTokenAPI.js
@@ -1,11 +1,11 @@
-(function(EXPORTS) { //floTokenAPI v1.0.3b
+(function (EXPORTS) { //floTokenAPI v1.0.3c
     /* Token Operator to send/receive tokens via blockchain using API calls*/
     'use strict';
     const tokenAPI = EXPORTS;
 
     const DEFAULT = {
         apiURL: floGlobals.tokenURL || "https://ranchimallflo.duckdns.org/",
-        currency: "rupee"
+        currency: floGlobals.currency || "rupee"
     }
 
     Object.defineProperties(tokenAPI, {
@@ -27,9 +27,9 @@
         }
     });
 
-    const fetch_api = tokenAPI.fetch = function(apicall) {
+    const fetch_api = tokenAPI.fetch = function (apicall) {
         return new Promise((resolve, reject) => {
-            console.log(DEFAULT.apiURL + apicall);
+            console.debug(DEFAULT.apiURL + apicall);
             fetch(DEFAULT.apiURL + apicall).then(response => {
                 if (response.ok)
                     response.json().then(data => resolve(data));
@@ -39,7 +39,7 @@
         })
     }
 
-    const getBalance = tokenAPI.getBalance = function(floID, token = DEFAULT.currency) {
+    const getBalance = tokenAPI.getBalance = function (floID, token = DEFAULT.currency) {
         return new Promise((resolve, reject) => {
             fetch_api(`api/v1.0/getFloAddressBalance?token=${token}&floAddress=${floID}`)
                 .then(result => resolve(result.balance || 0))
@@ -47,7 +47,7 @@
         })
     }
 
-    tokenAPI.getTx = function(txID) {
+    tokenAPI.getTx = function (txID) {
         return new Promise((resolve, reject) => {
             fetch_api(`api/v1.0/getTransactionDetails/${txID}`).then(res => {
                 if (res.result === "error")
@@ -62,7 +62,7 @@
         })
     }
 
-    tokenAPI.sendToken = function(privKey, amount, receiverID, message = "", token = DEFAULT.currency, options = {}) {
+    tokenAPI.sendToken = function (privKey, amount, receiverID, message = "", token = DEFAULT.currency, options = {}) {
         return new Promise((resolve, reject) => {
             let senderID = floCrypto.getFloID(privKey);
             if (typeof amount !== "number" || isNaN(amount) || amount <= 0)
@@ -77,7 +77,7 @@
         });
     }
 
-    tokenAPI.getAllTxs = function(floID, token = DEFAULT.currency) {
+    tokenAPI.getAllTxs = function (floID, token = DEFAULT.currency) {
         return new Promise((resolve, reject) => {
             fetch_api(`api/v1.0/getFloAddressTransactions?token=${token}&floAddress=${floID}`)
                 .then(result => resolve(result))
@@ -87,7 +87,7 @@
 
     const util = tokenAPI.util = {};
 
-    util.parseTxData = function(txData) {
+    util.parseTxData = function (txData) {
         let parsedData = {};
         for (let p in txData.parsedFloData)
             parsedData[p] = txData.parsedFloData[p];