From 556f4ddadd5a69439a6f6b76b6593e2384c835b3 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Tue, 7 Jan 2020 15:06:03 +0530 Subject: [PATCH 1/4] bug fix: floCloudAPI --- standard_Operations.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/standard_Operations.html b/standard_Operations.html index 7e85968..13badbd 100644 --- a/standard_Operations.html +++ b/standard_Operations.html @@ -8311,17 +8311,17 @@ Bitcoin.Util = { } }, - storeGeneralData: function(event){ + storeGeneralData: function(filterStr, dataSet){ try{ - dataSet = JSON.parse(event.dataSet); + dataSet = JSON.parse(dataSet); console.log(dataSet) - if(!Array.isArray(floGlobals.generalData[event.filterStr])) - floGlobals.generalData[event.filterStr] = [] + if(!Array.isArray(floGlobals.generalData[filterStr])) + floGlobals.generalData[filterStr] = [] for(vc in dataSet){ - floGlobals.generalData[event.filterStr].push({sender: dataSet[vc].senderID, vectorClock: vc, message: dataSet[vc].message}) - compactIDB.writeData("generalData", floGlobals.generalData[event.filterStr], event.filterStr) - floGlobals.generalVC[event.filterStr] = vc - compactIDB.writeData("generalVC", vc, event.filterStr) + floGlobals.generalData[filterStr].push({sender: dataSet[vc].senderID, vectorClock: vc, message: dataSet[vc].message}) + compactIDB.writeData("generalData", floGlobals.generalData[filterStr], filterStr) + floGlobals.generalVC[filterStr] = vc + compactIDB.writeData("generalVC", vc, filterStr) } }catch(error){ console.error(error) @@ -8403,12 +8403,12 @@ Bitcoin.Util = { mostRecent: true } floSupernode.requestData(JSON.stringify(request),request.receiverID).then(dataSet => { - this.util.resetData(filterStr, dataSet) + this.util.resetData(dataSet) request.type = `${objectName}@Update` request.lowerVectorClock = floGlobals.vectorClock[objectName]+1 request.mostRecent = false floSupernode.requestData(JSON.stringify(request), request.receiverID).then(dataSet => { - this.util.updateData(filterStr, dataSet) + this.util.updateData(dataSet) resolve('Object Data Updated') }).catch(error => reject(error)) }).catch(error => reject(error)) From e3e034ae0ad795c5c11d8f690ec686a0b4e7d13a Mon Sep 17 00:00:00 2001 From: sairajzero Date: Wed, 22 Jan 2020 22:25:02 +0530 Subject: [PATCH 2/4] bug fix: vectorClock IDB --- standard_Operations.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/standard_Operations.html b/standard_Operations.html index 13badbd..3c01100 100644 --- a/standard_Operations.html +++ b/standard_Operations.html @@ -8285,7 +8285,7 @@ Bitcoin.Util = { floGlobals.appObjects[message.object] = message.reset floGlobals.vectorClock[message.object] = vc compactIDB.writeData("appObjects", floGlobals.appObjects[message.object], message.object) - compactIDB.writeData("vectorClocks", vc, message.object) + compactIDB.writeData("vectorClock", vc, message.object) } } }catch(error){ @@ -8304,7 +8304,7 @@ Bitcoin.Util = { compactIDB.writeData("appObjects",floGlobals.appObjects[message.object], message.object) } floGlobals.vectorClock[message.object] = vc - compactIDB.writeData("vectorClocks", vc, message.object) + compactIDB.writeData("vectorClock", vc, message.object) } }catch(error){ console.error(error) @@ -8468,7 +8468,7 @@ Bitcoin.Util = { //for Dapps subAdmins:{}, appObjects:{}, - vectorClocks:{}, + vectorClock:{}, generalData:{}, generalVC:{} } @@ -8532,7 +8532,7 @@ Bitcoin.Util = { loadDataFromIDB: function(){ return new Promise((resolve,reject) => { - var loadData = ["appObjects", "vectorClocks", "generalData", "generalVC"] + var loadData = ["appObjects", "vectorClock", "generalData", "generalVC"] var promises = [] for(var i = 0; i < loadData.length; i++) promises[i] = compactIDB.readAllData(loadData[i]) From a44fe4be72078a15c3ebcc971f9d93fdd843e840 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Fri, 31 Jan 2020 14:42:42 +0530 Subject: [PATCH 3/4] adding custom input for privkey --- standard_Operations.html | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/standard_Operations.html b/standard_Operations.html index 3c01100..e073766 100644 --- a/standard_Operations.html +++ b/standard_Operations.html @@ -8481,6 +8481,11 @@ Bitcoin.Util = { }).catch(error => reject(error)); }) }, + + privKeyInput: function(){ + var privKey = prompt("Enter Private Key: ") + return privKey + }, startUpFunctions:{ @@ -8586,7 +8591,7 @@ Bitcoin.Util = { .catch(error => reject(error)) }else{ try{ - var privKey = prompt("Enter Private Key: ") + var privKey = floDapps.util.privKeyInput(); if(!privKey) return reject("Empty Private Key") var floID = floCrypto.getFloIDfromPubkeyHex(floCrypto.getPubKeyHex(privKey)) @@ -8665,6 +8670,10 @@ Bitcoin.Util = { this.util.startUpFunctions[fname] = fn; }, + setCustomPrivKeyInput: function(customFn){ + this.util.privKeyInput = customFn + }, + setAppObjectStores: function(appObs){ this.util.appObs = appObs }, @@ -8708,12 +8717,14 @@ Bitcoin.Util = { function onLoadStartUp() { - //addStartUpFunction('Sample', Promised Function) - //setAppObjectStores({sampleObs1:{}, sampleObs2:{options{autoIncrement:true, keyPath:'SampleKey'}, Indexes:{sampleIndex:{}}}}) + //floDapps.addStartUpFunction('Sample', Promised Function) + //floDapps.setAppObjectStores({sampleObs1:{}, sampleObs2:{options{autoIncrement:true, keyPath:'SampleKey'}, Indexes:{sampleIndex:{}}}}) + //floDapps.setCustomPrivKeyInput( () => { FUNCTION BODY *must return private key* } ) floDapps.launchStartUp().then(result => { console.log(result) alert(`Welcome FLO_ID: ${myFloID}`) + //App functions.... }).catch(error => console.error(error)) } From 2bf166ffd16765a9553b42c47bc2e73cc3df4367 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Fri, 31 Jan 2020 20:22:35 +0530 Subject: [PATCH 4/4] bug fix: floSupernode module --- standard_Operations.html | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/standard_Operations.html b/standard_Operations.html index e073766..1a2a1e1 100644 --- a/standard_Operations.html +++ b/standard_Operations.html @@ -7638,16 +7638,17 @@ Bitcoin.Util = { sendDataToSN(data, snfloID){ return new Promise((resolve, reject) => { - console.log(snfloID) var websocket = new WebSocket("wss://" + floGlobals.supernodes[snfloID].uri + "/ws"); websocket.onmessage = (evt => { if(evt.data == '$+'){ websocket.send(data); resolve(`Data sent to supernode : ${snfloID}`); }else if(evt.data == '$-'){ - this.kBucket.getNextSupernode(snfloID) - .then(nextNode => this.sendDataToSN(data, nextNode[0])) - .catch(error => reject(error)) + this.kBucket.getNextSupernode(snfloID).then(nextNode => { + this.sendDataToSN(data, nextNode[0]) + .then(result => resolve(result)) + .catch(error => reject(error)) + }).catch(error => reject(error)) }else{ console.log(evt.data) reject(evt.data) @@ -7655,9 +7656,11 @@ Bitcoin.Util = { websocket.close(); }) websocket.onerror = (evt) => { - this.kBucket.getNextSupernode(snfloID) - .then(nextNode => this.sendDataToSN(data, nextNode[0])) - .catch(error => reject(error)) + this.kBucket.getNextSupernode(snfloID).then(nextNode => { + this.sendDataToSN(data, nextNode[0]) + .then(result => resolve(result)) + .catch(error => reject(error)) + }).catch(error => reject(error)) }; }) }, @@ -7682,9 +7685,11 @@ Bitcoin.Util = { if(evt.data == '$+'){ websocket.send(`?${request}`); }else if(evt.data == '$-'){ - this.kBucket.getNextSupernode(snfloID) - .then(nextNode => this.requestDataFromSN(request, nextNode[0])) - .catch(error => reject(error)) + this.kBucket.getNextSupernode(snfloID).then(nextNode => { + this.requestDataFromSN(request, nextNode[0]) + .then(result => resolve(result)) + .catch(error => reject(error)) + }).catch(error => reject(error)) websocket.close() }else{ resolve(evt.data); @@ -7692,9 +7697,11 @@ Bitcoin.Util = { } }) websocket.onerror = (evt) => { - this.kBucket.getNextSupernode(snfloID) - .then(nextNode => this.requestDataFromSN(request, nextNode[0])) - .catch(error => reject(error)) + this.kBucket.getNextSupernode(snfloID).then(nextNode => { + this.requestDataFromSN(request, nextNode[0]) + .then(result => resolve(result)) + .catch(error => reject(error)) + }).catch(error => reject(error)) }; }) },