From f509b26ac88c1a2111b123a0e491d92baf2e00a3 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Sat, 19 Jul 2025 10:21:11 +0000 Subject: [PATCH] support Reth v1.5.1 --- mmgen/data/release_date | 2 +- mmgen/data/version | 2 +- mmgen/proto/eth/daemon.py | 2 +- test/cmdtest_d/automount_eth.py | 1 + test/cmdtest_d/ethbump.py | 3 ++- test/cmdtest_d/ethswap.py | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mmgen/data/release_date b/mmgen/data/release_date index 04eebfa2..e3352e6f 100644 --- a/mmgen/data/release_date +++ b/mmgen/data/release_date @@ -1 +1 @@ -June 2025 +July 2025 diff --git a/mmgen/data/version b/mmgen/data/version index 14e19487..7ec4afda 100644 --- a/mmgen/data/version +++ b/mmgen/data/version @@ -1 +1 @@ -15.1.dev50 +15.1.dev51 diff --git a/mmgen/proto/eth/daemon.py b/mmgen/proto/eth/daemon.py index 3568517d..6b920258 100755 --- a/mmgen/proto/eth/daemon.py +++ b/mmgen/proto/eth/daemon.py @@ -129,7 +129,7 @@ class geth_daemon(ethereum_daemon): ) class reth_daemon(geth_daemon): - daemon_data = _dd('Reth', 1005000, '1.5.0') + daemon_data = _dd('Reth', 1005001, '1.5.1') version_pat = r'reth/v(\d+)\.(\d+)\.(\d+)' exec_fn = 'reth' datadirs = { diff --git a/test/cmdtest_d/automount_eth.py b/test/cmdtest_d/automount_eth.py index ffbed844..f7f1f20b 100755 --- a/test/cmdtest_d/automount_eth.py +++ b/test/cmdtest_d/automount_eth.py @@ -67,6 +67,7 @@ class CmdTestAutosignETH(CmdTestAutosignThreaded, CmdTestEthdev, CmdTestEthdevMe return self._fund_mmgen_addr(arg='98831F3A:E:1,123.456') def create_tx(self): + self.mining_delay() self.insert_device_online() t = self._create_tx(fee='50G', args=['98831F3A:E:11,54.321'], add_opts=self.txop_opts) t.read() diff --git a/test/cmdtest_d/ethbump.py b/test/cmdtest_d/ethbump.py index 5b438986..f3644fea 100755 --- a/test/cmdtest_d/ethbump.py +++ b/test/cmdtest_d/ethbump.py @@ -319,7 +319,8 @@ class CmdTestEthBump(CmdTestEthBumpMethods, CmdTestEthSwapMethods, CmdTestSwapMe return self._bal_check(pat=rf'{dfl_sid}:E:2\s+777\s') def bal3(self): - return self._bal_check(pat=rf'{dfl_sid}:E:11\s+99987\.653431389777251448\s') + dec = {'geth': '653431389777251448', 'reth': '65337812418775812'}[self.daemon.id] + return self._bal_check(pat=rf'{dfl_sid}:E:11\s+99987\.{dec}\s') def bal4(self): return self._bal_check(pat=rf'{dfl_sid}:E:12\s+4444\.3333\s') diff --git a/test/cmdtest_d/ethswap.py b/test/cmdtest_d/ethswap.py index e6a7dbcb..4af59fd3 100755 --- a/test/cmdtest_d/ethswap.py +++ b/test/cmdtest_d/ethswap.py @@ -325,7 +325,7 @@ class CmdTestEthSwapEth(CmdTestEthSwapMethods, CmdTestSwapMethods, CmdTestEthdev bals = lambda self, k: { 'swap1': [('98831F3A:E:1', '123.456')], - 'swap2': [('98831F3A:E:1', '114.690978056')], + 'swap2': [('98831F3A:E:1', {'geth': '114.690978056', 'reth': '114.69097664'}[self.daemon.id])], }[k] cmd_group_in = CmdTestEthdev.cmd_group_in + (