pylint throughout (excluding tests) - bugfixes

mmgen/addrgen.py

@@ -40,7 +40,7 @@ class addr_generator:
 			self.proto = proto
 			self.pubkey_type = addr_type.pubkey_type
 			self.compressed = addr_type.compressed
-			desc = f'AddrGenerator {type(self).__name__!r}'
+			self.desc = f'AddrGenerator {type(self).__name__!r}'
 
 	class keccak(base):
 
@@ -71,7 +71,7 @@ def AddrGenerator(cfg,proto,addr_type):
 	elif type(addr_type) is MMGenAddrType:
 		assert addr_type in proto.mmtypes, f'{addr_type}: invalid address type for coin {proto.coin}'
 	else:
-		raise TypeError(f'{type(addr_type)}: incorrect argument type for {cls.__name__}()')
+		raise TypeError(f"{type(addr_type)}: incorrect argument type for 'addr_type' arg")
 
 	import importlib
 	return getattr(

mmgen/contrib/keccak.py

@@ -133,7 +133,7 @@ class KeccakState:
 			return '%016x' % x
 		for y in KeccakState.rangeH:
 			row = []
-			for x in rangeW:
+			for x in KeccakState.rangeW:
 				row.append(fmt(st[x][y]))
 			rows.append(' '.join(row))
 		return '\n'.join(rows)

mmgen/fileutil.py

@@ -312,7 +312,7 @@ def get_data_from_file(
 
 	if len(data) == cfg.max_input_size + 1:
 		die( 'MaxInputSizeExceeded',
-			f'Too much input data!  Max input data size: {f.max_input_size} bytes' )
+			f'Too much input data!  Max input data size: {cfg.max_input_size} bytes' )
 
 	return data
 

mmgen/proto/btc/regtest.py

@@ -38,7 +38,7 @@ def create_data_dir(cfg,data_dir):
 				f'Delete your existing MMGen regtest setup at {data_dir!r} and create a new one?'):
 			shutil.rmtree(data_dir)
 		else:
-			die()
+			die(1,'Exiting')
 
 	try:
 		os.makedirs(data_dir)

mmgen/proto/btc/tw/ctl.py

@@ -84,7 +84,7 @@ class BitcoinTwCtl(TwCtl):
 		if endless:
 			tip = await self.rpc.call('getblockcount')
 			while last_block < tip:
-				last_block = await do_scan(gen_chunks(last_block+1,tip),tip)
+				last_block = await do_scan(gen_chunks(last_block+1,tip,tip),tip)
 				tip = await self.rpc.call('getblockcount')
 
 		msg('Done')

mmgen/proto/eth/daemon.py

@@ -157,6 +157,7 @@ class erigon_daemon(geth_daemon):
 		)
 
 		self.rpc_d = erigon_rpcdaemon(
+			cfg          = self.cfg,
 			proto        = self.proto,
 			rpc_port     = self.rpc_port,
 			private_port = self.private_port,
@@ -185,12 +186,12 @@ class erigon_rpcdaemon(RPCDaemon):
 	use_pidfile = False
 	use_threads = True
 
-	def __init__(self,proto,rpc_port,private_port,test_suite,datadir):
+	def __init__(self,cfg,proto,rpc_port,private_port,test_suite,datadir):
 
 		self.proto = proto
 		self.test_suite = test_suite
 
-		super().__init__()
+		super().__init__(cfg)
 
 		self.network = proto.network
 		self.rpc_port = rpc_port

mmgen/proto/eth/tx/unsigned.py

@@ -62,7 +62,7 @@ class Unsigned(Completed,TxBase.Unsigned):
 
 		if o['data']:
 			if o['to']:
-				assert self.txobj['token_addr'] == TokenAddr(etx.creates.hex()),'Token address mismatch'
+				assert self.txobj['token_addr'] == TokenAddr(self.proto,etx.creates.hex()),'Token address mismatch'
 			else: # token- or contract-creating transaction
 				self.txobj['token_addr'] = TokenAddr(self.proto,etx.creates.hex())
 

mmgen/protocol.py

@@ -211,7 +211,7 @@ class CoinProtocol(MMGenObject):
 					die(4,'Private key == secp256k1_ge!')
 				else:
 					if not self.cfg.test_suite:
-						ymsg(f'Warning: private key is greater than secp256k1 group order!:\n  {hexpriv}')
+						ymsg(f'Warning: private key is greater than secp256k1 group order!:\n  {sec.hex()}')
 					return (pk % self.secp256k1_ge).to_bytes(self.privkey_len,'big')
 
 	class DummyWIF:

mmgen/tx/sign.py

@@ -101,8 +101,8 @@ def add_keys(tx,src,infiles=None,saved_seeds=None,keyaddr_list=None):
 					else:
 						die(3,fmt(f"""
 							{gc.proj_name} -> {tx.proto.coin} address mappings differ!
-							{{src_desc:<23}} {{mmid}} -> {{f.addr}}
-							{{'tx file:':<23}} {{e.mmid}} -> {{e.addr}}
+							{src_desc:<23} {mmid} -> {f.addr}
+							{'tx file:':<23} {e.mmid} -> {e.addr}
 							""").strip())
 	if new_keys:
 		cfg._util.vmsg(f'Added {len(new_keys)} wif key{suf(new_keys)} from {desc}')

mmgen/wallet/seed.py

@@ -56,7 +56,7 @@ class wallet(wallet):
 		ret = baseconv('b58').tobytes(b,pad='seed')
 
 		if ret is False:
-			msg(f'Invalid base-58 encoded seed: {val}')
+			msg(f'Invalid base-58 encoded seed: {b}')
 			return False
 
 		self.seed = Seed( self.cfg, ret )