RanchiMall/localbitcoinplusplus
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved fetch_configs function

Browse Source
This commit is contained in:
Abhishek Sinha 2018-11-22 18:51:16 +05:30
parent 1a8f91a592
commit 1bac736cf0
1 changed files with 26 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
supernode/index.html
View File

@ -7252,7 +7252,8 @@
var localbitcoinplusplus = { var localbitcoinplusplus = {
wallets: {}, wallets: {},
trade: {}, trade: {},
rpc: {} rpc: {},
master_configurations:{}
}; };
Object.defineProperty(localbitcoinplusplus, 'flocha', { Object.defineProperty(localbitcoinplusplus, 'flocha', {
@ -7262,22 +7263,8 @@
enumerable: false enumerable: false
}); });
Object.defineProperty(localbitcoinplusplus, 'MASTER_NODE', { Object.defineProperty(localbitcoinplusplus, 'RM_FLO_SENDING_ADDR', {
value: "023B9F60692A17FAC805D012C5C8ADA3DD19A980A3C5F0D8A5B3500CC54D6E8B75", value: "oUbQYNBo7hWRcVN4dnx2ZQPfumfnTS7NsP",
writable: false,
configurable: false,
enumerable: true
});
Object.defineProperty(localbitcoinplusplus, "RM_FLO_SENDING_ADDR", {
value: "oUbQYNBo7hWRcVN4dnx2ZQPfumfnTS7NsP", //C2832A5C3AEFFA1583379A67AB9B92CB7EC6566CCB35F00A9F1AF08EBD74B235
writable: false,
configurable: false,
enumerable: true
});
Object.defineProperty(localbitcoinplusplus, "RM_FLO_RECEIVING_ADDR", {
value: "oVRq2nka1GtALQT8pbuLHAGjqAQ7PAo6uy", // 79F82A750FF2EAE51A50BE242043634B3DDE7ABE3B09732A7842A56CFE3C098E
writable: false, writable: false,
configurable: false, configurable: false,
enumerable: true enumerable: true
@ -7681,7 +7668,9 @@
if (request.status >= 200 && request.status < 400) { if (request.status >= 200 && request.status < 400) {
data.txs.forEach(tx => { data.txs.forEach(tx => {
callback(tx.floData); if (typeof tx !== undefined && typeof tx.floData == 'string' && tx.floData.length>0) {
callback(tx.floData);
}
}); });
} else { } else {
console.log('error'); console.log('error');
@ -7696,46 +7685,28 @@
let RMAssets = floData.slice(5); let RMAssets = floData.slice(5);
// remove this line later // remove this line later
//'ValidAssets=BTC,FLO,INR#!#Supernode=oH6e6K8MhBG9VWeLEpTREqeL1YkfizSS22,oHsGVh6r682HxXNT21UXXC42TZatUcGvDB'; //RMAssets = 'validAssets=BTC,INR#!#supernodes=127.0.0.1,212.88.88.2#!#MASTER_NODE=023B9F60692A17FAC805D012C5C8ADA3DD19A980A3C5F0D8A5B3500CC54D6E8B75#!#MASTER_RECEIVING_ADDRESS=oVRq2nka1GtALQT8pbuLHAGjqAQ7PAo6uy';
let floAssetsArray = RMAssets.split('#!#'); let floAssetsArray = RMAssets.split('#!#');
if (floAssetsArray.length > 0 && typeof floAssetsArray[0] != undefined && if (floAssetsArray.length > 0 && typeof floAssetsArray[0] !== undefined &&
floAssetsArray[0].trim() !== "" && typeof floAssetsArray[1] !== undefined && floAssetsArray[0].trim() !== "" && typeof floAssetsArray[1] !== undefined &&
floAssetsArray[1].trim() !== "") { floAssetsArray[1].trim() !== "") {
try {
let validAssetsList = floAssetsArray[0].split('='); floAssetsArray.map(function(assets_string) {
let superNodesList = floAssetsArray[1].split('='); let k = assets_string.split('=');
return Object.defineProperty(localbitcoinplusplus.master_configurations, k[0], {
if (validAssetsList[0] == "ValidAssets" && superNodesList[0].trim() == value: k[1], writable: false, configurable: false, enumerable: true
"Supernode" && superNodesList[0].trim().length > 0) { });
try { });
let fetchedAssestsResponseObject = { return callback(localbitcoinplusplus);
validAssetsArray: validAssetsList[1].split(','), } catch (error) {
superNodesArray: superNodesList[1].split(',') console.error('FATAL ERROR: Failed to fetch master configuration: ', error);
}
callback(fetchedAssestsResponseObject);
} catch (error) {
console.error(error);
callback(error);
}
} }
} }
return false;
}); });
} }
} }
localbitcoinplusplus.rm_configs = {
networkSettings: function() {
this.myNodeUrl = null;
this.networkNodes = [];
},
dataBlock: function() {
this.blockVersion = null;
this.blockOwner = null;
this.blockHash = null;
this.blockSignature = null;
}
}
</script> </script>
<!-- Keys Object Operations (Generate, Sign and Verify) --> <!-- Keys Object Operations (Generate, Sign and Verify) -->
@ -8092,22 +8063,6 @@
doSend(sellers_job); doSend(sellers_job);
} }
}); });
// for list10k
// let iter = list10k[0].length < list10k[1].length ? list10k[0].length:list10k[1].length;
// console.log(iter);
// for (let index = 0; index < iter; index++) {
// const buy_element = list10k[0][index];
// const sell_element = list10k[1][index];
// let buyers_job = `${buy_element.user_flo_address} to pay ${buy_element.currency} ${buy_element.buy_price} to bank address "${sell_element.receiving_address}"`;
// let sellers_job = `${sell_element.user_flo_address} to pay X Bitcoins to address ${buy_element.receiving_address}`;
// doSend(buyers_job);
// doSend(sellers_job);
// }
} }
}); });
} }
@ -8662,12 +8617,12 @@
var RM_TRADE = new localbitcoinplusplus.trade; var RM_TRADE = new localbitcoinplusplus.trade;
var RM_RPC = new localbitcoinplusplus.rpc; var RM_RPC = new localbitcoinplusplus.rpc;
//Test: fetch flo comment // Fetch configs from Master Key
try { try {
console.log("ok");
var rm_configs = localbitcoinplusplus.actions.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]; console.log(fetch_configs_res);
RM_TRADE.super_nodes_array = local_btc_configs.superNodesArray;
RM_TRADE.valid_assets = local_btc_configs.validAssetsArray;
}); });
} catch (error) { } catch (error) {
throw new Error(`Failed to fetch configurations: ${error}`); throw new Error(`Failed to fetch configurations: ${error}`);
@ -8804,7 +8759,6 @@
// } // }
</script> </script>
<!-- Sync Nodes Database --> <!-- Sync Nodes Database -->
<script> <script>
window.onload = function() { window.onload = function() {
@ -8930,6 +8884,7 @@
}); });
} }
</script> </script>
<!-- Generate new keys -->
<script> <script>
(function() { (function() {
let new_flo_keys_ul = document.getElementById('new_flo_keys_ul'); let new_flo_keys_ul = document.getElementById('new_flo_keys_ul');