idaapayo/funga-eth
1
0
Fork 0
forked from chaintool/funga-eth
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Add no-newline option for output

Browse Source
This commit is contained in:
lash 2022-01-25 11:11:55 +00:00
parent d50489f0ba
commit c3033e9572
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,5 +1,7 @@
* 0.5.4 * 0.5.4
- Add message signer cli - Add message signer cli
- Add pbkdf2 support
- Add -0 flag for omitting newline on output
* 0.5.3 * 0.5.3
- Upgrade RLP to 3.0.0 (eliminates really annoying cytoolz warning on stdout) - Upgrade RLP to 3.0.0 (eliminates really annoying cytoolz warning on stdout)
--- ---

7
funga/eth/runnable/keyfile.py
View File

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

7
funga/eth/runnable/msg.py
View File

@ -23,6 +23,7 @@ argparser = argparse.ArgumentParser()
argparser.add_argument('-f', type=str, help='Keyfile to use for signing') 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('-z', action='store_true', help='zero-length password')
argparser.add_argument('-v', action='store_true', help='be verbose') 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('msg', type=str, help='Message to sign') argparser.add_argument('msg', type=str, help='Message to sign')
args = argparser.parse_args() args = argparser.parse_args()
@ -42,7 +43,11 @@ def main():
signer = EIP155Signer(keystore) signer = EIP155Signer(keystore)
sig = signer.sign_ethereum_message(address, args.msg.encode('utf-8').hex(), password=passphrase) sig = signer.sign_ethereum_message(address, args.msg.encode('utf-8').hex(), password=passphrase)
sys.stdout.write(sig.hex())
r = sig.hex()
if not args.nonl:
r += "\n"
sys.stdout.write(r)
if __name__ == '__main__': if __name__ == '__main__':

2
setup.py
View File

@ -33,7 +33,7 @@ f.close()
setup( setup(
name="funga-eth", name="funga-eth",
version="0.5.4b1", version="0.5.4b2",
description="Ethereum implementation of the funga keystore and signer", description="Ethereum implementation of the funga keystore and signer",
author="Louis Holbrook", author="Louis Holbrook",
author_email="dev@holbrook.no", author_email="dev@holbrook.no",