commit 75b47efb7a285229e7eea5576640f15c15ca4b9b
parent 8d20f1e807360a5dcdc5bc28b201b9e76e28e24f
Author: lash <dev@holbrook.no>
Date: Sat, 11 Jun 2022 18:55:52 +0000
Use correct package for runnables
Diffstat:
5 files changed, 298 insertions(+), 4 deletions(-)
diff --git a/pylibswarm/runnable/__init__.py b/pylibswarm/runnable/__init__.py
diff --git a/pylibswarm/runnable/bmt.py b/pylibswarm/runnable/bmt.py
@@ -0,0 +1,61 @@
+# standard imports
+import argparse
+import sys
+import logging
+import select
+
+# local imports
+from pylibswarm.arg import stdin_arg
+
+
+logging.basicConfig(level=logging.WARNING)
+logg = logging.getLogger()
+
+argparser = argparse.ArgumentParser()
+argparser.add_argument('-n', action='store_true', help='skip newline at end of output')
+argparser.add_argument('-b', action='store_true', help='output raw bytes')
+argparser.add_argument('-l', dest='data_length', type=int, help='length of data represented by preimage')
+argparser.add_argument('-v', action='store_true', help='verbose output')
+argparser.add_argument('-u', action='store_true', help='treat input as utf-8 string')
+argparser.add_argument('data', nargs='?', type=str, help='data input for BMT hasher')
+largs = argparser.parse_args(sys.argv[1:])
+
+
+if largs.v:
+ logg.setLevel(logging.DEBUG)
+
+data = largs.data
+if data == None:
+ data = stdin_arg()
+
+input_data = data
+if not largs.u:
+ input_data.rstrip()
+ if isinstance(input_data, str):
+ input_data = data.encode('utf-8')
+
+input_data_length = 0
+input_data_length = len(input_data)
+data_length = input_data_length
+if largs.data_length != None:
+ data_length = largs.data_length
+
+logg.info('hashing {} bytes input with {} length prefix'.format(int(input_data_length), int(data_length)))
+
+
+def main():
+ # TODO: why does this segfault just one line before? - probably refcount related
+ import swarm
+ r = swarm.bmt_hash(input_data, input_data_length, data_length)
+
+ if largs.b:
+ sys.stdout.buffer.write(r[:32])
+ else:
+ s = '{}'.format(r[:32].hex())
+ if not largs.n:
+ s += '\n'
+ sys.stdout.write(s)
+
+
+if __name__ == '__main__':
+ main()
diff --git a/pylibswarm/runnable/file.py b/pylibswarm/runnable/file.py
@@ -0,0 +1,54 @@
+# standard imports
+import os
+import sys
+import argparse
+import logging
+
+# local imports
+from pylibswarm.io import Outputter
+
+
+logging.basicConfig(level=logging.WARNING)
+logg = logging.getLogger()
+
+argparser = argparse.ArgumentParser()
+argparser.add_argument('-n', action='store_true', help='skip newline at end of output')
+argparser.add_argument('-b', action='store_true', help='output raw bytes')
+argparser.add_argument('--prepend-hash', dest='prepend_hash', action='store_true', help='prepend hash bytes to chunk output (no effect without -o)')
+argparser.add_argument('-o', type=str, help='chunk output location')
+argparser.add_argument('-v', action='store_true', help='verbose output')
+argparser.add_argument('-vv', action='store_true', help='very verbose output')
+argparser.add_argument('file', nargs='?', type=str, help='file to hash')
+largs = argparser.parse_args(sys.argv[1:])
+
+
+if largs.vv:
+ logg.setLevel(logging.DEBUG)
+elif largs.v:
+ logg.setLevel(logging.INFO)
+
+filepath = os.path.realpath(largs.file)
+
+outputter = None
+if largs.o:
+ outputter = Outputter(largs.o, prepend_hash=largs.prepend_hash)
+
+def main():
+ import swarm
+
+ if outputter:
+ r = swarm.filehash_path(filepath, outputter.dump)
+ else:
+ r = swarm.filehash_path(filepath)
+
+ if largs.b:
+ sys.stdout.buffer.write(r[:32])
+ else:
+ s = '{}'.format(r[:32].hex())
+ if not largs.n:
+ s += '\n'
+ sys.stdout.write(s)
+
+
+if __name__ == '__main__':
+ main()
diff --git a/pylibswarm/runnable/soc.py b/pylibswarm/runnable/soc.py
@@ -0,0 +1,179 @@
+# standard imports
+import argparse
+import sys
+import logging
+import os
+
+# external imports
+from hexathon import (
+ pad as hex_pad,
+ strip_0x,
+ )
+
+# local imports
+from pylibswarm.soc import from_str as soc_meta_from_str
+from pylibswarm.sign import DefaultSigner
+from pylibswarm.arg import stdin_arg
+from pylibswarm.io import Outputter
+
+
+logging.basicConfig(level=logging.WARNING)
+logg = logging.getLogger()
+
+argparser = argparse.ArgumentParser()
+argparser.add_argument('-n', action='store_true', help='skip newline at end of output. (stdout output only)')
+argparser.add_argument('-b', action='store_true', help='output raw bytes.')
+argparser.add_argument('-v', action='store_true', help='verbose output')
+argparser.add_argument('-vv', action='store_true', help='very verbose output')
+argparser.add_argument('-y', type=str, help='key provider (path to keyfile)')
+argparser.add_argument('-o', type=str, help='chunk output location')
+argparser.add_argument('-f', type=str, help='data input location')
+argparser.add_argument('-l', dest='data_length', type=int, help='length of data represented by preimage')
+argparser.add_argument('-u', action='store_true', help='treat input as utf-8 string')
+argparser.add_argument('--topic-string', dest='topic_string', type=str, help='string to use as soc topic.')
+argparser.add_argument('-t', '--topic', type=str, help='hex value to use as soc topic. overrides --topic-string.')
+argparser.add_argument('--index-string', dest='index_string', type=str, help='string to use as soc index.')
+argparser.add_argument('-i', '--index', type=str, help='hex value to use as soc index. overrides --index-string.')
+argparser.add_argument('--id', action='store_true', help='output identifier only')
+argparser.add_argument('--prepend-hash', dest='prepend_hash', action='store_true', help='prepend hash bytes to chunk output (no effect without -o)')
+argparser.add_argument('data', nargs='?', type=str, help='data to embed in soc.')
+largs = argparser.parse_args(sys.argv[1:])
+
+
+if largs.vv:
+ logg.setLevel(logging.DEBUG)
+elif largs.v:
+ logg.setLevel(logging.INFO)
+
+filepath = None
+input_data = None
+if largs.id == None:
+ if largs.f:
+ filepath = os.path.realpath(largs.f)
+ f = open(filepath, 'rb')
+ data = f.read()
+ f.close()
+ logg.info('data read from file: {}'.format(filepath))
+ else:
+ data = largs.data
+ if data == None:
+ data = stdin_arg()
+ logg.info('data read from positional argument'.format(filepath))
+ else:
+ logg.info('data read from stdin'.format(filepath))
+
+
+ input_data = data
+ if not largs.u:
+ input_data.rstrip()
+ if isinstance(input_data, str):
+ input_data = data.encode('utf-8')
+
+ input_data_length = len(input_data)
+ data_length = input_data_length
+ if largs.data_length != None:
+ data_length = largs.data_length
+ logg.debug('input length {}'.format(input_data_length))
+ logg.debug('span length {}'.format(data_length))
+
+src_topic = None
+src_index = None
+soc_topic = None
+soc_index = None
+
+if largs.topic:
+ src_topic = largs.topic
+ soc_topic = hex_pad(largs.topic, 20)
+elif largs.topic_string:
+ src_topic = largs.topic_string
+ try:
+ soc_topic = soc_meta_from_str(largs.topic_string, 20, 'topic')
+ except ValueError as e:
+ sys.stderr.write(str(e))
+ sys.exit(1)
+logg.debug('topic "{}" parsed as {}'.format(src_topic, soc_topic))
+
+if largs.index:
+ src_index = largs.index
+ soc_index = hex_pad(largs.index, 32)
+elif largs.index_string:
+ src_index = largs.index_string
+ try:
+ soc_index = soc_meta_from_str(largs.index_string, 32, 'index')
+ except ValueError as e:
+ sys.stderr.write(str(e))
+ sys.exit(1)
+logg.debug('index "{}" parsed as {}'.format(src_index, soc_index))
+
+
+if not largs.id:
+ keystore = DefaultSigner()
+ keystore.from_keyfile(largs.y, os.environ.get('WALLET_PASSPHRASE', ''))
+ address = keystore.get_signer_address()
+ logg.info('using keyfile wallet for address {}'.format(address))
+
+
+outputter = None
+if largs.o:
+ outputter = Outputter(largs.o, prepend_hash=largs.prepend_hash)
+
+
+def outputter_noop(*args, **kwargs):
+ pass
+
+def main():
+ soc_topic_bytes = bytes.fromhex(soc_topic)
+ soc_index_bytes = bytes.fromhex(soc_index)
+ out_data = None
+
+ import swarm
+ soc_identifier_bytes = swarm.soc_identifier(soc_topic_bytes, soc_index_bytes)
+ #soc_identifier_bytes = bytes(32)
+ logg.info('generated identifier {}'.format(soc_identifier_bytes.hex()))
+ if largs.id:
+ out_data = soc_identifier_bytes
+ else:
+ soc_sig = None
+ soc_hash = None
+ soc_chunk = None
+ if outputter:
+ (soc_sig, soc_hash, soc_chunk) = swarm.soc_create(
+ soc_identifier_bytes,
+ bytes.fromhex(strip_0x(address)),
+ input_data,
+ input_data_length,
+ data_length,
+ keystore.sign,
+ outputter.dump,
+ )
+ else:
+ (soc_sig, soc_hash, soc_chunk) = swarm.soc_create(
+ soc_identifier_bytes,
+ bytes.fromhex(strip_0x(address)),
+ input_data,
+ input_data_length,
+ data_length,
+ keystore.sign,
+ outputter_noop,
+ )
+
+ #logg.debug('signature {}'.format(soc_sig.hex()))
+ #logg.debug('hash {}'.format(soc_hash.hex()))
+ #logg.debug('chunk {}'.format(soc_chunk.hex()))
+ logg.debug('signature {}'.format(soc_sig))
+ logg.debug('hash {}'.format(soc_hash))
+ logg.debug('chunk {}'.format(soc_chunk))
+
+ out_data = soc_hash
+
+ if largs.b:
+ sys.stdout.buffer.write(out_data)
+ else:
+ s = '{}'.format(out_data.hex())
+ if not largs.n:
+ s += '\n'
+ sys.stdout.write(s)
+
+
+if __name__ == '__main__':
+ main()
diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@ def main():
install_requires=requirements,
packages=[
'pylibswarm',
- 'swarm.runnable',
+ 'pylibswarm.runnable',
],
ext_modules=[
Extension("swarm", [
@@ -61,9 +61,9 @@ def main():
],
entry_points = {
'console_scripts': [
- 'swarm-bmt=swarm.runnable.bmt:main',
- 'swarm-file=swarm.runnable.file:main',
- 'swarm-soc=swarm.runnable.soc:main',
+ 'swarm-bmt=pylibswarm.runnable.bmt:main',
+ 'swarm-file=pylibswarm.runnable.file:main',
+ 'swarm-soc=pylibswarm.runnable.soc:main',
],
},
)
