forked from bitcoinafterlife/bal-electrum-plugin
Problema: i server Will-Executor venivano contattati in sequenza e, su timeout, send_request riprovava 10x con sleep 3s (~130s per server morto). Un solo server irraggiungibile bloccava l'intera operazione (impallamento UI). Soluzione: - ThreadPoolExecutor: ping e push ora in parallelo (tempo ~= server piu' lento, non la somma). Un server morto non blocca piu' gli altri. - Fast-fail per operazioni interattive (ping/info/download): max_retries=0, niente retry-storm. - Feedback live: callback on_each() aggiorna il dialog server-per-server (thread-safe via pyqtSignal di BalWaitingDialog.update). - Push transazioni: parallelo ma con retry per-server mantenuti (no perdita tx). File: - bal/core/willexecutors.py: send_request(+max_retries,+retry_sleep), get_info_task fast-fail, NEW ping_servers_parallel(), push_transactions_parallel(), DEFAULT_TIMEOUT=5. - bal/gui/qt/window.py: ping_willexecutors_task + push_transactions_to_willexecutors riscritti su helper paralleli con feedback live; fetch_will_executors_list fast-fail. - bal/core/util.py: BUGFIX get_value_amount usava in_output (bool) invece di din_output (tupla) -> TypeError. Scoperto dai test ufficiali Gitea. Test (contro il codice refactor): - pytest tests/ ufficiali: 117 core + 65 gui = 182 passed. - smoke/external_zip/windows_overflow/gui_fixes: OK. - parallel_ping_test (nuovo): 0.50s per 8 server vs ~4.00s sequenziale. - ruff: nessun nuovo problema introdotto (codice nuovo PEP8-compliant). Aggiunti i test ufficiali del repo Gitea + REPORT_NETWORKING_PARALLELO.md.
522 lines
20 KiB
Python
522 lines
20 KiB
Python
"""
|
|
bal.core.willexecutors
|
|
=======================
|
|
|
|
Client logic for talking to *will-executor* servers.
|
|
|
|
A will-executor is an optional third-party service that, for a small fee,
|
|
stores the signed inheritance transactions off-line and broadcasts them once
|
|
their locktime expires (acting as a dead-man's switch backup).
|
|
|
|
This module only contains the networking / data-shaping logic (downloading the
|
|
server list, pinging servers for their fee and address, pushing transactions,
|
|
checking whether a tx is already stored). It is GUI-free: all user
|
|
interaction is handled by the Qt layer.
|
|
"""
|
|
|
|
import json
|
|
import time
|
|
from datetime import datetime
|
|
|
|
from aiohttp import ClientResponse
|
|
from electrum.i18n import _
|
|
from electrum.logging import get_logger
|
|
from electrum.network import Network
|
|
|
|
from .plugin_base import BalPlugin
|
|
|
|
DEFAULT_TIMEOUT = 5
|
|
_logger = get_logger(__name__)
|
|
|
|
|
|
chainname = BalPlugin.chainname
|
|
|
|
|
|
class Willexecutors:
|
|
|
|
@staticmethod
|
|
def save(bal_plugin, willexecutors):
|
|
_logger.debug(f"save {willexecutors},{chainname}")
|
|
aw = bal_plugin.WILLEXECUTORS.get()
|
|
aw[chainname] = willexecutors
|
|
bal_plugin.WILLEXECUTORS.set(aw)
|
|
_logger.debug(f"saved: {aw}")
|
|
# bal_plugin.WILLEXECUTORS.set(willexecutors)
|
|
|
|
@staticmethod
|
|
def get_willexecutors(
|
|
bal_plugin, update=False, bal_window=False, force=False, task=True
|
|
):
|
|
willexecutors = bal_plugin.WILLEXECUTORS.get()
|
|
willexecutors = willexecutors.get(chainname, {})
|
|
to_del = []
|
|
for w in willexecutors:
|
|
if not isinstance(willexecutors[w], dict):
|
|
to_del.append(w)
|
|
continue
|
|
Willexecutors.initialize_willexecutor(willexecutors[w], w)
|
|
for w in to_del:
|
|
_logger.error(
|
|
"error Willexecutor to delete type:{} {}".format(
|
|
type(willexecutors[w]), w
|
|
)
|
|
)
|
|
del willexecutors[w]
|
|
bal = bal_plugin.WILLEXECUTORS.default.get(chainname, {})
|
|
for bal_url, bal_executor in bal.items():
|
|
if bal_url not in willexecutors:
|
|
_logger.debug(f"force add {bal_url} willexecutor")
|
|
willexecutors[bal_url] = bal_executor
|
|
# if update:
|
|
# found = False
|
|
# for url, we in willexecutors.items():
|
|
# if Willexecutors.is_selected(we):
|
|
# found = True
|
|
# if found or force:
|
|
# if bal_plugin.PING_WILLEXECUTORS.get() or force:
|
|
# ping_willexecutors = True
|
|
# if bal_plugin.ASK_PING_WILLEXECUTORS.get() and not force:
|
|
# if bal_window:
|
|
# ping_willexecutors = bal_window.window.question(
|
|
# _(
|
|
# "Contact willexecutors servers to update payment informations?"
|
|
# )
|
|
# )
|
|
|
|
# if ping_willexecutors:
|
|
# if task:
|
|
# bal_window.ping_willexecutors(willexecutors, task)
|
|
# else:
|
|
# bal_window.ping_willexecutors_task(willexecutors)
|
|
w_sorted = dict(
|
|
sorted(
|
|
willexecutors.items(), key=lambda w: w[1].get("sort", 0), reverse=True
|
|
)
|
|
)
|
|
return w_sorted
|
|
|
|
@staticmethod
|
|
def is_selected(willexecutor, value=None):
|
|
if not willexecutor:
|
|
return False
|
|
if value is not None:
|
|
willexecutor["selected"] = value
|
|
try:
|
|
return willexecutor["selected"]
|
|
except Exception:
|
|
willexecutor["selected"] = False
|
|
return False
|
|
|
|
@staticmethod
|
|
def get_willexecutor_transactions(will, force=False):
|
|
willexecutors = {}
|
|
for wid, willitem in will.items():
|
|
if willitem.get_status("VALID"):
|
|
if willitem.get_status("COMPLETE"):
|
|
if not willitem.get_status("PUSHED") or force:
|
|
if willexecutor := willitem.we:
|
|
url = willexecutor["url"]
|
|
if willexecutor and Willexecutors.is_selected(willexecutor):
|
|
if url not in willexecutors:
|
|
willexecutor["txs"] = ""
|
|
willexecutor["txsids"] = []
|
|
willexecutor["broadcast_status"] = _("Waiting...")
|
|
willexecutors[url] = willexecutor
|
|
willexecutors[url]["txs"] += str(willitem.tx) + "\n"
|
|
willexecutors[url]["txsids"].append(wid)
|
|
|
|
return willexecutors
|
|
|
|
# def only_selected_list(willexecutors):
|
|
# out = {}
|
|
# for url, v in willexecutors.items():
|
|
# if Willexecutors.is_selected(url):
|
|
# out[url] = v
|
|
|
|
# def push_transactions_to_willexecutors(will):
|
|
# willexecutors = Willexecutors.get_transactions_to_be_pushed()
|
|
# for url in willexecutors:
|
|
# willexecutor = willexecutors[url]
|
|
# if Willexecutors.is_selected(willexecutor):
|
|
# if "txs" in willexecutor:
|
|
# Willexecutors.push_transactions_to_willexecutor(
|
|
# willexecutors[url]["txs"], url
|
|
# )
|
|
|
|
@staticmethod
|
|
def send_request(
|
|
method, url, data=None, *, timeout=10, handle_response=None, count_reply=0,
|
|
max_retries=10, retry_sleep=3,
|
|
):
|
|
"""Send an HTTP request to a will-executor server.
|
|
|
|
``max_retries`` / ``retry_sleep`` control the timeout-retry behaviour:
|
|
|
|
* For *critical* operations (pushing inheritance transactions) the
|
|
historical default of up to 10 retries with a 3s back-off is kept, so
|
|
a transient network hiccup does not lose a transaction.
|
|
* For *interactive* operations (ping / info / list download) callers
|
|
should pass ``max_retries=0`` so a dead server fails fast (one short
|
|
timeout) instead of blocking the UI for minutes. See
|
|
:meth:`ping_servers_parallel`.
|
|
"""
|
|
network = Network.get_instance()
|
|
if not network:
|
|
raise Exception("You are offline.")
|
|
_logger.debug(f"<-- {method} {url} {data}")
|
|
headers = {}
|
|
headers["user-agent"] = f"BalPlugin v:{BalPlugin.__version__}"
|
|
headers["Content-Type"] = "text/plain"
|
|
if not handle_response:
|
|
handle_response = Willexecutors.handle_response
|
|
try:
|
|
if method == "get":
|
|
response = Network.send_http_on_proxy(
|
|
method,
|
|
url,
|
|
params=data,
|
|
headers=headers,
|
|
on_finish=handle_response,
|
|
timeout=timeout,
|
|
)
|
|
elif method == "post":
|
|
response = Network.send_http_on_proxy(
|
|
method,
|
|
url,
|
|
body=data,
|
|
headers=headers,
|
|
on_finish=handle_response,
|
|
timeout=timeout,
|
|
)
|
|
else:
|
|
raise Exception(f"unexpected {method=!r}")
|
|
except TimeoutError:
|
|
if count_reply < max_retries:
|
|
_logger.debug(
|
|
f"timeout({count_reply}) error: retry in {retry_sleep} sec..."
|
|
)
|
|
if retry_sleep:
|
|
time.sleep(retry_sleep)
|
|
return Willexecutors.send_request(
|
|
method,
|
|
url,
|
|
data,
|
|
timeout=timeout,
|
|
handle_response=handle_response,
|
|
count_reply=count_reply + 1,
|
|
max_retries=max_retries,
|
|
retry_sleep=retry_sleep,
|
|
)
|
|
else:
|
|
_logger.debug(f"Too many timeouts: {count_reply}")
|
|
except Exception as e:
|
|
raise e
|
|
else:
|
|
_logger.debug(f"--> {response}")
|
|
return response
|
|
|
|
@staticmethod
|
|
def get_we_url_from_response(resp):
|
|
url_slices = str(resp.url).split("/")
|
|
if len(url_slices) > 2:
|
|
url_slices = url_slices[:-2]
|
|
return "/".join(url_slices)
|
|
|
|
@staticmethod
|
|
async def handle_response(resp: ClientResponse):
|
|
r = await resp.text()
|
|
try:
|
|
|
|
r = json.loads(r)
|
|
# url = Willexecutors.get_we_url_from_response(resp)
|
|
# r["url"]= url
|
|
# r["status"]=resp.status
|
|
except Exception as e:
|
|
_logger.debug(f"error handling response:{e}")
|
|
pass
|
|
return r
|
|
|
|
@staticmethod
|
|
class AlreadyPresentException(Exception):
|
|
pass
|
|
|
|
@staticmethod
|
|
def push_transactions_to_willexecutor(willexecutor):
|
|
out = True
|
|
try:
|
|
_logger.debug(f"{willexecutor['url']}: {willexecutor['txs']}")
|
|
if w := Willexecutors.send_request(
|
|
"post",
|
|
willexecutor["url"] + "/" + chainname + "/pushtxs",
|
|
data=willexecutor["txs"].encode("ascii"),
|
|
):
|
|
willexecutor["broadcast_status"] = _("Success")
|
|
_logger.debug(f"pushed: {w}")
|
|
if w != "thx":
|
|
_logger.debug(f"error: {w}")
|
|
raise Exception(w)
|
|
else:
|
|
raise Exception("empty reply from:{willexecutor['url']}")
|
|
except Exception as e:
|
|
_logger.debug(f"error:{e}")
|
|
if str(e) == "already present":
|
|
raise Willexecutors.AlreadyPresentException()
|
|
out = False
|
|
willexecutor["broadcast_status"] = _("Failed")
|
|
|
|
return out
|
|
|
|
@staticmethod
|
|
def ping_servers(willexecutors):
|
|
for url, we in willexecutors.items():
|
|
Willexecutors.get_info_task(url, we)
|
|
|
|
@staticmethod
|
|
def get_info_task(url, willexecutor, *, timeout=DEFAULT_TIMEOUT,
|
|
max_retries=0, retry_sleep=0):
|
|
w = None
|
|
try:
|
|
_logger.info("GETINFO_WILLEXECUTOR")
|
|
_logger.debug(url)
|
|
# Fast-fail by default (max_retries=0): a dead server returns after a
|
|
# single short timeout instead of retrying 10x with sleeps, which
|
|
# used to freeze the UI for minutes per unreachable server.
|
|
w = Willexecutors.send_request(
|
|
"get", url + "/" + chainname + "/info",
|
|
timeout=timeout, max_retries=max_retries, retry_sleep=retry_sleep,
|
|
)
|
|
if isinstance(w, dict):
|
|
willexecutor["url"] = url
|
|
willexecutor["status"] = 200
|
|
willexecutor["base_fee"] = w["base_fee"]
|
|
willexecutor["address"] = w["address"]
|
|
willexecutor["info"] = w["info"]
|
|
else:
|
|
# No dict reply (timeout / empty) -> mark as unreachable.
|
|
willexecutor["status"] = "KO"
|
|
_logger.debug(f"response_data {w}")
|
|
except Exception as e:
|
|
_logger.error(f"error {e} contacting {url}: {w}")
|
|
willexecutor["status"] = "KO"
|
|
|
|
willexecutor["last_update"] = datetime.now().timestamp()
|
|
return willexecutor
|
|
|
|
@staticmethod
|
|
def ping_servers_parallel(willexecutors, *, on_each=None, max_workers=8,
|
|
timeout=DEFAULT_TIMEOUT):
|
|
"""Ping every will-executor concurrently and report results as they
|
|
arrive.
|
|
|
|
Network requests run in a thread pool: each ``send_http_on_proxy`` call
|
|
schedules its coroutine on Electrum's shared asyncio loop and blocks
|
|
only its *own* worker thread, so the total wall-clock time is roughly
|
|
that of the slowest server rather than the *sum* of all of them. A
|
|
single dead server can no longer stall the whole batch.
|
|
|
|
Args:
|
|
willexecutors: ``{url: we_dict}`` mapping (mutated in place with the
|
|
ping result, exactly like the old sequential ``ping_servers``).
|
|
on_each: optional ``callback(url, we_dict, ok: bool)`` invoked from a
|
|
worker thread each time a server answers (or fails), so the GUI
|
|
can update its list live. Must be thread-safe / marshalled to
|
|
the GUI thread by the caller.
|
|
max_workers: maximum number of concurrent pings.
|
|
timeout: per-request timeout in seconds (fast-fail, no retries).
|
|
|
|
Returns:
|
|
The same ``willexecutors`` mapping, updated in place.
|
|
"""
|
|
from concurrent.futures import ThreadPoolExecutor, as_completed
|
|
|
|
items = list(willexecutors.items())
|
|
if not items:
|
|
return willexecutors
|
|
|
|
def _ping_one(url, we):
|
|
we = Willexecutors.get_info_task(
|
|
url, we, timeout=timeout, max_retries=0, retry_sleep=0
|
|
)
|
|
ok = we.get("status") == 200
|
|
return url, we, ok
|
|
|
|
workers = max(1, min(max_workers, len(items)))
|
|
with ThreadPoolExecutor(max_workers=workers,
|
|
thread_name_prefix="bal-ping") as pool:
|
|
futures = [pool.submit(_ping_one, url, we) for url, we in items]
|
|
for fut in as_completed(futures):
|
|
try:
|
|
url, we, ok = fut.result()
|
|
except Exception as e: # defensive: never let one server crash all
|
|
_logger.error(f"ping_servers_parallel worker error: {e}")
|
|
continue
|
|
willexecutors[url] = we
|
|
if on_each is not None:
|
|
try:
|
|
on_each(url, we, ok)
|
|
except Exception as cb_err:
|
|
_logger.error(f"ping on_each callback error: {cb_err}")
|
|
return willexecutors
|
|
|
|
@staticmethod
|
|
def push_transactions_parallel(willexecutors, *, on_each=None, max_workers=8):
|
|
"""Push transactions to multiple will-executors concurrently.
|
|
|
|
Like :meth:`ping_servers_parallel` but for the ``pushtxs`` operation.
|
|
Each server keeps the historical retry behaviour of
|
|
:meth:`push_transactions_to_willexecutor` (which is important so a real
|
|
transaction is not lost to a transient hiccup), but the servers are now
|
|
contacted in parallel instead of one-after-another, and results are
|
|
reported via ``on_each(url, we_dict, ok, exc)`` as they complete.
|
|
|
|
Returns ``{url: (ok, exception_or_None)}``.
|
|
"""
|
|
from concurrent.futures import ThreadPoolExecutor, as_completed
|
|
|
|
targets = [(url, we) for url, we in willexecutors.items() if "txs" in we]
|
|
results = {}
|
|
if not targets:
|
|
return results
|
|
|
|
def _push_one(url, we):
|
|
try:
|
|
ok = Willexecutors.push_transactions_to_willexecutor(we)
|
|
return url, we, ok, None
|
|
except Willexecutors.AlreadyPresentException as ape:
|
|
return url, we, False, ape
|
|
except Exception as e:
|
|
return url, we, False, e
|
|
|
|
workers = max(1, min(max_workers, len(targets)))
|
|
with ThreadPoolExecutor(max_workers=workers,
|
|
thread_name_prefix="bal-push") as pool:
|
|
futures = [pool.submit(_push_one, url, we) for url, we in targets]
|
|
for fut in as_completed(futures):
|
|
try:
|
|
url, we, ok, exc = fut.result()
|
|
except Exception as e:
|
|
_logger.error(f"push_transactions_parallel worker error: {e}")
|
|
continue
|
|
results[url] = (ok, exc)
|
|
if on_each is not None:
|
|
try:
|
|
on_each(url, we, ok, exc)
|
|
except Exception as cb_err:
|
|
_logger.error(f"push on_each callback error: {cb_err}")
|
|
return results
|
|
|
|
@staticmethod
|
|
def initialize_willexecutor(willexecutor, url, status=None, old_willexecutor=None):
|
|
old_willexecutor=old_willexecutor if old_willexecutor is not None else {}
|
|
willexecutor["url"] = url
|
|
if status is not None:
|
|
willexecutor["status"] = status
|
|
else:
|
|
willexecutor["status"] = old_willexecutor.get("status",willexecutor.get("status","Ko"))
|
|
willexecutor["selected"]=Willexecutors.is_selected(old_willexecutor) or willexecutor.get("selected",False)
|
|
willexecutor["address"]=old_willexecutor.get("address",willexecutor.get("address",""))
|
|
willexecutor["promo_code"]=old_willexecutor.get("promo_code",willexecutor.get("promo_code"))
|
|
|
|
|
|
|
|
@staticmethod
|
|
def download_list(old_willexecutors,welist_server):
|
|
try:
|
|
welist_server = welist_server if welist_server[-1] == '/' else welist_server+'/'
|
|
willexecutors = Willexecutors.send_request(
|
|
"get",
|
|
f"{welist_server}data/{chainname}?page=0&limit=100",
|
|
)
|
|
# del willexecutors["status"]
|
|
for w in willexecutors:
|
|
if w not in ("status", "url"):
|
|
Willexecutors.initialize_willexecutor(
|
|
willexecutors[w], w, None, old_willexecutors.get(w,None)
|
|
)
|
|
# bal_plugin.WILLEXECUTORS.set(l)
|
|
# bal_plugin.config.set_key(bal_plugin.WILLEXECUTORS,l,save=True)
|
|
return willexecutors
|
|
|
|
except Exception as e:
|
|
_logger.error(f"Failed to download willexecutors list: {e}")
|
|
return {}
|
|
|
|
@staticmethod
|
|
def get_willexecutors_list_from_json():
|
|
try:
|
|
with open("willexecutors.json") as f:
|
|
willexecutors = json.load(f)
|
|
for w in willexecutors:
|
|
willexecutor = willexecutors[w]
|
|
Willexecutors.initialize_willexecutor(willexecutor, w, "New", False)
|
|
# bal_plugin.WILLEXECUTORS.set(willexecutors)
|
|
return willexecutors
|
|
except Exception as e:
|
|
_logger.error(f"error opening willexecutors json: {e}")
|
|
|
|
return {}
|
|
|
|
@staticmethod
|
|
def check_transaction(txid, url):
|
|
_logger.debug(f"{url}:{txid}")
|
|
try:
|
|
w = Willexecutors.send_request(
|
|
"post", url + "/searchtx", data=txid.encode("ascii")
|
|
)
|
|
return w
|
|
except Exception as e:
|
|
_logger.error(f"error contacting {url} for checking txs {e}")
|
|
raise e
|
|
|
|
@staticmethod
|
|
def compute_id(willexecutor):
|
|
return "{}-{}".format(willexecutor.get("url"), willexecutor.get("chain"))
|
|
|
|
|
|
#class WillExecutor:
|
|
# def __init__(
|
|
# self,
|
|
# url,
|
|
# base_fee,
|
|
# chain,
|
|
# info,
|
|
# version,
|
|
# status,
|
|
# is_selected=False,
|
|
# promo_code="",
|
|
# ):
|
|
# self.url = url
|
|
# self.base_fee = base_fee
|
|
# self.chain = chain
|
|
# self.info = info
|
|
# self.version = version
|
|
# self.status = status
|
|
# self.promo_code = promo_code
|
|
# self.is_selected = is_selected
|
|
# self.id = self.compute_id()
|
|
#
|
|
# def from_dict(d):
|
|
# return WillExecutor(
|
|
# url=d.get("url", "http://localhost:8000"),
|
|
# base_fee=d.get("base_fee", 1000),
|
|
# chain=d.get("chain", chainname),
|
|
# info=d.get("info", ""),
|
|
# version=d.get("version", 0),
|
|
# status=d.get("status", "Ko"),
|
|
# is_selected=d.get("is_selected", "False"),
|
|
# promo_code=d.get("promo_code", ""),
|
|
# )
|
|
#
|
|
# def to_dict(self):
|
|
# return {
|
|
# "url": self.url,
|
|
# "base_fee": self.base_fee,
|
|
# "chain": self.chain,
|
|
# "info": self.info,
|
|
# "version": self.version,
|
|
# "promo_code": self.promo_code,
|
|
# }
|
|
#
|
|
# def compute_id(self):
|
|
# return f"{self.url}-{self.chain}"
|