diff --git a/FireWalletBrowser.bsdesign b/FireWalletBrowser.bsdesign index ca8cd64..3955edb 100644 Binary files a/FireWalletBrowser.bsdesign and b/FireWalletBrowser.bsdesign differ diff --git a/account.py b/account.py index 5b3bd85..f31c2e8 100644 --- a/account.py +++ b/account.py @@ -639,6 +639,30 @@ def getPendingRegisters(account): pending.append(bid) return pending +def getPendingFinalizes(account,password): + tx = createBatch(f'{account}:{password}',[["FINALIZE"]]) + if 'error' in tx: + return [] + + pending = [] + try: + for output in tx['outputs']: + if output['covenant']['type'] != 10: + continue + if output['covenant']['action'] != "FINALIZE": + continue + nameHash = output['covenant']['items'][0] + # Try to get the name from hash + name = hsd.rpc_getNameByHash(nameHash) + if name['error']: + pending.append(nameHash) + else: + pending.append(name['result']) + except: + print("Failed to parse finalizes") + return pending + + def getRevealTX(reveal): prevout = reveal['prevout'] hash = prevout['hash'] @@ -753,6 +777,19 @@ def registerAll(account): batch.append(["UPDATE",domain['name'],{"records":[]}]) return sendBatch(account,batch) +def finalizeAll(account): + account_name = check_account(account) + password = ":".join(account.split(":")[1:]) + + if account_name == False: + return { + "error": { + "message": "Invalid account" + } + } + + return sendBatch(account,[["FINALIZE"]]) + def rescan_auction(account,domain): # Get height of the start of the auction response = hsw.rpc_selectWallet(account) @@ -991,6 +1028,53 @@ def sendBatch(account, batch): } } +def createBatch(account, batch): + account_name = check_account(account) + password = ":".join(account.split(":")[1:]) + + if account_name == False: + return { + "error": { + "message": "Invalid account" + } + } + + try: + response = hsw.rpc_selectWallet(account_name) + if response['error'] is not None: + return { + "error": { + "message": response['error']['message'] + } + } + response = hsw.rpc_walletPassphrase(password,10) + if response['error'] is not None: + return { + "error": { + "message": response['error']['message'] + } + } + response = requests.post(f"http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}",json={ + "method": "createbatch", + "params": [batch] + }).json() + if response['error'] is not None: + return response + if 'result' not in response: + return { + "error": { + "message": "No result" + } + } + + return response['result'] + except Exception as e: + return { + "error": { + "message": str(e) + } + } + #region settingsAPIs def rescan(): diff --git a/main.py b/main.py index 1da423e..09911cf 100644 --- a/main.py +++ b/main.py @@ -293,6 +293,8 @@ def auctions(): bids=len(bids),message=message, sort_time=sort_time,sort_time_next=sort_time_next) + +#region All Auctions @app.route('/reveal') @app.route('/all/reveal') def revealAllBids(): @@ -355,6 +357,27 @@ def registerAllDomains(): return redirect("/success?tx=" + response['hash']) +@app.route('/all/finalize') +def finalizeAllBids(): + # Check if the user is logged in + if request.cookies.get("account") is None: + return redirect("/login") + + account = account_module.check_account(request.cookies.get("account")) + if not account: + return redirect("/logout") + + response = account_module.finalizeAll(request.cookies.get("account")) + if 'error' in response: + print(response) + if response['error'] != None: + if response['error']['message'] == "Nothing to do.": + return redirect("/dashboard?message=No domains to finalize") + return redirect("/dashboard?message=" + response['error']['message']) + + return redirect("/success?tx=" + response['hash']) +#endregion + @app.route('/search') def search(): # Check if the user is logged in @@ -1466,12 +1489,14 @@ def api_wallet(function): return jsonify({"result": len(account_module.getBids(account))}) if function == "pendingReveal": - return jsonify({"result": len(account_module.getPendingReveals(account))}) + return jsonify({"result": account_module.getPendingReveals(account)}) if function == "pendingRegister": - return jsonify({"result": len(account_module.getPendingRegisters(account))}) + return jsonify({"result": account_module.getPendingRegisters(account)}) if function == "pendingRedeem": - return jsonify({"result": len(account_module.getPendingRedeems(account,password))}) + return jsonify({"result": account_module.getPendingRedeems(account,password)}) + if function == "pendingFinalize": + return jsonify({"result": account_module.getPendingFinalizes(account,password)}) if function == "domains": domains = account_module.getDomains(account) diff --git a/templates/assets/js/dashboard.min.js b/templates/assets/js/dashboard.min.js new file mode 100644 index 0000000..d00d3a8 --- /dev/null +++ b/templates/assets/js/dashboard.min.js @@ -0,0 +1 @@ +function createCard(e,n,t){if(document.getElementById(t)&&document.getElementById(t).remove(),n<=0)return;const a=document.createElement("div");a.classList.add("col-md-6","col-xl-3","mb-4"),a.id=t,html=`\n
\n
\n
\n
\n
${e}
\n
${n}
\n
\n
${t} All
\n
\n \n \n \n \n \n \n
\n
\n
`,a.innerHTML=html,document.getElementById("actions-row").appendChild(a)}async function updateActions(){const e={Finalize:"Pending Finalizes",Register:"Pending Register",Redeem:"Pending Redeem",Reveal:"Pending Reveal"};for(const n in e){const t=await request(`wallet/pending${n}`);createCard(e[n],t.length,n)}}window.addEventListener("load",(async()=>{updateActions()})),setInterval((async function(){updateActions()}),2e4); \ No newline at end of file diff --git a/templates/assets/js/script.min.js b/templates/assets/js/script.min.js index 794bb5a..123b097 100644 --- a/templates/assets/js/script.min.js +++ b/templates/assets/js/script.min.js @@ -1 +1 @@ -async function request(e){try{const t=await fetch(`/api/v1/${e}`);if(!t.ok)throw new Error(`HTTP error! Status: ${t.status}`);const n=await t.json();return void 0!==n.error?`Error: ${n.error}`:n.result}catch(e){return console.error("Request failed:",e),"Error"}}function sortTable(e,t=!1){const n=document.getElementById("data-table"),a=n.querySelector("tbody"),o=Array.from(a.querySelectorAll("tr")),r=n.querySelectorAll("th");let l=n.getAttribute("data-sort-order")||"asc",c=n.getAttribute("data-sort-column")||"-1";l=t||c!=e?"asc":"asc"===l?"desc":"asc",n.setAttribute("data-sort-order",l),n.setAttribute("data-sort-column",e),o.sort(((t,n)=>{let a=t.cells[e].innerText.trim(),o=n.cells[e].innerText.trim(),r=parseFloat(a.replace(/[^0-9.,]/g,"").replace(/,/g,"")),c=parseFloat(o.replace(/[^0-9.,]/g,"").replace(/,/g,""));return isNaN(r)||isNaN(c)?"asc"===l?a.localeCompare(o):o.localeCompare(a):"asc"===l?r-c:c-r})),a.innerHTML="",o.forEach((e=>a.appendChild(e))),updateSortIndicators(r,e,l)}function updateSortIndicators(e,t,n){e.forEach(((e,a)=>{let o=e.querySelector(".sort-indicator");o.innerHTML=a===t?"asc"===n?" ▲":" ▼":""}))}window.addEventListener("load",(async()=>{const e=["hsd-sync","hsd-version","hsd-height","wallet-sync","wallet-available","wallet-total","wallet-locked","wallet-pending","wallet-domainCount","wallet-bidCount","wallet-pendingReveal","wallet-pendingRegister","wallet-pendingRedeem"],t=["wallet-available","wallet-total","wallet-locked"];for(const n of e){const e=document.getElementById(n);if(e){const a=n.replace(/-/g,"/");let o=await request(a);t.includes(n)&&(o=Number(o).toFixed(2)),o=o.toString().replace(/\B(?=(\d{3})+(?!\d))/g,","),e.innerHTML=o}}})),document.addEventListener("DOMContentLoaded",(function(){fetch("/api/v1/wallet/domains").then((e=>e.json())).then((e=>{const t=document.querySelector("#data-table tbody");t.innerHTML="",e.result.forEach((e=>{const n=document.createElement("tr"),a=document.createElement("td");a.textContent=e.name,n.appendChild(a);var o="Unknown";"stats"in e&&"daysUntilExpire"in e.stats&&(o=e.stats.daysUntilExpire);const r=document.createElement("td");r.textContent=`${o} days`,n.appendChild(r);const l=document.createElement("td");l.textContent=`${(e.value/1e6).toFixed(2).replace(/\B(?=(\d{3})+(?!\d))/g,",")} HNS`,n.appendChild(l);const c=document.createElement("td");c.innerHTML=e.registered?"Manage":"Register",n.appendChild(c),t.appendChild(n)})),sortTable(0,!0)})).catch((e=>console.error("Error fetching data:",e)))})),setInterval((async function(){const e=["hsd-sync","hsd-height","wallet-sync","wallet-pending","wallet-available","wallet-total"];for(const t of e){const e=document.getElementById(t);if(e){const n=t.replace(/-/g,"/");let a=await request(n);["wallet-available","wallet-total"].includes(t)&&(a=Number(a).toFixed(2)),a=a.toString().replace(/\B(?=(\d{3})+(?!\d))/g,","),e.innerHTML=a}}}),2e4),function(){"use strict";var e=document.querySelector(".sidebar"),t=document.querySelectorAll("#sidebarToggle, #sidebarToggleTop");if(e){e.querySelector(".collapse");var n=[].slice.call(document.querySelectorAll(".sidebar .collapse")).map((function(e){return new bootstrap.Collapse(e,{toggle:!1})}));for(var a of t)a.addEventListener("click",(function(t){if(document.body.classList.toggle("sidebar-toggled"),e.classList.toggle("toggled"),e.classList.contains("toggled"))for(var a of n)a.hide()}));window.addEventListener("resize",(function(){if(Math.max(document.documentElement.clientWidth||0,window.innerWidth||0)<768)for(var e of n)e.hide()}))}var o=document.querySelector("body.fixed-nav .sidebar");o&&o.on("mousewheel DOMMouseScroll wheel",(function(e){if(Math.max(document.documentElement.clientWidth||0,window.innerWidth||0)>768){var t=e.originalEvent,n=t.wheelDelta||-t.detail;this.scrollTop+=30*(n<0?1:-1),e.preventDefault()}}));var r=document.querySelector(".scroll-to-top");r&&window.addEventListener("scroll",(function(){var e=window.pageYOffset;r.style.display=e>100?"block":"none"}))}(); \ No newline at end of file +async function request(e){try{const t=await fetch(`/api/v1/${e}`);if(!t.ok)throw new Error(`HTTP error! Status: ${t.status}`);const n=await t.json();return void 0!==n.error?`Error: ${n.error}`:n.result}catch(e){return console.error("Request failed:",e),"Error"}}function sortTable(e,t=!1){const n=document.getElementById("data-table"),a=n.querySelector("tbody"),l=Array.from(a.querySelectorAll("tr")),o=n.querySelectorAll("th");let r=n.getAttribute("data-sort-order")||"asc",d=n.getAttribute("data-sort-column")||"-1";r=t||d!=e?"asc":"asc"===r?"desc":"asc",n.setAttribute("data-sort-order",r),n.setAttribute("data-sort-column",e),l.sort(((t,n)=>{let a=t.cells[e].innerText.trim(),l=n.cells[e].innerText.trim(),o=parseFloat(a.replace(/[^0-9.,]/g,"").replace(/,/g,"")),d=parseFloat(l.replace(/[^0-9.,]/g,"").replace(/,/g,""));return isNaN(o)||isNaN(d)?"asc"===r?a.localeCompare(l):l.localeCompare(a):"asc"===r?o-d:d-o})),a.innerHTML="",l.forEach((e=>a.appendChild(e))),updateSortIndicators(o,e,r)}function updateSortIndicators(e,t,n){e.forEach(((e,a)=>{let l=e.querySelector(".sort-indicator");l.innerHTML=a===t?"asc"===n?" ▲":" ▼":""}))}window.addEventListener("load",(async()=>{const e=["hsd-sync","hsd-version","hsd-height","wallet-sync","wallet-available","wallet-total","wallet-locked","wallet-pending","wallet-domainCount","wallet-bidCount","wallet-pendingReveal","wallet-pendingRegister","wallet-pendingRedeem"],t=["wallet-available","wallet-total","wallet-locked"],n=["wallet-pendingReveal","wallet-pendingRegister","wallet-pendingRedeem"];for(const a of e){const e=document.getElementById(a);if(e){const l=a.replace(/-/g,"/");let o=await request(l);n.includes(a)&&(o=o.length),t.includes(a)&&(o=Number(o).toFixed(2)),o=o.toString().replace(/\B(?=(\d{3})+(?!\d))/g,","),e.innerHTML=o}}})),document.addEventListener("DOMContentLoaded",(function(){fetch("/api/v1/wallet/domains").then((e=>e.json())).then((e=>{const t=document.querySelector("#data-table tbody");t&&(t.innerHTML="",e.result.forEach((e=>{const n=document.createElement("tr"),a=document.createElement("td");a.textContent=e.name,n.appendChild(a);var l="Unknown";"stats"in e&&"daysUntilExpire"in e.stats&&(l=e.stats.daysUntilExpire);const o=document.createElement("td");o.textContent=`${l} days`,n.appendChild(o);const r=document.createElement("td");r.textContent=`${(e.value/1e6).toFixed(2).replace(/\B(?=(\d{3})+(?!\d))/g,",")} HNS`,n.appendChild(r);const d=document.createElement("td");d.innerHTML=e.registered?"Manage":"Register",n.appendChild(d),t.appendChild(n)})),sortTable(0,!0))})).catch((e=>console.error("Error fetching data:",e)))})),setInterval((async function(){const e=["hsd-sync","hsd-height","wallet-sync","wallet-pending","wallet-available","wallet-total"];for(const t of e){const e=document.getElementById(t);if(e){const n=t.replace(/-/g,"/");let a=await request(n);["wallet-available","wallet-total"].includes(t)&&(a=Number(a).toFixed(2)),a=a.toString().replace(/\B(?=(\d{3})+(?!\d))/g,","),e.innerHTML=a}}}),2e4),function(){"use strict";var e=document.querySelector(".sidebar"),t=document.querySelectorAll("#sidebarToggle, #sidebarToggleTop");if(e){e.querySelector(".collapse");var n=[].slice.call(document.querySelectorAll(".sidebar .collapse")).map((function(e){return new bootstrap.Collapse(e,{toggle:!1})}));for(var a of t)a.addEventListener("click",(function(t){if(document.body.classList.toggle("sidebar-toggled"),e.classList.toggle("toggled"),e.classList.contains("toggled"))for(var a of n)a.hide()}));window.addEventListener("resize",(function(){if(Math.max(document.documentElement.clientWidth||0,window.innerWidth||0)<768)for(var e of n)e.hide()}))}var l=document.querySelector("body.fixed-nav .sidebar");l&&l.on("mousewheel DOMMouseScroll wheel",(function(e){if(Math.max(document.documentElement.clientWidth||0,window.innerWidth||0)>768){var t=e.originalEvent,n=t.wheelDelta||-t.detail;this.scrollTop+=30*(n<0?1:-1),e.preventDefault()}}));var o=document.querySelector(".scroll-to-top");o&&window.addEventListener("scroll",(function(){var e=window.pageYOffset;o.style.display=e>100?"block":"none"}))}(); \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index 3294c76..a554352 100644 --- a/templates/index.html +++ b/templates/index.html @@ -128,8 +128,9 @@
- {{plugins|safe}} + +
{{plugins|safe}}
@@ -182,6 +183,7 @@
+ \ No newline at end of file