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

fixed errors in backup syncing by primary supernode

Browse Source
This commit is contained in:
Abhishek Sinha 2019-06-05 14:54:51 +05:30
parent d8ce4c9745
commit c2c95789f1
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
supernode/index.html
View File

@ -12612,7 +12612,8 @@
const tableArray = ["deposit", "withdraw_cash", "withdraw_btc", const tableArray = ["deposit", "withdraw_cash", "withdraw_btc",
"crypto_balances", "cash_balances", "userPublicData" "crypto_balances", "cash_balances", "userPublicData"
]; ];
localbitcoinplusplus.actions.get_sharable_db_data(tableArray).then(
localbitcoinplusplus.actions.get_sharable_db_data(tableArray, primarySupernodeOfThisUser).then(
function (su_db_data) { function (su_db_data) {
if (typeof su_db_data == "object") { if (typeof su_db_data == "object") {
su_db_data.trader_flo_address = params.trader_flo_address; su_db_data.trader_flo_address = params.trader_flo_address;
@ -12677,7 +12678,8 @@
.call(this, "sync_backup_supernode_from_backup_supernode_response", .call(this, "sync_backup_supernode_from_backup_supernode_response",
su_db_data) su_db_data)
.then(server_sync_response=> .then(server_sync_response=>
doSend(server_sync_response, params.requester_flo_id)); doSend(server_sync_response));
//doSend(server_sync_response, params.requester_flo_id));
} }
}); });
} }
@ -15351,6 +15353,7 @@
} }
if (res_obj.method==="sync_backup_supernode_from_backup_supernode" if (res_obj.method==="sync_backup_supernode_from_backup_supernode"
|| res_obj.method==="sync_primary_supernode_from_backup_supernode_response" || res_obj.method==="sync_primary_supernode_from_backup_supernode_response"
|| res_obj.method==="sync_backup_supernode_from_backup_supernode_response"
) { ) {
onMessage(response); onMessage(response);
return; return;
@ -20159,14 +20162,18 @@
firstAliveBackupFloIdForBackupSupernode, closestSuNodes[index].trader_flo_address); firstAliveBackupFloIdForBackupSupernode, closestSuNodes[index].trader_flo_address);
} else { } else {
// it will ask backup from backup su next closest // it will ask backup from backup su next closest
for (let j = index-1; j >= index-localbitcoinplusplus.master_configurations.MaxBackups; j--) { for (let j = index; j < index+localbitcoinplusplus.master_configurations.MaxBackups; j++) {
const nextBKSu = closestSuNodes[j].trader_flo_address; let actual_num = j%index;
const nextBKSu = closestSuNodes[actual_num].trader_flo_address;
if (nextBKSu !== idbData.myLocalFLOAddress if (nextBKSu !== idbData.myLocalFLOAddress
&& closestSuNodes[index].is_live==true && closestSuNodes[actual_num].is_live==true
&& typeof firstAliveBackupFloIdForBackupSupernode !== "string") { && typeof firstAliveBackupFloIdForBackupSupernode !== "string") {
firstAliveBackupFloIdForBackupSupernode = closestSuNodes[actual_num].trader_flo_address;
localbitcoinplusplus.actions localbitcoinplusplus.actions
.sync_backup_supernode_from_backup_supernode(closestSuNodes[0].trader_flo_address, .sync_backup_supernode_from_backup_supernode(closestSuNodes[0].trader_flo_address,
firstAliveBackupFloIdForBackupSupernode, closestSuNodes[j].trader_flo_address); firstAliveBackupFloIdForBackupSupernode, closestSuNodes[index].trader_flo_address);
} }
} }
} }
@ -20916,7 +20923,8 @@
// ReadyState was 3 when this node disconnected. Re-initiate the // ReadyState was 3 when this node disconnected. Re-initiate the
// WS connection to be able to send/receive messages // WS connection to be able to send/receive messages
if (typeof localbitcoinplusplus.backupWS[getFLOId]=="object") { if (typeof localbitcoinplusplus.backupWS[getFLOId]=="object"
&& localbitcoinplusplus.backupWS[getFLOId].ws_connection.readyState !== 1) {
const back_ws_url = localbitcoinplusplus.backupWS[getFLOId].ws_url; const back_ws_url = localbitcoinplusplus.backupWS[getFLOId].ws_url;
localbitcoinplusplus.backupWS[getFLOId] = null; localbitcoinplusplus.backupWS[getFLOId] = null;
localbitcoinplusplus.backupWS[getFLOId] = new backupSupernodesWebSocketObject(back_ws_url); localbitcoinplusplus.backupWS[getFLOId] = new backupSupernodesWebSocketObject(back_ws_url);