3 Commits d3095b159e ... b89b6270a7

Author SHA1 Message Date
  The MMGen Project b89b6270a7 support Reth v1.9.4 2 months ago
  The MMGen Project 86d51f1ad7 mmgen-txsend: shorten default confirmation to 'YES' 2 months ago
  The MMGen Project 115d86f15b minor whitespace 2 months ago
5 changed files with 14 additions and 10 deletions
  1. 1 1
      mmgen/data/version
  2. 1 1
      mmgen/proto/eth/daemon.py
  3. 7 4
      mmgen/tx/online.py
  4. 2 2
      nix/reth.nix
  5. 3 2
      test/cmdtest_d/shared.py

+ 1 - 1
mmgen/data/version

@@ -1 +1 @@
-16.1.dev23
+16.1.dev24

+ 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', 1009003, '1.9.3')
+	daemon_data = _dd('Reth', 1009004, '1.9.4')
 	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'

+ 7 - 4
mmgen/tx/online.py

@@ -41,10 +41,13 @@ class OnlineSigned(Signed):
 	def confirm_send(self, idxs):
 	def confirm_send(self, idxs):
 		from ..ui import confirm_or_raise
 		from ..ui import confirm_or_raise
 		confirm_or_raise(
 		confirm_or_raise(
-			cfg     = self.cfg,
-			message = '' if self.cfg.quiet else 'Once this transaction is sent, there’s no taking it back!',
-			action  = f'broadcast this transaction to the {self.proto.coin} {self.proto.network.upper()} network',
-			expect  = 'YES' if self.cfg.quiet or self.cfg.yes else 'YES, I REALLY WANT TO DO THIS')
+			cfg = self.cfg,
+			message = '' if self.cfg.quiet else
+				'Once this transaction is sent, there’s no taking it back!',
+			action = 'broadcast this transaction to the {} {} network'.format(
+				self.proto.coin,
+				self.proto.network.upper()),
+			expect = 'YES')
 		msg('Sending transaction')
 		msg('Sending transaction')
 		if len(idxs) > 1 and getattr(self, 'coin_txid2', None) and self.is_swap:
 		if len(idxs) > 1 and getattr(self, 'coin_txid2', None) and self.is_swap:
 			ymsg('Warning: two transactions (approval and router) will be broadcast to the network')
 			ymsg('Warning: two transactions (approval and router) will be broadcast to the network')

+ 2 - 2
nix/reth.nix

@@ -5,7 +5,7 @@
 
 
 pkgs.rustPlatform.buildRustPackage rec {
 pkgs.rustPlatform.buildRustPackage rec {
     pname = "reth";
     pname = "reth";
-    version = "1.9.3";
+    version = "1.9.4";
 
 
     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-WDe75Sg7y4GfH3dSfY48aXrIBe89skj1VW0NcgtLEVU=";
+    cargoHash = "sha256-etYpgSbHPEdP0u6nywOa/05wda20kDrvOXVLOwcCiW4=";
 
 
     nativeBuildInputs = [
     nativeBuildInputs = [
         pkgs.clang
         pkgs.clang

+ 3 - 2
test/cmdtest_d/shared.py

@@ -359,5 +359,6 @@ class CmdTestShared:
 	def _do_confirm_send(self, t, quiet=False, confirm_send=True, sure=True):
 	def _do_confirm_send(self, t, quiet=False, confirm_send=True, sure=True):
 		if sure:
 		if sure:
 			t.expect('Are you sure you want to broadcast this')
 			t.expect('Are you sure you want to broadcast this')
-		m = ('YES, I REALLY WANT TO DO THIS', 'YES')[quiet]
-		t.expect(f'{m!r} to confirm: ', ('', m)[confirm_send]+'\n')
+		t.expect(
+			"'YES' to confirm: ",
+			('YES\n' if confirm_send else '\n'))