From 6cd8103c65a453c251e3db0cc40d3d0876d8e536 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Sun, 13 Sep 2026 15:47:26 +0000 Subject: [PATCH] update for MMGen Wallet v16.3.0dev6 --- mmgen_node_tools/data/version | 2 +- mmgen_node_tools/main_feeview.py | 10 ++--- mmgen_node_tools/main_halving_calculator.py | 2 +- setup.cfg | 2 +- test/cmdtest_d/misc.py | 2 +- test/cmdtest_d/regtest.py | 49 ++++++++++++++------- 6 files changed, 41 insertions(+), 26 deletions(-) diff --git a/mmgen_node_tools/data/version b/mmgen_node_tools/data/version index 6b99850..dc0c102 100644 --- a/mmgen_node_tools/data/version +++ b/mmgen_node_tools/data/version @@ -1 +1 @@ -3.6.dev12 +3.7.0dev0 diff --git a/mmgen_node_tools/main_feeview.py b/mmgen_node_tools/main_feeview.py index 188f60e..7fe1b9f 100755 --- a/mmgen_node_tools/main_feeview.py +++ b/mmgen_node_tools/main_feeview.py @@ -119,11 +119,11 @@ def create_data(coin_amt, mempool): size_key = 'size' if proto.coin == 'BCH' else 'vsize' for tx in mempool.values(): fee = coin_amt(tx['fees']['base']).to_unit('satoshi') - size = tx[size_key] - for bracket in out: - if fee / size < bracket.top: - bracket.tx_bytes += size - break + if size := tx[size_key]: + for bracket in out: + if fee / size < bracket.top: + bracket.tx_bytes += size + break # remove empty top brackets: while out and out[-1].tx_bytes == 0: diff --git a/mmgen_node_tools/main_halving_calculator.py b/mmgen_node_tools/main_halving_calculator.py index 60c5440..93ad982 100755 --- a/mmgen_node_tools/main_halving_calculator.py +++ b/mmgen_node_tools/main_halving_calculator.py @@ -94,7 +94,7 @@ async def main(): f'Halving interval: {proto.halving_interval:>7}\n' f'Blocks since last halving: {proto.halving_interval - remaining:>7}\n' f'Blocks until next halving: {remaining:>7}\n\n' - f'Current block subsidy: {str(sub).rstrip("0")} {proto.coin}\n' + f'Current block subsidy: {str(sub).rstrip("0").rstrip(".")} {proto.coin}\n' f'Current block discovery interval (over last {sample_size} blocks): {bdr/60:0.2f} min\n\n' f'Current clock time (UTC): {date(clock_time)}\n' f'Est. halving date (UTC): {date(t_next)}\n' diff --git a/setup.cfg b/setup.cfg index 0753d4f..dc3e40e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -37,7 +37,7 @@ python_requires = >=3.11 include_package_data = True install_requires = - mmgen-wallet>=16.1.dev26 + mmgen-wallet>=16.3.0dev6 pyyaml yahooquery diff --git a/test/cmdtest_d/misc.py b/test/cmdtest_d/misc.py index d5cb51d..b90b4ce 100755 --- a/test/cmdtest_d/misc.py +++ b/test/cmdtest_d/misc.py @@ -174,7 +174,7 @@ class CmdTestScripts(CmdTestBase): def ticker2(self): t = self.ticker(cached_data=False) - ret = t.expect(['proxy host could not be resolved', 'unexpected keyword']) + ret = t.expect(['host was not resolved', 'unexpected keyword']) t.exit_val = 1 if ret else 3 return t diff --git a/test/cmdtest_d/regtest.py b/test/cmdtest_d/regtest.py index 387594b..e3a8e50 100755 --- a/test/cmdtest_d/regtest.py +++ b/test/cmdtest_d/regtest.py @@ -117,6 +117,19 @@ class CmdTestRegtest(CmdTestBase): self.use_bdb_wallet = self.bdb_wallet and self.proto.coin != 'BTC' self.regtest = MMGenRegtest(cfg, self.proto.coin, bdb_wallet=self.use_bdb_wallet) + def blk(self, num): + return str({ + 'BTC': num, + 'LTC': num + 272, + 'BCH': num + 272}[self.proto.coin]) + + @property + def subsidy(self): + return str({ + 'BTC': 50, + 'LTC': 12.5, + 'BCH': 12.5}[self.proto.coin]) + def setup(self): stop_test_daemons(self.proto.network_id, force=True, remove_datadir=True) from shutil import rmtree @@ -156,7 +169,9 @@ class CmdTestRegtest(CmdTestBase): return self.halving_calculator(['--help'], ['USAGE:']) def halving_calculator2(self): - return self.halving_calculator([], ['Current block: 393', f'Current block subsidy: 12.5 {cfg.coin}']) + return self.halving_calculator( + [], + [f'Current block: {self.blk(121)}', f'Current block subsidy: {self.subsidy} {cfg.coin}']) def halving_calculator3(self): return self.halving_calculator(['--list'], ['33 4950', '0']) @@ -188,33 +203,33 @@ class CmdTestRegtest(CmdTestBase): [ f'Balance: 0.357 {cfg.coin}', '2 unspent outputs in 2 blocks', - '394', '0.123', - '395', '0.234' + self.blk(122), '0.123', + self.blk(123), '0.234' ]) def addrbal_multiple(self): return self.addrbal( [self.addrs[1], self.addrs[0]], [ - '396', '0.345', - '394', '0.123', - '395', '0.234' + self.blk(124), '0.345', + self.blk(122), '0.123', + self.blk(123), '0.234' ]) def addrbal_multiple_tabular1(self): return self.addrbal( ['--tabular', self.addrs[1], self.addrs[0]], [ - self.addrs[1] + ' 1 396', '0.345', - self.addrs[0] + ' 2 395', '0.357' + self.addrs[1] + f' 1 {self.blk(124)}', '0.345', + self.addrs[0] + f' 2 {self.blk(123)}', '0.357' ]) def addrbal_multiple_tabular2(self): return self.addrbal( ['--tabular', '--first-block', self.addrs[1], self.addrs[0]], [ - self.addrs[1] + ' 1 396', '396', '0.345', - self.addrs[0] + ' 2 394', '395', '0.357' + self.addrs[1] + f' 1 {self.blk(124)}', self.blk(124), '0.345', + self.addrs[0] + f' 2 {self.blk(122)}', self.blk(123), '0.357' ]) def addrbal_nobal1(self): @@ -231,7 +246,7 @@ class CmdTestRegtest(CmdTestBase): [ 'No balance', '2 unspent outputs in 2 blocks', - '394', '0.123', '395', '0.234', + self.blk(122), '0.123', self.blk(123), '0.234', 'No balance' ]) @@ -240,7 +255,7 @@ class CmdTestRegtest(CmdTestBase): ['--tabular', self.addrs[4], self.addrs[0], self.addrs[3]], [ self.addrs[4] + ' - - -', - self.addrs[0] + ' 2 395', '0.357', + self.addrs[0] + f' 2 {self.blk(123)}', '0.357', self.addrs[3] + ' - - -', ]) @@ -249,7 +264,7 @@ class CmdTestRegtest(CmdTestBase): ['--tabular', '--first-block', self.addrs[4], self.addrs[0], self.addrs[3]], [ self.addrs[4] + ' - - - -', - self.addrs[0] + ' 2 394', '395', '0.357', + self.addrs[0] + f' 2 {self.blk(122)}', self.blk(123), '0.357', self.addrs[3] + ' - - - -', ]) @@ -266,14 +281,14 @@ class CmdTestRegtest(CmdTestBase): def blocks_info2(self): return self.blocks_info( [], - ['Current height: 396']) + [f'Current height: {self.blk(124)}']) def blocks_info3(self): return self.blocks_info( ['+100'], [ - 'Range: 297-396', - 'Current height: 396', + f'Range: {self.blk(25)}-{self.blk(124)}', + f'Current height: {self.blk(124)}', 'Next diff adjust: 2016' ]) @@ -290,7 +305,7 @@ class CmdTestRegtest(CmdTestBase): f'nTx: {n2}', f'Inputs: {i2}', f'Outputs: {o2}', - 'Current height: 396', + f'Current height: {self.blk(124)}', 'Next diff adjust: 2016' ])