There seems to be a problem connecting to the internet.
RanchiMallFLO web wallet
Monitor
Monitor FLO data
Send
Send FLO data
Generate
Generate address
Settings
Settings
Copied
Add new address to monitoring list
Edit display card
Available balance
0
To send FLO data, make sure you have enough balance.
Send
Transaction successful
Dark mode
Automatic Dark mode active : 6pm - 6am
Manual Dark mode
Clear all local data
This will delete all local Web Wallet data like added addresses and locally stored transactions.After clearing local data you may experience slow loading of newly added address, please proceed cautiously!
- There seems to be a problem connecting to the internet.
-
-
-
-
- RanchiMall
-
- FLO web wallet
-
-
-
-
-
-
-
-
-
-
Generate
- Generate address
-
-
-
-
Send
- Send FLO data
-
-
-
-
Monitor
- Monitor FLO data
-
-
-
-
Settings
- Settings
-
-
-
-
- Copied
-
-
-
-
-
Add new address to monitoring list
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Edit display card
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Available balance
- 0
- FLO(s)
-
To send FLO data, make sure you have enough balance.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
1040/1040
-
-
-
-
-
-
-
-
-
Send
-
-
-
-
-
-
-
-
-
-
-
-
-
Transaction successful
-
-
-
-
-
-
-
-
-
-
-
-
Dark mode
-
-
- Automatic
- Dark mode active : 6pm - 6am
-
-
-
-
- Manual
- Dark mode
-
-
-
-
-
-
Clear all local data
-
This will delete all local Web Wallet data like added addresses and locally stored
- transactions.After clearing local data you may experience slow loading of newly added address,
- please proceed cautiously!
', customElements.define("sm-input", class extends HTMLElement { constructor() { super(), this.attachShadow({ mode: "open" }).append(smInput.content.cloneNode(!0)), this.inputParent = this.shadowRoot.querySelector(".input"), this.input = this.shadowRoot.querySelector("input"), this.clearBtn = this.shadowRoot.querySelector(".clear"), this.label = this.shadowRoot.querySelector(".label"), this.feedbackText = this.shadowRoot.querySelector(".feedback-text"), this.outerContainer = this.shadowRoot.querySelector(".outer-container"), this.optionList = this.shadowRoot.querySelector(".datalist"), this._helperText = "", this._errorText = "", this.isRequired = !1, this.datalist = [], this.validationFunction = void 0, this.reflectedAttributes = ["value", "required", "disabled", "type", "inputmode", "readonly", "min", "max", "pattern", "minlength", "maxlength", "step", "list", "autocomplete"], this.reset = this.reset.bind(this), this.clear = this.clear.bind(this), this.focusIn = this.focusIn.bind(this), this.focusOut = this.focusOut.bind(this), this.fireEvent = this.fireEvent.bind(this), this.checkInput = this.checkInput.bind(this), this.showError = this.showError.bind(this), this.allowOnlyNum = this.allowOnlyNum.bind(this), this.handleOptionClick = this.handleOptionClick.bind(this), this.handleInputNavigation = this.handleInputNavigation.bind(this), this.handleDatalistNavigation = this.handleDatalistNavigation.bind(this), this.handleFocus = this.handleFocus.bind(this), this.handleBlur = this.handleBlur.bind(this) } static get observedAttributes() { return ["value", "placeholder", "required", "disabled", "type", "inputmode", "readonly", "min", "max", "pattern", "minlength", "maxlength", "step", "helper-text", "error-text", "list"] } get value() { return this.input.value } set value(t) { t !== this.input.value && (this.input.value = t, this.checkInput()) } get placeholder() { return this.getAttribute("placeholder") } set placeholder(t) { this.setAttribute("placeholder", t) } get type() { return this.getAttribute("type") } set type(t) { this.setAttribute("type", t) } get validity() { return this.input.validity } get disabled() { return this.hasAttribute("disabled") } set disabled(t) { t ? (this.inputParent.classList.add("disabled"), this.setAttribute("disabled", "")) : (this.inputParent.classList.remove("disabled"), this.removeAttribute("disabled")) } get readOnly() { return this.hasAttribute("readonly") } set readOnly(t) { t ? this.setAttribute("readonly", "") : this.removeAttribute("readonly") } set customValidation(t) { this.validationFunction = t } set errorText(t) { this._errorText = t } showError() { this.feedbackText.className = "feedback-text error", this.feedbackText.innerHTML = ` ${this._errorText}` } set helperText(t) { this._helperText = t } get isValid() { if ("" !== this.input.value) { const t = this.input.checkValidity(); let e = !0; return this.validationFunction && (e = Boolean(this.validationFunction(this.input.value))), t && e ? (this.feedbackText.className = "feedback-text success", this.feedbackText.textContent = "") : this._errorText && this.showError(), t && e } } reset() { this.value = "" } clear() { this.value = "", this.input.focus(), this.fireEvent() } focusIn() { this.input.focus() } focusOut() { this.input.blur() } fireEvent() { let t = new Event("input", { bubbles: !0, cancelable: !0, composed: !0 }); this.dispatchEvent(t) } searchDatalist(t) { const e = this.datalist.filter(e => e.toLowerCase().includes(t.toLowerCase())); if (e.sort((e, n) => { const i = e.toLowerCase().indexOf(t.toLowerCase()), s = n.toLowerCase().indexOf(t.toLowerCase()); return i - s }), e.length) { if (this.optionList.children.length > e.length) { const t = this.optionList.children.length - e.length; for (let e = 0; e < t; e++)this.optionList.removeChild(this.optionList.lastChild) } e.forEach((t, e) => { if (this.optionList.children[e]) this.optionList.children[e].textContent = t; else { const e = document.createElement("li"); e.textContent = t, e.classList.add("datalist-item"), e.setAttribute("tabindex", "0"), this.optionList.appendChild(e) } }), this.optionList.classList.remove("hidden") } else this.optionList.classList.add("hidden") } checkInput(t) { this.hasAttribute("readonly") || ("" !== this.input.value ? this.clearBtn.classList.remove("hidden") : this.clearBtn.classList.add("hidden")), this.hasAttribute("placeholder") && "" !== this.getAttribute("placeholder").trim() && ("" !== this.input.value ? (this.animate ? this.inputParent.classList.add("animate-placeholder") : this.label.classList.add("hidden"), this.datalist.length && (this.searchTimeout && clearTimeout(this.searchTimeout), this.searchTimeout = setTimeout(() => { this.searchDatalist(this.input.value.trim()) }, 100))) : (this.animate ? this.inputParent.classList.remove("animate-placeholder") : this.label.classList.remove("hidden"), this.feedbackText.textContent = "", this.datalist.length && (this.optionList.innerHTML = "", this.optionList.classList.add("hidden")))) } allowOnlyNum(t) { 1 === t.key.length && (("." !== t.key || !t.target.value.includes(".") && 0 !== t.target.value.length) && ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "."].includes(t.key) || t.preventDefault()) } handleOptionClick(t) { this.input.value = t.target.textContent, this.optionList.classList.add("hidden"), this.input.focus() } handleInputNavigation(t) { "ArrowDown" === t.key ? (t.preventDefault(), this.optionList.children.length && this.optionList.children[0].focus()) : "ArrowUp" === t.key && (t.preventDefault(), this.optionList.children.length && this.optionList.children[this.optionList.children.length - 1].focus()) } handleDatalistNavigation(t) { "ArrowUp" === t.key ? (t.preventDefault(), this.shadowRoot.activeElement.previousElementSibling ? this.shadowRoot.activeElement.previousElementSibling.focus() : this.input.focus()) : "ArrowDown" === t.key ? (t.preventDefault(), this.shadowRoot.activeElement.nextElementSibling ? this.shadowRoot.activeElement.nextElementSibling.focus() : this.input.focus()) : "Enter" !== t.key && " " !== t.key || (t.preventDefault(), this.input.value = t.target.textContent, this.optionList.classList.add("hidden"), this.input.focus()) } handleFocus(t) { this.datalist.length && this.searchDatalist(this.input.value.trim()) } handleBlur(t) { this.datalist.length && this.optionList.classList.add("hidden") } connectedCallback() { this.animate = this.hasAttribute("animate"), this.setAttribute("role", "textbox"), this.input.addEventListener("input", this.checkInput), this.clearBtn.addEventListener("click", this.clear), this.datalist.length && (this.optionList.addEventListener("click", this.handleOptionClick), this.input.addEventListener("keydown", this.handleInputNavigation), this.optionList.addEventListener("keydown", this.handleDatalistNavigation)), this.input.addEventListener("focusin", this.handleFocus), this.addEventListener("focusout", this.handleBlur) } attributeChangedCallback(t, e, n) { if (e !== n) switch (this.reflectedAttributes.includes(t) && (this.hasAttribute(t) ? this.input.setAttribute(t, this.getAttribute(t) ? this.getAttribute(t) : "") : this.input.removeAttribute(t)), t) { case "placeholder": this.label.textContent = n, this.setAttribute("aria-label", n); break; case "value": this.checkInput(); break; case "type": this.hasAttribute("type") && "number" === this.getAttribute("type") ? (this.input.setAttribute("inputmode", "decimal"), this.input.addEventListener("keydown", this.allowOnlyNum)) : this.input.removeEventListener("keydown", this.allowOnlyNum); break; case "helper-text": this._helperText = n; break; case "error-text": this._errorText = n; break; case "required": this.isRequired = this.hasAttribute("required"), this.isRequired ? this.setAttribute("aria-required", "true") : this.setAttribute("aria-required", "false"); break; case "readonly": this.hasAttribute("readonly") ? this.inputParent.classList.add("readonly") : this.inputParent.classList.remove("readonly"); break; case "disabled": this.hasAttribute("disabled") ? this.inputParent.classList.add("disabled") : this.inputParent.classList.remove("disabled"); break; case "list": this.hasAttribute("list") && "" !== this.getAttribute("list").trim() && (this.datalist = this.getAttribute("list").split(",")) } } disconnectedCallback() { this.input.removeEventListener("input", this.checkInput), this.clearBtn.removeEventListener("click", this.clear), this.input.removeEventListener("keydown", this.allowOnlyNum), this.optionList.removeEventListener("click", this.handleOptionClick), this.input.removeEventListener("keydown", this.handleInputNavigation), this.optionList.removeEventListener("keydown", this.handleDatalistNavigation), this.input.removeEventListener("focusin", this.handleFocus), this.removeEventListener("focusout", this.handleBlur) } });
const smNotifications = document.createElement("template"); smNotifications.innerHTML = ' ', customElements.define("sm-notifications", class extends HTMLElement { constructor() { super(), this.shadow = this.attachShadow({ mode: "open" }).append(smNotifications.content.cloneNode(!0)), this.notificationPanel = this.shadowRoot.querySelector(".notification-panel"), this.animationOptions = { duration: 300, fill: "forwards", easing: "cubic-bezier(0.175, 0.885, 0.32, 1.275)" }, this.push = this.push.bind(this), this.createNotification = this.createNotification.bind(this), this.removeNotification = this.removeNotification.bind(this), this.clearAll = this.clearAll.bind(this), this.remove = this.remove.bind(this), this.handlePointerMove = this.handlePointerMove.bind(this), this.startX = 0, this.currentX = 0, this.endX = 0, this.swipeDistance = 0, this.swipeDirection = "", this.swipeThreshold = 0, this.startTime = 0, this.swipeTime = 0, this.swipeTimeThreshold = 200, this.currentTarget = null, this.mediaQuery = window.matchMedia("(min-width: 640px)"), this.handleOrientationChange = this.handleOrientationChange.bind(this), this.isLandscape = !1 } randString(n) { let t = ""; const e = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; for (let i = 0; i < n; i++)t += e.charAt(Math.floor(Math.random() * e.length)); return t } createNotification(n, t = {}) { const { pinned: e = !1, icon: i = "", action: o } = t, r = document.createElement("div"); r.id = this.randString(8), r.className = `notification ${e ? "pinned" : ""}`; const a = document.createElement("div"); a.className = "icon-container", a.innerHTML = i; const s = document.createElement("output"); if (s.textContent = n, r.append(a, s), o) { const n = document.createElement("button"); n.className = "action", n.innerText = o.label, n.addEventListener("click", o.callback) } if (e) { const n = document.createElement("button"); n.className = "close", n.innerHTML = ' ', n.addEventListener("click", () => { this.remove(r.id) }), r.append(n) } return r } push(n, t = {}) { const e = this.createNotification(n, t); return this.isLandscape ? this.notificationPanel.append(e) : this.notificationPanel.prepend(e), this.notificationPanel.animate([{ transform: `translateY(${this.isLandscape ? "" : "-"}${e.clientHeight}px)` }, { transform: "none" }], this.animationOptions), e.animate([{ transform: "translateY(-1rem)", opacity: "0" }, { transform: "none", opacity: "1" }], this.animationOptions).onfinish = (n => { n.target.commitStyles(), n.target.cancel() }), e.querySelector(".action") && e.querySelector(".action").addEventListener("click", t.action.callback), e.id } removeNotification(n, t = "left") { if (!n) return; const e = "left" === t ? "-" : "+"; n.animate([{ transform: this.currentX ? `translateX(${this.currentX}px)` : "none", opacity: "1" }, { transform: `translateX(calc(${e}${Math.abs(this.currentX)}px ${e} 1rem))`, opacity: "0" }], this.animationOptions).onfinish = (() => { n.remove() }) } remove(n) { const t = this.notificationPanel.querySelector(`#${n}`); t && this.removeNotification(t) } clearAll() { Array.from(this.notificationPanel.children).forEach(n => { this.removeNotification(n) }) } handlePointerMove(n) { this.currentX = n.clientX - this.startX, this.currentTarget.style.transform = `translateX(${this.currentX}px)` } handleOrientationChange(n) { this.isLandscape = n.matches, n.matches } connectedCallback() { this.handleOrientationChange(this.mediaQuery), this.mediaQuery.addEventListener("change", this.handleOrientationChange), this.notificationPanel.addEventListener("pointerdown", n => { n.target.closest(".close") ? this.removeNotification(n.target.closest(".notification")) : n.target.closest(".notification") && (this.swipeThreshold = n.target.closest(".notification").getBoundingClientRect().width / 2, this.currentTarget = n.target.closest(".notification"), this.currentTarget.setPointerCapture(n.pointerId), this.startTime = Date.now(), this.startX = n.clientX, this.startY = n.clientY, this.notificationPanel.addEventListener("pointermove", this.handlePointerMove)) }), this.notificationPanel.addEventListener("pointerup", n => { this.endX = n.clientX, this.endY = n.clientY, this.swipeDistance = Math.abs(this.endX - this.startX), this.swipeTime = Date.now() - this.startTime, this.endX > this.startX ? this.swipeDirection = "right" : this.swipeDirection = "left", this.swipeTime < this.swipeTimeThreshold ? this.swipeDistance > 50 && this.removeNotification(this.currentTarget, this.swipeDirection) : this.swipeDistance > this.swipeThreshold ? this.removeNotification(this.currentTarget, this.swipeDirection) : this.currentTarget.animate([{ transform: `translateX(${this.currentX}px)` }, { transform: "none" }], this.animationOptions).onfinish = (n => { n.target.commitStyles(), n.target.cancel() }), this.notificationPanel.removeEventListener("pointermove", this.handlePointerMove), this.notificationPanel.releasePointerCapture(n.pointerId), this.currentX = 0 }); const n = new MutationObserver(n => { n.forEach(n => { "childList" === n.type && n.addedNodes.length && !n.addedNodes[0].classList.contains("pinned") && setTimeout(() => { this.removeNotification(n.addedNodes[0]) }, 5e3) }) }); n.observe(this.notificationPanel, { childList: !0 }) } disconnectedCallback() { mediaQueryList.removeEventListener("change", handleOrientationChange) } });
diff --git a/scripts/flo-webwallet.js b/scripts/flo-webwallet.js
index 5d6538a..6ecf0b8 100644
--- a/scripts/flo-webwallet.js
+++ b/scripts/flo-webwallet.js
@@ -48,46 +48,76 @@
})
}
- function listTransactions_raw(address, options = {}) {
+ function formatTx(address, tx) {
+ let result = {
+ time: tx.time,
+ block: tx.blockheight,
+ blockhash: tx.blockhash,
+ txid: tx.txid,
+ floData: tx.floData,
+ confirmations: tx.confirmations
+ }
+
+ //format receivers
+ let receivers = {};
+ for (let vout of tx.vout) {
+ if (vout.scriptPubKey.isAddress) {
+ let id = vout.scriptPubKey.addresses[0];
+ if (id in receivers)
+ receivers[id] += vout.value;
+ else receivers[id] = vout.value;
+ }
+ }
+ result.receivers = receivers;
+ //format senders (or mined)
+ if (!tx.vin[0].isAddress) { //mined (ie, coinbase)
+ let coinbase = tx.vin[0].coinbase;
+ result.mine = coinbase;
+ result.mined = { [coinbase]: tx.valueOut }
+ } else {
+ result.sender = tx.vin[0].addresses[0];
+ result.receiver = tx.vout[0].scriptPubKey.addresses[0];
+ result.fees = tx.fees;
+ let senders = {};
+ for (let vin of tx.vin) {
+ if (vin.isAddress) {
+ let id = vin.addresses[0];
+ if (id in senders)
+ senders[id] += vin.value;
+ else senders[id] = vin.value;
+ }
+ }
+ result.senders = senders;
+
+ //remove change amounts
+ for (let id in senders) {
+ if (id in receivers) {
+ if (senders[id] > receivers[id]) {
+ senders[id] -= receivers[id];
+ delete receivers[id];
+ } else if (senders[id] < receivers[id]) { //&& id != address
+ receivers[id] -= senders[id];
+ delete senders[id];
+ }
+ }
+ }
+ }
+
+ return result;
+ }
+
+ floWebWallet.listTransactions = function (address, page_options = {}) {
return new Promise((resolve, reject) => {
- options.latest = true;
+ let options = {};
+ if (Number.isInteger(page_options.page))
+ options.page = page_options.page;
+ if (Number.isInteger(page_options.pageSize))
+ options.pageSize = page_options.pageSize;
floBlockchainAPI.readTxs(address, options).then(response => {
const result = {}
- result.items = response.items.map(({ time, txid, floData, isCoinBase, vin, vout }) => ({
- time, txid, floData, isCoinBase,
- sender: isCoinBase ? `(mined)${vin[0].coinbase}` : vin[0].addr,
- receiver: isCoinBase ? address : vout[0].scriptPubKey.addresses[0]
- }));
- result.lastItem = response.lastItem;
- result.initItem = response.initItem;
- resolve(result);
- }).catch(error => reject(error))
- })
- }
-
-
- floWebWallet.listTransactions = function (address) {
- return new Promise((resolve, reject) => {
- listTransactions_raw(address)
- .then(result => resolve(result))
- .catch(error => reject(error))
- })
- }
-
-
- floWebWallet.listTransactions.syncNew = function (address, lastItem) {
- return new Promise((resolve, reject) => {
- listTransactions_raw(address, { after: lastItem }).then(result => {
- delete result.initItem;
- resolve(result);
- }).catch(error => reject(error))
- })
- }
-
- floWebWallet.listTransactions.syncOld = function (address, initItem) {
- return new Promise((resolve, reject) => {
- listTransactions_raw(address, { before: initItem }).then(result => {
- delete result.lastItem;
+ result.items = response.txs.map(tx => formatTx(address, tx));
+ result.page = response.page;
+ result.totalPages = response.totalPages;
resolve(result);
}).catch(error => reject(error))
})
diff --git a/scripts/floBlockchainAPI.js b/scripts/floBlockchainAPI.js
index 58bbc5b..9dedb90 100644
--- a/scripts/floBlockchainAPI.js
+++ b/scripts/floBlockchainAPI.js
@@ -1,13 +1,13 @@
-(function (EXPORTS) { //floBlockchainAPI v2.5.6a
- /* FLO Blockchain Operator to send/receive data from blockchain using API calls*/
+(function (EXPORTS) { //floBlockchainAPI v3.0.1b
+ /* FLO Blockchain Operator to send/receive data from blockchain using API calls via FLO Blockbook*/
'use strict';
const floBlockchainAPI = EXPORTS;
const DEFAULT = {
blockchain: floGlobals.blockchain,
apiURL: {
- FLO: ['https://flosight.ranchimall.net/'],
- FLO_TEST: ['https://flosight-testnet.ranchimall.net/']
+ FLO: ['https://blockbook.ranchimall.net/'],
+ FLO_TEST: []
},
sendAmt: 0.0003,
fee: 0.0002,
@@ -61,9 +61,9 @@
var serverList = Array.from(allServerList);
var curPos = floCrypto.randInt(0, serverList.length - 1);
- function fetch_retry(apicall, rm_flosight) {
+ function fetch_retry(apicall, rm_node) {
return new Promise((resolve, reject) => {
- let i = serverList.indexOf(rm_flosight)
+ let i = serverList.indexOf(rm_node)
if (i != -1) serverList.splice(i, 1);
curPos = floCrypto.randInt(0, serverList.length - 1);
fetch_api(apicall, false)
@@ -82,19 +82,19 @@
.then(result => resolve(result))
.catch(error => reject(error));
} else
- reject("No floSight server working");
+ reject("No FLO blockbook server working");
} else {
- let flosight = serverList[curPos];
- fetch(flosight + apicall).then(response => {
+ let serverURL = serverList[curPos];
+ fetch(serverURL + apicall).then(response => {
if (response.ok)
response.json().then(data => resolve(data));
else {
- fetch_retry(apicall, flosight)
+ fetch_retry(apicall, serverURL)
.then(result => resolve(result))
.catch(error => reject(error));
}
}).catch(error => {
- fetch_retry(apicall, flosight)
+ fetch_retry(apicall, serverURL)
.then(result => resolve(result))
.catch(error => reject(error));
})
@@ -124,43 +124,27 @@
}
//Get balance for the given Address
- const getBalance = floBlockchainAPI.getBalance = function (addr, after = null) {
+ const getBalance = floBlockchainAPI.getBalance = function (addr) {
return new Promise((resolve, reject) => {
- let api = `api/addr/${addr}/balance`, query_params = {};
- if (after) {
- if (typeof after === 'string' && /^[0-9a-z]{64}$/i.test(after))
- query_params.after = after;
- else return reject("Invalid 'after' parameter");
- }
- promisedAPI(api, query_params).then(result => {
- if (typeof result === 'object' && result.lastItem) {
- getBalance(addr, result.lastItem)
- .then(r => resolve(util.toFixed(r + result.data)))
- .catch(error => reject(error))
- } else resolve(result);
- }).catch(error => reject(error))
+ let api = `api/address/${addr}`;
+ promisedAPI(api, { details: "basic" })
+ .then(result => resolve(result["balance"]))
+ .catch(error => reject(error))
});
}
- const getUTXOs = address => new Promise((resolve, reject) => {
- promisedAPI(`api/addr/${address}/utxo`)
- .then(utxo => resolve(utxo))
- .catch(error => reject(error))
- })
+ function getScriptPubKey(address) {
+ var tx = bitjs.transaction();
+ tx.addoutput(address, 0);
+ let outputBuffer = tx.outputs.pop().script;
+ return Crypto.util.bytesToHex(outputBuffer)
+ }
- const getUnconfirmedSpent = address => new Promise((resolve, reject) => {
- readTxs(address, { mempool: "only" }).then(result => {
- let unconfirmedSpent = {};
- for (let tx of result.items)
- if (tx.confirmations == 0)
- for (let vin of tx.vin)
- if (vin.addr === address) {
- if (Array.isArray(unconfirmedSpent[vin.txid]))
- unconfirmedSpent[vin.txid].push(vin.vout);
- else
- unconfirmedSpent[vin.txid] = [vin.vout];
- }
- resolve(unconfirmedSpent);
+ const getUTXOs = address => new Promise((resolve, reject) => {
+ promisedAPI(`api/utxo/${address}`, { confirmed: true }).then(utxos => {
+ let scriptPubKey = getScriptPubKey(address);
+ utxos.forEach(u => u.scriptPubKey = scriptPubKey);
+ resolve(utxos);
}).catch(error => reject(error))
})
@@ -180,32 +164,28 @@
var fee = DEFAULT.fee;
if (balance < sendAmt + fee)
return reject("Insufficient FLO balance!");
- getUnconfirmedSpent(senderAddr).then(unconfirmedSpent => {
- getUTXOs(senderAddr).then(utxos => {
- //form/construct the transaction data
- var trx = bitjs.transaction();
- var utxoAmt = 0.0;
- for (var i = utxos.length - 1;
- (i >= 0) && (utxoAmt < sendAmt + fee); i--) {
- //use only utxos with confirmations (strict_utxo mode)
- if (utxos[i].confirmations || !strict_utxo) {
- if (utxos[i].txid in unconfirmedSpent && unconfirmedSpent[utxos[i].txid].includes(utxos[i].vout))
- continue; //A transaction has already used the utxo, but is unconfirmed.
- trx.addinput(utxos[i].txid, utxos[i].vout, utxos[i].scriptPubKey);
- utxoAmt += utxos[i].amount;
- };
- }
- if (utxoAmt < sendAmt + fee)
- reject("Insufficient FLO: Some UTXOs are unconfirmed");
- else {
- trx.addoutput(receiverAddr, sendAmt);
- var change = utxoAmt - sendAmt - fee;
- if (change > DEFAULT.minChangeAmt)
- trx.addoutput(senderAddr, change);
- trx.addflodata(floData.replace(/\n/g, ' '));
- resolve(trx);
- }
- }).catch(error => reject(error))
+ getUTXOs(senderAddr).then(utxos => {
+ //form/construct the transaction data
+ var trx = bitjs.transaction();
+ var utxoAmt = 0.0;
+ for (var i = utxos.length - 1;
+ (i >= 0) && (utxoAmt < sendAmt + fee); i--) {
+ //use only utxos with confirmations (strict_utxo mode)
+ if (utxos[i].confirmations || !strict_utxo) {
+ trx.addinput(utxos[i].txid, utxos[i].vout, utxos[i].scriptPubKey);
+ utxoAmt += utxos[i].amount;
+ };
+ }
+ if (utxoAmt < sendAmt + fee)
+ reject("Insufficient FLO: Some UTXOs are unconfirmed");
+ else {
+ trx.addoutput(receiverAddr, sendAmt);
+ var change = utxoAmt - sendAmt - fee;
+ if (change > DEFAULT.minChangeAmt)
+ trx.addoutput(senderAddr, change);
+ trx.addflodata(floData.replace(/\n/g, ' '));
+ resolve(trx);
+ }
}).catch(error => reject(error))
}).catch(error => reject(error))
})
@@ -293,34 +273,30 @@
if (balance < totalAmt + fee)
return reject("Insufficient FLO balance!");
//get unconfirmed tx list
- getUnconfirmedSpent(floID).then(unconfirmedSpent => {
- getUTXOs(floID).then(utxos => {
- var trx = bitjs.transaction();
- var utxoAmt = 0.0;
- for (let i = utxos.length - 1; (i >= 0) && (utxoAmt < totalAmt + fee); i--) {
- //use only utxos with confirmations (strict_utxo mode)
- if (utxos[i].confirmations || !strict_utxo) {
- if (utxos[i].txid in unconfirmedSpent && unconfirmedSpent[utxos[i].txid].includes(utxos[i].vout))
- continue; //A transaction has already used the utxo, but is unconfirmed.
- trx.addinput(utxos[i].txid, utxos[i].vout, utxos[i].scriptPubKey);
- utxoAmt += utxos[i].amount;
- };
- }
- if (utxoAmt < totalAmt + fee)
- reject("Insufficient FLO: Some UTXOs are unconfirmed");
- else {
- for (let i = 0; i < count; i++)
- trx.addoutput(floID, splitAmt);
- var change = utxoAmt - totalAmt - fee;
- if (change > DEFAULT.minChangeAmt)
- trx.addoutput(floID, change);
- trx.addflodata(floData.replace(/\n/g, ' '));
- var signedTxHash = trx.sign(privKey, 1);
- broadcastTx(signedTxHash)
- .then(txid => resolve(txid))
- .catch(error => reject(error))
- }
- }).catch(error => reject(error))
+ getUTXOs(floID).then(utxos => {
+ var trx = bitjs.transaction();
+ var utxoAmt = 0.0;
+ for (let i = utxos.length - 1; (i >= 0) && (utxoAmt < totalAmt + fee); i--) {
+ //use only utxos with confirmations (strict_utxo mode)
+ if (utxos[i].confirmations || !strict_utxo) {
+ trx.addinput(utxos[i].txid, utxos[i].vout, utxos[i].scriptPubKey);
+ utxoAmt += utxos[i].amount;
+ };
+ }
+ if (utxoAmt < totalAmt + fee)
+ reject("Insufficient FLO: Some UTXOs are unconfirmed");
+ else {
+ for (let i = 0; i < count; i++)
+ trx.addoutput(floID, splitAmt);
+ var change = utxoAmt - totalAmt - fee;
+ if (change > DEFAULT.minChangeAmt)
+ trx.addoutput(floID, change);
+ trx.addflodata(floData.replace(/\n/g, ' '));
+ var signedTxHash = trx.sign(privKey, 1);
+ broadcastTx(signedTxHash)
+ .then(txid => resolve(txid))
+ .catch(error => reject(error))
+ }
}).catch(error => reject(error))
}).catch(error => reject(error))
})
@@ -551,33 +527,29 @@
var fee = DEFAULT.fee;
if (balance < sendAmt + fee)
return reject("Insufficient FLO balance!");
- getUnconfirmedSpent(senderAddr).then(unconfirmedSpent => {
- getUTXOs(senderAddr).then(utxos => {
- //form/construct the transaction data
- var trx = bitjs.transaction();
- var utxoAmt = 0.0;
- for (var i = utxos.length - 1;
- (i >= 0) && (utxoAmt < sendAmt + fee); i--) {
- //use only utxos with confirmations (strict_utxo mode)
- if (utxos[i].confirmations || !strict_utxo) {
- if (utxos[i].txid in unconfirmedSpent && unconfirmedSpent[utxos[i].txid].includes(utxos[i].vout))
- continue; //A transaction has already used the utxo, but is unconfirmed.
- trx.addinput(utxos[i].txid, utxos[i].vout, redeemScript); //for multisig, script=redeemScript
- utxoAmt += utxos[i].amount;
- };
- }
- if (utxoAmt < sendAmt + fee)
- reject("Insufficient FLO: Some UTXOs are unconfirmed");
- else {
- for (let i in receivers)
- trx.addoutput(receivers[i], amounts[i]);
- var change = utxoAmt - sendAmt - fee;
- if (change > DEFAULT.minChangeAmt)
- trx.addoutput(senderAddr, change);
- trx.addflodata(floData.replace(/\n/g, ' '));
- resolve(trx);
- }
- }).catch(error => reject(error))
+ getUTXOs(senderAddr).then(utxos => {
+ //form/construct the transaction data
+ var trx = bitjs.transaction();
+ var utxoAmt = 0.0;
+ for (var i = utxos.length - 1;
+ (i >= 0) && (utxoAmt < sendAmt + fee); i--) {
+ //use only utxos with confirmations (strict_utxo mode)
+ if (utxos[i].confirmations || !strict_utxo) {
+ trx.addinput(utxos[i].txid, utxos[i].vout, redeemScript); //for multisig, script=redeemScript
+ utxoAmt += utxos[i].amount;
+ };
+ }
+ if (utxoAmt < sendAmt + fee)
+ reject("Insufficient FLO: Some UTXOs are unconfirmed");
+ else {
+ for (let i in receivers)
+ trx.addoutput(receivers[i], amounts[i]);
+ var change = utxoAmt - sendAmt - fee;
+ if (change > DEFAULT.minChangeAmt)
+ trx.addoutput(senderAddr, change);
+ trx.addflodata(floData.replace(/\n/g, ' '));
+ resolve(trx);
+ }
}).catch(error => reject(error))
}).catch(error => reject(error))
});
@@ -773,20 +745,11 @@
const broadcastTx = floBlockchainAPI.broadcastTx = function (signedTxHash) {
return new Promise((resolve, reject) => {
if (signedTxHash.length < 1)
- return reject("Empty Signature");
- var url = serverList[curPos] + 'api/tx/send';
- fetch(url, {
- method: "POST",
- headers: {
- 'Content-Type': 'application/json'
- },
- body: `{"rawtx":"${signedTxHash}"}`
- }).then(response => {
- if (response.ok)
- response.json().then(data => resolve(data.txid.result));
- else
- response.text().then(data => resolve(data));
- }).catch(error => reject(error));
+ return reject("Empty Transaction Data");
+
+ promisedAPI('/api/sendtx/' + signedTxHash)
+ .then(response => resolve(response["result"]))
+ .catch(error => reject(error))
})
}
@@ -825,61 +788,96 @@
})
}
- //Read Txs of Address between from and to
+ //Read Txs of Address
const readTxs = floBlockchainAPI.readTxs = function (addr, options = {}) {
return new Promise((resolve, reject) => {
- let api = `api/addrs/${addr}/txs`;
//API options
- let query_params = {};
- if (!isUndefined(options.after) || !isUndefined(options.before)) {
- if (!isUndefined(options.after))
- query_params.after = options.after;
- if (!isUndefined(options.before))
- query_params.before = options.before;
- } else {
- if (!isUndefined(options.from))
- query_params.from = options.from;
- if (!isUndefined(options.to))
- query_params.to = options.to;
- }
- if (!isUndefined(options.latest))
- query_params.latest = options.latest;
- if (!isUndefined(options.mempool))
- query_params.mempool = options.mempool;
- promisedAPI(api, query_params)
- .then(response => resolve(response))
- .catch(error => reject(error))
+ let query_params = { details: 'txs' };
+ //page options
+ if (!isUndefined(options.page) && Number.isInteger(options.page))
+ query_params.page = options.page;
+ if (!isUndefined(options.pageSize) && Number.isInteger(options.pageSize))
+ query_params.pageSize = options.pageSize;
+ //only confirmed tx
+ if (options.confirmed) //Default is false in server, so only add confirmed filter if confirmed has a true value
+ query_params.confirmed = true;
+
+ promisedAPI(`api/address/${addr}`, query_params).then(response => {
+ if (!Array.isArray(response.txs)) //set empty array if address doesnt have any tx
+ response.txs = [];
+ resolve(response)
+ }).catch(error => reject(error))
});
}
+ //backward support (floBlockchainAPI < v2.5.6)
+ function readAllTxs_oldSupport(addr, options, ignoreOld = 0, cacheTotal = 0) {
+ return new Promise((resolve, reject) => {
+ readTxs(addr, options).then(response => {
+ cacheTotal += response.txs.length;
+ let n_remaining = response.txApperances - cacheTotal
+ if (n_remaining < ignoreOld) { // must remove tx that would have been fetch during prev call
+ let n_remove = ignoreOld - n_remaining;
+ resolve(response.txs.slice(0, -n_remove));
+ } else if (response.page == response.totalPages) //last page reached
+ resolve(response.txs);
+ else {
+ options.page = response.page + 1;
+ readAllTxs_oldSupport(addr, options, ignoreOld, cacheTotal)
+ .then(result => resolve(response.txs.concat(result)))
+ .catch(error => reject(error))
+ }
+ }).catch(error => reject(error))
+ })
+ }
+
+ function readAllTxs_new(addr, options, lastItem) {
+ return new Promise((resolve, reject) => {
+ readTxs(addr, options).then(response => {
+ let i = response.txs.findIndex(t => t.txid === lastItem);
+ if (i != -1) //found lastItem
+ resolve(response.txs.slice(0, i))
+ else if (response.page == response.totalPages) //last page reached
+ resolve(response.txs);
+ else {
+ options.page = response.page + 1;
+ readAllTxs_new(addr, options, lastItem)
+ .then(result => resolve(response.txs.concat(result)))
+ .catch(error => reject(error))
+ }
+ }).catch(error => reject(error))
+ })
+ }
+
//Read All Txs of Address (newest first)
const readAllTxs = floBlockchainAPI.readAllTxs = function (addr, options = {}) {
return new Promise((resolve, reject) => {
- readTxs(addr, options).then(response => {
- if (response.incomplete) {
- let next_options = Object.assign({}, options);
- if (options.latest)
- next_options.before = response.initItem; //update before for chain query (latest 1st)
- else
- next_options.after = response.lastItem; //update after for chain query (oldest 1st)
- readAllTxs(addr, next_options).then(r => {
- r.items = r.items.concat(response.items); //latest tx are 1st in array
- resolve(r);
- }).catch(error => reject(error))
- } else
+ if (Number.isInteger(options.ignoreOld)) //backward support: data from floBlockchainAPI < v2.5.6
+ readAllTxs_oldSupport(addr, options, options.ignoreOld).then(txs => {
+ let last_tx = txs.find(t => t.confirmations > 0);
+ let new_lastItem = last_tx ? last_tx.txid : options.ignoreOld;
resolve({
- lastItem: response.lastItem || options.after,
- items: response.items
- });
- })
- });
+ lastItem: new_lastItem,
+ items: txs
+ })
+
+ }).catch(error => reject(error))
+ else //New format for floBlockchainAPI >= v2.5.6
+ readAllTxs_new(addr, options, options.after).then(txs => {
+ let last_tx = txs.find(t => t.confirmations > 0);
+ let new_lastItem = last_tx ? last_tx.txid : options.after;
+ resolve({
+ lastItem: new_lastItem,
+ items: txs
+ })
+ }).catch(error => reject(error))
+ })
}
/*Read flo Data from txs of given Address
options can be used to filter data
after : query after the given txid
- before : query before the given txid
- mempool : query mempool tx or not (options same as readAllTx, DEFAULT=false: ignore unconfirmed tx)
+ confirmed : query only confirmed tx or not (options same as readAllTx, DEFAULT=true: only_confirmed_tx)
ignoreOld : ignore old txs (deprecated: support for backward compatibility only, cannot be used with 'after')
sentOnly : filters only sent data
receivedOnly: filters only received data
@@ -894,18 +892,14 @@
//fetch options
let query_options = {};
- query_options.mempool = isUndefined(options.mempool) ? false : options.mempool; //DEFAULT: ignore unconfirmed tx
- if (!isUndefined(options.after) || !isUndefined(options.before)) {
- if (!isUndefined(options.ignoreOld)) //Backward support
- return reject("Invalid options: cannot use after/before and ignoreOld in same query");
- //use passed after and/or before options (options remain undefined if not passed)
- query_options.after = options.after;
- query_options.before = options.before;
- }
- readAllTxs(addr, query_options).then(response => {
+ query_options.confirmed = isUndefined(options.confirmed) ? true : options.confirmed; //DEFAULT: ignore unconfirmed tx
- if (Number.isInteger(options.ignoreOld)) //backward support, cannot be used with options.after or options.before
- response.items.splice(-options.ignoreOld); //negative to count from end of the array
+ if (!isUndefined(options.after))
+ query_options.after = options.after;
+ else if (!isUndefined(options.ignoreOld))
+ query_options.ignoreOld = options.ignoreOld;
+
+ readAllTxs(addr, query_options).then(response => {
if (typeof options.senders === "string") options.senders = [options.senders];
if (typeof options.receivers === "string") options.receivers = [options.receivers];
@@ -916,9 +910,9 @@
if (!tx.confirmations) //unconfirmed transactions: this should not happen as we send mempool=false in API query
return false;
- if (options.sentOnly && !tx.vin.some(vin => vin.addr === addr))
+ if (options.sentOnly && !tx.vin.some(vin => vin.addresses[0] === addr))
return false;
- else if (Array.isArray(options.senders) && !tx.vin.some(vin => options.senders.includes(vin.addr)))
+ else if (Array.isArray(options.senders) && !tx.vin.some(vin => options.senders.includes(vin.addresses[0])))
return false;
if (options.receivedOnly && !tx.vout.some(vout => vout.scriptPubKey.addresses[0] === addr))
@@ -944,7 +938,7 @@
txid: tx.txid,
time: tx.time,
blockheight: tx.blockheight,
- senders: new Set(tx.vin.map(v => v.addr)),
+ senders: new Set(tx.vin.map(v => v.addresses[0])),
receivers: new Set(tx.vout.map(v => v.scriptPubKey.addresses[0])),
data: tx.floData
} : tx.floData);
@@ -964,8 +958,7 @@
caseFn: (function) flodata => return bool value
options can be used to filter data
after : query after the given txid
- before : query before the given txid
- mempool : query mempool tx or not (options same as readAllTx, DEFAULT=false: ignore unconfirmed tx)
+ confirmed : query only confirmed tx or not (options same as readAllTx, DEFAULT=true: only_confirmed_tx)
sentOnly : filters only sent data
receivedOnly: filters only received data
tx : (boolean) resolve tx data or not (resolves an Array of Object with tx details)
@@ -975,23 +968,37 @@
const getLatestData = floBlockchainAPI.getLatestData = function (addr, caseFn, options = {}) {
return new Promise((resolve, reject) => {
//fetch options
- let query_options = { latest: true };
- query_options.mempool = isUndefined(options.mempool) ? false : options.mempool; //DEFAULT: ignore unconfirmed tx
- if (!isUndefined(options.after)) query_options.after = options.after;
- if (!isUndefined(options.before)) query_options.before = options.before;
+ let query_options = {};
+ query_options.confirmed = isUndefined(options.confirmed) ? true : options.confirmed; //DEFAULT: confirmed tx only
+ if (!isUndefined(options.page))
+ query_options.page = options.page;
+ //if (!isUndefined(options.after)) query_options.after = options.after;
+ let new_lastItem;
readTxs(addr, query_options).then(response => {
+ //lastItem confirmed tx checked
+ if (!new_lastItem) {
+ let last_tx = response.items.find(t => t.confirmations > 0);
+ if (last_tx)
+ new_lastItem = last_tx.txid;
+ }
+
if (typeof options.senders === "string") options.senders = [options.senders];
if (typeof options.receivers === "string") options.receivers = [options.receivers];
+ //check if `after` txid is in the response
+ let i_after = response.txs.findIndex(t => t.txid === options.after);
+ if (i_after != -1) //found lastItem, hence remove it and all txs before that
+ response.items.splice(i_after);
+
var item = response.items.find(tx => {
if (!tx.confirmations) //unconfirmed transactions: this should not happen as we send mempool=false in API query
return false;
- if (options.sentOnly && !tx.vin.some(vin => vin.addr === addr))
+ if (options.sentOnly && !tx.vin.some(vin => vin.addresses[0] === addr))
return false;
- else if (Array.isArray(options.senders) && !tx.vin.some(vin => options.senders.includes(vin.addr)))
+ else if (Array.isArray(options.senders) && !tx.vin.some(vin => options.senders.includes(vin.addresses[0])))
return false;
if (options.receivedOnly && !tx.vout.some(vout => vout.scriptPubKey.addresses[0] === addr))
@@ -1004,32 +1011,31 @@
//if item found, then resolve the result
if (!isUndefined(item)) {
- const result = { lastItem: response.lastItem };
+ const result = { lastItem: new_lastItem || item.txid };
if (options.tx) {
result.item = {
- txid: tx.txid,
- time: tx.time,
- blockheight: tx.blockheight,
- senders: new Set(tx.vin.map(v => v.addr)),
- receivers: new Set(tx.vout.map(v => v.scriptPubKey.addresses[0])),
- data: tx.floData
+ txid: item.txid,
+ time: item.time,
+ blockheight: item.blockheight,
+ senders: new Set(item.vin.map(v => v.addresses[0])),
+ receivers: new Set(item.vout.map(v => v.scriptPubKey.addresses[0])),
+ data: item.floData
}
} else
- result.data = tx.floData;
+ result.data = item.floData;
return resolve(result);
}
+
+ if (response.page == response.totalPages || i_after != -1) //reached last page to check
+ resolve({ lastItem: new_lastItem || options.after }); //no data match the caseFn, resolve just the lastItem
+
//else if address needs chain query
- else if (response.incomplete) {
- let next_options = Object.assign({}, options);
- options.before = response.initItem; //this fn uses latest option, so using before to chain query
- getLatestData(addr, caseFn, next_options).then(r => {
- r.lastItem = response.lastItem; //update last key as it should be the newest tx
- resolve(r);
- }).catch(error => reject(error))
+ else {
+ options.page = response.page + 1;
+ getLatestData(addr, caseFn, options)
+ .then(result => resolve(result))
+ .catch(error => reject(error))
}
- //no data match the caseFn, resolve just the lastItem
- else
- resolve({ lastItem: response.lastItem });
}).catch(error => reject(error))
})
diff --git a/testnet.html b/testnet.html
deleted file mode 100644
index c3eeff7..0000000
--- a/testnet.html
+++ /dev/null
@@ -1,11088 +0,0 @@
-
-
-
-
- FLO web wallet
-
-
-
-
-
-
-
-
-
-
- There seems to be a problem connecting to the internet.
-
-
-
-
- RanchiMall
-
- FLO web wallet
-
-
-
-
-
-
-
-
-
-
Generate
- Generate address
-
-
-
-
Send
- Send FLO data
-
-
-
-
Monitor
- Monitor FLO data
-
-
-
-
Settings
- Settings
-
-
-
-
- Copied
-
-
-
-
-
Add new address to monitoring list
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Edit display card
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Available balance
- 0
- FLO(s)
-
To send FLO data, make sure you have enough balance.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
1040/1040
-
-
-
-
-
-
-
-
-
-
-
Send
-
-
-
-
-
-
-
-
-
-
-
-
-
Transaction successful
-
-
-
-
-
-
-
-
-
-
-
-
Dark mode
-
-
- Automatic
- Dark mode active : 6pm - 6am
-
-
-
-
- Manual
- Dark mode
-
-
-
-
-
-
Clear all local data
-
This will delete all local Web Wallet data like added addresses and locally stored
- transactions.After clearing local data you may experience slow loading of newly added address,
- please proceed cautiously!
-
-
-
-
-
-
Developer options
-
-
-
-
-
Allow unconfirmed UTXOs
-
- This is a developer option only and not recommended for normal use.
-
-