diff --git a/mmgen/addr.py b/mmgen/addr.py index 566502ed..06d4e8c4 100755 --- a/mmgen/addr.py +++ b/mmgen/addr.py @@ -85,6 +85,10 @@ class AddrGeneratorEthereum(AddrGenerator): import sha3 return CoinAddr(sha3.keccak_256(pubhex[2:].decode('hex')).digest()[12:].encode('hex')) + def to_wallet_passwd(self,sk_hex): + from mmgen.protocol import hash256 + return WalletPassword(hash256(sk_hex)[:32]) + def to_segwit_redeem_script(self,pubhex): raise NotImplementedError,'Segwit redeem script not supported by this address type' diff --git a/mmgen/obj.py b/mmgen/obj.py index c14ff297..772c9ab4 100755 --- a/mmgen/obj.py +++ b/mmgen/obj.py @@ -739,6 +739,8 @@ class MMGenAddrType(str,Hilite,InitErrors,MMGenObject): 'compressed':False, 'gen_method':'ethereum', 'addr_fmt':'ethereum', + 'wif_label':'privkey:', + 'extra_attrs': ('wallet_passwd',), 'desc':'Ethereum address' }, 'Z': { 'name':'zcash_z', 'pubkey_type':'zcash_z', diff --git a/test/ref/ethereum/98831F3A-ETH[1,31-33,500-501,1010-1011].akeys.mmenc b/test/ref/ethereum/98831F3A-ETH[1,31-33,500-501,1010-1011].akeys.mmenc index 62a6a5ae..a179f2dd 100644 Binary files a/test/ref/ethereum/98831F3A-ETH[1,31-33,500-501,1010-1011].akeys.mmenc and b/test/ref/ethereum/98831F3A-ETH[1,31-33,500-501,1010-1011].akeys.mmenc differ diff --git a/test/ref/ethereum_classic/98831F3A-ETC[1,31-33,500-501,1010-1011].akeys.mmenc b/test/ref/ethereum_classic/98831F3A-ETC[1,31-33,500-501,1010-1011].akeys.mmenc index cd07f6d4..a969e5d9 100644 Binary files a/test/ref/ethereum_classic/98831F3A-ETC[1,31-33,500-501,1010-1011].akeys.mmenc and b/test/ref/ethereum_classic/98831F3A-ETC[1,31-33,500-501,1010-1011].akeys.mmenc differ diff --git a/test/test.py b/test/test.py index 1181f4d6..0d46510c 100755 --- a/test/test.py +++ b/test/test.py @@ -541,8 +541,8 @@ cfgs = { 'ref_keyaddrfile_chksum_zec_z': '6B87 9B2D 0D8D 8D1E', 'ref_keyaddrfile_chksum_xmr': 'E0D7 9612 3D67 404A', 'ref_keyaddrfile_chksum_dash': 'E83D 2C63 FEA2 4142', - 'ref_keyaddrfile_chksum_eth': '3635 4DCF B752 8772', - 'ref_keyaddrfile_chksum_etc': '9BAC 38E7 5C8E 42E0', + 'ref_keyaddrfile_chksum_eth': 'E400 70D9 0AE3 C7C2', + 'ref_keyaddrfile_chksum_etc': 'EF49 967D BD6C FE45', 'ref_passwdfile_chksum': 'A983 DAB9 5514 27FB', # 'ref_fake_unspent_data':'98831F3A_unspent.json', 'ref_tx_file': {