Update flo-webwallet.js
- Wrapped flo webwallet module inside IIF. - use strict for flo webwallet module - moved onload fn to index.html
This commit is contained in:
sairajzero
parent
d4673462c0
commit
f89cf27826
16
index.html
16
index.html
@ -24,6 +24,21 @@
|
|||||||
<script src="scripts/floBlockchainAPI.js"></script>
|
<script src="scripts/floBlockchainAPI.js"></script>
|
||||||
<script src="scripts/compactIDB.js"></script>
|
<script src="scripts/compactIDB.js"></script>
|
||||||
<script src="scripts/flo-webwallet.js"></script>
|
<script src="scripts/flo-webwallet.js"></script>
|
||||||
|
<script>
|
||||||
|
function onLoadStartUp() {
|
||||||
|
var IDBObjects = {
|
||||||
|
lastSync: {},
|
||||||
|
labels: {},
|
||||||
|
pinnedIds: {},
|
||||||
|
transactions: {}
|
||||||
|
}
|
||||||
|
compactIDB.initDB("FLOwebWallet", IDBObjects).then(result => {
|
||||||
|
showPage(window.location.hash)
|
||||||
|
render.savedIds();
|
||||||
|
console.log(result)
|
||||||
|
}).catch(error => console.error(error))
|
||||||
|
}
|
||||||
|
</script>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body onload="onLoadStartUp()" class="hide">
|
<body onload="onLoadStartUp()" class="hide">
|
||||||
@ -1706,4 +1721,5 @@
|
|||||||
]
|
]
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
@ -1,16 +1,81 @@
|
|||||||
/*FLO Web Wallet operations*/
|
(function (EXPORTS) {
|
||||||
floWebWallet = {
|
/*FLO Web Wallet operations*/
|
||||||
|
'use strict';
|
||||||
|
const floWebWallet = EXPORTS;
|
||||||
|
|
||||||
|
//generate a new Address triplet : resolves Object(floID,pubKey,privKey)
|
||||||
|
floWebWallet.generateNewAddr = function () {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
try {
|
||||||
|
var triplet = floCrypto.generateNewID();
|
||||||
|
resolve(triplet);
|
||||||
|
} catch (error) {
|
||||||
|
reject(error);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
//recover triplet from given privKey : resolves Object(floID,pubKey,privKey)
|
||||||
|
floWebWallet.recoverAddr = function (privKey) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
try {
|
||||||
|
var triplet = {}
|
||||||
|
triplet.privKey = privKey;
|
||||||
|
triplet.pubKey = floCrypto.getPubKeyHex(triplet.privKey);
|
||||||
|
triplet.floID = floCrypto.getFloID(triplet.pubKey);
|
||||||
|
resolve(triplet);
|
||||||
|
} catch (error) {
|
||||||
|
reject(error);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
//get balance of addr using API : resolves (balance)
|
||||||
|
floWebWallet.getBalance = function (addr) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
floBlockchainAPI.getBalance(addr)
|
||||||
|
.then(txid => resolve(txid))
|
||||||
|
.catch(error => reject(error))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
//send transaction to the blockchain using API : resolves (txid)
|
||||||
|
floWebWallet.sendTransaction = function (sender, receiver, amount, floData, privKey) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
floBlockchainAPI.sendTx(sender, receiver, amount, privKey, floData)
|
||||||
|
.then(txid => resolve(txid))
|
||||||
|
.catch(error => reject(error))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
//sync new transactions from blockchain using API and stores in IDB : resolves Array(newItems)
|
||||||
|
floWebWallet.syncTransactions = function (addr) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
compactIDB.readData('lastSync', addr).then(lastSync => {
|
||||||
|
lastSync = lastSync | 0;
|
||||||
|
getNewTxs(addr, lastSync).then(APIresult => {
|
||||||
|
compactIDB.readData('transactions', addr).then(IDBresult => {
|
||||||
|
if (IDBresult === undefined)
|
||||||
|
var promise1 = compactIDB.addData('transactions', APIresult.items, addr)
|
||||||
|
else
|
||||||
|
var promise1 = compactIDB.writeData('transactions', IDBresult.concat(APIresult.items), addr)
|
||||||
|
var promise2 = compactIDB.writeData('lastSync', APIresult.totalItems, addr)
|
||||||
|
Promise.all([promise1, promise2]).then(values => resolve(APIresult.items))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}).catch(error => reject(error))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
util: {
|
|
||||||
//Get new Tx in blockchain since last sync using API
|
//Get new Tx in blockchain since last sync using API
|
||||||
getNewTxs: function (addr, ignoreOld) {
|
function getNewTxs(addr, ignoreOld) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
floBlockchainAPI.readTxs(addr, 0, 1).then(response => {
|
floBlockchainAPI.readTxs(addr, 0, 1).then(response => {
|
||||||
var newItems = response.totalItems - ignoreOld;
|
var newItems = response.totalItems - ignoreOld;
|
||||||
if (newItems) {
|
if (newItems) {
|
||||||
floBlockchainAPI.readTxs(addr, 0, newItems * 2).then(response => {
|
floBlockchainAPI.readTxs(addr, 0, newItems * 2).then(response => {
|
||||||
var filteredData = [];
|
var filteredData = [];
|
||||||
for (i = 0; i < newItems; i++) {
|
for (let i = 0; i < newItems; i++) {
|
||||||
var item = {
|
var item = {
|
||||||
time: response.items[i].time,
|
time: response.items[i].time,
|
||||||
txid: response.items[i].txid,
|
txid: response.items[i].txid,
|
||||||
@ -42,103 +107,23 @@ floWebWallet = {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
|
||||||
|
|
||||||
//generate a new Address triplet : resolves Object(floID,pubKey,privKey)
|
|
||||||
generateNewAddr: function () {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
try {
|
|
||||||
var triplet = floCrypto.generateNewID();
|
|
||||||
resolve(triplet);
|
|
||||||
} catch (error) {
|
|
||||||
reject(error);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
|
||||||
|
|
||||||
//recover triplet from given privKey : resolves Object(floID,pubKey,privKey)
|
|
||||||
recoverAddr: function (privKey) {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
try {
|
|
||||||
var triplet = {}
|
|
||||||
triplet.privKey = privKey;
|
|
||||||
triplet.pubKey = floCrypto.getPubKeyHex(triplet.privKey);
|
|
||||||
triplet.floID = floCrypto.getFloID(triplet.pubKey);
|
|
||||||
resolve(triplet);
|
|
||||||
} catch (error) {
|
|
||||||
reject(error);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
|
||||||
|
|
||||||
//get balance of addr using API : resolves (balance)
|
|
||||||
getBalance: function (addr) {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
floBlockchainAPI.getBalance(addr)
|
|
||||||
.then(txid => resolve(txid))
|
|
||||||
.catch(error => reject(error))
|
|
||||||
})
|
|
||||||
},
|
|
||||||
|
|
||||||
//send transaction to the blockchain using API : resolves (txid)
|
|
||||||
sendTransaction: function (sender, receiver, amount, floData, privKey) {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
floBlockchainAPI.sendTx(sender, receiver, amount, privKey, floData)
|
|
||||||
.then(txid => resolve(txid))
|
|
||||||
.catch(error => reject(error))
|
|
||||||
})
|
|
||||||
},
|
|
||||||
|
|
||||||
//sync new transactions from blockchain using API and stores in IDB : resolves Array(newItems)
|
|
||||||
syncTransactions: function (addr) {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
compactIDB.readData('lastSync', addr).then(lastSync => {
|
|
||||||
lastSync = lastSync | 0;
|
|
||||||
this.util.getNewTxs(addr, lastSync).then(APIresult => {
|
|
||||||
compactIDB.readData('transactions', addr).then(IDBresult => {
|
|
||||||
if (IDBresult === undefined)
|
|
||||||
var promise1 = compactIDB.addData('transactions', APIresult.items, addr)
|
|
||||||
else
|
|
||||||
var promise1 = compactIDB.writeData('transactions', IDBresult.concat(APIresult.items), addr)
|
|
||||||
var promise2 = compactIDB.writeData('lastSync', APIresult.totalItems, addr)
|
|
||||||
Promise.all([promise1, promise2]).then(values => resolve(APIresult.items))
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}).catch(error => reject(error))
|
|
||||||
})
|
|
||||||
},
|
|
||||||
|
|
||||||
//read transactions stored in IDB : resolves Array(storedItems)
|
//read transactions stored in IDB : resolves Array(storedItems)
|
||||||
readTransactions: function (addr) {
|
floWebWallet.readTransactions = function (addr) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
compactIDB.readData('transactions', addr)
|
compactIDB.readData('transactions', addr)
|
||||||
.then(IDBresult => resolve(IDBresult))
|
.then(IDBresult => resolve(IDBresult))
|
||||||
.catch(error => reject(error))
|
.catch(error => reject(error))
|
||||||
})
|
})
|
||||||
},
|
}
|
||||||
|
|
||||||
//get address-label pairs from IDB : resolves Object(addr:label)
|
//get address-label pairs from IDB : resolves Object(addr:label)
|
||||||
getLabels: function () {
|
floWebWallet.getLabels = function () {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
compactIDB.readAllData('labels')
|
compactIDB.readAllData('labels')
|
||||||
.then(IDBresult => resolve(IDBresult))
|
.then(IDBresult => resolve(IDBresult))
|
||||||
.catch(error => reject(error))
|
.catch(error => reject(error))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function onLoadStartUp() {
|
})(window.floWebWallet = {});
|
||||||
var IDBObjects = {
|
|
||||||
lastSync: {},
|
|
||||||
labels: {},
|
|
||||||
pinnedIds: {},
|
|
||||||
transactions: {}
|
|
||||||
}
|
|
||||||
compactIDB.initDB("FLOwebWallet", IDBObjects)
|
|
||||||
.then(result => {
|
|
||||||
showPage(window.location.hash)
|
|
||||||
render.savedIds();
|
|
||||||
console.log(result)
|
|
||||||
})
|
|
||||||
.catch(error => console.error(error))
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user