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

bug fix

Browse Source
This commit is contained in:
sairajzero 2019-11-16 20:18:09 +05:30
parent 2757aaa20e
commit 9c445a65fc
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
index.html
View File

@ -4892,6 +4892,7 @@
//Sign data using private-key //Sign data using private-key
signData: function (data, privateKeyHex) { signData: function (data, privateKeyHex) {
console.log(data)
var key = new Bitcoin.ECKey(privateKeyHex); var key = new Bitcoin.ECKey(privateKeyHex);
key.setCompressed(true); key.setCompressed(true);
@ -5240,7 +5241,7 @@
const KA = KB.toArray(); const KA = KB.toArray();
let pos = KB._indexOf(KB.root,flo_addr) let pos = KB._indexOf(KB.root,flo_addr)
var prevSupernode = [] var prevSupernode = []
for(var i = 0; i < n; i++){ for(var i = 1; i <= n; i++){
if(pos - i < 0) if(pos - i < 0)
var prev = pos - i + KA.length var prev = pos - i + KA.length
else else
@ -5263,7 +5264,7 @@
const KA = KB.toArray(); const KA = KB.toArray();
let pos = KB._indexOf(KB.root,flo_addr) let pos = KB._indexOf(KB.root,flo_addr)
var nextSupernode = [] var nextSupernode = []
for(var i = 0; i < n; i++){ for(var i = 1; i <= n; i++){
if(pos + i >= KA.length) if(pos + i >= KA.length)
var next = pos + i - KA.length var next = pos + i - KA.length
else else
@ -6047,13 +6048,12 @@
console.log(result) console.log(result)
serverPwd = prompt("Enter Server Pass!") serverPwd = prompt("Enter Server Pass!")
setInterval(refreshBlockchainData, 3600000); setInterval(refreshBlockchainData, 3600000);
floSupernode.initSupernode(serverPwd, myFloID).then(result => { floSupernode.initSupernode(serverPwd, myFloID).then(async result => {
console.log(result) console.log(result)
sleep(5000).then( _ => { await sleep(5000)
connectToAllBackupSupernode().then(result => { connectToAllBackupSupernode().then(result => {
console.log(result) console.log(result)
reactor.dispatchEvent("indicate_supernode_up",myFloID) reactor.dispatchEvent("indicate_supernode_up",myFloID)
})
}) })
}) })
}) })
@ -6124,7 +6124,7 @@
compactIDB.readAllData("supernodes").then(result => { compactIDB.readAllData("supernodes").then(result => {
floGlobals.supernodes = result floGlobals.supernodes = result
compactIDB.readAllData("config").then(result => { compactIDB.readAllData("config").then(result => {
floGlobals.config = result floGlobals.supernodeConfig = result
resolve("Read supernode from blockchain"); resolve("Read supernode from blockchain");
}) })
}) })
@ -6139,6 +6139,7 @@
resolve("Connected to all backup nodes") resolve("Connected to all backup nodes")
else{ else{
floSupernode.kBucket.getNextSupernode(curNode).then(nextBackupNode => { floSupernode.kBucket.getNextSupernode(curNode).then(nextBackupNode => {
console.log(nextBackupNode)
if(nextBackupNode[0].floID != myFloID){ if(nextBackupNode[0].floID != myFloID){
connectToBackupSupernode(nextBackupNode[0].floID).then(backupConn => { connectToBackupSupernode(nextBackupNode[0].floID).then(backupConn => {
floGlobals.backupNodes[i] = backupConn floGlobals.backupNodes[i] = backupConn
@ -6170,6 +6171,7 @@
function initateBackupWebsocket(backupNodeID){ function initateBackupWebsocket(backupNodeID){
return new Promise((resolve,reject) => { return new Promise((resolve,reject) => {
try{ try{
console.log(backupNodeID)
var backupNode = { var backupNode = {
floID: backupNodeID, floID: backupNodeID,
wsConn: new WebSocket("wss://" + floGlobals.supernodes[backupNodeID].uri + "/ws") wsConn: new WebSocket("wss://" + floGlobals.supernodes[backupNodeID].uri + "/ws")
@ -6237,9 +6239,9 @@
type: "startBackupStore", type: "startBackupStore",
snfloID: myFloID, snfloID: myFloID,
time: Date.now() time: Date.now()
}, }
sign: floCrypto.signData(JSON.stringify(this.backupMsg), myPrivKey)
} }
sendData1.sign = floCrypto.signData(JSON.stringify(sendData1.backupMsg), myPrivKey)
floGlobals.backupNodes[len].wsConn.send(JSON.stringify(sendData1)) floGlobals.backupNodes[len].wsConn.send(JSON.stringify(sendData1))
//inform the immediate next node of the dead to start serving it //inform the immediate next node of the dead to start serving it
if(index == 0){ if(index == 0){
@ -6249,9 +6251,9 @@
type: "startBackupServe", type: "startBackupServe",
snfloID: offlineNodeID, snfloID: offlineNodeID,
time: Date.now() time: Date.now()
}, }
sign: floCrypto.signData(JSON.stringify(this.backupMsg), myPrivKey)
} }
sendData2.sign = floCrypto.signData(JSON.stringify(sendData2.backupMsg), myPrivKey)
floGlobals.backupNodes[0].wsConn.send(JSON.stringify(sendData2)) floGlobals.backupNodes[0].wsConn.send(JSON.stringify(sendData2))
} }
}) })
@ -6261,13 +6263,14 @@
reactor.addEventListener("send_message_to_backup_nodes", function (backupMsg) { reactor.addEventListener("send_message_to_backup_nodes", function (backupMsg) {
console.log("send_message_to_backup_nodes"); console.log("send_message_to_backup_nodes");
//send message to all connected backup nodes //send message to all connected backup nodes
console.log(backupMsg)
var sendData = { var sendData = {
from: myFloID, from: myFloID,
backupMsg: backupMsg, backupMsg: backupMsg,
sign: floCrypto.signData(JSON.stringify(this.backupMsg), myPrivKey) sign: floCrypto.signData(JSON.stringify(backupMsg), myPrivKey)
} }
for(var i = 0; i < floGlobals.backupNodes.length; i++) for(var i = 0; i < floGlobals.backupNodes.length; i++)
floGlobals.backupNode[i].wsConn.send(sendData) floGlobals.backupNodes[i].wsConn.send(sendData)
}) })
reactor.registerEvent("send_message_to_node"); reactor.registerEvent("send_message_to_node");
@ -6281,7 +6284,7 @@
var sendData = { var sendData = {
from: myFloID, from: myFloID,
backupMsg: event.backupMsg, backupMsg: event.backupMsg,
sign: floCrypto.signData(JSON.stringify(this.backupMsg), myPrivKey) sign: floCrypto.signData(JSON.stringify(event.backupMsg), myPrivKey)
} }
nodeWS.send(JSON.stringify(this.sendData)) nodeWS.send(JSON.stringify(this.sendData))
} }
@ -6290,7 +6293,7 @@
var sendData = { var sendData = {
from: myFloID, from: myFloID,
backupMsg: event.bulkBackupMsg[i], backupMsg: event.bulkBackupMsg[i],
sign: floCrypto.signData(JSON.stringify(this.backupMsg), myPrivKey) sign: floCrypto.signData(JSON.stringify(event.bulkBackupMsg[i]), myPrivKey)
} }
nodeWS.send(JSON.stringify(this.sendData)) nodeWS.send(JSON.stringify(this.sendData))
} }
@ -6336,9 +6339,9 @@
snfloID: event.snfloID, snfloID: event.snfloID,
key: k, key: k,
value: result[k] value: result[k]
}, }
sign: floCrypto.signData(JSON.stringify(this.backupMsg), myPrivKey)
} }
sendData.sign = floCrypto.signData(JSON.stringify(sendData.backupMsg), myPrivKey)
requestorWS.send(JSON.stringify(sendData)) requestorWS.send(JSON.stringify(sendData))
} }
}).catch(error => console.log(error)) }).catch(error => console.log(error))
@ -6508,9 +6511,9 @@
type: "startBackupStore", type: "startBackupStore",
snfloID: snfloID, snfloID: snfloID,
time: Date.now() time: Date.now()
}, }
sign: floCrypto.signData(JSON.stringify(this.backupMsg), myPrivKey)
} }
sendData.sign = floCrypto.signData(JSON.stringify(sendData.backupMsg), myPrivKey)
var lastIndex = floGlobals.backupNodes.length - 1 var lastIndex = floGlobals.backupNodes.length - 1
floGlobals.backupNodes[lastIndex].wsConn.send(JSON.stringify(sendData)) floGlobals.backupNodes[lastIndex].wsConn.send(JSON.stringify(sendData))
} }
@ -6529,9 +6532,9 @@
type: "stopBackupStore", type: "stopBackupStore",
snfloID: snfloID, snfloID: snfloID,
time: Date.now() time: Date.now()
}, }
sign: floCrypto.signData(JSON.stringify(this.backupMsg), myPrivKey)
} }
sendData.sign = floCrypto.signData(JSON.stringify(sendData.backupMsg), myPrivKey)
var lastIndex = floGlobals.backupNodes.length - 1 var lastIndex = floGlobals.backupNodes.length - 1
floGlobals.backupNodes[lastIndex].wsConn.send(JSON.stringify(sendData)) floGlobals.backupNodes[lastIndex].wsConn.send(JSON.stringify(sendData))
}) })