2 Commits d1145e6f1d ... 3d7e4a472a

Author SHA1 Message Date
  The MMGen Project 3d7e4a472a support Reth v1.11.2, Monero v0.18.4.6 2 weeks ago
  The MMGen Project 81c6c10135 mmgen-xmrwallet tx{view,list}: include compat-mode transactions 2 weeks ago
5 changed files with 10 additions and 7 deletions
  1. 1 1
      mmgen/data/version
  2. 1 1
      mmgen/proto/eth/daemon.py
  3. 1 1
      mmgen/proto/xmr/daemon.py
  4. 5 2
      mmgen/xmrwallet/ops/txview.py
  5. 2 2
      nix/reth.nix

+ 1 - 1
mmgen/data/version

@@ -1 +1 @@
-16.1.dev33
+16.1.dev34

+ 1 - 1
mmgen/proto/eth/daemon.py

@@ -130,7 +130,7 @@ class geth_daemon(ethereum_daemon):
 		)
 		)
 
 
 class reth_daemon(geth_daemon):
 class reth_daemon(geth_daemon):
-	daemon_data = _dd('Reth', 1011001, '1.11.1')
+	daemon_data = _dd('Reth', 1011002, '1.11.2')
 	version_pat = r'reth/v(\d+)\.(\d+)\.(\d+)'
 	version_pat = r'reth/v(\d+)\.(\d+)\.(\d+)'
 	exec_fn = 'reth'
 	exec_fn = 'reth'
 	version_info_arg = '--version'
 	version_info_arg = '--version'

+ 1 - 1
mmgen/proto/xmr/daemon.py

@@ -19,7 +19,7 @@ from ...util import list_gen, die, contains_any
 from ...daemon import CoinDaemon, RPCDaemon, _nw, _dd
 from ...daemon import CoinDaemon, RPCDaemon, _nw, _dd
 
 
 class monero_daemon(CoinDaemon):
 class monero_daemon(CoinDaemon):
-	daemon_data = _dd('Monero', 18004005, '0.18.4.5-release')
+	daemon_data = _dd('Monero', 18004006, '0.18.4.6-release')
 	networks = ('mainnet', 'testnet')
 	networks = ('mainnet', 'testnet')
 	exec_fn = 'monerod'
 	exec_fn = 'monerod'
 	testnet_dir = 'stagenet'
 	testnet_dir = 'stagenet'

+ 5 - 2
mmgen/xmrwallet/ops/txview.py

@@ -33,8 +33,11 @@ class OpTxview(OpBase):
 		self.mount_removable_device()
 		self.mount_removable_device()
 
 
 		if self.cfg.autosign:
 		if self.cfg.autosign:
-			files = [f for f in getattr(self.asi, self.tx_dir).iterdir()
-						if f.name.endswith('.' + mtx.Submitted.ext)]
+			def get_submitted(tx_dir, subext):
+				return [f for f in getattr(self.asi, tx_dir).iterdir() if f.name.endswith('.' + subext)]
+			files = get_submitted('xmr_tx_dir', mtx.Submitted.ext) + (
+				[f for f in get_submitted('txauto_dir', 'asubtx') if 'XMR' in f.name]
+					if self.cfg.compat else [])
 		else:
 		else:
 			files = self.uargs.infile
 			files = self.uargs.infile
 
 

+ 2 - 2
nix/reth.nix

@@ -5,7 +5,7 @@
 
 
 pkgs.rustPlatform.buildRustPackage rec {
 pkgs.rustPlatform.buildRustPackage rec {
     pname = "reth";
     pname = "reth";
-    version = "1.11.1";
+    version = "1.11.2";
 
 
     src = fetchGit {
     src = fetchGit {
         url = "https://github.com/paradigmxyz/reth";
         url = "https://github.com/paradigmxyz/reth";
@@ -14,7 +14,7 @@ pkgs.rustPlatform.buildRustPackage rec {
         shallow = true;
         shallow = true;
     };
     };
 
 
-    cargoHash = "sha256-OJp+CAiz/1LWLt0qQrvzjFsU2nIz4ehc+bBtdTf17Oc=";
+    cargoHash = "sha256-IzqAIgfC9Y9atYxkFhaK09QwTMnrtMtU4MnG9AChwCQ=";
 
 
     doCheck = false;
     doCheck = false;
     doInstallCheck = false;
     doInstallCheck = false;