From 13a6d7e76ad6ef43574fab1c78d94127a60d407b Mon Sep 17 00:00:00 2001 From: Abhishek Sinha Date: Sun, 4 Nov 2018 15:11:00 +0530 Subject: [PATCH] added actions object in localbitcoinplusplus --- supernode/index.html | 144 +++++++++++++++++++++++-------------------- 1 file changed, 76 insertions(+), 68 deletions(-) diff --git a/supernode/index.html b/supernode/index.html index 3733d4a..4bb053f 100644 --- a/supernode/index.html +++ b/supernode/index.html @@ -7200,7 +7200,7 @@ configurable: false, enumerable: false }); - + Object.defineProperty(localbitcoinplusplus, 'MASTER_NODE', { value: "023B9F60692A17FAC805D012C5C8ADA3DD19A980A3C5F0D8A5B3500CC54D6E8B75", writable: false, @@ -7604,6 +7604,64 @@ return pubHexUncompressed; } }; + + localbitcoinplusplus.actions = { + parse_flo_comments: function (callback) { + if (this.floAddress == null) { + return false; + } + var request = new XMLHttpRequest(); + + request.open('GET', `${localbitcoinplusplus.flocha}/api/txs/?address=${this.floAddress}`, true); + request.onload = function () { + + // Begin accessing JSON data here + var data = JSON.parse(this.response); + + if (request.status >= 200 && request.status < 400) { + data.txs.forEach(tx => { + callback(tx.floData); + }); + } else { + console.log('error'); + } + } + request.send(); + }, + + fetch_configs: function (callback) { + this.floAddress = localbitcoinplusplus.RM_FLO_SENDING_ADDR; + this.parse_flo_comments(function (floData) { + let RMAssets = floData.slice(5); + + // remove this line later + //'ValidAssets=BTC,FLO,INR#!#Supernode=oH6e6K8MhBG9VWeLEpTREqeL1YkfizSS22,oHsGVh6r682HxXNT21UXXC42TZatUcGvDB'; + let floAssetsArray = RMAssets.split('#!#'); + + if (floAssetsArray.length > 0 && typeof floAssetsArray[0] != undefined && + floAssetsArray[0].trim() !== "" && typeof floAssetsArray[1] !== undefined && + floAssetsArray[1].trim() !== "") { + + let validAssetsList = floAssetsArray[0].split('='); + let superNodesList = floAssetsArray[1].split('='); + + if (validAssetsList[0] == "ValidAssets" && superNodesList[0].trim() == + "Supernode" && superNodesList[0].trim().length > 0) { + try { + let fetchedAssestsResponseObject = { + validAssetsArray: validAssetsList[1].split(','), + superNodesArray: superNodesList[1].split(',') + } + callback(fetchedAssestsResponseObject); + } catch (error) { + console.error(error); + callback(error); + } + } + } + }); + } + } @@ -7751,7 +7809,7 @@ this.product = null; this.valid_assets = ["BTC", "INR"]; this.currency = null; - this.valid_currencies = ["BTC", "INR"], + this.valid_currencies = ["BTC", "INR"]; this.buy_price = null; this.buyer_public_key = null; this.buyer_key_signature = null; @@ -7759,36 +7817,6 @@ this.rpc_job = null; this.floAddress = null; this.super_nodes_array = null; - - this.fetch_configs = function (callback) { - this.floAddress = localbitcoinplusplus.RM_FLO_SENDING_ADDR; - this.parse_flo_comments(function (floData) { - let RMAssets = floData.slice(5); - - // remove this line later - //'ValidAssets=BTC,FLO,INR#!#Supernode=oH6e6K8MhBG9VWeLEpTREqeL1YkfizSS22,oHsGVh6r682HxXNT21UXXC42TZatUcGvDB'; - let floAssetsArray = RMAssets.split('#!#'); - - if(floAssetsArray.length>0 && typeof floAssetsArray[0] != undefined && floAssetsArray[0].trim() !== "" && typeof floAssetsArray[1] !== undefined && floAssetsArray[1].trim() !== "") { - - let validAssetsList = floAssetsArray[0].split('='); - let superNodesList = floAssetsArray[1].split('='); - - if(validAssetsList[0]=="ValidAssets" && superNodesList[0].trim() == "Supernode" && superNodesList[0].trim().length > 0) { - try { - let fetchedAssestsResponseObject = { - validAssetsArray: validAssetsList[1].split(','), - superNodesArray: superNodesList[1].split(',') - } - callback(fetchedAssestsResponseObject); - } catch (error) { - console.error(error); - callback(error); - } - } - } - }); - } } Trade.prototype = { @@ -7874,31 +7902,7 @@ }, trade_sell() { console.log("sell is called"); - }, - /*Parse Flo Blockchain comments*/ - parse_flo_comments(callback) { - if (this.floAddress == null) { - return false; - } - var request = new XMLHttpRequest(); - - request.open('GET', `${localbitcoinplusplus.flocha}/api/txs/?address=${this.floAddress}`, true); - request.onload = function () { - - // Begin accessing JSON data here - var data = JSON.parse(this.response); - - if (request.status >= 200 && request.status < 400) { - data.txs.forEach(tx => { - callback(tx.floData); - }); - } else { - console.log('error'); - } - } - request.send(); } - } @@ -8308,10 +8312,10 @@ var RM_RPC = new localbitcoinplusplus.rpc; //Test: fetch flo comment - var rm_configs = RM_TRADE.fetch_configs(function(...fetch_configs_res) { + var rm_configs = localbitcoinplusplus.actions.fetch_configs(function (...fetch_configs_res) { let local_btc_configs = fetch_configs_res[0]; - RM_TRADE.super_nodes_array = local_btc_configs.superNodesArray; - RM_TRADE.valid_assets = local_btc_configs.validAssetsArray; + RM_TRADE.super_nodes_array = local_btc_configs.superNodesArray; + RM_TRADE.valid_assets = local_btc_configs.validAssetsArray; }); // // Test: Trade functionality @@ -8323,11 +8327,10 @@ doSend(buytrade); } document.getElementById("output_div").appendChild(trade_btn); - -