From b07f41960aab5a5afa0e021ccf9eb4d7218e0048 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Thu, 10 Sep 2026 02:13:24 +0000 Subject: [PATCH] new `is_signing` and `is_sending` configuration options --- mmgen/cfg.py | 5 +++++ mmgen/data/version | 2 +- mmgen/tx/completed.py | 9 ++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/mmgen/cfg.py b/mmgen/cfg.py index 8851ee11..c0459cc7 100755 --- a/mmgen/cfg.py +++ b/mmgen/cfg.py @@ -626,6 +626,11 @@ class Config(Lockable): if hasattr(self, 'bch_cashaddr') and not hasattr(self, 'cashaddr'): self.cashaddr = self.bch_cashaddr + if 'sign' in gc.prog_name: + self.is_signing = True + elif 'send' in gc.prog_name and not (hasattr(self, 'status') or hasattr(self, 'receipt')): + self.is_sending = True + self._lock() if need_proto: diff --git a/mmgen/data/version b/mmgen/data/version index b0711b80..70c5b075 100644 --- a/mmgen/data/version +++ b/mmgen/data/version @@ -1 +1 @@ -16.3.0dev3 +16.3.0dev4 diff --git a/mmgen/tx/completed.py b/mmgen/tx/completed.py index 88060d07..d1dbec8d 100755 --- a/mmgen/tx/completed.py +++ b/mmgen/tx/completed.py @@ -12,7 +12,6 @@ tx.completed: completed transaction class """ -from ..cfg import gc from ..util import msg, ymsg, die from .base import Base @@ -108,9 +107,9 @@ class Completed(Base): die('TxFileVersionError', errmsg) def legacy_fmt_chk(self, desc): - if 'sign' in gc.prog_name: + if self.cfg.is_signing: a, b = ('sign', 'Has your online installation been compromised?') - elif 'send' in gc.prog_name: + elif self.cfg.is_sending: a, b = ('send', 'Is your offline installation out of date?') elif not self.cfg.allow_legacy_tx_files: a, b = ('operate on', 'Operation forbidden by ‘allow_legacy_tx_files false’') @@ -120,10 +119,10 @@ class Completed(Base): self.die_on_version_error(fs.format(a, b)) def txfile_version_chk(self, f_ver, s_ver): - if 'sign' in gc.prog_name: + if self.cfg.is_signing: a = 'sign' b = 'Is your {} installation out of date?'.format('offline' if f_ver > s_ver else 'online') - elif 'send' in gc.prog_name: + elif self.cfg.is_sending: a = 'send' b = 'Is your {} installation out of date?'.format('offline' if f_ver < s_ver else 'online') elif self.cfg.forbid_version_mismatched_tx_files: