Upgrade chainsyncer, chainqueue

chaind/adapters/fs.py

@@ -28,7 +28,6 @@ class ChaindFsAdapter(ChaindAdapter):
 
 
     def put(self, signed_tx):
-        #cache_tx = self.deserialize(signed_tx)
         (s, tx_hash,) = self.store.put(signed_tx, cache_adapter=self.cache_adapter)
         return tx_hash
 

chaind/cli/__init__.py

@@ -0,0 +1,12 @@
+# standard imports
+import os
+
+# local imports
+from .base import *
+from .arg import process_flags
+from .config import process_config
+
+
+__script_dir = os.path.dirname(os.path.realpath(__file__))
+data_dir = os.path.join(os.path.dirname(__script_dir), 'data')
+config_dir = os.path.join(data_dir, 'config')

chaind/cli/arg.py

@@ -0,0 +1,17 @@
+# local imports
+from .base import ChaindFlag
+
+def process_flags(argparser, flags):
+    if flags & ChaindFlag.SESSION > 0:
+        argparser.add_argument('--session-id', dest='session_id', type=str, help='Session to store state and data under')
+        argparser.add_argument('--runtime-dir', dest='runtime_dir', type=str, help='Directory to store volatile data')
+        argparser.add_argument('--data-dir', dest='data_dir', type=str, help='Directory to store persistent data')
+
+    if flags & ChaindFlag.SOCKET > 0:
+        argparser.add_argument('--socket-path', dest='socket', type=str, help='UNIX socket path')
+
+    if flags & ChaindFlag.SOCKET_CLIENT > 0:
+        argparser.add_argument('--send-socket', dest='socket_send', action='store_true', help='Send to UNIX socket')
+
+    if flags & ChaindFlag.TOKEN > 0:
+        argparser.add_argument('--token-module', dest='token_module', type=str, help='Python module path to resolve tokens from identifiers')

chaind/cli/base.py

@@ -0,0 +1,13 @@
+# standard imports
+import enum
+
+
+class ChaindFlag(enum.IntEnum):
+    SESSION = 1
+    DISPATCH = 2
+    SOCKET = 16
+    SOCKET_CLIENT = 32
+    TOKEN = 256
+
+argflag_local_base = ChaindFlag.SESSION
+argflag_local_socket_client = ChaindFlag.SESSION | ChaindFlag.SOCKET | ChaindFlag.SOCKET_CLIENT

chaind/cli/config.py

@@ -0,0 +1,23 @@
+# external imports
+from chaind.cli import ChaindFlag
+
+
+def process_config(config, args, flags):
+    args_override = {}
+    if flags & ChaindFlag.SESSION:
+        args_override['SESSION_ID'] = getattr(args, 'session_id')
+        args_override['SESSION_RUNTIME_DIR'] = getattr(args, 'runtime_dir')
+        args_override['SESSION_DATA_DIR'] = getattr(args, 'data_dir')
+
+    if flags & ChaindFlag.SOCKET:
+        args_override['SESSION_SOCKET_PATH'] = getattr(args, 'socket')
+
+    if flags & ChaindFlag.TOKEN:
+        args_override['TOKEN_MODULE'] = getattr(args, 'token_module')
+
+    config.dict_override(args_override, 'local cli args')
+
+    if flags & ChaindFlag.SOCKET_CLIENT:
+        config.add(getattr(args, 'socket_send'), '_SOCKET_SEND', False)
+
+    return config

chaind/data/config/config.ini

@@ -4,12 +4,3 @@ runtime_dir =
 id =
 data_dir =
 
-[database]
-engine =
-name = chaind
-driver =
-user =
-password =
-host =
-port =
-debug = 0

chaind/filter.py

@@ -21,6 +21,7 @@ class StateFilter(SyncFilter):
         except NotLocalTxError:
             logg.debug('skipping not local transaction {}'.format(tx.hash))
             return False
+
         if tx.status == TxStatus.SUCCESS:
             self.adapter.succeed(block, tx)
         else:

chaind/session.py

@@ -117,3 +117,4 @@ class SessionController:
             logg.debug('{} bytes sent'.format(len(v)))
         except BrokenPipeError:
             logg.debug('they just hung up. how rude.')
+        srvs.close()

chaind/settings.py

@@ -0,0 +1,115 @@
+# standard imports
+import logging
+import os
+import uuid
+
+# external imports
+from chainlib.chain import ChainSpec
+from chainsyncer.settings import ChainsyncerSettings
+
+logg = logging.getLogger(__name__)
+
+
+class ChaindSettings(ChainsyncerSettings):
+
+    def __init__(self, include_sync=False, include_queue=False):
+        self.o = {}
+        self.get = self.o.get
+        self.include_sync = include_sync
+        self.include_queue = include_queue
+
+
+    def process_common(self, config):
+        self.o['CHAIN_SPEC'] = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
+
+
+    def process_session(self, config):
+        session_id = config.get('SESSION_ID')
+
+        base_dir = os.getcwd()
+        data_dir = config.get('SESSION_DATA_DIR')
+        if data_dir == None:
+            data_dir = os.path.join(base_dir, '.chaind', 'chaind')
+        data_engine_dir = os.path.join(data_dir, config.get('CHAIND_ENGINE'))
+        os.makedirs(data_engine_dir, exist_ok=True)
+
+        # check if existing session
+        if session_id == None:
+            fp = os.path.join(data_engine_dir, 'default')
+            try:
+                os.stat(fp)
+                fp = os.path.realpath(fp)
+            except FileNotFoundError:
+                fp = None
+            if fp != None:
+                session_id = os.path.basename(fp)
+
+        make_default = False
+        if session_id == None:
+            session_id = str(uuid.uuid4())
+            make_default = True
+
+        # create the session persistent dir
+        session_dir = os.path.join(data_engine_dir, session_id)
+        if make_default:
+            fp = os.path.join(data_engine_dir, 'default')
+            os.symlink(session_dir, fp)
+
+        data_dir = os.path.join(session_dir, config.get('CHAIND_COMPONENT'))
+        os.makedirs(data_dir, exist_ok=True)
+
+        # create volatile dir
+        uid = os.getuid()
+        runtime_dir = config.get('SESSION_RUNTIME_DIR')
+        if runtime_dir == None:
+            runtime_dir = os.path.join('/run', 'user', str(uid), 'chaind')
+        runtime_dir = os.path.join(runtime_dir, config.get('CHAIND_ENGINE'), session_id, config.get('CHAIND_COMPONENT'))
+        os.makedirs(runtime_dir, exist_ok=True)
+
+        self.o['SESSION_RUNTIME_DIR'] = runtime_dir
+        self.o['SESSION_DIR'] = session_dir
+        self.o['SESSION_DATA_DIR'] = data_dir
+        self.o['SESSION_ID'] = session_id
+
+    
+    def process_sync_interface(self, config):
+        raise NotImplementedError('no sync interface implementation defined')
+
+
+    def process_sync(self, config):
+        self.process_sync_interface(config)
+        self.process_sync_range(config)
+
+
+    def process_socket(self, config):
+        socket_path = config.get('SESSION_SOCKET_PATH')
+        if socket_path == None:
+            socket_path = os.path.join(self.o['SESSION_RUNTIME_DIR'], 'chaind.sock')
+        self.o['SESSION_SOCKET_PATH'] = socket_path
+
+
+    def process_dispatch(self, config):
+        self.o['SESSION_DISPATCH_DELAY'] = 0.01
+
+                
+    def process(self, config):
+        self.process_common(config)
+        self.process_session(config)
+        self.process_socket(config)
+        if self.include_sync:
+            self.process_sync(config)
+        if self.include_queue:
+            self.process_dispatch(config)
+
+
+    def dir_for(self, k):
+        return os.path.join(self.o['SESSION_DIR'], k)
+
+
+    def __str__(self):
+        ks = list(self.o.keys())
+        ks.sort()
+        s = ''
+        for k in ks:
+            s += '{}: {}\n'.format(k, self.o.get(k))
+        return s

requirements.txt

@@ -1,6 +1,6 @@
 chainlib~=0.1.0
-chainqueue~=0.1.1
-chainsyncer~=0.3.5
+chainqueue~=0.1.2
+chainsyncer~=0.3.6
 confini~=0.6.0
 funga~=0.5.2
 pyxdg~=0.26

scripts/migrate.py

@@ -1,80 +0,0 @@
-#!/usr/bin/python
-import os
-import argparse
-import logging
-
-# external imports
-import alembic
-from alembic.config import Config as AlembicConfig
-import confini
-import chainqueue.db
-import chainsyncer.db
-
-# local imports
-from chaind import Environment
-
-logging.basicConfig(level=logging.WARNING)
-logg = logging.getLogger()
-
-rootdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-dbdir = os.path.join(rootdir, 'chaind', 'db')
-configdir = os.path.join(rootdir, 'chaind', 'data', 'config')
-default_migrations_dir = os.path.join(dbdir, 'migrations')
-
-env = Environment(env=os.environ)
-
-argparser = argparse.ArgumentParser()
-argparser.add_argument('-c', type=str, default=env.config_dir, help='config directory')
-argparser.add_argument('--env-prefix', default=os.environ.get('CONFINI_ENV_PREFIX'), dest='env_prefix', type=str, help='environment prefix for variables to overwrite configuration')
-argparser.add_argument('--data-dir', dest='data_dir', type=str, help='data directory')
-argparser.add_argument('--migrations-dir', dest='migrations_dir', default=default_migrations_dir, type=str, help='path to alembic migrations directory')
-argparser.add_argument('--reset', action='store_true', help='reset exsting database')
-argparser.add_argument('-v', action='store_true', help='be verbose')
-argparser.add_argument('-vv', action='store_true', help='be more verbose')
-args = argparser.parse_args()
-
-if args.vv:
-    logging.getLogger().setLevel(logging.DEBUG)
-elif args.v:
-    logging.getLogger().setLevel(logging.INFO)
-
-# process config
-logg.debug('loading config from {}'.format(args.c))
-config = confini.Config(configdir, args.env_prefix, override_dirs=[args.c])
-config.process()
-args_override = {
-            'SESSION_DATA_DIR': getattr(args, 'data_dir'),
-        }
-config.dict_override(args_override, 'cli args')
-
-if config.get('DATABASE_ENGINE') == 'sqlite':
-    config.add(os.path.join(config.get('SESSION_DATA_DIR'), config.get('DATABASE_NAME') + '.sqlite'), 'DATABASE_NAME', True)
- 
-config.censor('PASSWORD', 'DATABASE')
-
-logg.debug('config loaded:\n{}'.format(config))
-config.add(os.path.join(args.migrations_dir, config.get('DATABASE_ENGINE')), '_MIGRATIONS_DIR', True)
-if not os.path.isdir(config.get('_MIGRATIONS_DIR')):
-    logg.debug('migrations dir for engine {} not found, reverting to default'.format(config.get('DATABASE_ENGINE')))
-    config.add(os.path.join(args.migrations_dir, 'default'), '_MIGRATIONS_DIR', True)
-
-os.makedirs(config.get('SESSION_DATA_DIR'), exist_ok=True)
-
-dsn = chainqueue.db.dsn_from_config(config)
-
-def main():
-    logg.info('using migrations dir {}'.format(config.get('_MIGRATIONS_DIR')))
-    logg.info('using db {}'.format(dsn))
-    ac = AlembicConfig(os.path.join(config.get('_MIGRATIONS_DIR'), 'alembic.ini'))
-    ac.set_main_option('sqlalchemy.url', dsn)
-    ac.set_main_option('script_location', config.get('_MIGRATIONS_DIR'))
-
-    if args.reset:
-        logg.debug('reset is set, purging existing content')
-        alembic.command.downgrade(ac, 'base')
-
-    alembic.command.upgrade(ac, 'head')
-
-
-if __name__ == '__main__':
-    main()

setup.cfg

@@ -27,10 +27,10 @@ python_requires = >= 3.6
 include_package_data = True
 packages = 
 	chaind
-#	chaind.sql
 #	chaind.runnable
 	chaind.adapters
 	chaind.unittest
+	chaind.cli
 
 #[options.entry_points]
 #console_scripts =