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

added new field receiversList in global params

Browse Source
This commit is contained in:
Abhishek Sinha 2019-06-17 17:43:03 +05:30
parent 738192720d
commit 2cf168039a
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
supernode/index.html
View File

@ -11272,16 +11272,27 @@
request.globalParams.senderFloId = resObj.myLocalFLOAddress; request.globalParams.senderFloId = resObj.myLocalFLOAddress;
if (typeof params[0].trader_flo_address !=="string") { if (typeof params[0].trader_flo_address !=="string") {
const n = localbitcoinplusplus.master_configurations.MaxBackups+1;
const my_closest_su = await localbitcoinplusplus.kademlia const my_closest_su = await localbitcoinplusplus.kademlia
.determineClosestSupernode(resObj.myLocalFLOAddress); .determineClosestSupernode(resObj.myLocalFLOAddress, n);
if (typeof my_closest_su=="object") { if (typeof my_closest_su=="object") {
request.globalParams.primarySupernode = my_closest_su[0].data.id; request.globalParams.primarySupernode = my_closest_su[0].data.id;
request.globalParams["receiversList"] = [];
for (let j = 0; j <= localbitcoinplusplus.master_configurations.MaxBackups; j++) {
request.globalParams.receiversList.push(my_closest_su[j].data.id);
}
} }
} }
} }
if (typeof params[0].receiver_flo_address == "string") { if (typeof params[0].receiver_flo_address == "string") {
request.globalParams.receiverFloId = params[0].receiver_flo_address; request.globalParams.receiverFloId = params[0].receiver_flo_address;
if (typeof request.globalParams.receiversList == "object") {
if (!request.globalParams.receiversList.includes(params[0].receiver_flo_address)) {
request.globalParams.receiversList.push(params[0].receiver_flo_address);
}
}
} }
return resolve(request.toString()); return resolve(request.toString());
@ -11581,6 +11592,8 @@
let generate_btc_keys_for_requester = RM_WALLET let generate_btc_keys_for_requester = RM_WALLET
.generateFloKeys(null, params.product); .generateFloKeys(null, params.product);
console.table(generate_btc_keys_for_requester);
params.id = helper_functions.unique_id(); params.id = helper_functions.unique_id();
params.status = 1; params.status = 1;
params.btc_address = generate_btc_keys_for_requester.address; params.btc_address = generate_btc_keys_for_requester.address;
@ -12859,6 +12872,8 @@
let generate_btc_keys_for_requester = RM_WALLET let generate_btc_keys_for_requester = RM_WALLET
.generateFloKeys(null, params.product); .generateFloKeys(null, params.product);
console.table(generate_btc_keys_for_requester);
params.id = helper_functions.unique_id(); params.id = helper_functions.unique_id();
params.status = 1; params.status = 1;
params.btc_address = params.btc_address =
@ -15560,11 +15575,10 @@
var res_obj = JSON.parse(res); var res_obj = JSON.parse(res);
if (typeof res_obj.globalParams !== "object" if (typeof res_obj.globalParams !== "object"
|| (typeof res_obj.globalParams.receiverFloId == "string" || (typeof res_obj.globalParams.receiversList == "object"
&& res_obj.globalParams.receiverFloId !== && !request.globalParams.receiversList
localbitcoinplusplus.wallets.my_local_flo_address)) { .includes(localbitcoinplusplus.wallets.my_local_flo_address)
return; )) return;
}
const isIncomingMessageValid = await validateIncomingMessage(res); const isIncomingMessageValid = await validateIncomingMessage(res);
console.log("isIncomingMessageValid: ", isIncomingMessageValid); console.log("isIncomingMessageValid: ", isIncomingMessageValid);
@ -16811,11 +16825,11 @@
try { try {
var res_obj = JSON.parse(res); var res_obj = JSON.parse(res);
// if (typeof res_obj.globalParams.receiverFloId=="string" if (typeof res_obj.globalParams !== "object"
// && res_obj.globalParams.receiverFloId !== || (typeof res_obj.globalParams.receiversList == "object"
// localbitcoinplusplus.wallets.my_local_flo_address) { && !request.globalParams.receiversList
// return; .includes(localbitcoinplusplus.wallets.my_local_flo_address)
// } )) return;
// Check if request is from primary user or backup user // Check if request is from primary user or backup user
// If request is from backup user, divert the request to backup onmessage event // If request is from backup user, divert the request to backup onmessage event