remove unused import and renaming pbkdf2 default params

CHANGELOG

@@ -1,14 +1,3 @@
-* 0.6.2
-	- Enable signing of binary message
-* 0.6.1
-	- Avoid padding of addresses missing one nibble
-* 0.6.0
-	- Upgrade confini
-* 0.5.4
-	- Add message signer cli
-	- Add pbkdf2 support
-	- Add -0 flag for omitting newline on output
-	- Revert RLP to 2.0.1, to not break eth-tester in dependents
 * 0.5.3
 	- Upgrade RLP to 3.0.0 (eliminates really annoying cytoolz warning on stdout)
 ---

funga/eth/encoding.py

@@ -41,7 +41,7 @@ def private_key_to_address(pk, result_format='hex'):
 
 def is_address(address_hex):
     try:
-        address_hex = strip_0x(address_hex, pad=False)
+        address_hex = strip_0x(address_hex)    
     except ValueError:
         return False
     return len(address_hex) == 40
@@ -57,10 +57,10 @@ def is_checksum_address(address_hex):
 
 
 def to_checksum_address(address_hex):
-        address_hex = strip_0x(address_hex, pad=False)
+        address_hex = strip_0x(address_hex)
+        address_hex = uniform(address_hex)
         if len(address_hex) != 40:
             raise ValueError('Invalid address length')
-        address_hex = uniform(address_hex)
         h = sha3.keccak_256()
         h.update(address_hex.encode('utf-8'))
         z = h.digest()

funga/eth/runnable/keyfile.py

@@ -30,7 +30,6 @@ logg = logging.getLogger()
 argparser = argparse.ArgumentParser()
 argparser.add_argument('-d', '--decrypt', dest='d', type=str, help='decrypt file')
 argparser.add_argument('--private-key', dest='private_key', action='store_true', help='output private key instead of address')
-argparser.add_argument('-0', dest='nonl', action='store_true', help='no newline at end of output')
 argparser.add_argument('-z', action='store_true', help='zero-length password')
 argparser.add_argument('-k', type=str, help='load key from file')
 argparser.add_argument('-v', action='store_true', help='be verbose')
@@ -80,12 +79,10 @@ def main():
         else:
             pk_bytes = os.urandom(32)
         pk = coincurve.PrivateKey(secret=pk_bytes)
-        o = to_dict(pk_bytes, passphrase=passphrase)
+        o = to_dict(pk_bytes, passphrase)
         r = json.dumps(o)
 
-    if not args.nonl:
+    print(r) 
-        r += "\n"
-    sys.stdout.write(r) 
 
 
 if __name__ == '__main__':

funga/eth/runnable/msg.py

@@ -1,62 +0,0 @@
-# standard imports
-import os
-import logging
-import sys
-import json
-import argparse
-import getpass
-
-# external impors
-import coincurve
-from hexathon import strip_0x
-
-# local imports
-from funga.error import DecryptError
-from funga.eth.keystore.dict import DictKeystore
-from funga.eth.signer import EIP155Signer
-
-
-logging.basicConfig(level=logging.WARNING)
-logg = logging.getLogger()
-
-argparser = argparse.ArgumentParser()
-argparser.add_argument('-f', type=str, help='Keyfile to use for signing')
-argparser.add_argument('-z', action='store_true', help='zero-length password')
-argparser.add_argument('-v', action='store_true', help='be verbose')
-argparser.add_argument('-0', dest='nonl', action='store_true', help='no newline at end of output')
-argparser.add_argument('-b', '--binary', dest='binary', action='store_true', help='parse input as binary hex')
-argparser.add_argument('msg', type=str, help='Message to sign')
-args = argparser.parse_args()
-
-if args.v:
-    logg.setLevel(logging.DEBUG)
-
-
-def main():
-    passphrase = os.environ.get('WALLET_PASSPHRASE', os.environ.get('PASSPHRASE'))
-    if args.z:
-        passphrase = ''
-    if passphrase == None:
-        passphrase = getpass.getpass('decryption phrase: ')
-   
-    keystore = DictKeystore()
-    address = keystore.import_keystore_file(args.f, password=passphrase)
-
-    signer = EIP155Signer(keystore)
-
-    msg = None
-    if args.binary:
-        hx = strip_0x(args.msg, pad=True)
-        msg = bytes.fromhex(hx)
-    else:
-        msg = args.msg.encode('utf-8').hex()
-    sig = signer.sign_ethereum_message(address, msg, password=passphrase)
-
-    r = sig.hex()
-    if not args.nonl:
-        r += "\n"
-    sys.stdout.write(r)
-
-
-if __name__ == '__main__':
-    main()

requirements.txt

@@ -1,10 +1,10 @@
 cryptography==3.2.1
 pysha3==1.0.2
-rlp==2.0.1
+#rlp==2.0.1
-#rlp==3.0.0
+rlp==3.0.0
 json-rpc==1.13.0
-confini~=0.6.0
+confini~=0.5.1
 coincurve==15.0.0
-hexathon~=0.1.6
+hexathon~=0.1.0
 pycryptodome==3.10.1
-funga==0.5.2
+funga==0.5.1

setup.py

@@ -33,7 +33,7 @@ f.close()
 
 setup(
         name="funga-eth",
-        version="0.6.2",
+        version="0.5.3",
         description="Ethereum implementation of the funga keystore and signer",
         author="Louis Holbrook",
         author_email="dev@holbrook.no",
@@ -55,9 +55,8 @@ setup(
             'console_scripts': [
                 'funga-ethd=funga.eth.runnable.signer:main',
                 'eth-keyfile=funga.eth.runnable.keyfile:main',
-                'eth-sign-msg=funga.eth.runnable.msg:main',
                 ],
             },
-        url='https://git.grassecon.net/chaintool/funga-eth',
+        url='https://gitlab.com/chaintool/funga-eth',
         include_package_data=True,
         )