parent
42e8f642b4
commit
86c93da5a2
Binary file not shown.
@ -36,11 +36,14 @@ def hsdConnected():
|
|||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def hsdVersion():
|
def hsdVersion(format=True):
|
||||||
info = hsd.getInfo()
|
info = hsd.getInfo()
|
||||||
if 'error' in info:
|
if 'error' in info:
|
||||||
return -1
|
return -1
|
||||||
return float('.'.join(info['version'].split(".")[:2]))
|
if format:
|
||||||
|
return float('.'.join(info['version'].split(".")[:2]))
|
||||||
|
else:
|
||||||
|
return info['version']
|
||||||
|
|
||||||
def check_account(cookie: str):
|
def check_account(cookie: str):
|
||||||
if cookie is None:
|
if cookie is None:
|
||||||
|
2
main.py
2
main.py
@ -1078,6 +1078,7 @@ def settings():
|
|||||||
if not os.path.exists(".git"):
|
if not os.path.exists(".git"):
|
||||||
return render_template("settings.html", account=account,sync=account_module.getNodeSync(),
|
return render_template("settings.html", account=account,sync=account_module.getNodeSync(),
|
||||||
wallet_status=account_module.getWalletStatus(),
|
wallet_status=account_module.getWalletStatus(),
|
||||||
|
hsd_version=account_module.hsdVersion(False),
|
||||||
error=error,success=success,version="Error")
|
error=error,success=success,version="Error")
|
||||||
info = gitinfo.get_git_info()
|
info = gitinfo.get_git_info()
|
||||||
branch = info['refs']
|
branch = info['refs']
|
||||||
@ -1092,6 +1093,7 @@ def settings():
|
|||||||
|
|
||||||
return render_template("settings.html", account=account,sync=account_module.getNodeSync(),
|
return render_template("settings.html", account=account,sync=account_module.getNodeSync(),
|
||||||
wallet_status=account_module.getWalletStatus(),
|
wallet_status=account_module.getWalletStatus(),
|
||||||
|
hsd_version=account_module.hsdVersion(False),
|
||||||
error=error,success=success,version=version)
|
error=error,success=success,version=version)
|
||||||
|
|
||||||
@app.route('/settings/<action>')
|
@app.route('/settings/<action>')
|
||||||
|
@ -74,7 +74,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -106,7 +106,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -164,7 +164,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -76,7 +76,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -75,7 +75,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -123,7 +123,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2023</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -180,7 +180,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -151,7 +151,7 @@ function checkAddress(inputValue) {
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -69,7 +69,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -69,7 +69,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -71,7 +71,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -70,7 +70,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -74,7 +74,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -115,7 +115,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -118,7 +118,7 @@ function checkAddress(inputValue) {
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -68,7 +68,7 @@
|
|||||||
<h3 class="mb-1" style="text-align: center;color: rgb(0,255,0);">{{success}}</h3>
|
<h3 class="mb-1" style="text-align: center;color: rgb(0,255,0);">{{success}}</h3>
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h4 class="card-title">Node Settings</h4>
|
<h4 class="card-title">Node Settings</h4><small>HSD Version: v{{hsd_version}}</small>
|
||||||
<h6 class="text-muted card-subtitle mb-2">Settings that affect all wallets</h6>
|
<h6 class="text-muted card-subtitle mb-2">Settings that affect all wallets</h6>
|
||||||
<ul class="list-group">
|
<ul class="list-group">
|
||||||
<li class="list-group-item">
|
<li class="list-group-item">
|
||||||
@ -105,7 +105,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="container-fluid" style="margin-top: 50px;">
|
<div class="container-fluid" style="margin-top: 50px;margin-bottom: 50px;">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h4 class="card-title">About</h4>
|
<h4 class="card-title">About</h4>
|
||||||
@ -117,7 +117,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -73,7 +73,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
@ -107,7 +107,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
|
||||||
<div class="container my-auto">
|
<div class="container my-auto">
|
||||||
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div>
|
<div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>
|
||||||
|
Loading…
Reference in New Issue
Block a user