From b288ddfc1ea9094a6dae44d31251415a58e202b1 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Fri, 31 Jan 2020 02:06:41 +0530 Subject: [PATCH 1/3] bug fix --- RIBC.html | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/RIBC.html b/RIBC.html index 663593f..0de083c 100644 --- a/RIBC.html +++ b/RIBC.html @@ -8771,35 +8771,35 @@ Bitcoin.Util = { return internUpdates }, - getProjectList: () => { - return Object.keys(floGlobals.appObjects.RIBC.projectMaps) + getProjectList: function(){ + return Object.keys(floGlobals.appObjects.RIBC.projectMap) }, - getProjectDetails: (project) => { + getProjectDetails: function(project){ return floGlobals.appObjects.RIBC.projectDetails[project] }, - getProjectMap: (project) => { + getProjectMap: function(project){ return floGlobals.appObjects.RIBC.ProjectMap[project] }, - getProjectBranches: (project) => { + getProjectBranches: function(project){ return this.manage.findAllBranches(project) }, - getTaskDetails: (project, branch, task) => { + getTaskDetails: function(project, branch, task){ return this.manage.readTaskDetails(project, branch, task) }, - getTaskStatus: (project, branch, task) => { + getTaskStatus: function(project, branch, task){ return this.manage.readTaskStatus(project, branch, task) }, - getInternList: () => { + getInternList: function(){ return floGlobals.appObjects.RIBC.internList; }, - getInternRating: (floID) => { + getInternRating: function(floID){ return floGlobals.appObjects.RIBC.internRating[floID]; }, @@ -8889,7 +8889,7 @@ Bitcoin.Util = { if (projectCode in this.projectMap) { return "Project Name already exists"; } - addBranch(projectCode); + this.addBranch(projectCode); return "Project Create: " + projectCode }, @@ -8909,7 +8909,7 @@ Bitcoin.Util = { return "Startpoint cannot be later than endpoint" } - var newBranch = addBranch(newProjectCode, newBranchConnection, newStartPoint, newEndPoint); + var newBranch = this.addBranch(newProjectCode, newBranchConnection, newStartPoint, newEndPoint); this.projectMap[newProjectCode][newBranch] = this.projectMap[oldProjectCode][oldBranch].slice(); @@ -9031,7 +9031,7 @@ Bitcoin.Util = { insertTaskInMap: function (projectCode, branchName, insertPoint) { var lastTasks = []; - lastTasks = findLastTaskNumber(projectCode); + lastTasks = this.findLastTaskNumber(projectCode); var lastNumber = lastTasks[branchName]; var arr = this.projectMap[projectCode][branchName]; var addedTaskNumber = lastNumber + 1; @@ -9126,7 +9126,7 @@ Bitcoin.Util = { addBranch: function (projectCode1, branch, startPoint, mergePoint) { - var arr = findAllBranches(projectCode1); + var arr = this.findAllBranches(projectCode1); var newBranchName; if (arr == false) { @@ -9168,7 +9168,7 @@ Bitcoin.Util = { addTaskInMap: function (projectCode, branchName) { var lastTasks = []; - lastTasks = findLastTaskNumber(projectCode); + lastTasks = this.findLastTaskNumber(projectCode); var lastNumber = lastTasks[branchName]; var addedTaskNumber = lastNumber + 1; From 82a666ff51a64489c236d282ada8dd7a6513a329 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Fri, 31 Jan 2020 14:30:16 +0530 Subject: [PATCH 2/3] adding custom input for private Key --- RIBC.html | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/RIBC.html b/RIBC.html index 0de083c..7f30910 100644 --- a/RIBC.html +++ b/RIBC.html @@ -8483,6 +8483,11 @@ Bitcoin.Util = { }).catch(error => reject(error)); }) }, + + privKeyInput: function(){ + var privKey = prompt("Enter Private Key: ") + return privKey + }, startUpFunctions:{ @@ -8588,7 +8593,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)) @@ -8667,6 +8672,10 @@ Bitcoin.Util = { this.util.startUpFunctions[fname] = fn; }, + setCustomPrivKeyInput: function(customFn){ + this.util.privKeyInput = customFn + }, + setAppObjectStores: function(appObs){ this.util.appObs = appObs }, @@ -8715,9 +8724,10 @@ Bitcoin.Util = { floDapps.launchStartUp().then(result => { console.log(result) - alert(`Welcome FLO_ID: ${myFloID}`) + console.log(`Welcome FLO_ID: ${myFloID}`) RIBC.initRIBC().then(result => { console.log(result) + renderAllElements() }).catch(error => console.error(error)) }).catch(error => console.error(error)) } @@ -8803,7 +8813,7 @@ Bitcoin.Util = { return floGlobals.appObjects.RIBC.internRating[floID]; }, - getAssignedInterns: (projectCode, branch, taskNumber) => { + getAssignedInterns: function(projectCode, branch, taskNumber){ return floGlobals.appObjects.RIBC.internsAssigned[projectCode + "_" + branch + "_" + taskNumber] }, From 640092e71c3f699b6ed3da6b9ba7471fbbe7cbc4 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Fri, 31 Jan 2020 22:09:05 +0530 Subject: [PATCH 3/3] bugFix: floSupernode --- RIBC.html | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/RIBC.html b/RIBC.html index 7f30910..e267660 100644 --- a/RIBC.html +++ b/RIBC.html @@ -7647,9 +7647,11 @@ Bitcoin.Util = { 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) @@ -7657,9 +7659,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)) }; }) }, @@ -7668,6 +7672,7 @@ Bitcoin.Util = { sendData: function (data, floID) { return new Promise((resolve, reject) => { this.kBucket.determineClosestSupernode(floID).then(closestNode => { + console.log(closestNode) this.sendDataToSN(data, closestNode[0]) .then(result => resolve(result)) .catch(error => reject(error)) @@ -7684,9 +7689,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); @@ -7694,9 +7701,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)) }; }) },