From 6704bdfc414cdd065a72296aa47fe3c8c95d615b Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Fri, 25 Feb 2022 10:00:27 +0100 Subject: [PATCH 001/317] poc check chaintip --- .../specter/managers/wallet_manager.py | 29 +++++++++++++++++ .../templates/includes/sidebar/sidebar.jinja | 31 +++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/src/cryptoadvance/specter/managers/wallet_manager.py b/src/cryptoadvance/specter/managers/wallet_manager.py index ffc67a7f8f..c894c7a2a4 100644 --- a/src/cryptoadvance/specter/managers/wallet_manager.py +++ b/src/cryptoadvance/specter/managers/wallet_manager.py @@ -19,6 +19,10 @@ purposes, ) +from apscheduler.schedulers.background import BackgroundScheduler +import time +import atexit + logger = logging.getLogger(__name__) @@ -48,6 +52,31 @@ def __init__( # define different wallet classes for liquid and bitcoin self.WalletClass = LWallet if is_liquid(chain) else Wallet self.update(data_folder, rpc, chain) + self.chaintips = None + + def update_if_chaintip_changed(): + if self.rpc: + newchaintips = self.rpc.getchaintips() + if self.chaintips != newchaintips: + self.chaintips = newchaintips + logger.info(self.chaintips) + self.update() + else: + logger.info("do nothing") + + if ( + os.environ.get("WERKZEUG_RUN_MAIN") != "true" + ): # in debug mode flask initializes everything twice. This env checks if it is already running + scheduler = BackgroundScheduler() + scheduler.add_job( + func=update_if_chaintip_changed, + trigger="interval", + seconds=5, + max_instances=1, + ) + atexit.register(lambda: scheduler.shutdown(wait=False)) + scheduler.start() + print("scheduler activated") def update(self, data_folder=None, rpc=None, chain=None, use_threading=True): if self.is_loading: diff --git a/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja b/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja index c334e35856..8aca25c8c6 100644 --- a/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja +++ b/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja @@ -224,6 +224,37 @@ {% include "services/sidebar_services_list.jinja" %} {{ sidebar_btn(url_for('services_endpoint.choose'), 'Choose plugins', 'btn_plugins') }}
+ + + + +
{{ _("Specter Version:") }} {{ specter.version.current }} From 95490c2d29ce17527694f1451df14a8c9f97882e Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Fri, 25 Feb 2022 10:36:40 +0100 Subject: [PATCH 002/317] Working scheduler in javascript that asks for the maxchaintip --- .../specter/managers/wallet_manager.py | 30 ++++--------------- .../specter/server_endpoints/controller.py | 12 ++++++++ .../templates/includes/sidebar/sidebar.jinja | 17 ++++++++++- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/src/cryptoadvance/specter/managers/wallet_manager.py b/src/cryptoadvance/specter/managers/wallet_manager.py index c894c7a2a4..a428613b68 100644 --- a/src/cryptoadvance/specter/managers/wallet_manager.py +++ b/src/cryptoadvance/specter/managers/wallet_manager.py @@ -20,7 +20,6 @@ ) from apscheduler.schedulers.background import BackgroundScheduler -import time import atexit logger = logging.getLogger(__name__) @@ -52,31 +51,12 @@ def __init__( # define different wallet classes for liquid and bitcoin self.WalletClass = LWallet if is_liquid(chain) else Wallet self.update(data_folder, rpc, chain) - self.chaintips = None - def update_if_chaintip_changed(): - if self.rpc: - newchaintips = self.rpc.getchaintips() - if self.chaintips != newchaintips: - self.chaintips = newchaintips - logger.info(self.chaintips) - self.update() - else: - logger.info("do nothing") - - if ( - os.environ.get("WERKZEUG_RUN_MAIN") != "true" - ): # in debug mode flask initializes everything twice. This env checks if it is already running - scheduler = BackgroundScheduler() - scheduler.add_job( - func=update_if_chaintip_changed, - trigger="interval", - seconds=5, - max_instances=1, - ) - atexit.register(lambda: scheduler.shutdown(wait=False)) - scheduler.start() - print("scheduler activated") + def getchaintips(self): + if not self.rpc: + return [] + chaintips = self.rpc.getchaintips() + return chaintips def update(self, data_folder=None, rpc=None, chain=None, use_threading=True): if self.is_loading: diff --git a/src/cryptoadvance/specter/server_endpoints/controller.py b/src/cryptoadvance/specter/server_endpoints/controller.py index 0cf72c9808..513314363a 100644 --- a/src/cryptoadvance/specter/server_endpoints/controller.py +++ b/src/cryptoadvance/specter/server_endpoints/controller.py @@ -201,6 +201,18 @@ def inject_debug(): return dict(debug=app.config["DEBUG"]) +@app.route("/", methods=["GET", "POST"]) +def get_max_chaintip_height(): # GET request + from flask import jsonify + + if request.method == "GET": + chaintips = app.specter.wallet_manager.getchaintips() + max_chaintip_height = ( + max([chaintip["height"] for chaintip in chaintips]) if chaintips else 0 + ) + return jsonify(max_chaintip_height) # serialize and use JSON headers + + ################ Specter global routes #################### @app.route("/") def index(): diff --git a/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja b/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja index 8aca25c8c6..6cdbab1e93 100644 --- a/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja +++ b/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja @@ -226,6 +226,22 @@
-
From e0c03f9c697d36a8710ea1bdb97447d2e80dafd5 Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Fri, 25 Feb 2022 10:44:00 +0100 Subject: [PATCH 003/317] Included the webpush notification when there is a new block --- .../templates/includes/sidebar/sidebar.jinja | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja b/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja index 6cdbab1e93..62f160c2c3 100644 --- a/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja +++ b/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja @@ -226,23 +226,8 @@
From bd30a458c76b106965a78c514ead883a902f834a Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Fri, 25 Feb 2022 11:34:41 +0100 Subject: [PATCH 004/317] better initialization --- .../specter/templates/includes/sidebar/sidebar.jinja | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja b/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja index 62f160c2c3..046eadbb10 100644 --- a/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja +++ b/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja @@ -254,17 +254,21 @@ - current_chaintip_height = 0 + current_chaintip_height = -1 setInterval(function(){ //this code runs every interval fetch('/') .then(function (response) { return response.json(); }).then(function (max_chaintip_height) { + if (current_chaintip_height == -1){ + current_chaintip_height = max_chaintip_height; + } if (current_chaintip_height != max_chaintip_height){ webpush_notification(`New Block ${max_chaintip_height}`) //console.log(`new Block!!! ${max_chaintip_height}`); current_chaintip_height = max_chaintip_height; + // location.reload(); } ; console.log(`${max_chaintip_height}`); }); From 2d2c6dbd3dd04fed6254e92fe3e628bcf8a3a31e Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Fri, 25 Feb 2022 11:51:58 +0100 Subject: [PATCH 005/317] Mved python functionality --- .../specter/server_endpoints/controller.py | 12 ------------ .../specter/server_endpoints/wallets_api.py | 12 ++++++++++++ .../specter/templates/includes/sidebar/sidebar.jinja | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/cryptoadvance/specter/server_endpoints/controller.py b/src/cryptoadvance/specter/server_endpoints/controller.py index 513314363a..0cf72c9808 100644 --- a/src/cryptoadvance/specter/server_endpoints/controller.py +++ b/src/cryptoadvance/specter/server_endpoints/controller.py @@ -201,18 +201,6 @@ def inject_debug(): return dict(debug=app.config["DEBUG"]) -@app.route("/", methods=["GET", "POST"]) -def get_max_chaintip_height(): # GET request - from flask import jsonify - - if request.method == "GET": - chaintips = app.specter.wallet_manager.getchaintips() - max_chaintip_height = ( - max([chaintip["height"] for chaintip in chaintips]) if chaintips else 0 - ) - return jsonify(max_chaintip_height) # serialize and use JSON headers - - ################ Specter global routes #################### @app.route("/") def index(): diff --git a/src/cryptoadvance/specter/server_endpoints/wallets_api.py b/src/cryptoadvance/specter/server_endpoints/wallets_api.py index d60c657120..618983bcc2 100644 --- a/src/cryptoadvance/specter/server_endpoints/wallets_api.py +++ b/src/cryptoadvance/specter/server_endpoints/wallets_api.py @@ -93,6 +93,18 @@ def fees_old(blocks): return app.specter.estimatesmartfee(int(blocks)) +@wallets_endpoint_api.route("/get_max_chaintip_height", methods=["GET"]) +@login_required +def get_max_chaintip_height(): # GET request + from flask import jsonify + + chaintips = app.specter.wallet_manager.getchaintips() + max_chaintip_height = ( + max([chaintip["height"] for chaintip in chaintips]) if chaintips else 0 + ) + return jsonify(max_chaintip_height) # serialize and use JSON headers + + @wallets_endpoint_api.route("/wallet//combine/", methods=["POST"]) @login_required def combine(wallet_alias): diff --git a/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja b/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja index 046eadbb10..bdcf678882 100644 --- a/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja +++ b/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja @@ -257,7 +257,7 @@ current_chaintip_height = -1 setInterval(function(){ //this code runs every interval - fetch('/') + fetch("{{ url_for('wallets_endpoint_api.get_max_chaintip_height') }}") .then(function (response) { return response.json(); }).then(function (max_chaintip_height) { @@ -270,7 +270,7 @@ current_chaintip_height = max_chaintip_height; // location.reload(); } ; - console.log(`${max_chaintip_height}`); + console.log(max_chaintip_height); }); }, 2000); From dfa98154c8dab9245b987e298b17ccab89794b2d Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Fri, 25 Feb 2022 12:31:53 +0100 Subject: [PATCH 006/317] Working TX notification --- .../specter/server_endpoints/wallets_api.py | 16 ++++++++++ .../templates/includes/sidebar/sidebar.jinja | 30 +++++++++++++++---- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/cryptoadvance/specter/server_endpoints/wallets_api.py b/src/cryptoadvance/specter/server_endpoints/wallets_api.py index 618983bcc2..0315cab384 100644 --- a/src/cryptoadvance/specter/server_endpoints/wallets_api.py +++ b/src/cryptoadvance/specter/server_endpoints/wallets_api.py @@ -105,6 +105,22 @@ def get_max_chaintip_height(): # GET request return jsonify(max_chaintip_height) # serialize and use JSON headers +@wallets_endpoint_api.route("/get_updated_wallet_infos", methods=["GET"]) +@login_required +def get_updated_wallet_infos(): # GET request + from flask import jsonify + + old_full_txlist = app.specter.wallet_manager.full_txlist(fetch_transactions=False) + old_txids = set(tx["txid"] for tx in old_full_txlist) + app.specter.wallet_manager.update() + new_full_txlist = app.specter.wallet_manager.full_txlist() + updated_txids = set(tx["txid"] for tx in new_full_txlist) - old_txids + + return jsonify( + [tx for tx in new_full_txlist if tx["txid"] in updated_txids] + ) # serialize and use JSON headers + + @wallets_endpoint_api.route("/wallet//combine/", methods=["POST"]) @login_required def combine(wallet_alias): diff --git a/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja b/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja index bdcf678882..0fc6426c62 100644 --- a/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja +++ b/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja @@ -235,7 +235,7 @@ // Let's check whether notification permissions have already been granted else if (Notification.permission === "granted") { // If it's okay let's create a notification - var notification = new Notification(text); + let notification = new Notification(text); } // Otherwise, we need to ask the user for permission @@ -243,7 +243,7 @@ Notification.requestPermission().then(function (permission) { // If the user accepts, let's create a notification if (permission === "granted") { - var notification = new Notification(text); + let notification = new Notification(text); } }); } @@ -255,24 +255,44 @@ current_chaintip_height = -1 - setInterval(function(){ + function evalaute_new_transactions(){ + fetch("{{ url_for('wallets_endpoint_api.get_updated_wallet_infos') }}") + .then(function (response) { + return response.json(); + }).then(function (wallets_txlists) { + // do something with the response + for (let i in wallets_txlists) { + console.log(wallets_txlists[i]) + webpush_notification(`New Transaction ${wallets_txlists[i]["amount"]}`) + } + + }); + }; + + function run_scheduled(){ //this code runs every interval fetch("{{ url_for('wallets_endpoint_api.get_max_chaintip_height') }}") .then(function (response) { return response.json(); }).then(function (max_chaintip_height) { + // do something with the response if (current_chaintip_height == -1){ current_chaintip_height = max_chaintip_height; } if (current_chaintip_height != max_chaintip_height){ + evalaute_new_transactions() + current_chaintip_height = max_chaintip_height; webpush_notification(`New Block ${max_chaintip_height}`) //console.log(`new Block!!! ${max_chaintip_height}`); - current_chaintip_height = max_chaintip_height; // location.reload(); } ; console.log(max_chaintip_height); }); - }, 2000); + + }; + + + setInterval(run_scheduled, 2000); From 609c70fdc33d28ba7169e759a129f22ebc2cc9dd Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Fri, 25 Feb 2022 20:47:12 +0100 Subject: [PATCH 007/317] Moved js --- .../specter/templates/base.jinja | 1 + .../templates/includes/notifications.js | 68 ++++++++++++++++++ .../templates/includes/sidebar/sidebar.jinja | 70 ------------------- 3 files changed, 69 insertions(+), 70 deletions(-) create mode 100644 src/cryptoadvance/specter/templates/includes/notifications.js diff --git a/src/cryptoadvance/specter/templates/base.jinja b/src/cryptoadvance/specter/templates/base.jinja index e5df48cf10..940cb2a191 100644 --- a/src/cryptoadvance/specter/templates/base.jinja +++ b/src/cryptoadvance/specter/templates/base.jinja @@ -323,6 +323,7 @@ {% block scripts %} {% endblock %} diff --git a/src/cryptoadvance/specter/templates/includes/notifications.js b/src/cryptoadvance/specter/templates/includes/notifications.js new file mode 100644 index 0000000000..ee124a5918 --- /dev/null +++ b/src/cryptoadvance/specter/templates/includes/notifications.js @@ -0,0 +1,68 @@ + +function webpush_notification(text) { + // Let's check if the browser supports notifications + if (!("Notification" in window)) { + console.debug("This browser does not support desktop notification"); + } + // Let's check whether notification permissions have already been granted + else if (Notification.permission === "granted") { + // If it's okay let's create a notification + let notification = new Notification(text); + } + + // Otherwise, we need to ask the user for permission + else if (Notification.permission !== "denied") { + Notification.requestPermission().then(function (permission) { + // If the user accepts, let's create a notification + if (permission === "granted") { + let notification = new Notification(text); + } + }); + } + + // At last, if the user has denied notifications, and you + // want to be respectful there is no need to bother them any more. + } + + + +current_chaintip_height = -1 +function evalaute_new_transactions(){ + fetch("{{ url_for('wallets_endpoint_api.get_updated_wallet_infos') }}") + .then(function (response) { + return response.json(); + }).then(function (wallets_txlists) { + // do something with the response + for (let i in wallets_txlists) { + console.log(wallets_txlists[i]) + webpush_notification(`New Transaction ${wallets_txlists[i]["amount"]}`) + } + + }); +}; + +function run_scheduled(){ + //this code runs every interval + fetch("{{ url_for('wallets_endpoint_api.get_max_chaintip_height') }}") + .then(function (response) { + return response.json(); + }).then(function (max_chaintip_height) { + // do something with the response + if (current_chaintip_height == -1){ + current_chaintip_height = max_chaintip_height; + } + if (current_chaintip_height != max_chaintip_height){ + evalaute_new_transactions() + current_chaintip_height = max_chaintip_height; + webpush_notification(`New Block ${max_chaintip_height}`) + //console.log(`new Block!!! ${max_chaintip_height}`); + // location.reload(); + } ; + console.log(max_chaintip_height); + }); + +}; + + +setInterval(run_scheduled, 2000); + diff --git a/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja b/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja index 0fc6426c62..c9f4bdd0a4 100644 --- a/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja +++ b/src/cryptoadvance/specter/templates/includes/sidebar/sidebar.jinja @@ -225,76 +225,6 @@ {{ sidebar_btn(url_for('services_endpoint.choose'), 'Choose plugins', 'btn_plugins') }}
-
From bf6c6cd0a475ed000118ca40fb7545508510bac6 Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Fri, 25 Feb 2022 21:48:56 +0100 Subject: [PATCH 008/317] Added body text --- .../templates/includes/notifications.js | 43 +++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/src/cryptoadvance/specter/templates/includes/notifications.js b/src/cryptoadvance/specter/templates/includes/notifications.js index ee124a5918..2ed293a2ec 100644 --- a/src/cryptoadvance/specter/templates/includes/notifications.js +++ b/src/cryptoadvance/specter/templates/includes/notifications.js @@ -1,30 +1,47 @@ +function webpush_notification(title, options) { + function show_notification(){ + let notification = new Notification(title, options); + }; -function webpush_notification(text) { - // Let's check if the browser supports notifications + + + // Let's check if the browser supports notifications if (!("Notification" in window)) { console.debug("This browser does not support desktop notification"); } // Let's check whether notification permissions have already been granted else if (Notification.permission === "granted") { // If it's okay let's create a notification - let notification = new Notification(text); + show_notification(); } - // Otherwise, we need to ask the user for permission else if (Notification.permission !== "denied") { Notification.requestPermission().then(function (permission) { // If the user accepts, let's create a notification if (permission === "granted") { - let notification = new Notification(text); + show_notification(); } }); } // At last, if the user has denied notifications, and you // want to be respectful there is no need to bother them any more. - } +}; + +function webpush_tx(tx) { + title = `Incoming Transaction`; + amount = tx["amount"]; + amount_formatted = amount.toFixed(8); + if (amount>0){ + amount_formatted = `+${amount_formatted}` + }; + var options = { + body: amount_formatted, + }; + webpush_notification(title, options); +}; current_chaintip_height = -1 function evalaute_new_transactions(){ @@ -35,12 +52,16 @@ function evalaute_new_transactions(){ // do something with the response for (let i in wallets_txlists) { console.log(wallets_txlists[i]) - webpush_notification(`New Transaction ${wallets_txlists[i]["amount"]}`) + webpush_tx(wallets_txlists[i]) } }); }; +function notify_new_block(max_chaintip_height){ + //webpush_notification(`New Block ${max_chaintip_height}`) +}; + function run_scheduled(){ //this code runs every interval fetch("{{ url_for('wallets_endpoint_api.get_max_chaintip_height') }}") @@ -52,9 +73,10 @@ function run_scheduled(){ current_chaintip_height = max_chaintip_height; } if (current_chaintip_height != max_chaintip_height){ + evalaute_new_transactions() + notify_new_block(max_chaintip_height) current_chaintip_height = max_chaintip_height; - webpush_notification(`New Block ${max_chaintip_height}`) //console.log(`new Block!!! ${max_chaintip_height}`); // location.reload(); } ; @@ -66,3 +88,8 @@ function run_scheduled(){ setInterval(run_scheduled, 2000); + + + + + From 6fd9ac3e5c0070b9123f13c6b2ba65ede1938a78 Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Sat, 26 Feb 2022 08:15:33 +0100 Subject: [PATCH 009/317] better formatting --- .../templates/includes/notifications.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/cryptoadvance/specter/templates/includes/notifications.js b/src/cryptoadvance/specter/templates/includes/notifications.js index 2ed293a2ec..53f510a016 100644 --- a/src/cryptoadvance/specter/templates/includes/notifications.js +++ b/src/cryptoadvance/specter/templates/includes/notifications.js @@ -29,16 +29,24 @@ function webpush_notification(title, options) { }; -function webpush_tx(tx) { - title = `Incoming Transaction`; - amount = tx["amount"]; - amount_formatted = amount.toFixed(8); +function format_amount(value){ + unit = "{{ specter.unit }}" + if (unit == 'btc'){ + amount_formatted = `${value.toFixed(8)}`; + } else if (unit == 'sat') { + amount_formatted = `${(value * 1e8).toFixed(0)}`; + }; if (amount>0){ amount_formatted = `+${amount_formatted}` }; + return amount_formatted + " {{ specter.unit }}" +} + +function webpush_tx(tx) { + title = `Incoming Transaction`; var options = { - body: amount_formatted, + body: format_amount(tx["amount"]), }; webpush_notification(title, options); }; From 69f81342e26be9d786bf6d96e1254f54cd241ebb Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Sat, 26 Feb 2022 09:48:20 +0100 Subject: [PATCH 010/317] Moved logic to python Added icon (somehow it doesn't work though) --- .../specter/server_endpoints/wallets_api.py | 37 ++++++++-- .../templates/includes/notifications.js | 70 +++++++++++-------- .../specter/templates/includes/tx-row.html | 23 +++--- 3 files changed, 81 insertions(+), 49 deletions(-) diff --git a/src/cryptoadvance/specter/server_endpoints/wallets_api.py b/src/cryptoadvance/specter/server_endpoints/wallets_api.py index 0315cab384..0021193875 100644 --- a/src/cryptoadvance/specter/server_endpoints/wallets_api.py +++ b/src/cryptoadvance/specter/server_endpoints/wallets_api.py @@ -19,7 +19,7 @@ from ..helpers import bcur2base64, generate_mnemonic from ..rpc import RpcError -from ..server_endpoints.filters import assetlabel +from ..server_endpoints.filters import assetlabel, btcunitamount from ..specter_error import SpecterError, handle_exception from ..util.base43 import b43_decode from ..util.descriptor import Descriptor @@ -105,9 +105,9 @@ def get_max_chaintip_height(): # GET request return jsonify(max_chaintip_height) # serialize and use JSON headers -@wallets_endpoint_api.route("/get_updated_wallet_infos", methods=["GET"]) +@wallets_endpoint_api.route("/get_new_tx_notifications", methods=["GET"]) @login_required -def get_updated_wallet_infos(): # GET request +def get_new_tx_notifications(): # GET request from flask import jsonify old_full_txlist = app.specter.wallet_manager.full_txlist(fetch_transactions=False) @@ -116,9 +116,34 @@ def get_updated_wallet_infos(): # GET request new_full_txlist = app.specter.wallet_manager.full_txlist() updated_txids = set(tx["txid"] for tx in new_full_txlist) - old_txids - return jsonify( - [tx for tx in new_full_txlist if tx["txid"] in updated_txids] - ) # serialize and use JSON headers + updated_txs = [tx for tx in new_full_txlist if tx["txid"] in updated_txids] + + print(updated_txs) + notifications = [ + { + "title": f"{tx['category'].capitalize()} Transaction of wallet {tx['wallet_alias']}", + "options": { + "body": f"{btcunitamount(None, tx['amount'])} {app.specter.unit.upper()}\n" + f"sent to {tx['label']}", + "timestamp": tx["time"], + }, + "category": tx["category"], + "isConfirmed": tx["confirmations"] > 0, + } + for tx in updated_txs + ] + + return jsonify(notifications) # serialize and use JSON headers + + +""" + {{ fullbalance | btcunitamount }} + {% if specter.unit == 'sat' %} + sats + {% else %} + {% if specter.is_testnet %}t{%endif%}{% if specter.is_liquid %}L{%endif%}BTC + {% endif %} +""" @wallets_endpoint_api.route("/wallet//combine/", methods=["POST"]) diff --git a/src/cryptoadvance/specter/templates/includes/notifications.js b/src/cryptoadvance/specter/templates/includes/notifications.js index 53f510a016..4c9840722b 100644 --- a/src/cryptoadvance/specter/templates/includes/notifications.js +++ b/src/cryptoadvance/specter/templates/includes/notifications.js @@ -1,8 +1,36 @@ +{% include "includes/utils.js" %} + function webpush_notification(title, options) { function show_notification(){ let notification = new Notification(title, options); }; + /* +{ + "//": "Visual Options", + "body": "", + "icon": "", + "image": "", + "badge": "", + "vibrate": "", + "sound": "", + "dir": "", + + "//": "Behavioral Options", + "tag": "", + "data": "", + "requireInteraction": "", + "renotify": "", + "silent": "", + + "//": "Both visual & behavioral options", + "actions": "", + + "//": "Information Option. No visual affect.", + "timestamp": "" +} + + */ // Let's check if the browser supports notifications @@ -29,38 +57,20 @@ function webpush_notification(title, options) { }; -function format_amount(value){ - unit = "{{ specter.unit }}" - if (unit == 'btc'){ - amount_formatted = `${value.toFixed(8)}`; - } else if (unit == 'sat') { - amount_formatted = `${(value * 1e8).toFixed(0)}`; - }; - if (amount>0){ - amount_formatted = `+${amount_formatted}` - }; - return amount_formatted + " {{ specter.unit }}" -} - -function webpush_tx(tx) { - title = `Incoming Transaction`; - - var options = { - body: format_amount(tx["amount"]), - }; - webpush_notification(title, options); -}; - current_chaintip_height = -1 function evalaute_new_transactions(){ - fetch("{{ url_for('wallets_endpoint_api.get_updated_wallet_infos') }}") + fetch("{{ url_for('wallets_endpoint_api.get_new_tx_notifications') }}") .then(function (response) { return response.json(); - }).then(function (wallets_txlists) { + }).then(function (tx_notifications) { // do something with the response - for (let i in wallets_txlists) { - console.log(wallets_txlists[i]) - webpush_tx(wallets_txlists[i]) + console.log(tx_notifications) + for (let i in tx_notifications) { + console.log(tx_notifications[i]); + tx_notifications[i]['icon'] = getCategoryImg(tx_notifications[i]['category'], tx_notifications[i]['isConfirmed']); // TODO: Doesnt work + tx_notifications[i]['image'] = tx_notifications[i]['icon'] + tx_notifications[i]['badge'] = tx_notifications[i]['icon'] + webpush_notification(tx_notifications[i]['title'], tx_notifications[i]['options']); } }); @@ -72,6 +82,10 @@ function notify_new_block(max_chaintip_height){ function run_scheduled(){ //this code runs every interval + evalaute_new_transactions() + + + /* fetch("{{ url_for('wallets_endpoint_api.get_max_chaintip_height') }}") .then(function (response) { return response.json(); @@ -90,7 +104,7 @@ function run_scheduled(){ } ; console.log(max_chaintip_height); }); - + */ }; diff --git a/src/cryptoadvance/specter/templates/includes/tx-row.html b/src/cryptoadvance/specter/templates/includes/tx-row.html index ccd70b10a8..bf86405da8 100644 --- a/src/cryptoadvance/specter/templates/includes/tx-row.html +++ b/src/cryptoadvance/specter/templates/includes/tx-row.html @@ -58,7 +58,10 @@ + From 6497aa60b594bab4e0d895d2e9e1643832d330bc Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Thu, 3 Mar 2022 13:05:16 +0100 Subject: [PATCH 011/317] Title change --- src/cryptoadvance/specter/server_endpoints/wallets_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cryptoadvance/specter/server_endpoints/wallets_api.py b/src/cryptoadvance/specter/server_endpoints/wallets_api.py index 0021193875..35951ad468 100644 --- a/src/cryptoadvance/specter/server_endpoints/wallets_api.py +++ b/src/cryptoadvance/specter/server_endpoints/wallets_api.py @@ -121,7 +121,7 @@ def get_new_tx_notifications(): # GET request print(updated_txs) notifications = [ { - "title": f"{tx['category'].capitalize()} Transaction of wallet {tx['wallet_alias']}", + "title": f"Specter: {tx['category'].capitalize()} Transaction of wallet {tx['wallet_alias']}", "options": { "body": f"{btcunitamount(None, tx['amount'])} {app.specter.unit.upper()}\n" f"sent to {tx['label']}", From f954e0ef24bc4760714bc8d1df31f8263ffb0585 Mon Sep 17 00:00:00 2001 From: Kim Neunert Date: Fri, 1 Apr 2022 15:28:50 +0200 Subject: [PATCH 012/317] Feature: Menu extensions can extend menus --- .../specter/managers/service_manager.py | 4 +++- .../specter/server_endpoints/settings.py | 12 +++++++++++- src/cryptoadvance/specter/services/callbacks.py | 4 ++++ .../settings/components/settings_menu.jinja | 10 +++++++++- .../settings/components/settings_menu_item.jinja | 4 ++-- .../templates/settings/general_settings.jinja | 2 +- .../specter/templates/settings/hwi_settings.jinja | 2 +- 7 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/cryptoadvance/specter/managers/service_manager.py b/src/cryptoadvance/specter/managers/service_manager.py index 3ba03139ea..824509c757 100644 --- a/src/cryptoadvance/specter/managers/service_manager.py +++ b/src/cryptoadvance/specter/managers/service_manager.py @@ -225,10 +225,12 @@ def execute_ext_callbacks(self, callback_id, *args, **kwargs): """ if callback_id not in dir(callbacks): raise Exception(f"Non existing callback_id: {callback_id}") + return_values = {} logger.debug(f"Executing callback {callback_id}") for ext in self.services.values(): if hasattr(ext, "callback"): - ext.callback(callback_id, *args, **kwargs) + return_values[ext.id] = ext.callback(callback_id, *args, **kwargs) + return return_values @property def services(self) -> Dict[str, Service]: diff --git a/src/cryptoadvance/specter/server_endpoints/settings.py b/src/cryptoadvance/specter/server_endpoints/settings.py index 00729f0f6c..8edcc74054 100644 --- a/src/cryptoadvance/specter/server_endpoints/settings.py +++ b/src/cryptoadvance/specter/server_endpoints/settings.py @@ -19,7 +19,7 @@ from flask import flash, jsonify, redirect, render_template, request, send_file, url_for from flask_babel import lazy_gettext as _ from flask_login import current_user, login_required -from cryptoadvance.specter.services.service import Service +from cryptoadvance.specter.services.service import Service, callbacks from cryptoadvance.specter.user import User, UserSecretException @@ -43,6 +43,16 @@ settings_endpoint = Blueprint("settings_endpoint", __name__) +@settings_endpoint.context_processor +def inject_common_stuff(): + """Can be used in all jinja2 templates""" + settings_exts = app.specter.service_manager.execute_ext_callbacks( + callbacks.setting_exts + ) + settings_exts = settings_exts["scratchpad"] + return dict(settings_exts=settings_exts) + + @settings_endpoint.route("/", methods=["GET"]) @login_required def settings(): diff --git a/src/cryptoadvance/specter/services/callbacks.py b/src/cryptoadvance/specter/services/callbacks.py index 1d891786d3..fc10b03ec3 100644 --- a/src/cryptoadvance/specter/services/callbacks.py +++ b/src/cryptoadvance/specter/services/callbacks.py @@ -13,3 +13,7 @@ afterServiceManagerInit = "afterServiceManagerInit" after_serverpy_init_app = "after_serverpy_init_app" + +# Extensions which want to extend the settings dialog +# needs to return something like: return [{"title": "token", "endpoint":"settings_token"}] +setting_exts = "setting_exts" diff --git a/src/cryptoadvance/specter/templates/settings/components/settings_menu.jinja b/src/cryptoadvance/specter/templates/settings/components/settings_menu.jinja index 0cb05f5667..16e14f7ed0 100644 --- a/src/cryptoadvance/specter/templates/settings/components/settings_menu.jinja +++ b/src/cryptoadvance/specter/templates/settings/components/settings_menu.jinja @@ -6,11 +6,19 @@ - active_menuitem: Current active tab. Options: 'general', 'bitcoin_core', 'auth'. - current_user: The current user. #} -{% macro settings_menu(active_menuitem, current_user) -%} +{% macro settings_menu(active_menuitem, current_user, settings_exts=[]) -%} +