diff --git a/floBank.html b/floBank.html
index 10286bd..9f940ba 100644
--- a/floBank.html
+++ b/floBank.html
@@ -30,7 +30,11 @@
vectorClock: {},
appObjects: {},
generalData: {},
- generalVC: {}
+ generalVC: {},
+
+ //bank app
+ policy: {},
+ collaterals : []
}
@@ -8332,7 +8336,7 @@ Bitcoin.Util = {
if(!Array.isArray(floGlobals.generalData[filterStr]))
floGlobals.generalData[filterStr] = []
for(vc in dataSet){
- floGlobals.generalData[filterStr].push({sender: dataSet[vc].senderID, vectorClock: vc, message: dataSet[vc].message})
+ floGlobals.generalData[filterStr].push({sender: dataSet[vc].senderID, vectorClock: vc, message: dataSet[vc].message, pubKey: dataSet[vc].pubKey})
compactIDB.writeData("generalData", floGlobals.generalData[filterStr], filterStr)
floGlobals.generalVC[filterStr] = vc
compactIDB.writeData("generalVC", vc, filterStr)
@@ -8487,7 +8491,11 @@ Bitcoin.Util = {
appObjects:{},
vectorClock:{},
generalData:{},
- generalVC:{}
+ generalVC:{},
+
+ //bankApp
+ collaterals: {},
+ policy: {}
}
//add other given objectStores
for(o in this.appObs)
@@ -8546,11 +8554,23 @@ Bitcoin.Util = {
if(Array.isArray(content.addSubAdmin))
for(var k = 0; k < content.addSubAdmin.length; k++)
compactIDB.writeData("subAdmins",true,content.addSubAdmin[k]);
+ for(let c in content.removeCollateral)
+ compactIDB.removeData("collaterals", c);
+ for(let c in content.addCollateral)
+ compactIDB.writeData("collaterals", content.addCollateral[c], c);
+ for(let p in content.policy)
+ compactIDB.writeData("policy", content.policy[p], p);
}
compactIDB.writeData("lastTx",result.totalTxs,floGlobals.adminID);
+
compactIDB.readAllData("subAdmins").then(result => {
floGlobals.subAdmins = Object.keys(result);
- resolve("Read subAdmins from blockchain");
+ let dataList = ["collaterals", "policy"]
+ Promises.all(dataList.map(d => compactIDB.readAllData(d))).then(results => {
+ for(let i in dataList)
+ floGlobals[dataList[i]] = results[i]
+ resolve("Read subAdmins from blockchain");
+ })
})
})
}).catch(error => reject(error))
@@ -8773,7 +8793,7 @@ Bitcoin.Util = {
floDapps.launchStartUp().then(result => {
console.log(result)
alert(`Welcome FLO_ID: ${myFloID}`)
- floBank.initApp()
+ floBank.refreshAppData()
.then(result => console.log(result))
.catch(error => console.error(error))
//App functions....
@@ -8784,153 +8804,467 @@ Bitcoin.Util = {