Correct runnable package name

This reverts commit 1c92b97799.

CHANGELOG

@@ -0,0 +1,19 @@
+* 0.3.7
+	- Remove hard eth dependency in settings rendering
+	- Add unlock cli tool
+* 0.3.6
+	- Add cli arg processing and settings renderer
+* 0.3.5
+	- Allow memory-only shep if factory set to None in store constructor
+* 0.3.4
+	- Use explicit bool check in filter interrupt check
+* 0.3.3
+	- Include shep persistent state bootstrap sync
+	- Add chainsyncer extras
+* 0.3.2
+	- Implement rocksdb backend
+* 0.3.1
+	- Upgrade to release shep version
+	- Move sync state to SYNC after start
+* 0.3.0
+	- Re-implement chainsyncer on shep

MANIFEST.in

@@ -1 +1 @@
-include *requirements.txt LICENSE.txt chainsyncer/db/migrations/default/* chainsyncer/db/migrations/default/versions/* chainsyncer/db/migrations/default/versions/src/*
+include *requirements.txt LICENSE.txt chainsyncer/data/config/*

chainsyncer/backend/base.py

@@ -1,60 +0,0 @@
-# standard imports
-import logging
-
-logg = logging.getLogger(__name__)
-
-
-class Backend:
-    """Base class for syncer state backend.
-
-    :param flags_reversed: If set, filter flags are interpreted from left to right
-    :type flags_reversed: bool
-    """
-
-    def __init__(self, object_id, flags_reversed=False):
-        self.object_id = object_id
-        self.filter_count = 0
-        self.flags_reversed = flags_reversed
-
-        self.block_height_offset = 0
-        self.tx_index_offset = 0
-
-        self.block_height_cursor = 0
-        self.tx_index_cursor = 0
-
-        self.block_height_target = 0
-        self.tx_index_target = 0
-
-    
-    def check_filter(self, n, flags):
-        """Check whether an individual filter flag is set.
-
-        :param n: Bit index
-        :type n: int
-        :param flags: Bit field to check against
-        :type flags: int
-        :rtype: bool
-        :returns: True if set
-        """
-        if self.flags_reversed:
-            try:
-                v = 1 << flags.bit_length() - 1
-                return (v >> n) & flags > 0
-            except ValueError:
-                pass
-            return False
-        return flags & (1 << n) > 0
-
-
-
-    def chain(self):
-        """Returns chain spec for syncer.
-
-        :returns: Chain spec
-        :rtype chain_spec: cic_registry.chain.ChainSpec
-        """
-        return self.chain_spec
-
-
-    def __str__(self):
-        return "syncerbackend {} chain {} start {} target {}".format(self.object_id, self.chain(), self.start(), self.target())

chainsyncer/backend/file.py

@@ -1,472 +0,0 @@
-# standard imports
-import os
-import uuid
-import shutil
-import logging
-
-# local imports
-from .base import Backend
-
-logg = logging.getLogger().getChild(__name__)
-
-BACKEND_BASE_DIR = '/var/lib'
-
-
-def chain_dir_for(chain_spec, base_dir=BACKEND_BASE_DIR):
-    """Retrieve file backend directory for the given chain spec.
-
-    :param chain_spec: Chain spec context of backend
-    :type chain_spec: chainlib.chain.ChainSpec
-    :param base_dir: Base directory to use for generation. Default is value of BACKEND_BASE_DIR
-    :type base_dir: str 
-    :rtype: str
-    :returns: Absolute path of chain backend directory
-    """
-    base_data_dir = os.path.join(base_dir, 'chainsyncer')
-    return os.path.join(base_data_dir, str(chain_spec).replace(':', '/'))
-
-
-def data_dir_for(chain_spec, object_id, base_dir=BACKEND_BASE_DIR):
-    """Retrieve file backend directory for the given syncer.
-
-    :param chain_spec: Chain spec context of backend
-    :type chain_spec: chainlib.chain.ChainSpec
-    :param object_id: Syncer id
-    :type object_id: str
-    :param base_dir: Base directory to use for generation. Default is value of BACKEND_BASE_DIR
-    :type base_dir: str 
-    :rtype: str
-    :returns: Absolute path of chain backend directory
-    """
-    chain_dir = chain_dir_for(chain_spec, base_dir=base_dir)
-    return os.path.join(chain_dir, object_id)
-
-
-class FileBackend(Backend):
-    """Filesystem backend implementation for syncer state.
-
-    FileBackend uses reverse order of filter flags.
-
-    :param chain_spec: Chain spec for the chain that syncer is running for.
-    :type chain_spec: cic_registry.chain.ChainSpec
-    :param object_id: Unique id for the syncer session.
-    :type object_id: str
-    :param base_dir: Base directory to use for generation. Default is value of BACKEND_BASE_DIR
-    :type base_dir: str 
-    """
-    __warned = False
-
-    def __init__(self, chain_spec, object_id, base_dir=BACKEND_BASE_DIR):
-        if not FileBackend.__warned:
-            logg.warning('file backend for chainsyncer is experimental and not yet guaranteed to handle interrupted filter execution.')
-            FileBackend.__warned = True
-        super(FileBackend, self).__init__(object_id, flags_reversed=True)
-        self.object_data_dir = data_dir_for(chain_spec, object_id, base_dir=base_dir)
-
-        self.object_id = object_id
-        self.db_object = None
-        self.db_object_filter = None
-        self.chain_spec = chain_spec
-
-        self.filter = b'\x00'
-        self.filter_names = []
-
-        if self.object_id != None:
-            self.connect()
-            self.disconnect()
-
-
-    @staticmethod
-    def create_object(chain_spec, object_id=None, base_dir=BACKEND_BASE_DIR):
-        """Creates a new syncer session at the given backend destination.
-
-        :param chain_spec: Chain spec for the chain that syncer is running for.
-        :type chain_spec: cic_registry.chain.ChainSpec
-        :param object_id: Unique id for the syncer session.
-        :type object_id: str
-        :param base_dir: Base directory to use for generation. Default is value of BACKEND_BASE_DIR
-        :type base_dir: str 
-        """
-        if object_id == None:
-            object_id = str(uuid.uuid4())
-
-        object_data_dir = data_dir_for(chain_spec, object_id, base_dir=base_dir)
-
-        if os.path.isdir(object_data_dir):
-            raise FileExistsError(object_data_dir)
-
-        os.makedirs(object_data_dir)
-
-        object_id_path = os.path.join(object_data_dir, 'object_id')
-        f = open(object_id_path, 'wb')
-        f.write(object_id.encode('utf-8'))
-        f.close()
-
-        init_value = 0
-        b = init_value.to_bytes(16, byteorder='big')
-        offset_path = os.path.join(object_data_dir, 'offset')
-        f = open(offset_path, 'wb')
-        f.write(b)
-        f.close()
-
-        target_path = os.path.join(object_data_dir, 'target')
-        f = open(target_path, 'wb')
-        f.write(b'\x00' * 16)
-        f.close()
-
-        cursor_path = os.path.join(object_data_dir, 'cursor')
-        f = open(cursor_path, 'wb')
-        f.write(b'\x00' * 16)
-        f.close()
-
-        cursor_path = os.path.join(object_data_dir, 'filter')
-        f = open(cursor_path, 'wb')
-        f.write(b'\x00' * 9)
-        f.close()
-
-        filter_name_path = os.path.join(object_data_dir, 'filter_name')
-        f = open(filter_name_path, 'wb')
-        f.write(b'')
-        f.close()
-
-        return object_id
-
-
-    def load(self):
-        """Loads the state of the syncer at the given location of the instance.
-
-        :raises FileNotFoundError: Invalid data directory
-        :raises IsADirectoryError: Invalid data directory
-        """
-        offset_path = os.path.join(self.object_data_dir, 'offset')
-        f = open(offset_path, 'rb')
-        b = f.read(16)
-        f.close()
-        self.block_height_offset = int.from_bytes(b[:8], byteorder='big')
-        self.tx_index_offset = int.from_bytes(b[8:], byteorder='big')
-
-        target_path = os.path.join(self.object_data_dir, 'target')
-        f = open(target_path, 'rb')
-        b = f.read(16)
-        f.close()
-        self.block_height_target = int.from_bytes(b[:8], byteorder='big')
-        self.tx_index_target = int.from_bytes(b[8:], byteorder='big')
-
-        cursor_path = os.path.join(self.object_data_dir, 'cursor')
-        f = open(cursor_path, 'rb')
-        b = f.read(16)
-        f.close()
-        self.block_height_cursor = int.from_bytes(b[:8], byteorder='big')
-        self.tx_index_cursor = int.from_bytes(b[8:], byteorder='big')
-
-        filter_path = os.path.join(self.object_data_dir, 'filter')
-        f = open(filter_path, 'rb')
-        b = f.read(8)
-        self.filter_count = int.from_bytes(b, byteorder='big')
-        filter_count_bytes = int((self.filter_count - 1) / 8 + 1)
-        if filter_count_bytes > 0:
-            self.filter = f.read(filter_count_bytes)
-        f.close()
-
-        filter_name_path = filter_path + '_name'
-        f = open(filter_name_path, 'r')
-        while True:
-            s = f.readline().rstrip()
-            if len(s) == 0:
-                break
-            self.filter_names.append(s)
-        f.close()
-
-
-    def connect(self):
-        """Proxy for chainsyncer.backend.file.FileBackend.load that performs a basic sanity check for instance's backend location.
-
-        :raises ValueError: Sanity check failed
-        """
-        object_path = os.path.join(self.object_data_dir, 'object_id') 
-        f = open(object_path, 'r')
-        object_id = f.read()
-        f.close()
-        if object_id != self.object_id:
-            raise ValueError('data corruption in store for id {}'.format(object_id))
-
-        self.load()
-
-
-    def disconnect(self):
-        """FileBackend applies no actual connection, so this is noop
-        """
-        pass
-
-    
-    def purge(self):
-        """Remove syncer state from backend.
-        """
-        shutil.rmtree(self.object_data_dir)
-
-
-    def get(self):
-        """Get the current state of the syncer cursor.
-
-        :rtype: tuple
-        :returns: Block height / tx index tuple, and filter flags value
-        """
-        logg.debug('filter {}'.format(self.filter.hex()))
-        return ((self.block_height_cursor, self.tx_index_cursor), self.get_flags())
-
-
-    def get_flags(self):
-        """Get canonical representation format of flags.
-
-        :rtype: int
-        :returns: Filter flag bitfield value
-        """
-        return int.from_bytes(self.filter, 'little')
-
-
-    def set(self, block_height, tx_index):
-        """Update the state of the syncer cursor.
-
-        :param block_height: New block height
-        :type block_height: int
-        :param tx_height: New transaction height in block
-        :type tx_height: int
-        :returns: Block height / tx index tuple, and filter flags value
-        :rtype: tuple
-        """
-        self.__set(block_height, tx_index, 'cursor')
-
-#        cursor_path = os.path.join(self.object_data_dir, 'filter')
-#        f = open(cursor_path, 'r+b')
-#        f.seek(8)
-#        l = len(self.filter)
-#        c = 0
-#        while c < l:
-#            c += f.write(self.filter[c:])
-#        f.close()
-
-        return ((self.block_height_cursor, self.tx_index_cursor), self.get_flags())
-
-
-    def __set(self, block_height, tx_index, category):
-        cursor_path = os.path.join(self.object_data_dir, category)
-
-        block_height_bytes = block_height.to_bytes(8, byteorder='big')
-        tx_index_bytes = tx_index.to_bytes(8, byteorder='big')
-
-        f = open(cursor_path, 'wb')
-        b = f.write(block_height_bytes)
-        b = f.write(tx_index_bytes)
-        f.close()
-
-        setattr(self, 'block_height_' + category, block_height)
-        setattr(self, 'tx_index_' + category, tx_index)
-
-
-    @staticmethod
-    def initial(chain_spec, target_block_height, start_block_height=0, base_dir=BACKEND_BASE_DIR):
-        """Creates a new syncer session and commit its initial state to backend.
-
-        :param chain_spec: Chain spec of chain that syncer is running for.
-        :type chain_spec: cic_registry.chain.ChainSpec
-        :param target_block_height: Target block height
-        :type target_block_height: int
-        :param start_block_height: Start block height
-        :type start_block_height: int
-        :param base_dir: Base directory to use for generation. Default is value of BACKEND_BASE_DIR
-        :type base_dir: str 
-        :raises ValueError: Invalid start/target specification
-        :returns: New syncer object 
-        :rtype: cic_eth.db.models.BlockchainSync
-        """
-        if start_block_height >= target_block_height:
-            raise ValueError('start block height must be lower than target block height')
-       
-        uu = FileBackend.create_object(chain_spec, base_dir=base_dir)
-
-        o = FileBackend(chain_spec, uu, base_dir=base_dir)
-        o.__set(target_block_height, 0, 'target')
-        o.__set(start_block_height, 0, 'offset')
-        o.__set(start_block_height, 0, 'cursor')
-
-        return o
-
-
-    @staticmethod
-    def live(chain_spec, block_height, base_dir=BACKEND_BASE_DIR):
-        """Creates a new open-ended syncer session starting at the given block height.
-
-        :param chain: Chain spec of chain that syncer is running for.
-        :type chain: cic_registry.chain.ChainSpec
-        :param block_height: Start block height
-        :type block_height: int
-        :param base_dir: Base directory to use for generation. Default is value of BACKEND_BASE_DIR
-        :type base_dir: str 
-        :returns: "Live" syncer object
-        :rtype: cic_eth.db.models.BlockchainSync
-        """
-        uu = FileBackend.create_object(chain_spec, base_dir=base_dir)
-        o = FileBackend(chain_spec, uu, base_dir=base_dir)
-        o.__set(block_height, 0, 'offset')
-        o.__set(block_height, 0, 'cursor')
-
-        return o
-
-
-    def target(self):
-        """Get the target state (upper bound of sync) of the syncer cursor.
-
-        :returns: Block height and filter flags value
-        :rtype: tuple
-        """
-
-        return (self.block_height_target, 0,)
-
-
-    def start(self):
-        """Get the initial state of the syncer cursor.
-
-        :returns: Block height / tx index tuple, and filter flags value
-        :rtype: tuple
-        """
-        return ((self.block_height_offset, self.tx_index_offset), 0,)
-
-
-    @staticmethod
-    def __sorted_entries(chain_spec, base_dir=BACKEND_BASE_DIR):
-        chain_dir = chain_dir_for(chain_spec, base_dir=base_dir)
-
-        entries = {}
-
-        for v in os.listdir(chain_dir):
-            d = os.path.realpath(os.path.join(chain_dir, v))
-            f = open(os.path.join(d, 'object_id'))
-            object_id = f.read()
-            f.close()
-
-            logg.debug('found syncer entry {} in {}'.format(object_id, d))
-
-            o = FileBackend(chain_spec, object_id, base_dir=base_dir)
-
-            entries[o.block_height_offset] = o
-
-        sorted_entries = []
-        for k in sorted(entries):
-            sorted_entries.append(entries[k])
-
-        return sorted_entries
-
-
-    @staticmethod
-    def resume(chain_spec, block_height, base_dir=BACKEND_BASE_DIR):
-        """Retrieves and returns all previously unfinished syncer sessions.
-
-        If a previous open-ended syncer is found, a new syncer will be generated to sync from where that syncer left off until the block_height given as argument.
-
-        :param chain_spec: Chain spec of chain that syncer is running for
-        :type chain_spec: cic_registry.chain.ChainSpec
-        :param block_height: Target block height for previous live syncer
-        :type block_height: int
-        :param base_dir: Base directory to use for generation. Default is value of BACKEND_BASE_DIR
-        :type base_dir: str 
-        :raises FileNotFoundError: Invalid backend location
-        :returns: Syncer objects of unfinished syncs
-        :rtype: list of cic_eth.db.models.BlockchainSync
-        """
-        try:
-            return FileBackend.__sorted_entries(chain_spec, base_dir=base_dir)
-        except FileNotFoundError:
-            return []
-
-
-    @staticmethod
-    def first(chain_spec, base_dir=BACKEND_BASE_DIR):
-        """Returns the model object of the most recent syncer in backend.
-
-        :param chain_spec: Chain spec of chain that syncer is running for.
-        :type chain_spec: cic_registry.chain.ChainSpec
-        :param base_dir: Base directory to use for generation. Default is value of BACKEND_BASE_DIR
-        :type base_dir: str 
-        :returns: Last syncer object 
-        :rtype: cic_eth.db.models.BlockchainSync
-        """
-        entries = []
-        try:
-            entries = FileBackend.__sorted_entries(chain_spec, base_dir=base_dir)
-        except FileNotFoundError:
-            return entries
-        return entries[len(entries)-1]
-
-
-    # n is zero-index of bit field
-    def begin_filter(self, n, base_dir=BACKEND_BASE_DIR):
-        pass
-
-
-    # n is zero-index of bit field
-    def complete_filter(self, n, base_dir=BACKEND_BASE_DIR):
-        """Sets the filter at the given index as completed.
-
-        :param n: Filter index, starting at zero
-        :type n: int
-        :raises IndexError: Index is outside filter count range
-        """
-        if self.filter_count <= n:
-            raise IndexError('index {} out of ranger for filter size {}'.format(n, self.filter_count))
-
-        byte_pos = int(n / 8)
-        bit_pos = n % 8
-
-        byts = bytearray(self.filter)
-        b = (0x80 >> bit_pos)
-        b |= self.filter[byte_pos]
-        logg.debug('bbb {}'.format(type(b)))
-        byts[byte_pos] = b #b.to_bytes(1, byteorder='big')
-        self.filter = byts
-        
-        filter_path = os.path.join(self.object_data_dir, 'filter')
-        f = open(filter_path, 'r+b')
-        f.seek(8 + byte_pos)
-        f.write(self.filter)
-        f.close()
-
-
-    def register_filter(self, name):
-        """Add filter to backend.
-
-        Overwrites record on disk if manual changed members in struct
-
-        :param name: Name of filter
-        :type name: str
-        """
-        filter_path = os.path.join(self.object_data_dir, 'filter')
-        if (self.filter_count + 1) % 8 == 0:
-            self.filter += b'\x00'
-            f = open(filter_path, 'a+b')
-            f.write(b'\x00')
-            f.close()
-      
-        filter_name_path = filter_path + '_name'
-        f = open(filter_name_path, 'a')
-        f.write(name + '\n')
-        f.close()
-
-        self.filter_count += 1
-        f = open(filter_path, 'r+b')
-        b = self.filter_count.to_bytes(8, byteorder='big')
-        f.write(b)
-        f.close()
-
-
-    def reset_filter(self):
-        """Reset all filter states.
-        """
-        self.filter = b'\x00' * len(self.filter)
-        cursor_path = os.path.join(self.object_data_dir, 'filter')
-        f = open(cursor_path, 'r+b')
-        f.seek(8)
-        l = len(self.filter)
-        c = 0
-        while c < l:
-            c += f.write(self.filter[c:])
-        f.close()

chainsyncer/backend/memory.py

@@ -1,141 +0,0 @@
-# standard imports
-import logging
-import uuid
-
-# local imports
-from .base import Backend
-
-logg = logging.getLogger(__name__)
-
-
-class MemBackend(Backend):
-    """Disposable syncer backend. Keeps syncer state in memory.
-
-    Filter bitfield is interpreted right to left.
-
-    :param chain_spec: Chain spec context of syncer
-    :type chain_spec: chainlib.chain.ChainSpec
-    :param object_id: Unique id for the syncer session.
-    :type object_id: str
-    :param target_block: Block height to terminate sync at
-    :type target_block: int
-    """
-
-    def __init__(self, chain_spec, object_id):
-        super(MemBackend, self).__init__(object_id)
-        self.chain_spec = chain_spec
-        self.db_session = None
-        self.block_height_offset = 0
-        self.block_height_cursor = 0
-        self.tx_height_offset = 0
-        self.tx_height_cursor = 0
-        self.block_height_target = None
-        self.flags = 0
-        self.flags_start = 0
-        self.flags_target = 0
-        self.filter_names = []
-
-
-    @staticmethod
-    def custom(chain_spec, target_block, block_offset=0, tx_offset=0, flags=0, flags_count=0, *args, **kwargs):
-        object_id = kwargs.get('object_id', str(uuid.uuid4()))
-        backend = MemBackend(chain_spec, object_id)
-        backend.block_height_offset = block_offset
-        backend.block_height_cursor = block_offset
-        backend.tx_height_offset = tx_offset
-        backend.tx_height_cursor = tx_offset
-        backend.block_height_target = target_block
-        backend.flags = flags
-        backend.flags_count = flags_count
-        backend.flags_start = flags
-        flags_target = (2 ** flags_count) - 1
-        backend.flags_target = flags_target
-        return backend
-
-
-    def connect(self):
-        """NOOP as memory backend implements no connection.
-        """
-        pass
-
-
-    def disconnect(self):
-        """NOOP as memory backend implements no connection.
-        """
-        pass
-
-
-    def set(self, block_height, tx_height):
-        """Set the syncer state.
-
-        :param block_height: New block height
-        :type block_height: int
-        :param tx_height: New transaction height in block
-        :type tx_height: int
-        """
-        logg.debug('memory backend received {} {}'.format(block_height, tx_height))
-        self.block_height_cursor = block_height
-        self.tx_height_cursor = tx_height
-
-
-    def get(self):
-        """Get the current syncer state
-
-        :rtype: tuple
-        :returns: block height / tx index tuple, and filter flags value
-        """
-        return ((self.block_height_cursor, self.tx_height_cursor), self.flags)
-
-
-    def start(self):
-        """Get the initial syncer state
-
-        :rtype: tuple
-        :returns: block height / tx index tuple, and filter flags value
-        """
-        return ((self.block_height_offset, self.tx_height_offset), self.flags_start)
-
-
-    def target(self):
-        """Returns the syncer target.
-
-        :rtype: tuple
-        :returns: block height / tx index tuple
-        """
-        return (self.block_height_target, self.flags_target)
-
-
-    def register_filter(self, name):
-        """Adds a filter identifier to the syncer.
-
-        :param name: Filter name
-        :type name: str
-        """
-        self.filter_names.append(name)
-        self.filter_count += 1
-
-
-    def begin_filter(self, n):
-        """Set filter at index as completed for the current block / tx state.
-
-        :param n: Filter index
-        :type n: int
-        """
-        v = 1 << n
-        self.flags |= v
-        logg.debug('set filter {} {}'.format(self.filter_names[n], v))
-
-
-    def complete_filter(self, n):
-        pass
-
-
-    def reset_filter(self):
-        """Set all filters to unprocessed for the current block / tx state.
-        """
-        logg.debug('reset filters')
-        self.flags = 0
-
-    
-    def __str__(self):
-        return "syncer membackend {} chain {} cursor {}".format(self.object_id, self.chain(), self.get())

chainsyncer/backend/sql.py

@@ -1,367 +0,0 @@
-# standard imports
-import logging
-import uuid
-
-# imports
-from chainlib.chain import ChainSpec
-
-# local imports
-from chainsyncer.db.models.sync import BlockchainSync
-from chainsyncer.db.models.filter import BlockchainSyncFilter
-from chainsyncer.db.models.base import SessionBase
-from .base import Backend
-
-logg = logging.getLogger().getChild(__name__)
-
-
-class SQLBackend(Backend):
-    """Interface to block and transaction sync state.
-
-    :param chain_spec: Chain spec for the chain that syncer is running for.
-    :type chain_spec: cic_registry.chain.ChainSpec
-    :param object_id: Unique database record id for the syncer session.
-    :type object_id: int
-    """
-
-    base = None
-
-    def __init__(self, chain_spec, object_id):
-        super(SQLBackend, self).__init__(int(object_id))
-        self.db_session = None
-        self.db_object = None
-        self.db_object_filter = None
-        self.chain_spec = chain_spec
-        self.connect()
-        self.disconnect()
-
-
-    @classmethod
-    def setup(cls, dsn, debug=False, pool_size=0, *args, **kwargs):
-        """Set up database connection backend.
-
-        :param dsn: Database connection string
-        :type dsn: str
-        :param debug: Activate debug output in sql engine
-        :type debug: bool
-        :param pool_size: Size of transaction pool
-        :type pool_size: int
-        """
-        if cls.base == None:
-            cls.base = SessionBase
-            cls.base.connect(dsn, debug=debug, pool_size=pool_size)
-
-
-    def connect(self):
-        """Loads the state of the syncer session by the given database record id.
-
-        :raises ValueError: Database syncer object with given id does not exist
-        :rtype: sqlalchemy.orm.session.Session
-        :returns: Database session object
-        """
-        if self.db_session == None:
-            self.db_session = SessionBase.create_session()
-
-        q = self.db_session.query(BlockchainSync)
-        q = q.filter(BlockchainSync.id==self.object_id)
-        self.db_object = q.first()
-
-        if self.db_object != None:
-            qtwo = self.db_session.query(BlockchainSyncFilter)
-            qtwo = qtwo.join(BlockchainSync)
-            qtwo = qtwo.filter(BlockchainSync.id==self.db_object.id)
-            self.db_object_filter = qtwo.first()
-
-        if self.db_object == None:
-            raise ValueError('sync entry with id {} not found'.format(self.object_id))
-
-        return self.db_session
-
-
-    def disconnect(self):
-        """Commits state of sync to backend and frees connection resources.
-        """
-        if self.db_session == None:
-            return
-
-        if self.db_object_filter != None:
-            self.db_session.add(self.db_object_filter)
-        self.db_session.add(self.db_object)
-        self.db_session.commit()
-        self.db_session.close()
-        self.db_session = None
-       
-   
-
-    def get(self):
-        """Get the current state of the syncer cursor.
-
-        :rtype: tuple
-        :returns: Block height / tx index tuple, and filter flags value
-        """
-        self.connect()
-        pair = self.db_object.cursor()
-        (filter_state, count, digest) = self.db_object_filter.cursor()
-        self.disconnect()
-        return (pair, filter_state,)
-   
-
-    def set(self, block_height, tx_height):
-        """Update the state of the syncer cursor.
-
-        :param block_height: New block height
-        :type block_height: int
-        :param tx_height: New transaction height in block
-        :type tx_height: int
-        :returns: Block height / tx index tuple, and filter flags value
-        :rtype: tuple
-        """
-        self.connect()
-        pair = self.db_object.set(block_height, tx_height)
-        (filter_state, count, digest)= self.db_object_filter.cursor()
-        self.disconnect()
-        return (pair, filter_state,)
-
-
-    def start(self):
-        """Get the initial state of the syncer cursor.
-
-        :returns: Block height / tx index tuple, and filter flags value
-        :rtype: tuple
-        """
-        self.connect()
-        pair = self.db_object.start()
-        (filter_state, count, digest) = self.db_object_filter.start()
-        self.disconnect()
-        return (pair, filter_state,)
-
-    
-    def target(self):
-        """Get the target state (upper bound of sync) of the syncer cursor.
-
-        :returns: Block height and filter flags value
-        :rtype: tuple
-        """
-        self.connect()
-        target = self.db_object.target()
-        (filter_target, count, digest) = self.db_object_filter.target()
-        self.disconnect()
-        return (target, filter_target,)
-
-
-    @staticmethod
-    def custom(chain_spec, target_block, block_offset=0, tx_offset=0, flags=0, flag_count=0, *args, **kwargs):
-        """
-
-        :param flags: flags bit field
-        :type flags: bytes
-        :param flag_count: number of flags in bit field
-        :type flag_count: 
-        """
-        session = SessionBase.create_session()
-        o = BlockchainSync(str(chain_spec), block_offset, tx_offset, target_block)
-        session.add(o)
-        session.commit()
-        object_id = o.id
-  
-        of = BlockchainSyncFilter(o, flag_count, flags, kwargs.get('flags_digest'))
-        session.add(of)
-        session.commit()
-
-        session.close()
-
-        return SQLBackend(chain_spec, object_id)
-
-
-    @staticmethod
-    def first(chain_spec):
-        """Returns the model object of the most recent syncer in backend.
-
-        :param chain_spec: Chain spec of chain that syncer is running for.
-        :type chain_spec: cic_registry.chain.ChainSpec
-        :returns: Last syncer object 
-        :rtype: cic_eth.db.models.BlockchainSync
-        """
-        object_id = BlockchainSync.first(str(chain_spec))
-        if object_id == None:
-            return None
-        return SQLBackend(chain_spec, object_id)
-
-
-
-    @staticmethod
-    def initial(chain_spec, target_block_height, start_block_height=0):
-        """Creates a new syncer session and commit its initial state to backend.
-
-        :param chain_spec: Chain spec of chain that syncer is running for
-        :type chain_spec: cic_registry.chain.ChainSpec
-        :param target_block_height: Target block height
-        :type target_block_height: int
-        :param start_block_height: Start block height
-        :type start_block_height: int
-        :raises ValueError: Invalid start/target specification
-        :returns: New syncer object 
-        :rtype: cic_eth.db.models.BlockchainSync
-        """
-        if start_block_height >= target_block_height:
-            raise ValueError('start block height must be lower than target block height')
-        object_id = None
-        session = SessionBase.create_session()
-        o = BlockchainSync(str(chain_spec), start_block_height, 0, target_block_height)
-        session.add(o)
-        session.commit()
-        object_id = o.id
-
-        of = BlockchainSyncFilter(o)
-        session.add(of)
-        session.commit()
-
-        session.close()
-
-        return SQLBackend(chain_spec, object_id)
-
-
-    @staticmethod
-    def resume(chain_spec, block_height):
-        """Retrieves and returns all previously unfinished syncer sessions.
-
-        If a previous open-ended syncer is found, a new syncer will be generated to sync from where that syncer left off until the block_height given as argument.
-
-        :param chain_spec: Chain spec of chain that syncer is running for
-        :type chain_spec: cic_registry.chain.ChainSpec
-        :param block_height: Target block height for previous live syncer
-        :type block_height: int
-        :returns: Syncer objects of unfinished syncs
-        :rtype: list of cic_eth.db.models.BlockchainSync
-        """
-        syncers = []
-
-        session = SessionBase.create_session()
-
-        object_id = None
-
-        highest_unsynced_block = 0
-        highest_unsynced_tx = 0
-        object_id = BlockchainSync.get_last(session=session, live=False)
-        if object_id != None:
-            q = session.query(BlockchainSync)
-            o = q.get(object_id)
-            (highest_unsynced_block, highest_unsynced_index) = o.cursor()
-        
-        object_ids = BlockchainSync.get_unsynced(session=session)
-        session.close()
-
-        for object_id in object_ids:
-            s = SQLBackend(chain_spec, object_id)
-            logg.debug('resume unfinished {}'.format(s))
-            syncers.append(s)
-
-        session = SessionBase.create_session()
-
-        last_live_id = BlockchainSync.get_last(session=session)
-        if last_live_id != None:
-
-            q = session.query(BlockchainSync)
-            o = q.get(last_live_id)
-
-            (block_resume, tx_resume) = o.cursor()
-            session.flush()
-
-            #if block_height != block_resume:
-            if highest_unsynced_block < block_resume: 
-
-                q = session.query(BlockchainSyncFilter)
-                q = q.filter(BlockchainSyncFilter.chain_sync_id==last_live_id)
-                of = q.first()
-                (flags, count, digest) = of.cursor()
-
-                session.flush()
-
-                o = BlockchainSync(str(chain_spec), block_resume, tx_resume, block_height)
-                session.add(o)
-                session.flush()
-                object_id = o.id
-
-                of = BlockchainSyncFilter(o, count, flags, digest)
-                session.add(of)
-                session.commit()
-
-                backend = SQLBackend(chain_spec, object_id)
-                syncers.append(backend)
-
-                logg.debug('last live session resume {}'.format(backend))
-
-        session.close()
-
-        return syncers
-
-
-    @staticmethod
-    def live(chain_spec, block_height):
-        """Creates a new open-ended syncer session starting at the given block height.
-
-        :param chain: Chain spec of chain that syncer is running for.
-        :type chain: cic_registry.chain.ChainSpec
-        :param block_height: Start block height
-        :type block_height: int
-        :returns: "Live" syncer object
-        :rtype: cic_eth.db.models.BlockchainSync
-        """
-        session = SessionBase.create_session()
-
-        o = BlockchainSync(str(chain_spec), block_height, 0, None)
-        session.add(o)
-        session.flush()
-        object_id = o.id
-
-        of = BlockchainSyncFilter(o)
-        session.add(of)
-        session.commit()
-
-        session.close()
-
-        return SQLBackend(chain_spec, object_id)
-
-
-    def register_filter(self, name):
-        """Add filter to backend.
-
-        No check is currently implemented to enforce that filters are the same for existing syncers. Care must be taken by the caller to avoid inconsistencies. 
-
-        :param name: Name of filter
-        :type name: str
-        """
-        self.connect()
-        if self.db_object_filter == None:
-            self.db_object_filter = BlockchainSyncFilter(self.db_object)
-        self.db_object_filter.add(name)
-        self.db_session.add(self.db_object_filter)
-        self.disconnect()
-
-
-    def begin_filter(self, n):
-        """Marks start of execution of the filter indexed by the corresponding bit.
-
-        :param n: Filter index
-        :type n: int
-        """
-        self.connect()
-        self.db_object_filter.set(n)
-        self.db_session.add(self.db_object_filter)
-        self.db_session.commit()
-        self.disconnect()
-
-
-    def complete_filter(self, n):
-        self.connect()
-        self.db_object_filter.release(check_bit=n)
-        self.db_session.add(self.db_object_filter)
-        self.db_session.commit()
-        self.disconnect()
-
-
-    def reset_filter(self):
-        """Reset all filter states.
-        """
-        self.connect()
-        self.db_object_filter.clear()
-        self.disconnect()

chainsyncer/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')

chainsyncer/cli/arg.py

@@ -0,0 +1,14 @@
+# local imports
+from .base import SyncFlag
+
+
+def process_flags(argparser, flags):
+
+    if flags & SyncFlag.RANGE > 0:
+        argparser.add_argument('--offset', type=int, help='Block to start sync from. Default is start of history (0).')
+        argparser.add_argument('--until', type=int, default=-1, help='Block to stop sync on. Default is stop at block height of first run.')
+    if flags & SyncFlag.HEAD > 0:
+        argparser.add_argument('--head', action='store_true', help='Start from latest block as offset')
+        argparser.add_argument('--keep-alive', action='store_true', help='Do not stop syncing when caught up')
+
+    argparser.add_argument('--backend', type=str, help='Backend to use for state store')

chainsyncer/cli/base.py

@@ -0,0 +1,7 @@
+# standard imports
+import enum
+
+
+class SyncFlag(enum.IntEnum):
+    RANGE = 1
+    HEAD = 2

chainsyncer/cli/config.py

@@ -0,0 +1,20 @@
+# external imports
+from chainsyncer.cli import SyncFlag
+
+
+def process_config(config, args, flags):
+        args_override = {}
+
+        args_override['SYNCER_BACKEND'] = getattr(args, 'backend')
+
+        if flags & SyncFlag.RANGE:
+            args_override['SYNCER_OFFSET'] = getattr(args, 'offset')
+            args_override['SYNCER_LIMIT'] = getattr(args, 'until')
+
+        config.dict_override(args_override, 'local cli args')
+
+        if flags & SyncFlag.HEAD:
+            config.add(getattr(args, 'keep_alive'), '_KEEP_ALIVE')
+            config.add(getattr(args, 'head'), '_HEAD')
+
+        return config

chainsyncer/data/config/syncer.ini

@@ -0,0 +1,4 @@
+[syncer]
+offset = 0
+limit = 0
+backend = mem

chainsyncer/db/__init__.py

@@ -1,53 +0,0 @@
-# standard imports
-import os
-import logging
-
-# local imports
-from chainsyncer.db.models.base import SessionBase
-
-logg = logging.getLogger()
-
-
-def dsn_from_config(config):
-    """Generate a dsn string from the provided config dict.
-
-    The config dict must include all well-known database connection parameters, and must implement the method "get(key)" to retrieve them. Any missing parameters will be be rendered as the literal string "None"
-
-    :param config: Configuration object
-    :type config: Varies
-    :returns: dsn string
-    :rtype: str
-    """
-    scheme = config.get('DATABASE_ENGINE')
-    if config.get('DATABASE_DRIVER') != None:
-        scheme += '+{}'.format(config.get('DATABASE_DRIVER'))
-
-    dsn = ''
-    dsn_out = ''
-    if config.get('DATABASE_ENGINE') == 'sqlite':
-        dsn = '{}:///{}'.format(
-                scheme,
-                config.get('DATABASE_NAME'),    
-            )
-        dsn_out = dsn
-
-    else:
-        dsn = '{}://{}:{}@{}:{}/{}'.format(
-                scheme,
-                config.get('DATABASE_USER'),
-                config.get('DATABASE_PASSWORD'),
-                config.get('DATABASE_HOST'),
-                config.get('DATABASE_PORT'),
-                config.get('DATABASE_NAME'),    
-            )
-        dsn_out = '{}://{}:{}@{}:{}/{}'.format(
-                scheme,
-                config.get('DATABASE_USER'),
-                '***',
-                config.get('DATABASE_HOST'),
-                config.get('DATABASE_PORT'),
-                config.get('DATABASE_NAME'),    
-            )
-    logg.debug('parsed dsn from config: {}'.format(dsn_out))
-    return dsn
-

chainsyncer/db/migrations/default/README

@@ -1 +0,0 @@
-Generic single-database configuration.

chainsyncer/db/migrations/default/alembic.ini

@@ -1,85 +0,0 @@
-# A generic, single database configuration.
-
-[alembic]
-# path to migration scripts
-script_location = .
-
-# template used to generate migration files
-# file_template = %%(rev)s_%%(slug)s
-
-# timezone to use when rendering the date
-# within the migration file as well as the filename.
-# string value is passed to dateutil.tz.gettz()
-# leave blank for localtime
-# timezone =
-
-# max length of characters to apply to the
-# "slug" field
-# truncate_slug_length = 40
-
-# set to 'true' to run the environment during
-# the 'revision' command, regardless of autogenerate
-# revision_environment = false
-
-# set to 'true' to allow .pyc and .pyo files without
-# a source .py file to be detected as revisions in the
-# versions/ directory
-# sourceless = false
-
-# version location specification; this defaults
-# to ./versions.  When using multiple version
-# directories, initial revisions must be specified with --version-path
-# version_locations = %(here)s/bar %(here)s/bat ./versions
-
-# the output encoding used when revision files
-# are written from script.py.mako
-# output_encoding = utf-8
-
-sqlalchemy.url = driver://user:pass@localhost/dbname
-
-
-[post_write_hooks]
-# post_write_hooks defines scripts or Python functions that are run
-# on newly generated revision scripts.  See the documentation for further
-# detail and examples
-
-# format using "black" - use the console_scripts runner, against the "black" entrypoint
-# hooks=black
-# black.type=console_scripts
-# black.entrypoint=black
-# black.options=-l 79
-
-# Logging configuration
-[loggers]
-keys = root,sqlalchemy,alembic
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-#level = WARN
-handlers = console
-qualname =
-
-[logger_sqlalchemy]
-level = WARN
-handlers =
-qualname = sqlalchemy.engine
-
-[logger_alembic]
-level = INFO
-handlers =
-qualname = alembic
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S

chainsyncer/db/migrations/default/env.py

@@ -1,77 +0,0 @@
-from logging.config import fileConfig
-
-from sqlalchemy import engine_from_config
-from sqlalchemy import pool
-
-from alembic import context
-
-# this is the Alembic Config object, which provides
-# access to the values within the .ini file in use.
-config = context.config
-
-# Interpret the config file for Python logging.
-# This line sets up loggers basically.
-fileConfig(config.config_file_name)
-
-# add your model's MetaData object here
-# for 'autogenerate' support
-# from myapp import mymodel
-# target_metadata = mymodel.Base.metadata
-target_metadata = None
-
-# other values from the config, defined by the needs of env.py,
-# can be acquired:
-# my_important_option = config.get_main_option("my_important_option")
-# ... etc.
-
-
-def run_migrations_offline():
-    """Run migrations in 'offline' mode.
-
-    This configures the context with just a URL
-    and not an Engine, though an Engine is acceptable
-    here as well.  By skipping the Engine creation
-    we don't even need a DBAPI to be available.
-
-    Calls to context.execute() here emit the given string to the
-    script output.
-
-    """
-    url = config.get_main_option("sqlalchemy.url")
-    context.configure(
-        url=url,
-        target_metadata=target_metadata,
-        literal_binds=True,
-        dialect_opts={"paramstyle": "named"},
-    )
-
-    with context.begin_transaction():
-        context.run_migrations()
-
-
-def run_migrations_online():
-    """Run migrations in 'online' mode.
-
-    In this scenario we need to create an Engine
-    and associate a connection with the context.
-
-    """
-    connectable = engine_from_config(
-        config.get_section(config.config_ini_section),
-        prefix="sqlalchemy.",
-        poolclass=pool.NullPool,
-    )
-
-    with connectable.connect() as connection:
-        context.configure(
-            connection=connection, target_metadata=target_metadata
-        )
-
-        with context.begin_transaction():
-            context.run_migrations()
-
-
-if context.is_offline_mode():
-    run_migrations_offline()
-else:
-    run_migrations_online()

chainsyncer/db/migrations/default/export.py

@@ -1,37 +0,0 @@
-from alembic import op
-import sqlalchemy as sa
-
-from chainsyncer.db.migrations.default.versions.src.sync import (
-    upgrade as upgrade_sync,
-    downgrade as downgrade_sync,
-)
-
-from chainsyncer.db.migrations.default.versions.src.sync_tx import (
-    upgrade as upgrade_sync_tx,
-    downgrade as downgrade_sync_tx,
-)
-
-def chainsyncer_upgrade(major=0, minor=0, patch=3):
-    r0_0_1_u()
-    if patch >= 3:
-        r0_0_3_u()
-
-def chainsyncer_downgrade(major=0, minor=0, patch=3):
-    if patch >= 3:
-        r0_0_3_d()
-    r0_0_1_d()
-
-def r0_0_1_u():
-    upgrade_sync()
-
-def r0_0_1_d():
-    downgrade_sync()
-
-
-# 0.0.3
-
-def r0_0_3_u():
-    upgrade_sync_tx()
- 
-def r0_0_3_d():
-    downgrade_sync_tx()

chainsyncer/db/migrations/default/script.py.mako

@@ -1,24 +0,0 @@
-"""${message}
-
-Revision ID: ${up_revision}
-Revises: ${down_revision | comma,n}
-Create Date: ${create_date}
-
-"""
-from alembic import op
-import sqlalchemy as sa
-${imports if imports else ""}
-
-# revision identifiers, used by Alembic.
-revision = ${repr(up_revision)}
-down_revision = ${repr(down_revision)}
-branch_labels = ${repr(branch_labels)}
-depends_on = ${repr(depends_on)}
-
-
-def upgrade():
-    ${upgrades if upgrades else "pass"}
-
-
-def downgrade():
-    ${downgrades if downgrades else "pass"}

chainsyncer/db/migrations/default/versions/452ecfa81de3_base_setup.py

@@ -1,14 +0,0 @@
-"""base setup
-
-Revision ID: 452ecfa81de3
-Revises: 
-Create Date: 2021-07-16 16:29:32.460027
-
-"""
-# revision identifiers, used by Alembic.
-revision = '452ecfa81de3'
-down_revision = None
-branch_labels = None
-depends_on = None
-
-from chainsyncer.db.migrations.default.versions.src.sync import upgrade, downgrade

chainsyncer/db/migrations/default/versions/a2ce6826c5eb_sync_tx.py

@@ -1,14 +0,0 @@
-"""sync-tx
-
-Revision ID: a2ce6826c5eb
-Revises: 452ecfa81de3
-Create Date: 2021-07-16 18:17:53.439721
-
-"""
-# revision identifiers, used by Alembic.
-revision = 'a2ce6826c5eb'
-down_revision = '452ecfa81de3'
-branch_labels = None
-depends_on = None
-
-from chainsyncer.db.migrations.default.versions.src.sync_tx import upgrade, downgrade

chainsyncer/db/migrations/default/versions/src/sync.py

@@ -1,33 +0,0 @@
-from alembic import op
-import sqlalchemy as sa
-
-
-def upgrade():
-    op.create_table(
-            'chain_sync',
-            sa.Column('id', sa.Integer, primary_key=True),
-            sa.Column('blockchain', sa.String, nullable=False),
-            sa.Column('block_start', sa.Integer, nullable=False, default=0),
-            sa.Column('tx_start', sa.Integer, nullable=False, default=0),
-            sa.Column('block_cursor', sa.Integer, nullable=False, default=0),
-            sa.Column('tx_cursor', sa.Integer, nullable=False, default=0),
-            sa.Column('block_target', sa.Integer, nullable=True),
-            sa.Column('date_created', sa.DateTime, nullable=False),
-            sa.Column('date_updated', sa.DateTime),
-            )
-
-    op.create_table(
-            'chain_sync_filter',
-            sa.Column('id', sa.Integer, primary_key=True),
-            sa.Column('chain_sync_id', sa.Integer, sa.ForeignKey('chain_sync.id'), nullable=True),
-            sa.Column('flags', sa.LargeBinary, nullable=True),
-            sa.Column('flags_lock', sa.Integer, nullable=False, default=0),
-            sa.Column('flags_start', sa.LargeBinary, nullable=True),
-            sa.Column('count', sa.Integer, nullable=False, default=0),
-            sa.Column('digest', sa.String(64), nullable=False),
-            )
-
-
-def downgrade():
-    op.drop_table('chain_sync_filter')
-    op.drop_table('chain_sync')

chainsyncer/db/migrations/default/versions/src/sync_tx.py

@@ -1,17 +0,0 @@
-from alembic import op
-import sqlalchemy as sa
-
-
-def upgrade():
-    op.create_table(
-            'chain_sync_tx',
-            sa.Column('id', sa.Integer, primary_key=True),
-            sa.Column('blockchain', sa.String, nullable=False),
-            sa.Column('chain_sync_id', sa.Integer, sa.ForeignKey('chain_sync.id'), nullable=False),
-            sa.Column('flags', sa.LargeBinary, nullable=True),
-            sa.Column('block', sa.Integer, nullable=False),
-            sa.Column('tx', sa.Integer, nullable=False),
-            )
-
-def downgrade():
-    op.drop_table('chain_sync_tx')

chainsyncer/db/migrations/sqlalchemy.py

@@ -1,37 +0,0 @@
-from alembic import op
-import sqlalchemy as sa
-
-from chainsyncer.db.migrations.default.versions.tags.sync import
-    upgrade as upgrade_sync,
-    downgrade as downgrade_sync,
-)
-
-from chainsyncer.db.migrations.default.versions.tags.sync_tx import
-    upgrade as upgrade_sync_tx,
-    downgrade as downgrade_sync_tx,
-)
-
-def chainsyncer_upgrade(major=0, minor=0, patch=3):
-    r0_0_1_u()
-    if patch >= 3:
-        r0_0_3_u()
-
-def chainsyncer_downgrade(major=0, minor=0, patch=3):
-    if patch >= 3:
-        r0_0_3_d()
-    r0_0_1_d()
-
-def r0_0_1_u():
-    upgrade_sync()
-
-def r0_0_1_d():
-    downgrade_sync()
-
-
-# 0.0.3
-
-def r0_0_3_u():
-    upgrade_sync_tx()
- 
-def r0_0_3_d():
-    downgrade_sync_tx()

chainsyncer/db/models/base.py

@@ -1,161 +0,0 @@
-# stanard imports
-import logging
-
-# third-party imports
-from sqlalchemy import Column, Integer
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
-from sqlalchemy.pool import (
-        StaticPool,
-        QueuePool,
-        AssertionPool,
-        NullPool,
-        )
-
-logg = logging.getLogger()
-
-Model = declarative_base(name='Model')
-
-CONNECTION_OVERFLOW_FACTOR = 3
-CONNECTION_RECYCLE_AFTER = 60
-
-
-class SessionBase(Model):
-    """The base object for all SQLAlchemy enabled models. All other models must extend this.
-    """
-    __abstract__ = True
- 
-    id = Column(Integer, primary_key=True)
-
-    engine = None
-    """Database connection engine of the running aplication"""
-    sessionmaker = None
-    """Factory object responsible for creating sessions from the  connection pool"""
-    transactional = True
-    """Whether the database backend supports query transactions. Should be explicitly set by initialization code"""
-    poolable = True
-    """Whether the database backend supports connection pools. Should be explicitly set by initialization code"""
-    procedural = True
-    """Whether the database backend supports stored procedures"""
-    localsessions = {}
-    """Contains dictionary of sessions initiated by db model components"""
-
-
-    @staticmethod
-    def create_session():
-        """Creates a new database session.
-        """
-        return SessionBase.sessionmaker()
-
-
-    @staticmethod
-    def _set_engine(engine):
-        """Sets the database engine static property
-
-        :param engine: The sqlalchemy engine
-        :type engine: sqlalchemy.engine.Engine
-        """
-        SessionBase.engine = engine
-        SessionBase.sessionmaker = sessionmaker(bind=SessionBase.engine)
-
-
-    @staticmethod
-    def connect(dsn, pool_size=16, debug=False):
-        """Create new database connection engine and connect to database backend.
-
-        The pool_size argument controls the behavior of the connection pool.
-
-        If the pool_size is greater than 1, and the engine has connection pool settings, The connection pool will be set up with the given number of connections. By default, it allows for 3x connection overflow (CONNECTION_OVERFLOW_FACTOR), and connection recycling after 60 seconds of inactivity (CONNECTION_RECYCLE_AFTER).
-
-        If the pool_size is 1 and debug mode is off, the StaticPool class (single connection pool) will be used. If debug is on, AssertionPool will be used (which raises assertionerror if more than a single connection is attempted at any one time by the process).
-
-        If the underlying engine does not have pooling capabilities, the pool_size parameter toggles the connection class used. If pool_size is set to 0, the NullPool will be used (build a new connection for every session). If pool_size is set to a positive number, the StaticPool will be used, keeping a single connection for all sessions.
-
-        :param dsn: DSN string defining connection
-        :type dsn: str
-        :param pool_size: Size of connection pool
-        :type pool_size: int
-        :param debug: Activate sql debug mode (outputs sql statements)
-        :type debug: bool
-        """
-        e = None
-        if SessionBase.poolable:
-            poolclass = QueuePool
-            if pool_size > 1:
-                e = create_engine(
-                        dsn,
-                        max_overflow=pool_size * CONNECTION_OVERFLOW_FACTOR,
-                        pool_pre_ping=True,
-                        pool_size=pool_size,
-                        pool_recycle=CONNECTION_RECYCLE_AFTER,
-                        poolclass=poolclass,
-                        echo=debug,
-                    )
-            else:
-                if debug:
-                    poolclass = AssertionPool
-                else:
-                    poolclass = StaticPool
-
-                e = create_engine(
-                        dsn,
-                        poolclass=poolclass,
-                        echo=debug,
-                    )
-        else:
-            pool_class = StaticPool
-            if pool_size < 1:
-                pool_class = NullPool
-            e = create_engine(
-                    dsn,
-                    poolclass=pool_class,
-                    echo=debug,
-                    )
-
-        SessionBase._set_engine(e)
-
-
-    @staticmethod
-    def disconnect():
-        """Disconnect from database and free resources.
-        """
-        SessionBase.engine.dispose()
-        SessionBase.engine = None
-
-
-    @staticmethod
-    def bind_session(session=None):
-        """Convenience function to enforce database session responsilibity in call stacks where it is unclear which layer will create a database session.
-
-        If the session argument is None, the method will create and return a new database session. A reference to the database session will be statically stored in the SessionBase class, and must be explicitly released with release_session.
-
-        When an existing session in passed as the argument, this method simply returns back the same session.
-
-        :param session: An sqlalchemy session
-        :type session: session.orm.Session
-        :rtype: session.orm.Session
-        :returns: An sqlalchemy session
-        """
-        localsession = session
-        if localsession == None:
-            localsession = SessionBase.create_session()
-            localsession_key = str(id(localsession))
-            logg.debug('creating new session {}'.format(localsession_key))
-            SessionBase.localsessions[localsession_key] = localsession
-        return localsession
-
-
-    @staticmethod
-    def release_session(session):
-        """Checks if a reference to the given session exists in the SessionBase session store, and if it does commits the transaction and closes the session.
-
-        :param session: An sqlalchemy session
-        :type session: session.orm.Session
-        """
-        session_key = str(id(session))
-        if SessionBase.localsessions.get(session_key) != None:
-            logg.debug('commit and destroy session {}'.format(session_key))
-            session.commit()
-            session.close()
-            del SessionBase.localsessions[session_key]

chainsyncer/db/models/filter.py

@@ -1,166 +0,0 @@
-# standard imports
-import logging
-import hashlib
-
-# external imports
-from sqlalchemy import Column, String, Integer, LargeBinary, ForeignKey
-from sqlalchemy.ext.hybrid import hybrid_property, hybrid_method
-
-# local imports
-from .base import SessionBase
-from .sync import BlockchainSync
-from chainsyncer.error import LockError
-
-zero_digest = bytes(32).hex()
-logg = logging.getLogger(__name__)
-
-
-class BlockchainSyncFilter(SessionBase):
-    """Sync filter sql backend database interface.
-
-    :param chain_sync: BlockchainSync object to use as context for filter
-    :type chain_sync: chainsyncer.db.models.sync.BlockchainSync
-    :param count: Number of filters to track
-    :type count: int
-    :param flags: Filter flag value to instantiate record with
-    :type flags: int
-    :param digest: Filter digest as integrity protection when resuming session, 256 bits, in hex
-    :type digest: str
-    """
-
-    __tablename__ = 'chain_sync_filter'
-
-    chain_sync_id = Column(Integer, ForeignKey('chain_sync.id'))
-    flags_start = Column(LargeBinary)
-    flags = Column(LargeBinary)
-    flags_lock = Column(Integer)
-    digest = Column(String(64))
-    count = Column(Integer)
-
-
-    def __init__(self, chain_sync, count=0, flags=None, digest=None):
-        if digest == None:
-            digest = zero_digest
-        self.digest = digest
-        self.count = count
-
-        if flags == None:
-            flags = bytearray(0)
-        else: 
-            bytecount = int((count - 1) / 8 + 1) 
-            flags = flags.to_bytes(bytecount, 'big')
-        self.flags_start = flags
-        self.flags = flags
-        self.flags_lock = 0
-
-        self.chain_sync_id = chain_sync.id
-
-
-    @staticmethod
-    def load(sync_id, session=None):
-        q = session.query(BlockchainSyncFilter)
-        q = q.filter(BlockchainSyncFilter.chain_sync_id==sync_id)
-        o = q.first()
-        if o.is_locked():
-            raise LockError('locked state for flag {} of sync id {} must be manually resolved'.format(o.flags_lock))
-
-
-    def add(self, name):
-        """Add a new filter to the syncer record.
-
-        The name of the filter is hashed with the current aggregated hash sum of previously added filters.
-
-        :param name: Filter informal name
-        :type name: str
-        """
-        h = hashlib.new('sha256')
-        h.update(bytes.fromhex(self.digest))
-        h.update(name.encode('utf-8'))
-        z = h.digest()
-
-        old_byte_count = int((self.count - 1) / 8 + 1)
-        new_byte_count = int((self.count) / 8 + 1)
-
-        if old_byte_count != new_byte_count:
-            self.flags = bytearray(1) + self.flags
-        self.count += 1
-        self.digest = z.hex()
-
-
-    def start(self):
-        """Retrieve the initial filter state of the syncer.
-
-        :rtype: tuple
-        :returns: Filter flag value, filter count, filter digest
-        """
-        return (int.from_bytes(self.flags_start, 'big'), self.count, self.digest)
-
-
-    def cursor(self):
-        """Retrieve the current filter state of the syncer.
-
-        :rtype: tuple
-        :returns: Filter flag value, filter count, filter digest
-        """
-        return (int.from_bytes(self.flags, 'big'), self.count, self.digest)
-
-
-    def target(self):
-        """Retrieve the target filter state of the syncer.
-
-        The target filter value will be the integer value when all bits are set for the filter count.
-
-        :rtype: tuple
-        :returns: Filter flag value, filter count, filter digest
-        """
-
-        n = 0
-        for i in range(self.count):
-            n |= (1 << self.count) - 1
-        return (n, self.count, self.digest)
-
-
-    def is_locked(self):
-        return self.flags_lock > 0
-
-
-    def clear(self):
-        """Set current filter flag value to zero.
-        """
-        if self.is_locked():
-            raise LockError('flag clear attempted when lock set at {}'.format(self.flags_lock))
-
-        self.flags = bytearray(len(self.flags))
-
-
-    def set(self, n):
-        """Set the filter flag at given index.
-
-        :param n: Filter flag index
-        :type n: int
-        :raises IndexError: Invalid flag index
-        :raises AttributeError: Flag at index already set
-        """
-        if self.is_locked():
-            raise LockError('flag set attempted when lock set at {}'.format(self.flags_lock))
-
-        if n > self.count:
-            raise IndexError('bit flag out of range')
-
-        self.flags_lock = n
-
-        b = 1 << (n % 8)
-        i = int(n / 8)
-        byte_idx = len(self.flags)-1-i
-        if (self.flags[byte_idx] & b) > 0:
-            raise AttributeError('Filter bit already set')
-        flags = bytearray(self.flags)
-        flags[byte_idx] |= b
-        self.flags = flags
-
-
-    def release(self, check_bit=0):
-        if check_bit > 0:
-            if self.flags_lock > 0 and self.flags_lock != check_bit:
-                raise LockError('release attemped on explicit bit {}, but bit {} was locked'.format(check_bit, self.flags_lock))
-        self.flags_lock = 0

chainsyncer/db/models/sync.py

@@ -1,202 +0,0 @@
-# standard imports
-import datetime
-
-# third-party imports
-from sqlalchemy import Column, String, Integer, DateTime, Text, Boolean
-from sqlalchemy.ext.hybrid import hybrid_property, hybrid_method
-
-# local imports
-from .base import SessionBase
-
-
-class BlockchainSync(SessionBase):
-    """Syncer control backend.
-
-    :param chain_str: Chain spec string representation
-    :type chain_str: str
-    :param block_start: Block number to start sync from
-    :type block_start: number
-    :param tx_start: Block transaction number to start sync from
-    :type tx_start: number
-    :param block_target: Block number to sync until, inclusive
-    :type block_target: number
-    """
-    __tablename__ = 'chain_sync'
-
-    blockchain = Column(String)
-    """Chainspec string specifying the blockchain the syncer is running against."""
-    block_start = Column(Integer)
-    """The block height at the start of syncer."""
-    tx_start = Column(Integer)
-    """The transaction index at the start of syncer."""
-    block_cursor = Column(Integer)
-    """The block height for the current state of the syncer."""
-    tx_cursor = Column(Integer)
-    """The transaction index for the current state of the syncer."""
-    block_target = Column(Integer)
-    """The block height at which the syncer should terminate. Will be None for an open-ended syncer."""
-    date_created = Column(DateTime, default=datetime.datetime.utcnow)
-    """Datetime when syncer was first created."""
-    date_updated = Column(DateTime)
-    """Datetime of the latest update of the syncer state."""
-
-    def __init__(self, chain_str, block_start, tx_start, block_target=None):
-        self.blockchain = chain_str
-        self.block_start = block_start
-        self.tx_start = tx_start
-        self.block_cursor = block_start
-        self.tx_cursor = tx_start
-        self.block_target = block_target
-        self.date_created = datetime.datetime.utcnow()
-        self.date_updated = datetime.datetime.utcnow()
-
-
-    @staticmethod
-    def first(chain_str, session=None):
-        """Check if a sync session for the specified chain already exists.
-
-        :param chain_str: Chain spec string representation
-        :type chain_str: str
-        :param session: Session to use. If not specified, a separate session will be created for this method only.
-        :type session: sqlalchemy.orm.session.Sessoin
-        :returns: Database primary key id of sync record, or None if insert failed
-        :rtype: number
-        """
-        session = SessionBase.bind_session(session)
-
-        q = session.query(BlockchainSync.id)
-        q = q.filter(BlockchainSync.blockchain==chain_str)
-        o = q.first()
-
-        if o == None:
-            SessionBase.release_session(session)
-            return None
-
-        sync_id = o.id
-
-        SessionBase.release_session(session)
-
-        return sync_id
-
-
-    @staticmethod
-    def get_last(session=None, live=True):
-        """Get the most recent syncer record.
-
-        If live is set, only the latest open-ended syncer will be returned.
-
-        :param session: Session to use. If not specified, a separate session will be created for this method only.
-        :type session: SqlAlchemy Session
-        :param live: Match only open-ended syncers
-        :type live: bool
-        :returns: Syncer database id 
-        :rtype: int
-        """
-        session = SessionBase.bind_session(session)
-
-        q = session.query(BlockchainSync.id)
-        if live:
-            q = q.filter(BlockchainSync.block_target==None)
-        else:
-            q = q.filter(BlockchainSync.block_target!=None)
-        q = q.order_by(BlockchainSync.date_created.desc())
-        object_id = q.first()
-
-        SessionBase.release_session(session)
-
-        if object_id == None:
-            return None
-
-        return object_id[0]
-
-
-    @staticmethod
-    def get_unsynced(session=None):
-        """Get previous bounded sync sessions that did not complete.
-
-        :param session: Session to use. If not specified, a separate session will be created for this method only.
-        :type session: SqlAlchemy Session
-        :returns: Syncer database ids
-        :rtype: list
-        """
-        unsynced = []
-        local_session = False
-        if session == None:
-            session = SessionBase.create_session()
-            local_session = True
-        q = session.query(BlockchainSync.id)
-        q = q.filter(BlockchainSync.block_target!=None)
-        q = q.filter(BlockchainSync.block_cursor<BlockchainSync.block_target)
-        q = q.order_by(BlockchainSync.date_created.asc())
-        for u in q.all():
-            unsynced.append(u[0])
-        if local_session:
-            session.close()
-
-        return unsynced
-
-
-    def set(self, block_height, tx_height):
-        """Set the cursor height of the syncer instance.
-
-        Only manipulates object, does not transaction or commit to backend.
-
-        :param block_height: Block number
-        :type block_height: number
-        :param tx_height: Block transaction number
-        :type tx_height: number
-        :rtype: tuple
-        :returns: Stored block height, transaction index
-        """
-        self.block_cursor = block_height
-        self.tx_cursor = tx_height
-        self.date_updated = datetime.datetime.utcnow()
-        return (self.block_cursor, self.tx_cursor,)
-
-
-    def cursor(self):
-        """Get current state of cursor from cached instance.
-
-        :returns: Block height, transaction index
-        :rtype: tuple
-        """
-        return (self.block_cursor, self.tx_cursor)
-
-
-    def start(self):
-        """Get sync block start position from cached instance.
-
-        :returns: Block height, transaction index
-        :rtype: tuple
-        """
-        return (self.block_start, self.tx_start)
-
-
-    def target(self):
-        """Get sync block upper bound from cached instance.
-
-        :returns: Block number. Returns None if syncer is open-ended.
-        :rtype: int
-        """
-        return self.block_target
-
-
-    def chain(self):
-        """Get chain string representation for which the cached instance represents.
-        """
-        return self.blockchain
-
-
-    def __str__(self):
-        return """object_id: {}
-start: {}:{}
-cursor: {}:{}
-target: {}
-""".format(
-        self.id,
-        self.block_start,
-        self.tx_start,
-        self.block_cursor,
-        self.tx_cursor,
-        self.block_target,
-        )

chainsyncer/driver/__init__.py

@@ -1 +1 @@
-from .base import Syncer
+from .base import SyncDriver

chainsyncer/driver/base.py

@@ -1,48 +1,21 @@
 # standard imports
-import uuid
 import logging
 import time
 import signal
-import json
-
-# external imports
-from chainlib.error import JSONRPCException
 
 # local imports
-from chainsyncer.filter import SyncFilter
 from chainsyncer.error import (
         SyncDone,
         NoBlockForYou,
         )
+from chainsyncer.session import SyncSession
+
 
 logg = logging.getLogger(__name__)
 
+NS_DIV = 1000000000
 
-def noop_callback(block, tx):
-    """Logger-only callback for pre- and post processing.
-
-    :param block: Block object
-    :type block: chainlib.block.Block
-    :param tx: Transaction object
-    :type tx: chainlib.tx.Tx
-    """
-    logg.debug('noop callback ({},{})'.format(block, tx))
-
-
-class Syncer:
-    """Base class for syncer implementations.
-
-    :param backend: Syncer state backend
-    :type backend: chainsyncer.backend.base.Backend implementation
-    :param chain_interface: Chain interface implementation 
-    :type chain_interface: chainlib.interface.ChainInterface implementation
-    :param pre_callback: Function to call before polling. Function will receive no arguments.
-    :type pre_callback: function 
-    :param block_callback: Function to call before processing txs in a retrieved block. Function should have signature as chainsyncer.driver.base.noop_callback
-    :type block_callback: function
-    :param post_callback: Function to call after polling. Function will receive no arguments.
-    :type post_callback: function 
-    """
+class SyncDriver:
 
     running_global = True
     """If set to false syncer will terminate polling loop."""
@@ -55,19 +28,22 @@ class Syncer:
     name = 'base'
     """Syncer name, to be overriden for each extended implementation."""
 
-    def __init__(self, backend, chain_interface, pre_callback=None, block_callback=None, post_callback=None):
-        self.chain_interface = chain_interface
-        self.cursor = None
+
+    def __init__(self, store, offset=0, target=-1, pre_callback=None, post_callback=None, block_callback=None, idle_callback=None):
+        self.store = store
         self.running = True
-        self.backend = backend
-        self.filter = SyncFilter(backend)
-        self.block_callback = block_callback
         self.pre_callback = pre_callback
         self.post_callback = post_callback
-        if not Syncer.signal_set:
-            for sig in Syncer.signal_request:
+        self.block_callback = block_callback
+        self.idle_callback = idle_callback
+        self.last_start = 0
+        self.clock_id = time.CLOCK_MONOTONIC_RAW
+        self.store.connect()
+        self.store.start(offset=offset, target=target)
+        if not SyncDriver.signal_set:
+            for sig in SyncDriver.signal_request:
                 signal.signal(sig, self.__sig_terminate)
-            Syncer.signal_set = True
+            SyncDriver.signal_set = True
 
 
     def __sig_terminate(self, sig, frame):
@@ -79,48 +55,90 @@ class Syncer:
         """Set syncer to terminate as soon as possible.
         """
         logg.info('termination requested!')
-        Syncer.running_global = False
+        SyncDriver.running_global = False
         self.running = False
 
 
-    def add_filter(self, f):
-        """Add filter to be processed for each transaction.
+    def run(self, conn, interval=1):
+        while self.running_global:
+            self.session = SyncSession(self.store)
+            item = self.session.start()
+            if item == None:
+                self.running = False
+                self.running_global = False
+                break
+            self.loop(conn, item, interval=interval)
 
-        :param f: Filter
-        :type f: Object instance implementing signature as in chainsyncer.filter.NoopFilter.filter
-        """
-        self.filter.add(f)
-        self.backend.register_filter(str(f))
+
+    def idle(self, interval):
+        interval *= NS_DIV
+        idle_start = time.clock_gettime_ns(self.clock_id)
+        delta = idle_start - self.last_start
+        if delta > interval:
+            interval /= NS_DIV
+            time.sleep(interval)
+            return
+
+        if self.idle_callback != None:
+            r = True
+            while r:
+                before = time.clock_gettime_ns(self.clock_id)
+                r = self.idle_callback(interval)
+                after = time.clock_gettime_ns(self.clock_id)
+                delta = after - before
+                if delta < 0:
+                    return
+                interval -= delta
+                if interval < 0:
+                    return
+
+        interval /= NS_DIV
+        time.sleep(interval)
+
+
+    def loop(self, conn, item, interval=1):
+        logg.debug('started loop')
+        while self.running and SyncDriver.running_global:
+            self.last_start = time.clock_gettime_ns(self.clock_id)
+
+            if self.pre_callback != None:
+                self.pre_callback()
+
+            while True and self.running:
+                try:
+                    block = self.get(conn, item)
+                except SyncDone as e:
+                    logg.info('all blocks sumitted for processing: {}'.format(e))
+                    return
+                except NoBlockForYou as e:
+                    break
+                if self.block_callback != None:
+                    self.block_callback(block, None)
+
+                try:
+                    self.process(conn, item, block)
+                except IndexError:
+                    item.next(advance_block=True)
+                time.sleep(self.yield_delay)
+
+                if self.store.target > -1 and block.number >= self.store.target:
+                    self.running = False
+
+            if self.post_callback != None:
+                self.post_callback()
+   
+
+            self.idle(interval)
 
 
     def process_single(self, conn, block, tx):
-        """Set syncer backend cursor to the given transaction index and block height, and apply all registered filters on transaction.
-
-        :param conn: RPC connection instance
-        :type conn: chainlib.connection.RPCConnection
-        :param block: Block object
-        :type block: chainlib.block.Block
-        :param block: Transaction object
-        :type block: chainlib.tx.Tx
-        """
-        self.backend.set(block.number, tx.index)
-        self.filter.apply(conn, block, tx)
+        self.session.filter(conn, block, tx)
 
 
-    def loop(self, interval, conn):
-        raise NotImplementedError()
-  
-
-    def process(self, conn, block):
+    def process(self, conn, item, block):
         raise NotImplementedError()
 
 
     def get(self, conn):
         raise NotImplementedError()
 
-
-    def __str__(self):
-        return 'syncer "{}" {}'.format(
-                self.name,
-                self.backend,
-                )

chainsyncer/driver/chain_interface.py

@@ -0,0 +1,57 @@
+# external imports
+from chainlib.error import RPCException
+
+# local imports
+from chainsyncer.error import NoBlockForYou
+from chainsyncer.driver import SyncDriver
+
+
+class ChainInterfaceDriver(SyncDriver):
+
+    def __init__(self, store, chain_interface, offset=0, target=-1, pre_callback=None, post_callback=None, block_callback=None, idle_callback=None):
+        super(ChainInterfaceDriver, self).__init__(store, offset=offset, target=target, pre_callback=pre_callback, post_callback=post_callback, block_callback=block_callback, idle_callback=idle_callback)
+        self.chain_interface = chain_interface
+
+
+    def get(self, conn, item):
+        """Retrieve the block currently defined by the syncer cursor from the RPC provider.
+
+        :param conn: RPC connection
+        :type conn: chainlib.connectin.RPCConnection
+        :raises NoBlockForYou: Block at the given height does not exist
+        :rtype: chainlib.block.Block
+        :returns: Block object
+        """
+        o = self.chain_interface.block_by_number(item.cursor)
+        try:
+            r = conn.do(o)
+        except RPCException:
+            r = None
+        if r == None:
+            raise NoBlockForYou()
+        b = self.chain_interface.block_from_src(r)
+        b.txs = b.txs[item.tx_cursor:]
+
+        return b
+
+
+    def process(self, conn, item, block):
+        tx_src = None
+        i = item.tx_cursor
+        while True:
+            # handle block objects regardless of whether the tx data is embedded or not
+            try:
+                tx = block.tx(i)
+            except AttributeError:
+                tx_hash = block.txs[i]
+                o = self.chain_interface.tx_by_hash(tx_hash, block=block)
+                r = conn.do(o)
+                #tx = self.chain_interface.tx_from_src(tx_src, block=block)
+
+            rcpt = conn.do(self.chain_interface.tx_receipt(tx.hash))
+            if rcpt != None:
+                tx.apply_receipt(self.chain_interface.src_normalize(rcpt))
+
+            self.process_single(conn, block, tx)
+                        
+            i += 1

chainsyncer/driver/head.py

@@ -1,86 +0,0 @@
-# standard imports
-import logging
-
-# external imports
-from chainlib.eth.tx import (
-        transaction,
-        Tx,
-        )
-from chainlib.error import RPCException
-
-# local imports
-from chainsyncer.error import NoBlockForYou
-from .poll import BlockPollSyncer
-
-logg = logging.getLogger(__name__)
-
-class HeadSyncer(BlockPollSyncer):
-    """Extends the block poller, implementing an open-ended syncer.
-    """
-
-    name = 'head'
-
-    def process(self, conn, block):
-        """Process a single block using the given RPC connection.
-
-        Processing means that all filters are executed on all transactions in the block.
-
-        If the block object does not contain the transaction details, the details will be retrieved from the network (incurring the corresponding performance penalty).
-
-        :param conn: RPC connection
-        :type conn: chainlib.connection.RPCConnection
-        :param block: Block object
-        :type block: chainlib.block.Block
-        """
-        (pair, fltr) = self.backend.get()
-        logg.debug('process block {} (backend {}:{})'.format(block, pair, fltr))
-        i = pair[1] # set tx index from previous
-        tx_src = None
-        while True:
-            # handle block objects regardless of whether the tx data is embedded or not
-            try:
-                tx = block.tx(i)
-            except AttributeError:
-                o = transaction(block.txs[i])
-                r = conn.do(o)
-                tx_src = Tx.src_normalize(r)
-                tx = self.chain_interface.tx_from_src(tx_src, block=block)
-
-
-            #except IndexError as e:
-            #    logg.debug('index error syncer tx get {}'.format(e))
-            #    break
-
-            rcpt = conn.do(self.chain_interface.tx_receipt(tx.hash))
-            if rcpt != None:
-                tx.apply_receipt(self.chain_interface.src_normalize(rcpt))
-
-            self.process_single(conn, block, tx)
-            self.backend.reset_filter()
-                        
-            i += 1
-        
-
-    def get(self, conn):
-        """Retrieve the block currently defined by the syncer cursor from the RPC provider.
-
-        :param conn: RPC connection
-        :type conn: chainlib.connectin.RPCConnection
-        :raises NoBlockForYou: Block at the given height does not exist
-        :rtype: chainlib.block.Block
-        :returns: Block object
-        """
-        (height, flags) = self.backend.get()
-        block_number = height[0]
-        block_hash = []
-        o = self.chain_interface.block_by_number(block_number)
-        try:
-            r = conn.do(o)
-        except RPCException:
-            r = None
-        if r == None:
-            raise NoBlockForYou()
-        b = self.chain_interface.block_from_src(r)
-        b.txs = b.txs[height[1]:]
-
-        return b

chainsyncer/driver/history.py

@@ -1,56 +0,0 @@
-# standard imports
-import logging
-
-# external imports
-from chainlib.error import RPCException
-
-# local imports
-from .head import HeadSyncer
-from chainsyncer.error import SyncDone
-from chainlib.error import RPCException
-
-logg = logging.getLogger(__name__)
-
-
-class HistorySyncer(HeadSyncer):
-    """Bounded syncer implementation of the block poller. Reuses the head syncer process method implementation.
-
-
-    """
-    name = 'history'
-
-    def __init__(self, backend, chain_interface, pre_callback=None, block_callback=None, post_callback=None):
-        super(HeadSyncer, self).__init__(backend, chain_interface, pre_callback, block_callback, post_callback)
-        self.block_target = None
-        (block_number, flags) = self.backend.target()
-        if block_number == None:
-            raise AttributeError('backend has no future target. Use HeadSyner instead')
-        self.block_target = block_number
-
-
-    def get(self, conn):
-        """Retrieve the block currently defined by the syncer cursor from the RPC provider.
-
-        :param conn: RPC connection
-        :type conn: chainlib.connectin.RPCConnection
-        :raises SyncDone: Block target reached (at which point the syncer should terminate).
-        :rtype: chainlib.block.Block
-        :returns: Block object
-        :todo: DRY against HeadSyncer
-        """
-        (height, flags) = self.backend.get()
-        if self.block_target < height[0]:
-            raise SyncDone(self.block_target)
-        block_number = height[0]
-        block_hash = []
-        o = self.chain_interface.block_by_number(block_number, include_tx=True)
-        try:
-            r = conn.do(o)
-        # TODO: Disambiguate whether error is temporary or permanent, if permanent, SyncDone should be raised, because a historical sync is attempted into the future
-        except RPCException:
-            r = None
-        if r == None:
-            raise SyncDone()
-        b = self.chain_interface.block_from_src(r)
-
-        return b

chainsyncer/driver/poll.py

@@ -1,68 +0,0 @@
-# standard imports
-import logging
-import time
-
-# local imports
-from .base import Syncer
-from chainsyncer.error import (
-        SyncDone,
-        NoBlockForYou,
-        )
-
-logg = logging.getLogger(__name__)
-
-
-
-class BlockPollSyncer(Syncer):
-    """Syncer driver implementation of chainsyncer.driver.base.Syncer that retrieves new blocks through polling.
-    """
-
-    name = 'blockpoll'
-
-    def loop(self, interval, conn):
-        """Indefinite loop polling the given RPC connection for new blocks in the given interval.
-
-        :param interval: Seconds to wait for next poll after processing of previous poll has been completed.
-        :type interval: int
-        :param conn: RPC connection
-        :type conn: chainlib.connection.RPCConnection
-        :rtype: tuple
-        :returns: See chainsyncer.backend.base.Backend.get
-        """
-        (pair, fltr) = self.backend.get()
-        start_tx = pair[1]
-
-
-        while self.running and Syncer.running_global:
-            if self.pre_callback != None:
-                self.pre_callback()
-            #while True and Syncer.running_global:
-            while True and self.running:
-                if start_tx > 0:
-                    start_tx -= 1
-                    continue
-                try:
-                    block = self.get(conn)
-                except SyncDone as e:
-                    logg.info('all blocks sumitted for processing: {}'.format(e))
-                    return self.backend.get()
-                except NoBlockForYou as e:
-                    break
-# TODO: To properly handle this, ensure that previous request is rolled back
-#                except sqlalchemy.exc.OperationalError as e:
-#                    logg.error('database error: {}'.format(e))
-#                    break
-
-                if self.block_callback != None:
-                    self.block_callback(block, None)
-
-                last_block = block
-                try:
-                    self.process(conn, block)
-                except IndexError:
-                    self.backend.set(block.number + 1, 0)
-                start_tx = 0
-                time.sleep(self.yield_delay)
-            if self.post_callback != None:
-                self.post_callback()
-            time.sleep(interval)

chainsyncer/driver/thread.py

@@ -1,133 +0,0 @@
-# standard imports
-import logging
-#import threading
-import multiprocessing
-import queue
-
-# external imports
-from chainlib.error import RPCException
-
-# local imports
-from .history import HistorySyncer
-from chainsyncer.error import SyncDone
-
-logg = logging.getLogger(__name__)
-
-
-
-class ThreadedHistorySyncer(HistorySyncer):
-
-    def __init__(self, conn_factory, thread_limit, backend, chain_interface, pre_callback=None, block_callback=None, post_callback=None, conn_limit=0):
-        super(ThreadedHistorySyncer, self).__init__(backend, chain_interface, pre_callback, block_callback, post_callback)
-        self.workers = []
-        if conn_limit == 0:
-            conn_limit = thread_limit
-        #self.conn_pool = queue.Queue(conn_limit)
-        #self.queue = queue.Queue(thread_limit)
-        #self.quit_queue = queue.Queue(1)
-        self.conn_pool = multiprocessing.Queue(conn_limit)
-        self.queue = multiprocessing.Queue(thread_limit)
-        self.quit_queue = multiprocessing.Queue(1)
-        #self.lock = threading.Lock()
-        self.lock = multiprocessing.Lock()
-        for i in range(thread_limit):
-            #w = threading.Thread(target=self.worker)
-            w = multiprocessing.Process(target=self.worker)
-            self.workers.append(w)
-
-        for i in range(conn_limit):
-            self.conn_pool.put(conn_factory())
-
-
-    def terminate(self):
-        self.quit_queue.put(())
-        super(ThreadedHistorySyncer, self).terminate()
-
-
-    def worker(self):
-        while True:
-            block_number = None
-            try:
-                block_number = self.queue.get(timeout=0.01)
-            except queue.Empty:
-                if self.quit_queue.qsize() > 0:
-                    #logg.debug('{} received quit'.format(threading.current_thread().getName()))
-                    logg.debug('{} received quit'.format(multiprocessing.current_process().name))
-                    return
-                continue
-            conn = self.conn_pool.get()
-            try:
-                logg.debug('processing parent {} {}'.format(conn, block_number))
-                self.process_parent(conn, block_number)
-            except IndexError:
-                pass
-            except RPCException as e:
-                logg.error('RPC failure for block {}, resubmitting to queue: {}'.format(block, e))
-                self.queue.put(block_number)
-            conn = self.conn_pool.put(conn)
-
-
-    def process_parent(self, conn, block_number):
-            logg.debug('getting block {}'.format(block_number))
-            o = self.chain_interface.block_by_number(block_number)
-            r = conn.do(o)
-            block = self.chain_interface.block_from_src(r)
-            logg.debug('got block typ {}'.format(type(block)))
-            super(ThreadedHistorySyncer, self).process(conn, block)
-
-
-    def process_single(self, conn, block, tx):
-        self.filter.apply(conn, block, tx)
-
-
-    def process(self, conn, block):
-        pass
-
-
-    #def process(self, conn, block):
-    def get(self, conn):
-        if not self.running:
-            raise SyncDone()
-
-        block_number = None
-        tx_index = None
-        flags = None
-        ((block_number, tx_index), flags) = self.backend.get()
-        try:
-            #logg.debug('putting {}'.format(block.number))
-            #self.queue.put((conn, block_number,), timeout=0.1)
-            self.queue.put(block_number, timeout=0.1)
-        except queue.Full:
-            #logg.debug('queue full, try again')
-            return
-   
-        target, flags = self.backend.target()
-        next_block = block_number + 1
-        if next_block > target:
-            self.quit_queue.put(())
-            raise SyncDone()
-        self.backend.set(self.backend.block_height + 1, 0)
-
-
-#    def get(self, conn):
-#        try:
-#            r = super(ThreadedHistorySyncer, self).get(conn)
-#            return r
-#        except SyncDone as e:
-#            self.quit_queue.put(())
-#            raise e
-
-
-    def loop(self, interval, conn):
-        for w in self.workers:
-            w.start()
-        r = super(ThreadedHistorySyncer, self).loop(interval, conn)
-        for w in self.workers:
-            w.join()
-        while True:
-            try:
-                self.quit_queue.get_nowait()
-            except queue.Empty:
-                break
-
-        logg.info('workers done {}'.format(r))

chainsyncer/driver/threadpool.py

@@ -1,170 +0,0 @@
-# standard imports
-import logging
-#import threading
-import multiprocessing
-import queue
-import time
-
-# external imports
-from chainlib.error import RPCException
-
-# local imports
-from .history import HistorySyncer
-from chainsyncer.error import SyncDone
-
-logg = logging.getLogger(__name__)
-
-
-def foobarcb(v):
-    logg.debug('foooz {}'.format(v))
-
-
-class ThreadPoolTask:
-
-    process_func = None
-    chain_interface = None
-
-    def poolworker(self, block_number, conn):
-#            conn = args[1].get()
-            try:
-                logg.debug('processing parent {} {}'.format(conn, block_number))
-                #self.process_parent(self.conn, block_number)
-                self.process_parent(conn, block_number)
-            except IndexError:
-                pass
-            except RPCException as e:
-                logg.error('RPC failure for block {}, resubmitting to queue: {}'.format(block, e))
-                raise e
-                #self.queue.put(block_number)
-#            conn = self.conn_pool.put(conn)
-
-    def process_parent(self, conn, block_number):
-            logg.debug('getting block {}'.format(block_number))
-            o = self.chain_interface.block_by_number(block_number)
-            r = conn.do(o)
-            block = self.chain_interface.block_from_src(r)
-            logg.debug('got block typ {}'.format(type(block)))
-            #super(ThreadedHistorySyncer, self).process(conn, block)
-            self.process_func(conn, block)
-
-
-
-class ThreadPoolHistorySyncer(HistorySyncer):
-
-    def __init__(self, conn_factory, thread_limit, backend, chain_interface, pre_callback=None, block_callback=None, post_callback=None, conn_limit=0):
-        super(ThreadPoolHistorySyncer, self).__init__(backend, chain_interface, pre_callback, block_callback, post_callback)
-        self.workers = []
-        self.thread_limit = thread_limit
-        if conn_limit == 0:
-            self.conn_limit = self.thread_limit
-        #self.conn_pool = queue.Queue(conn_limit)
-        #self.queue = queue.Queue(thread_limit)
-        #self.quit_queue = queue.Queue(1)
-        #self.conn_pool = multiprocessing.Queue(conn_limit)
-        #self.queue = multiprocessing.Queue(thread_limit)
-        #self.quit_queue = multiprocessing.Queue(1)
-        #self.lock = threading.Lock()
-        #self.lock = multiprocessing.Lock()
-        ThreadPoolTask.process_func = super(ThreadPoolHistorySyncer, self).process
-        ThreadPoolTask.chain_interface = chain_interface
-        #for i in range(thread_limit):
-            #w = threading.Thread(target=self.worker)
-        #    w = multiprocessing.Process(target=self.worker)
-        #    self.workers.append(w)
-
-        #for i in range(conn_limit):
-        #    self.conn_pool.put(conn_factory())
-        self.conn_factory = conn_factory
-        self.worker_pool = None
-
-
-    def terminate(self):
-        #self.quit_queue.put(())
-        super(ThreadPoolHistorySyncer, self).terminate()
-
-
-#    def worker(self):
-#        while True:
-#            block_number = None
-#            try:
-#                block_number = self.queue.get(timeout=0.01)
-#            except queue.Empty:
-#                if self.quit_queue.qsize() > 0:
-#                    #logg.debug('{} received quit'.format(threading.current_thread().getName()))
-#                    logg.debug('{} received quit'.format(multiprocessing.current_process().name))
-#                    return
-#                continue
-#            conn = self.conn_pool.get()
-#            try:
-#                logg.debug('processing parent {} {}'.format(conn, block_number))
-#                self.process_parent(conn, block_number)
-#            except IndexError:
-#                pass
-#            except RPCException as e:
-#                logg.error('RPC failure for block {}, resubmitting to queue: {}'.format(block, e))
-#                self.queue.put(block_number)
-#            conn = self.conn_pool.put(conn)
-#
-
-
-    def process_single(self, conn, block, tx):
-        self.filter.apply(conn, block, tx)
-
-
-    def process(self, conn, block):
-        pass
-
-
-    def get(self, conn):
-        if not self.running:
-            raise SyncDone()
-
-        block_number = None
-        tx_index = None
-        flags = None
-        ((block_number, tx_index), flags) = self.backend.get()
-        #try:
-            #logg.debug('putting {}'.format(block.number))
-            #self.queue.put((conn, block_number,), timeout=0.1)
-            #self.queue.put(block_number, timeout=0.1)
-        #except queue.Full:
-            #logg.debug('queue full, try again')
-        #    return
-        task = ThreadPoolTask()
-        conn = self.conn_factory()
-        self.worker_pool.apply_async(task.poolworker, (block_number, conn,), {}, foobarcb)
-
-        target, flags = self.backend.target()
-        next_block = block_number + 1
-        if next_block > target:
-            #self.quit_queue.put(())
-            self.worker_pool.close()
-            raise SyncDone()
-        self.backend.set(self.backend.block_height + 1, 0)
-
-
-#    def get(self, conn):
-#        try:
-#            r = super(ThreadedHistorySyncer, self).get(conn)
-#            return r
-#        except SyncDone as e:
-#            self.quit_queue.put(())
-#            raise e
-
-
-    def loop(self, interval, conn):
-        self.worker_pool = multiprocessing.Pool(self.thread_limit)
-        #for w in self.workers:
-        #    w.start()
-        r = super(ThreadPoolHistorySyncer, self).loop(interval, conn)
-        #for w in self.workers:
-        #    w.join()
-        #while True:
-        #    try:
-        #     self.quit_queue.get_nowait()
-        #    except queue.Empty:
-        #        break
-        time.sleep(1)
-        self.worker_pool.join()
-
-        logg.info('workers done {}'.format(r))

chainsyncer/driver/threadrange.py

@@ -1,81 +0,0 @@
-# standard imports
-import copy
-import logging
-import multiprocessing
-import os
-
-# external iports
-from chainlib.eth.connection import RPCConnection
-# local imports
-from chainsyncer.driver.history import HistorySyncer
-from chainsyncer.driver.base import Syncer
-from .threadpool import ThreadPoolTask
-
-logg = logging.getLogger(__name__)
-
-
-def sync_split(block_offset, block_target, count):
-    block_count = block_target - block_offset
-    if block_count < count:
-        logg.warning('block count is less than thread count, adjusting thread count to {}'.format(block_count))
-        count = block_count
-    blocks_per_thread = int(block_count / count)
-
-    ranges = []
-    for i in range(count):
-        block_target = block_offset + blocks_per_thread
-        offset = block_offset
-        target = block_target -1
-        ranges.append((offset, target,))
-        block_offset = block_target
-    return ranges
-
-
-class ThreadPoolRangeTask:
-
-    def __init__(self, backend, sync_range, chain_interface, syncer_factory=HistorySyncer, filters=[]):
-        backend_start = backend.start()
-        backend_target = backend.target()
-        backend_class = backend.__class__
-        tx_offset = 0
-        flags = 0
-        if sync_range[0] == backend_start[0][0]:
-            tx_offset = backend_start[0][1]
-            flags = backend_start[1]
-        self.backend = backend_class.custom(backend.chain_spec, sync_range[1], block_offset=sync_range[0], tx_offset=tx_offset, flags=flags, flags_count=0)
-        self.syncer = syncer_factory(self.backend, chain_interface)
-        for fltr in filters:
-            self.syncer.add_filter(fltr)
-
-    def start_loop(self, interval):
-        conn = RPCConnection.connect(self.backend.chain_spec)
-        return self.syncer.loop(interval, conn)
-
-
-class ThreadPoolRangeHistorySyncer:
-
-    def __init__(self, thread_count, backend, chain_interface, pre_callback=None, block_callback=None, post_callback=None, runlevel_callback=None):
-        self.src_backend = backend
-        self.thread_count = thread_count
-        self.single_sync_offset = 0
-        self.runlevel_callback = None
-        backend_start = backend.start()
-        backend_target = backend.target()
-        self.ranges = sync_split(backend_start[0][0], backend_target[0], thread_count)
-        self.chain_interface = chain_interface
-        self.filters = []
-
-
-    def add_filter(self, f):
-        self.filters.append(f)
-
-
-    def loop(self, interval, conn):
-        self.worker_pool = multiprocessing.Pool(processes=self.thread_count)
-
-        for sync_range in self.ranges:
-            task = ThreadPoolRangeTask(self.src_backend, sync_range, self.chain_interface, filters=self.filters)
-            t = self.worker_pool.apply_async(task.start_loop, (0.1,))
-            logg.debug('result of worker {}: {}'.format(t, t.get()))
-        self.worker_pool.close()
-        self.worker_pool.join()

chainsyncer/error.py

@@ -3,6 +3,7 @@ class SyncDone(Exception):
     """
     pass
 
+
 class NoBlockForYou(Exception):
     """Exception raised when attempt to retrieve a block from network that does not (yet) exist.
     """
@@ -27,6 +28,20 @@ class LockError(Exception):
     pass
 
 
+class FilterDone(Exception):
+    """Exception raised when all registered filters have been executed
+    """
+
+
+class InterruptError(FilterDone):
+    """Exception for interrupting or attempting to use an interrupted sync
+    """
+
+
+class IncompleteFilterError(Exception):
+    """Exception raised if filter reset is executed prematurely
+    """
+
 #class AbortTx(Exception):
 #    """
 #    """

chainsyncer/filter.py

@@ -1,96 +1,131 @@
 # standard imports
+import hashlib
 import logging
-
-# local imports
-from .error import BackendError
+import re
+import os
 
 logg = logging.getLogger(__name__)
 
+re_processedname = r'^_?[A-Z,\.]*$'
+
 
 class SyncFilter:
-    """Manages the collection of filters on behalf of a specific backend.
 
-    A filter is a pluggable piece of code to execute for every transaction retrieved by the syncer. Filters are executed in the sequence they were added to the instance.
-
-    :param backend: Syncer backend to apply filter state changes to
-    :type backend: chainsyncer.backend.base.Backend implementation
-    """
-
-    def __init__(self, backend):
-        self.filters = []
-        self.backend = backend
+    def sum(self):
+        s = self.common_name()
+        h = hashlib.sha256()
+        h.update(s.encode('utf-8'))
+        return h.digest()
         
 
-    def add(self, fltr):
-        """Add a filter instance.
-
-        :param fltr: Filter instance.
-        :type fltr: Object instance implementing signature as in chainsyncer.filter.NoopFilter.filter
-        :raises ValueError: Object instance is incorrect implementation
-        """
-        if getattr(fltr, 'filter') == None:
-            raise ValueError('filter object must implement have method filter')
-        logg.debug('added filter "{}"'.format(str(fltr)))
-
-        self.filters.append(fltr)
+    def filter(self, conn, block, tx):
+        raise NotImplementedError()
 
 
-    def __apply_one(self, fltr, idx, conn, block, tx, session):
-        self.backend.begin_filter(idx)
-        fltr.filter(conn, block, tx, session)
-        self.backend.complete_filter(idx)
+    def common_name(self):
+        s = self.__module__ + '.' + self.__class__.__name__
+        return s.replace('.', '_')
 
 
-    def apply(self, conn, block, tx):
-        """Apply all registered filters on the given transaction.
+# TODO: properly clarify interface shared with syncfsstore, move to filter module?
+class FilterState:
 
-        :param conn: RPC Connection, will be passed to the filter method
-        :type conn: chainlib.connection.RPCConnection
-        :param block: Block object
-        :type block: chainlib.block.Block
-        :param tx: Transaction object
-        :type tx: chainlib.tx.Tx
-        :raises BackendError: Backend connection failed
-        """
-        session = None
+    def __init__(self, state_store, scan=None):
+        self.state_store = state_store
+        self.digest = b'\x00' * 32
+        self.summed = False
+        self.__syncs = {}
+        self.synced = False
+        self.connected = False
+        self.state_store.add('DONE')
+        self.state_store.add('LOCK')
+        self.state_store.add('INTERRUPT')
+        self.state_store.add('RESET')
+
+        self.state = self.state_store.state
+        self.elements = self.state_store.elements
+        self.put = self.state_store.put
+        self.mask = self.state_store.mask
+        self.name = self.state_store.name
+        self.set = self.state_store.set
+        self.next = self.state_store.next
+        self.move = self.state_store.move
+        self.unset = self.state_store.unset
+        self.peek = self.state_store.peek
+        self.from_name = self.state_store.from_name
+        self.list = self.state_store.list
+        self.state_store.sync()
+        self.all = self.state_store.all
+        self.started = False
+
+        self.scan = scan
+
+
+    def __verify_sum(self, v):
+        if not isinstance(v, bytes) and not isinstance(v, bytearray):
+            raise ValueError('argument must be instance of bytes')
+        if len(v) != 32:
+            raise ValueError('argument must be 32 bytes')
+
+
+    def register(self, fltr):
+        if self.summed:
+            raise RuntimeError('filter already applied')
+        z = fltr.sum()
+        self.__verify_sum(z)
+        self.digest += z
+        s = fltr.common_name()
+        self.state_store.add(s)
+        n = self.state_store.from_name(s)
+        logg.debug('add filter {} {} {}'.format(s, n, self))
+
+
+    def sum(self):
+        h = hashlib.sha256()
+        h.update(self.digest)
+        self.digest = h.digest()
+        self.summed = True
+        return self.digest
+
+
+    def connect(self):
+        if not self.synced:
+            for v in self.state_store.all():
+                k = self.state_store.from_name(v)
+                self.state_store.sync(k)
+                self.__syncs[v] = True
+            if self.scan != None:
+                ks = self.scan()
+                for v in ks: #os.listdir(self.scan_path):
+                    logg.debug('ks {}'.format(v))
+                    k = None
                     try:
-            session = self.backend.connect()
-        except TimeoutError as e:
-            self.backend.disconnect()
-            raise BackendError('database connection fail: {}'.format(e))
-        i = 0
-        (pair, flags) = self.backend.get()
-        for f in self.filters:
-            if not self.backend.check_filter(i, flags):
-                logg.debug('applying filter {} {}'.format(str(f), flags))
-                self.__apply_one(f, i, conn, block, tx, session)
-            else:
-                logg.debug('skipping previously applied filter {} {}'.format(str(f), flags))
-            i += 1
-
-        self.backend.disconnect()
+                        k = self.state_store.from_elements(v)
+                        self.state_store.alias(v, k)
+                    except ValueError:
+                        k = self.state_store.from_name(v)
+                    self.state_store.sync(k)
+                    self.__syncs[v] = True
+            self.synced = True
+        self.connected = True
 
 
-class NoopFilter:
-    """A noop implemenation of a sync filter.
-
-    Logs the filter inputs at debug log level.
-    """
-    
-    def filter(self, conn, block, tx, db_session=None):
-        """Filter method implementation:
-
-        :param conn: RPC Connection, will be passed to the filter method
-        :type conn: chainlib.connection.RPCConnection
-        :param block: Block object
-        :type block: chainlib.block.Block
-        :param tx: Transaction object
-        :type tx: chainlib.tx.Tx
-        :param db_session: Backend session object
-        :type db_session: varies
-        """
-        logg.debug('noop filter :received\n{} {} {}'.format(block, tx, id(db_session)))
+    def disconnect(self):
+        self.connected = False
 
 
-    def __str__(self):
-        return 'noopfilter'
+    def start(self, offset=0, target=-1):
+        self.state_store.start(offset=offset, target=target)
+        self.started = True
+
+
+    def get(self, k):
+        return None
+
+
+    def next_item(self):
+        return None
+
+
+    def filters(self):
+        return []

chainsyncer/paths.py

@@ -0,0 +1 @@
+

chainsyncer/runnable/unlock.py

@@ -0,0 +1,146 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# standard imports
+import os
+import logging
+import sys
+import importlib
+
+# external imports
+import chainlib.cli
+from shep.persist import PersistedState
+
+# local imports
+import chainsyncer.cli
+from chainsyncer.settings import ChainsyncerSettings
+from chainsyncer.store import SyncStore
+from chainsyncer.filter import (
+        FilterState,
+        SyncFilter,
+        )
+
+logging.basicConfig(level=logging.WARNING)
+logg = logging.getLogger()
+
+valid_fwd = [
+        'fwd',
+        'forward',
+        'next',
+        'continue',
+        ]
+
+valid_rwd = [
+        'rwd',
+        'rewind',
+        'current',
+        'back',
+        'repeat',
+        'replay',
+        ]
+
+action_is_forward = False
+
+arg_flags = chainlib.cli.argflag_std_base | chainlib.cli.Flag.CHAIN_SPEC
+argparser = chainlib.cli.ArgumentParser(arg_flags)
+argparser.add_argument('--state-dir', type=str, dest='state_dir', help='State directory')
+argparser.add_positional('action', type=str, help='Action to take on lock. Repeat means re-run the locked filter. Continue means resume execution for next filter.')
+
+sync_flags = chainsyncer.cli.SyncFlag.RANGE | chainsyncer.cli.SyncFlag.HEAD
+chainsyncer.cli.process_flags(argparser, sync_flags)
+
+args = argparser.parse_args()
+
+if args.action in valid_fwd:
+    action_is_forward = True
+elif args.action not in valid_rwd:
+    sys.stderr.write('action argument must be one of {} or {}\n'.format(valid_rwd, valid_fwd))
+    sys.exit(1)
+
+
+base_config_dir = chainsyncer.cli.config_dir,
+config = chainlib.cli.Config.from_args(args, arg_flags, base_config_dir=base_config_dir)
+config = chainsyncer.cli.process_config(config, args, sync_flags)
+config.add(args.state_dir, '_STATE_DIR', False)
+logg.debug('config loaded:\n{}'.format(config))
+
+settings = ChainsyncerSettings()
+settings.process_sync_backend(config)
+logg.debug('settings:\n{}'.format(str(settings)))
+
+
+class FilterInNameOnly(SyncFilter):
+
+    def __init__(self, k):
+        self.k = k
+
+
+    def common_name(self):
+        return self.k
+
+
+def main():
+    if settings.get('SYNCER_BACKEND') == 'mem':
+        raise ValueError('cannot unlock volatile state store')
+
+    state_dir = config.get('_STATE_DIR')
+
+    if config.get('SYNCER_BACKEND') == 'fs': 
+            syncer_store_module = importlib.import_module('chainsyncer.store.fs')
+            syncer_store_class = getattr(syncer_store_module, 'SyncFsStore')
+    elif config.get('SYNCER_BACKEND') == 'rocksdb':
+        syncer_store_module = importlib.import_module('chainsyncer.store.rocksdb')
+        syncer_store_class = getattr(syncer_store_module, 'SyncRocksDbStore')
+    else:
+        syncer_store_module = importlib.import_module(config.get('SYNCER_BACKEND'))
+        syncer_store_class = getattr(syncer_store_module, 'SyncStore')
+
+    logg.info('using engine {} module {}.{}'.format(config.get('SYNCER_BACKEND'), syncer_store_module.__file__, syncer_store_class.__name__))
+
+    store = syncer_store_class(state_dir)
+    
+    filter_list = store.load_filter_list()
+    for i, k in enumerate(filter_list):
+        fltr = FilterInNameOnly(k)
+        store.register(fltr)
+        filter_list[i] = k.upper()
+
+    store.connect()
+    store.start(ignore_lock=True)
+
+    lock_state = store.filter_state.from_name('LOCK')
+    locked_item = store.filter_state.list(lock_state)
+    if len(locked_item) == 0:
+        sys.stderr.write('Sync filter in {} is not locked\n'.format(state_dir))
+        sys.exit(1)
+    elif len(locked_item) > 1:
+        sys.stderr.write('More than one locked item encountered in {}. That should never happen, so I do not know what to do next.\n'.format(state_dir))
+        sys.exit(1)
+
+    locked_item_key = locked_item[0]
+    locked_item = store.get(int(locked_item_key))
+    locked_state = store.filter_state.state(locked_item_key) - lock_state
+    locked_state_name = store.filter_state.name(locked_state)
+    logg.info('found item "{}" in locked state {}'.format(locked_item, store.filter_state.name(locked_state)))
+
+    if action_is_forward:
+        k = locked_state_name
+        filter_index = None
+        filter_index = filter_list.index(k)
+        filter_pos = filter_index + 1
+        filter_count = len(filter_list)
+        logg.debug('Locked filter {} found at position {} of {}'.format(k, filter_pos, filter_count))
+        if filter_pos == filter_count:
+            logg.info('Locked filter {} is the last filter in the list. Executing filter reset'.format(k))
+            locked_item.reset(check_incomplete=False)
+        else:
+            locked_item.advance(ignore_lock=True)
+            store.filter_state.unset(locked_item_key, lock_state)
+    else:
+        filter_mask = 0xf
+        filter_state = store.filter_state.mask(locked_state, filter_mask)
+        logg.info('Chosen action is "{}": will continue execution at previous filter {}'.format(args.action, store.filter_state.name(filter_state)))
+        store.filter_state.unset(locked_item_key, lock_state)
+
+
+if __name__ == '__main__':
+    main()

chainsyncer/session.py

@@ -0,0 +1,42 @@
+# standard imports
+import uuid
+import logging
+
+# local imports
+from chainsyncer.error import FilterDone
+
+logg = logging.getLogger(__name__)
+
+
+class SyncSession:
+
+    def __init__(self, session_store):
+        self.session_store = session_store
+        self.started = self.session_store.started
+        self.get = self.session_store.get
+        self.next = self.session_store.next_item
+        self.item = None
+        self.filters = self.session_store.filters
+
+    
+    def start(self, offset=0, target=-1):
+        self.session_store.start(offset=offset, target=target)
+        self.item = self.session_store.next_item()
+        return self.item
+
+
+    def stop(self, item):
+        self.session_store.stop(item)
+
+
+    def filter(self, conn, block, tx):
+        self.session_store.connect()
+        for fltr in self.filters:
+            logg.debug('executing filter {}'.format(fltr))
+            self.item.advance()
+            interrupt = fltr.filter(conn, block, tx)
+            if not self.item.release(interrupt=interrupt):
+                break
+        self.item.reset()
+        self.next()
+        self.session_store.disconnect()

chainsyncer/settings.py

@@ -0,0 +1,55 @@
+# standard imports
+import logging
+
+# external imports
+from hexathon import (
+        to_int as hex_to_int,
+        strip_0x,
+        )
+from chainlib.settings import ChainSettings
+
+logg = logging.getLogger(__name__)
+
+
+class ChainsyncerSettings(ChainSettings):
+
+    def process_sync_backend(self, config):
+        self.o['SYNCER_BACKEND'] = config.get('SYNCER_BACKEND')
+
+
+    def process_sync_range(self, config):
+        o = self.o['SYNCER_INTERFACE'].block_latest()
+        r = self.o['RPC'].do(o)
+        block_offset = int(strip_0x(r), 16) + 1
+        logg.info('network block height at startup is {}'.format(block_offset))
+
+        keep_alive = False
+        session_block_offset = 0
+        block_limit = 0
+        until = 0
+
+        if config.true('_HEAD'):
+            self.o['SYNCER_OFFSET'] = block_offset
+            self.o['SYNCER_LIMIT'] = -1
+            return
+
+        session_block_offset = int(config.get('SYNCER_OFFSET'))
+        until = int(config.get('SYNCER_LIMIT'))
+
+        if until > 0:
+            if until <= session_block_offset:
+                raise ValueError('sync termination block number must be later than offset ({} >= {})'.format(session_block_offset, until))
+            block_limit = until
+        elif until == -1:
+            keep_alive = True
+
+        if session_block_offset == -1:
+            session_block_offset = block_offset
+        elif config.true('_KEEP_ALIVE'):
+            block_limit = -1
+        else:
+            if block_limit == 0:
+                block_limit = block_offset
+    
+        self.o['SYNCER_OFFSET'] = session_block_offset
+        self.o['SYNCER_LIMIT'] = block_limit

chainsyncer/store/__init__.py

@@ -0,0 +1 @@
+from .base import *

chainsyncer/store/base.py

@@ -0,0 +1,322 @@
+# standard imports
+import os
+import logging
+
+# local imports
+from shep.persist import PersistedState
+from shep import State
+from shep.error import StateInvalid
+from chainsyncer.filter import FilterState
+from chainsyncer.error import (
+        LockError,
+        FilterDone,
+        InterruptError,
+        IncompleteFilterError,
+        SyncDone,
+        )
+
+logg = logging.getLogger(__name__)
+
+
+def sync_state_serialize(block_height, tx_index, block_target):
+    b = block_height.to_bytes(4, 'big')
+    b += tx_index.to_bytes(4, 'big')
+    b += block_target.to_bytes(4, 'big', signed=True)
+    return b
+
+
+def sync_state_deserialize(b):
+    block_height = int.from_bytes(b[:4], 'big')
+    tx_index = int.from_bytes(b[4:8], 'big')
+    block_target = int.from_bytes(b[8:], 'big', signed=True)
+    return (block_height, tx_index, block_target,)
+
+
+# NOT thread safe
+class SyncItem:
+    
+    def __init__(self, offset, target, sync_state, filter_state, started=False, ignore_lock=False):
+        self.offset = offset
+        self.target = target
+        self.sync_state = sync_state
+        self.filter_state = filter_state
+        self.state_key = str(offset)
+
+        logg.debug('get key {}'.format(self.state_key))
+        v = self.sync_state.get(self.state_key)
+
+        (self.cursor, self.tx_cursor, self.target) = sync_state_deserialize(v)
+
+        filter_state = self.filter_state.state(self.state_key)
+        if filter_state  & self.filter_state.from_name('LOCK') > 0 and not ignore_lock:
+            raise LockError(self.state_key)
+
+        self.count = len(self.filter_state.all(pure=True)) - 4
+        self.skip_filter = False
+        if self.count == 0:
+            self.skip_filter = True
+        elif not started:
+            self.filter_state.move(self.state_key, self.filter_state.from_name('RESET'))
+        
+
+    def __check_done(self):
+        if self.filter_state.state(self.state_key) & self.filter_state.from_name('INTERRUPT') > 0:
+            raise InterruptError(self.state_key)
+        if self.filter_state.state(self.state_key) & self.filter_state.from_name('DONE') > 0:
+            raise FilterDone(self.state_key)
+
+
+    def resume(self):
+        filter_state = self.filter_state.state(self.state_key)
+        if filter_state > 0x0f:
+            filter_state_part = self.filter_state.mask(filter_state, 0x0f)
+            if len(self.filter_state.elements(filter_state)) == 1:
+                logg.info('resume execution on state {} ({})'.format(self.filter_state.name(filter_state_part), filter_state_part))
+                lock_state = self.filter_state.from_name('LOCK')
+                self.filter_state.set(lock_state)
+
+
+    def reset(self, check_incomplete=True):
+        if check_incomplete:
+            if self.filter_state.state(self.state_key) & self.filter_state.from_name('LOCK') > 0:
+                raise LockError('reset attempt on {} when state locked'.format(self.state_key))
+            if self.filter_state.state(self.state_key) & self.filter_state.from_name('DONE') == 0:
+                raise IncompleteFilterError('reset attempt on {} when incomplete'.format(self.state_key))
+        self.filter_state.move(self.state_key, self.filter_state.from_name('RESET'))
+
+        
+    def next(self, advance_block=False):
+        v = self.sync_state.state(self.state_key)
+        if v == self.sync_state.DONE:
+            raise SyncDone(self.target)
+        elif v == self.sync_state.NEW:
+            self.sync_state.next(self.state_key)
+
+        v = self.sync_state.get(self.state_key)
+        (block_number, tx_index, target) = sync_state_deserialize(v)
+        if advance_block:
+            block_number += 1
+            tx_index = 0
+            if self.target >= 0 and block_number > self.target:
+                self.sync_state.move(self.state_key, self.sync_state.DONE)
+                raise SyncDone(self.target)
+        else:
+            tx_index += 1
+
+        self.cursor = block_number
+        self.tx_cursor = tx_index
+
+        b = sync_state_serialize(block_number, tx_index, target)
+        self.sync_state.replace(self.state_key, b)
+
+
+    def __find_advance(self):
+        v = self.filter_state.state(self.state_key)
+
+
+    def advance(self, ignore_lock=False):
+        if self.skip_filter:
+            raise FilterDone()
+        self.__check_done()
+
+        if self.filter_state.state(self.state_key) & self.filter_state.from_name('LOCK') > 0:
+            if ignore_lock:
+                self.filter_state.unset(self.state_key, self.filter_state.from_name('LOCK'))
+            else:
+                raise LockError('advance attempt on {} when state locked'.format(self.state_key))
+        done = False
+        try:
+            self.filter_state.next(self.state_key)
+        except StateInvalid:
+            done = True
+        if done:
+            raise FilterDone()
+        self.filter_state.set(self.state_key, self.filter_state.from_name('LOCK'))
+       
+
+    def release(self, interrupt=False):
+        if self.skip_filter:
+            return False
+        if interrupt == True:
+            self.filter_state.unset(self.state_key, self.filter_state.from_name('LOCK'))
+            self.filter_state.set(self.state_key, self.filter_state.from_name('INTERRUPT'))
+            self.filter_state.set(self.state_key, self.filter_state.from_name('DONE'))
+            return False
+
+        state = self.filter_state.state(self.state_key)
+        if state & self.filter_state.from_name('LOCK') == 0:
+            raise LockError('release attempt on {} when state unlocked'.format(self.state_key))
+        self.filter_state.unset(self.state_key, self.filter_state.from_name('LOCK'))
+        try:
+            c = self.filter_state.peek(self.state_key)
+            logg.debug('peeked {}'.format(c))
+        except StateInvalid:
+            self.filter_state.set(self.state_key, self.filter_state.from_name('DONE'))
+            return False
+        return True
+       
+
+    def __str__(self):
+        return 'syncitem offset {} target {} cursor {}'.format(self.offset, self.target, self.cursor)
+
+
+class SyncStore:
+
+    def __init__(self, path, session_id=None):
+        self.session_id = session_id
+        self.session_path = None
+        self.is_default = False
+        self.first = False
+        self.target = None
+        self.items = {}
+        self.item_keys = []
+        self.started = False
+        self.thresholds = []
+        self.session_path = path
+
+
+    def setup_sync_state(self, factory=None, event_callback=None):
+        if factory == None:
+            self.state = State(2, event_callback=event_callback)
+        else:
+            self.state = PersistedState(factory.add, 2, event_callback=event_callback)
+        self.state.add('SYNC')
+        self.state.add('DONE')
+
+
+    def setup_filter_state(self, factory=None, event_callback=None):
+        if factory == None:
+            filter_state_backend = State(0, check_alias=False, event_callback=event_callback)
+            self.filter_state = FilterState(filter_state_backend)
+        else:
+            filter_state_backend = PersistedState(factory.add, 0, check_alias=False, event_callback=event_callback)
+            self.filter_state = FilterState(filter_state_backend, scan=factory.ls)
+        self.filters = []
+
+
+    def set_target(self, v):
+        pass
+
+
+    def get_target(self):
+        return None
+
+
+    def register(self, fltr):
+        self.filters.append(fltr)
+        self.filter_state.register(fltr)
+
+
+    def start(self, offset=0, target=-1, ignore_lock=False):
+        if self.started:
+            return
+
+        self.save_filter_list() 
+        
+        self.load(target, ignore_lock=ignore_lock)
+
+        if self.first:
+            state_bytes = sync_state_serialize(offset, 0, target)
+            block_number_str = str(offset)
+            self.state.put(block_number_str, contents=state_bytes)
+            self.filter_state.put(block_number_str)
+            o = SyncItem(offset, target, self.state, self.filter_state, ignore_lock=ignore_lock)
+            o.resume()
+            self.items[offset] = o
+            self.item_keys.append(offset)
+        elif offset > 0:
+            logg.warning('block number argument {} for start ignored for already initiated sync {}'.format(offset, self.session_id))
+        self.started = True
+
+        self.item_keys.sort()
+
+
+    def stop(self, item):
+        if item.target == -1:
+            state_bytes = sync_state_serialize(item.cursor, 0, item.cursor)
+            self.state.replace(str(item.offset), state_bytes)
+            self.filter_state.put(str(item.cursor))
+
+            SyncItem(item.offset, -1, self.state, self.filter_state)
+            logg.info('New sync state start at block number {} for next head sync backfill'.format(item.cursor))
+
+            self.state.move(item.state_key, self.state.DONE)
+
+            state_bytes = sync_state_serialize(item.cursor, 0, -1)
+            self.state.put(str(item.cursor), contents=state_bytes)
+
+
+    def load(self, target, ignore_lock=False):
+        self.state.sync(self.state.NEW)
+        self.state.sync(self.state.SYNC)
+
+        thresholds_sync = []
+        for v in self.state.list(self.state.SYNC):
+            block_number = int(v)
+            thresholds_sync.append(block_number)
+            logg.debug('queue resume {}'.format(block_number))
+        thresholds_new = []
+        for v in self.state.list(self.state.NEW):
+            block_number = int(v)
+            thresholds_new.append(block_number)
+            logg.debug('queue new range {}'.format(block_number))
+
+        thresholds_sync.sort()
+        thresholds_new.sort()
+        thresholds = thresholds_sync + thresholds_new
+        lim = len(thresholds) - 1
+
+        for i in range(len(thresholds)):
+            item_target = target
+            if i < lim:
+                item_target = thresholds[i+1] 
+            o = SyncItem(block_number, item_target, self.state, self.filter_state, started=True, ignore_lock=ignore_lock)
+            o.resume()
+            self.items[block_number] = o
+            self.item_keys.append(block_number)
+            logg.info('added existing {}'.format(o))
+
+        self.get_target()
+        
+        if len(thresholds) == 0:
+            if self.target != None:
+                logg.warning('sync "{}" is already done, nothing to do'.format(self.session_id))
+            else:
+                logg.info('syncer first run target {}'.format(target))
+                self.first = True
+                self.set_target(target)
+
+
+    def get(self, k):
+        return self.items[k]
+
+
+    def next_item(self):
+        try:
+            k = self.item_keys.pop(0)
+        except IndexError:
+            return None
+        return self.items[k]
+
+
+    def connect(self):
+        self.filter_state.connect()
+
+
+    def disconnect(self):
+        self.filter_state.disconnect()
+
+
+    def save_filter_list(self):
+        raise NotImplementedError()
+       
+
+    def load_filter_list(self):
+        raise NotImplementedError()
+
+
+    def peek_next_filter(self):
+        pass
+
+    def peek_current_filter(self):
+        pass

chainsyncer/store/fs.py

@@ -0,0 +1,98 @@
+# standard imports
+import uuid
+import os
+import logging
+
+# external imports
+from shep.store.file import SimpleFileStoreFactory
+
+# local imports 
+from chainsyncer.store import SyncStore
+
+logg = logging.getLogger(__name__)
+
+
+class SyncFsStore(SyncStore):
+
+    def __init__(self, base_path, session_id=None, state_event_callback=None, filter_state_event_callback=None):
+        super(SyncFsStore, self).__init__(base_path, session_id=session_id)
+
+        create_path = False
+        try:
+            os.stat(self.session_path)
+        except FileNotFoundError:
+            create_path = True
+
+        if create_path:
+            self.__create_path(base_path, self.default_path, session_id=session_id)
+
+        self.session_id = os.path.basename(self.session_path)
+        logg.info('session id {} resolved {} path {}'.format(session_id, self.session_id, self.session_path))
+
+        base_sync_path = os.path.join(self.session_path, 'sync')
+        factory = SimpleFileStoreFactory(base_sync_path, binary=True)
+        self.setup_sync_state(factory, state_event_callback)
+
+        self.setup_filter_state(callback=filter_state_event_callback)
+
+
+    def setup_filter_state(self, callback=None):
+        base_filter_path = os.path.join(self.session_path, 'filter')
+        factory = SimpleFileStoreFactory(base_filter_path, binary=True)
+        super(SyncFsStore, self).setup_filter_state(factory, callback)
+
+
+    def __create_path(self, base_path, default_path, session_id=None):
+        logg.debug('fs store path {} does not exist, creating'.format(self.session_path))
+        if session_id == None:
+            session_id = str(uuid.uuid4())
+        self.session_path = os.path.join(base_path, session_id)
+        os.makedirs(self.session_path)
+        
+        if self.is_default:
+            try:
+                os.symlink(self.session_path, default_path)
+            except FileExistsError:
+                pass
+
+
+    def get_target(self):
+        fp = os.path.join(self.session_path, 'target')
+        try:
+            f = open(fp, 'r')
+            v = f.read()
+            f.close()
+            self.target = int(v)
+        except FileNotFoundError as e:
+            logg.debug('cant find target {} {}'.format(fp, e))
+            pass
+
+
+    def set_target(self, v):
+        fp = os.path.join(self.session_path, 'target')
+        f = open(fp, 'w')
+        f.write(str(v))
+        f.close()
+        self.target = v
+
+
+    def load_filter_list(self):
+        fltr = []
+        fp = os.path.join(self.session_path, 'filter_list')
+        f = open(fp, 'r')
+        while True:
+            v = f.readline()
+            if len(v) == 0:
+                break
+            v = v.rstrip()
+            fltr.append(v) 
+        f.close()
+        return fltr
+
+
+    def save_filter_list(self):
+        fp = os.path.join(self.session_path, 'filter_list')
+        f = open(fp, 'w')
+        for fltr in self.filters:
+            f.write(fltr.common_name() + '\n')
+        f.close()

chainsyncer/store/mem.py

@@ -0,0 +1,45 @@
+# standard imports
+import logging
+import os
+
+# external imports
+from shep import State
+
+# local imports 
+from chainsyncer.store import SyncStore
+
+logg = logging.getLogger(__name__)
+
+
+class SyncMemStore(SyncStore):
+
+    def __init__(self, session_id=None, state_event_callback=None, filter_state_event_callback=None):
+        super(SyncMemStore, self).__init__(None, session_id=session_id)
+
+        factory = None
+        self.setup_sync_state(factory, state_event_callback)
+
+        factory = None
+        self.setup_filter_state(factory, filter_state_event_callback)
+
+
+    def set_target(self, v):
+        self.target = int(v)
+
+
+    def get_target(self):
+        return self.target
+
+
+    def stop(self, item):
+        if item != None:
+            super(SyncMemStore, self).stop(item)
+        logg.info('I am an in-memory only state store. I am shutting down now, so all state will now be discarded.')
+
+
+    def save_filter_list(self):
+        pass
+
+
+    def load_filter_list(self):
+        return []

chainsyncer/store/rocksdb.py

@@ -0,0 +1,79 @@
+# standard imports
+import uuid
+import os
+import logging
+
+# external imports
+from shep.store.rocksdb import RocksDbStoreFactory
+
+# local imports 
+from chainsyncer.store import (
+        SyncItem,
+        SyncStore,
+        )
+
+logg = logging.getLogger(__name__)
+
+
+class RocksDbStoreAdder:
+
+    def __init__(self, factory, prefix):
+        self.factory = factory
+        self.prefix = prefix
+
+
+    def add(self, k):
+        path = os.path.join(self.prefix, k)
+        return self.factory.add(path)
+
+
+    def ls(self):
+        return self.factory.ls()
+
+
+class SyncRocksDbStore(SyncStore):
+
+    def __init__(self, base_path, session_id=None, state_event_callback=None, filter_state_event_callback=None):
+        super(SyncRocksDbStore, self).__init__(base_path, session_id=session_id)
+
+        self.factory = RocksDbStoreFactory(self.session_path, binary=True)
+        prefix_factory = RocksDbStoreAdder(self.factory, 'sync')
+        self.setup_sync_state(prefix_factory, state_event_callback)
+
+        prefix_factory = RocksDbStoreAdder(self.factory, 'filter')
+        self.setup_filter_state(prefix_factory, filter_state_event_callback)
+
+        #self.session_id = os.path.basename(self.session_path)
+        #logg.info('session id {} resolved {} path {}'.format(session_id, self.session_id, self.session_path))
+
+        self.target_db = RocksDbStoreAdder(self.factory, '.stat').add('target')
+
+
+    def get_target(self):
+        v = self.target_db.get('target')
+        if v != None:
+            self.target = int(v)
+
+
+    def set_target(self, v):
+        self.target_db.put('target', str(v))
+        self.target = v
+
+
+    def stop(self, item):
+        if item != None:
+            super(SyncRocksDbStore, self).stop(item)
+        self.factory.close()
+
+
+    def save_filter_list(self):
+        fltr = []
+        for v in self.filters:
+            fltr.append(v.common_name())
+        self.target_db.put('filter_list', ','.join(fltr))
+
+
+    def load_filter_list(self):
+        v = self.target_db.get('filter_list')
+        v = v.decode('utf-8')
+        return v.split(',')

chainsyncer/unittest/__init__.py

@@ -0,0 +1 @@
+from .base import *

chainsyncer/unittest/base.py

@@ -1,17 +1,73 @@
 # standard imports
 import os
 import logging
+import hashlib
 
 # external imports
 from hexathon import add_0x
+from shep.state import State
 
 # local imports
-from chainsyncer.driver.history import HistorySyncer
+#from chainsyncer.driver.history import HistorySyncer
 from chainsyncer.error import NoBlockForYou
+from chainsyncer.driver import SyncDriver
 
+logging.STATETRACE = 5
 logg = logging.getLogger().getChild(__name__)
 
 
+def state_event_handler(k, v_old, v_new):
+    if v_old == None:
+        logg.log(logging.STATETRACE, 'sync state create key {}: -> {}'.format(k, v_new))
+    else:
+        logg.log(logging.STATETRACE, 'sync state change key {}: {} -> {}'.format(k, v_old, v_new))
+    
+
+def filter_state_event_handler(k, v_old, v_new):
+    if v_old == None:
+        logg.log(logging.STATETRACE, 'filter state create key {}: -> {}'.format(k, v_new))
+    else:
+        logg.log(logging.STATETRACE, 'filter state change key {}: {} -> {}'.format(k, v_old, v_new))
+
+
+class MockFilterError(Exception):
+    pass
+
+
+class MockBlockGenerator:
+
+    def __init__(self, offset=0):
+        self.blocks = {}
+        self.offset = offset
+        self.cursor = offset
+
+
+    def generate(self, spec=[], driver=None):
+        for v in spec:
+            txs = []
+            for i in range(v):
+                tx_hash = os.urandom(32).hex()
+                tx = MockTx(0, tx_hash)
+                txs.append(tx)
+
+            block = MockBlock(self.cursor, txs)
+            self.blocks[self.cursor] = block
+            self.cursor += 1
+
+        if driver != None:
+            self.apply(driver)
+
+
+    def apply(self, driver, offset=0):
+        block_numbers = list(self.blocks.keys())
+        for block_number in block_numbers:
+            if block_number < offset:
+                continue
+            block = self.blocks[block_number]
+            driver.add_block(block) 
+
+
+
 class MockConn:
     """Noop connection mocker.
 
@@ -56,6 +112,7 @@ class MockBlock:
         """
         self.number = number
         self.txs = txs
+        self.hash = os.urandom(32).hex()
 
 
     def tx(self, i):
@@ -64,45 +121,158 @@ class MockBlock:
         :param i: Transaction index
         :type i: int
         """
-        return MockTx(i, self.txs[i])
+        return MockTx(i, self.txs[i].hash)
 
 
-class TestSyncer(HistorySyncer):
-    """Unittest extension of history syncer driver.
+class MockStore(State):
 
-    :param backend: Syncer backend
-    :type backend: chainsyncer.backend.base.Backend implementation
-    :param chain_interface: Chain interface
-    :type chain_interface: chainlib.interface.ChainInterface implementation
-    :param tx_counts: List of integer values defining how many mock transactions to generate per block. Mock blocks will be generated for each element in list.
-    :type tx_counts: list
-    """
-
-    def __init__(self, backend, chain_interface, tx_counts=[]):
-        self.tx_counts = tx_counts
-        super(TestSyncer, self).__init__(backend, chain_interface)
+    def __init__(self, bits=0):
+        super(MockStore, self).__init__(bits, check_alias=False) 
 
     
-    def get(self, conn):
-        """Implements the block getter of chainsyncer.driver.base.Syncer.
+    def start(self, offset=0, target=-1):
+        pass
 
-        :param conn: RPC connection
-        :type conn: chainlib.connection.RPCConnection
-        :raises NoBlockForYou: End of mocked block array reached
-        :rtype: chainsyncer.unittest.base.MockBlock
-        :returns: Mock block.
-        """
-        (pair, fltr) = self.backend.get()
-        (target_block, fltr) = self.backend.target()
-        block_height = pair[0]
 
-        if block_height == target_block:
-            self.running = False
+class MockFilter:
+
+    def __init__(self, name, brk=None, brk_hard=None, z=None):
+        self.name = name
+        if z == None:
+            h = hashlib.sha256()
+            h.update(self.name.encode('utf-8'))
+            z = h.digest()
+        self.z = z
+        self.brk = brk
+        self.brk_hard = brk_hard
+        self.contents = []
+
+
+    def sum(self):
+        return self.z
+
+
+    def common_name(self):
+        return self.name 
+
+
+    def filter(self, conn, block, tx):
+        r = False
+        if self.brk_hard != None:
+            r = True
+            if self.brk_hard > 0:
+                r = True
+            self.brk_hard -= 1
+            if r:
+                raise MockFilterError()
+        if self.brk != None:
+            if self.brk > 0:
+                r = True
+            self.brk -= 1
+        self.contents.append((block.number, tx.index, tx.hash,))
+        logg.debug('filter {} result {} block {} tx {} {}'.format(self.common_name(), r, block.number, tx.index, tx.hash))
+        return r
+
+
+class MockDriver(SyncDriver):
+
+    def __init__(self, store, offset=0, target=-1, interrupt_block=None, interrupt_tx=None, interrupt_global=False):
+        super(MockDriver, self).__init__(store, offset=offset, target=target)
+        self.blocks = {}
+        self.interrupt = None
+        if interrupt_block != None:
+            interrupt_block = int(interrupt_block)
+            if interrupt_tx == None:
+                interrupt_tx = 0
+            else:
+                interrupt_tx = int(interrupt_tx)
+            self.interrupt = (interrupt_block, interrupt_tx,)
+        self.interrupt_global = interrupt_global
+
+
+    def add_block(self, block):
+        logg.debug('add block {} {} with {} txs'.format(block.number, block.hash, len(block.txs)))
+        self.blocks[block.number] = block
+
+
+    def get(self, conn, item):
+        try:
+            return self.blocks[item.cursor]
+        except KeyError:
             raise NoBlockForYou()
 
-        block_txs = []
-        if block_height < len(self.tx_counts):
-            for i in range(self.tx_counts[block_height]):
-                block_txs.append(add_0x(os.urandom(32).hex()))
 
-        return MockBlock(block_height, block_txs)
+    def process(self, conn, item, block):
+        i = item.tx_cursor
+        while self.running:
+            if self.interrupt != None:
+                if self.interrupt[0] == block.number and self.interrupt[1] == i:
+                    logg.info('interrupt triggered at {}'.format(self.interrupt))
+                    if self.interrupt_global:
+                        SyncDriver.running_global = False
+                    self.running = False
+                    break
+            tx = block.tx(i)
+            self.process_single(conn, block, tx)
+            item.next()
+            i += 1
+
+
+class MockChainInterface:
+
+    def block_by_number(self, number):
+        return ('block_by_number', number,)
+
+
+    def tx_by_hash(self, hsh):
+        return ('tx_by_hash', hsh,)
+
+
+    def block_from_src(self, src):
+        return src
+
+
+    def src_normalize(self, src):
+        return src
+
+
+    def tx_receipt(self, hsh):
+        return ('receipt', hsh,)
+
+
+class MockChainInterfaceConn(MockConn):
+
+    def __init__(self, interface):
+        self.ifc = interface
+        self.blocks = {}
+        self.txs = {}
+   
+
+    def add_block(self, block):
+        logg.debug('add block {} {} with {} txs'.format(block.number, block.hash, len(block.txs)))
+        self.blocks[block.number] = block
+        for tx in block.txs:
+            self.txs[tx.hash] = tx
+           
+
+    def do(self, o):
+        m = getattr(self, 'handle_' + o[0])
+        return m(o[1])
+
+
+    def handle_block_by_number(self, number):
+        return self.blocks[number]
+
+
+
+    def handle_receipt(self, hsh):
+        return {}
+
+
+class MockItem:
+
+    def __init__(self, target, offset, cursor, state_key):
+        self.target = target
+        self.offset = offset
+        self.cursor = cursor
+        self.state_key = state_key

chainsyncer/unittest/db.py

@@ -1,64 +0,0 @@
-# standard imports
-import logging
-import os
-
-# external imports
-import alembic
-import alembic.config
-
-# local imports
-from chainsyncer.db.models.base import SessionBase
-from chainsyncer.db import dsn_from_config
-from chainsyncer.db.models.base import SessionBase
-
-logg = logging.getLogger(__name__)
-
-
-class ChainSyncerDb:
-    """SQLITE database setup for unit tests
-
-    :param debug: Activate sql level debug (outputs sql statements)
-    :type debug: bool
-    """
-
-    base = SessionBase
-
-    def __init__(self, debug=False):
-        config = {
-            'DATABASE_ENGINE': 'sqlite',
-            'DATABASE_DRIVER': 'pysqlite',
-            'DATABASE_NAME': 'chainsyncer.sqlite',
-                }
-        logg.debug('config {}'.format(config))
-
-        self.dsn = dsn_from_config(config)
-
-        self.base.poolable = False
-        self.base.transactional = False
-        self.base.procedural = False
-        self.base.connect(self.dsn, debug=debug) # TODO: evaluates to "true" even if string is 0
-
-        rootdir = os.path.join(os.path.dirname(os.path.dirname(__file__)), '..')
-        dbdir = os.path.join(rootdir, 'chainsyncer', 'db')
-        #migrationsdir = os.path.join(dbdir, 'migrations', config.get('DATABASE_ENGINE'))
-        migrationsdir = os.path.join(dbdir, 'migrations', 'default')
-        logg.info('using migrations directory {}'.format(migrationsdir))
-
-        ac = alembic.config.Config(os.path.join(migrationsdir, 'alembic.ini'))
-        ac.set_main_option('sqlalchemy.url', self.dsn)
-        ac.set_main_option('script_location', migrationsdir)
-
-        alembic.command.downgrade(ac, 'base')
-        alembic.command.upgrade(ac, 'head')
-
-
-    def bind_session(self, session=None):
-        """Create session using underlying session base
-        """
-        return self.base.bind_session(session)
-
-    
-    def release_session(self, session=None):
-        """Release session using underlying session base
-        """
-        return self.base.release_session(session)

chainsyncer/unittest/store.py

@@ -0,0 +1,301 @@
+# standard imports
+import os
+import stat
+import unittest
+import shutil
+import tempfile
+import logging
+import uuid
+
+# local imports
+from chainsyncer.session import SyncSession
+from chainsyncer.error import (
+        LockError,
+        FilterDone,
+        IncompleteFilterError,
+        SyncDone,
+        )
+from chainsyncer.unittest import (
+        MockFilter,
+        MockItem,
+        )
+
+logging.STATETRACE = 5
+logg = logging.getLogger(__name__)
+logg.setLevel(logging.STATETRACE)
+
+
+def state_change_callback(k, old_state, new_state):
+    logg.log(logging.STATETRACE, 'state change: {} {} -> {}'.format(k, old_state, new_state)) 
+
+
+def filter_change_callback(k, old_state, new_state):
+    logg.log(logging.STATETRACE, 'filter change: {} {} -> {}'.format(k, old_state, new_state)) 
+
+
+class TestStoreBase(unittest.TestCase):
+
+    def setUp(self):
+        self.base_path = tempfile.mkdtemp()
+        self.session_id = str(uuid.uuid4())
+        self.path = os.path.join(self.base_path, self.session_id)
+        os.makedirs(self.path)
+        self.store_factory = None
+        self.persist = True
+
+
+    @classmethod
+    def link(cls, target):
+        for v in [
+                "default",
+                "store_start",
+                "store_resume",
+                "filter_list",
+                "sync_process_nofilter",
+                "sync_process_onefilter",
+                "sync_process_outoforder",
+                "sync_process_interrupt",
+                "sync_process_reset",
+                "sync_process_done",
+                "sync_head_future",
+                "sync_history_interrupted",
+                "sync_history_complete",
+                ]:
+            setattr(target, 'test_' + v, getattr(cls, 't_' + v))
+
+
+    def tearDown(self):
+        shutil.rmtree(self.path)
+
+
+    def t_default(self):
+        bogus_item = MockItem(0, 0, 0, 0)
+        store = self.store_factory()
+
+        if store.session_path == None:
+            return
+
+        #fp = os.path.join(self.path, store.session_id)
+        fp = self.path
+        session_id = store.session_id
+        st = None
+        st = os.stat(fp)
+
+        if st != None: 
+            self.assertTrue(stat.S_ISDIR(st.st_mode))
+            #self.assertTrue(store.is_default)
+
+        store.stop(bogus_item)
+        store = self.store_factory()
+        fpr = os.path.join(self.path, self.session_id)
+        self.assertEqual(fp, self.path)
+        
+
+    def t_store_start(self):
+        bogus_item = MockItem(0, 0, 0, 0)
+        store = self.store_factory()
+        store.start(42)
+        self.assertTrue(store.first)
+
+        store.stop(bogus_item)
+
+        if self.persist:
+            store = self.store_factory()
+            store.start()
+            self.assertFalse(store.first)
+
+
+    def t_store_resume(self):
+        store = self.store_factory()
+        store.start(13)
+        self.assertTrue(store.first)
+        # todo not done
+
+
+    def t_sync_process_nofilter(self):
+        store = self.store_factory()
+        session = SyncSession(store)
+        session.start()
+        o = session.get(0)
+        with self.assertRaises(FilterDone):
+            o.advance()
+
+
+    def t_sync_process_onefilter(self):
+        store = self.store_factory()
+        session = SyncSession(store)
+
+        fltr_one = MockFilter('foo')
+        store.register(fltr_one)
+
+        session.start()
+        o = session.get(0)
+        o.advance()
+        o.release()
+
+
+    def t_sync_process_outoforder(self):
+        store = self.store_factory()
+        session = SyncSession(store)
+
+        fltr_one = MockFilter('foo')
+        store.register(fltr_one)
+        fltr_two = MockFilter('two')
+        store.register(fltr_two)
+
+        session.start()
+        o = session.get(0)
+        o.advance()
+        with self.assertRaises(LockError):
+            o.advance()
+
+        o.release()
+        with self.assertRaises(LockError):
+            o.release()
+
+        o.advance()
+        o.release()
+
+
+    def t_sync_process_interrupt(self):
+        store = self.store_factory()
+        session = SyncSession(store)
+
+        fltr_one = MockFilter('foo')
+        store.register(fltr_one)
+        fltr_two = MockFilter('bar')
+        store.register(fltr_two)
+
+        session.start()
+        o = session.get(0)
+        o.advance()
+        o.release(interrupt=True)
+        with self.assertRaises(FilterDone):
+            o.advance()
+
+
+    def t_sync_process_reset(self):
+        store = self.store_factory()
+        session = SyncSession(store)
+
+        fltr_one = MockFilter('foo')
+        store.register(fltr_one)
+        fltr_two = MockFilter('bar')
+        store.register(fltr_two)
+
+        session.start()
+        o = session.get(0)
+        o.advance()
+        with self.assertRaises(LockError):
+            o.reset()
+        o.release()
+        with self.assertRaises(IncompleteFilterError):
+            o.reset()
+
+        o.advance()
+        o.release()
+
+        with self.assertRaises(FilterDone):
+            o.advance()
+
+        o.reset()
+
+    
+    def t_sync_process_done(self):
+        store = self.store_factory()
+        session = SyncSession(store)
+
+        fltr_one = MockFilter('foo')
+        store.register(fltr_one)
+
+        session.start(target=0)
+        o = session.get(0)
+        o.advance()
+        o.release()
+        with self.assertRaises(FilterDone):
+            o.advance()
+        o.reset()
+        with self.assertRaises(SyncDone):
+            o.next(advance_block=True)
+
+
+    def t_sync_head_future(self):
+        store = self.store_factory('foo')
+        session = SyncSession(store)
+
+        session.start()
+        o = session.get(0)
+        o.next(advance_block=True)
+        o.next(advance_block=True)
+        session.stop(o)
+
+        if self.persist:
+            store = self.store_factory('foo')
+            store.start()
+            o = store.get(2)
+
+
+    def t_sync_history_interrupted(self):
+        if not self.persist:
+            return
+
+        bogus_item = MockItem(0, 0, 0, 0)
+        store = self.store_factory('foo')
+        session = SyncSession(store)
+
+        session.start(target=13)
+        o = session.get(0)
+        o.next(advance_block=True)
+        o.next(advance_block=True)
+        session.stop(o)
+
+        store.stop(bogus_item)
+        store = self.store_factory('foo')
+        store.start()
+        o = store.get(0)
+        self.assertEqual(o.cursor, 2)
+        self.assertEqual(o.target, 13) 
+        o.next(advance_block=True)
+        o.next(advance_block=True)
+
+        store.stop(bogus_item)
+        store = self.store_factory('foo')
+        store.start()
+        self.assertEqual(o.cursor, 4)
+        self.assertEqual(o.target, 13) 
+
+
+    def t_sync_history_complete(self):
+        store = self.store_factory('foo')
+        session = SyncSession(store)
+
+        session.start(target=3)
+        o = session.get(0)
+        o.next(advance_block=True)
+        o.next(advance_block=True)
+        o.next(advance_block=True)
+        with self.assertRaises(SyncDone):
+            o.next(advance_block=True)
+
+
+    def t_filter_list(self):
+        bogus_item = MockItem(0, 0, 0, 0)
+        store = self.store_factory()
+
+        if store.session_path == None:
+            return
+
+        fltr_one = MockFilter('foo_bar')
+        store.register(fltr_one)
+
+        fltr_two = MockFilter('bar_baz')
+        store.register(fltr_two)
+
+        store.start()
+        store.stop(bogus_item)
+
+        store = self.store_factory()
+        r = store.load_filter_list() 
+
+        self.assertEqual(r[0], 'foo_bar')
+        self.assertEqual(r[1], 'bar_baz')

requirements.txt

@@ -1,4 +1,5 @@
-confini~=0.5.1
+confini~=0.6.0
 semver==2.13.0
-hexathon~=0.1.0
-chainlib~=0.0.10
+hexathon~=0.1.5
+chainlib~=0.1.1
+shep~=0.2.3

run_tests.sh

@@ -8,5 +8,12 @@ for f in `ls tests/*.py`; do
 		exit
 	fi
 done
+
+for f in `ls tests/store/*.py`; do
+	python $f
+	if [ $? -gt 0 ]; then
+		exit
+	fi
+done
 set +x
 set +e

setup.cfg

@@ -1,10 +1,10 @@
 [metadata]
 name = chainsyncer
-version = 0.0.7
+version = 0.4.1
 description = Generic blockchain syncer driver
 author = Louis Holbrook
 author_email = dev@holbrook.no
-url = https://gitlab.com/chaintools/chainsyncer
+url = https://gitlab.com/chaintool/chainsyncer
 keywords =
 	cryptocurrency
 classifiers =
@@ -25,16 +25,17 @@ include_package_data = True
 python_requires = >= 3.6
 packages =
 	chainsyncer
-	chainsyncer.db
-	chainsyncer.db.models
-	chainsyncer.backend
 	chainsyncer.driver
 	chainsyncer.unittest
+	chainsyncer.store
+	chainsyncer.cli
+	chainsyncer.runnable
 
-[options.package_data]
-* =
-	sql/*
+#[options.package_data]
+#* =
+#	sql/*
 
-#[options.entry_points]
-#console_scripts =
+[options.entry_points]
+console_scripts =
 	#blocksync-celery = chainsyncer.runnable.tracker:main
+	chainsyncer-unlock = chainsyncer.runnable.unlock:main

setup.py

@@ -26,5 +26,7 @@ setup(
     install_requires=requirements,
     extras_require={
         'sql': sql_requirements,
+        'rocksdb': ['shep[rocksdb]~=0.2.2'],
+        'redis': ['shep[redis]~=0.2.2'],
     }
     )

tests/chainsyncer_base.py

@@ -1,69 +0,0 @@
-# standard imports
-import logging
-import unittest
-import tempfile
-import os
-#import pysqlite
-
-# external imports
-from chainlib.chain import ChainSpec
-from chainlib.interface import ChainInterface
-from chainlib.eth.tx import (
-        receipt,
-        Tx,
-        )
-from chainlib.eth.block import (
-        block_by_number,
-        Block,
-        )
-from potaahto.symbols import snake_and_camel
-
-# local imports
-from chainsyncer.db import dsn_from_config
-from chainsyncer.db.models.base import SessionBase
-
-# test imports
-from chainsyncer.unittest.db import ChainSyncerDb
-
-script_dir = os.path.realpath(os.path.dirname(__file__))
-
-logging.basicConfig(level=logging.DEBUG)
-
-
-class EthChainInterface(ChainInterface):
-    
-    def __init__(self):
-        self._tx_receipt = receipt
-        self._block_by_number = block_by_number
-        self._block_from_src = Block.from_src
-        self._tx_from_src = Tx.from_src
-        self._src_normalize = snake_and_camel
-
-
-class TestBase(unittest.TestCase):
-
-    interface = EthChainInterface()
-
-    def setUp(self):
-        self.db = ChainSyncerDb()
-        
-        #f = open(os.path.join(script_dir, '..', 'sql', 'sqlite', '1.sql'), 'r')
-        #sql = f.read()
-        #f.close()
-
-        #conn = SessionBase.engine.connect()
-        #conn.execute(sql)
-
-        #f = open(os.path.join(script_dir, '..', 'sql', 'sqlite', '2.sql'), 'r')
-        #sql = f.read()
-        #f.close()
-
-        #conn = SessionBase.engine.connect()
-        #conn.execute(sql)
-        self.session = self.db.bind_session()
-        self.chain_spec = ChainSpec('evm', 'foo', 42, 'bar')
-
-    def tearDown(self):
-        self.session.commit()
-        self.db.release_session(self.session)
-        #os.unlink(self.db_path)

tests/store/test_0_mem.py

@@ -0,0 +1,33 @@
+# standard imports
+import unittest
+import logging
+
+# external imports
+from shep import State
+
+# local imports
+from chainsyncer.store.mem import SyncMemStore
+from chainsyncer.unittest.store import TestStoreBase
+
+logging.basicConfig(level=logging.DEBUG)
+logg = logging.getLogger()
+
+
+class StoreFactory:
+
+    def create(self, session_id=None):
+        return SyncMemStore(session_id=session_id)
+
+
+class TestMem(TestStoreBase):
+
+    def setUp(self):
+        super(TestMem, self).setUp()
+        self.store_factory = StoreFactory().create
+        self.persist = False
+
+
+if __name__ == '__main__':
+    TestStoreBase.link(TestMem)
+    # Remove tests that test persistence of state
+    unittest.main()

tests/store/test_1_fs.py

@@ -0,0 +1,32 @@
+# standard imports
+import unittest
+import logging
+
+# local imports
+from chainsyncer.store.fs import SyncFsStore
+from chainsyncer.unittest.store import TestStoreBase
+
+logging.basicConfig(level=logging.DEBUG)
+logg = logging.getLogger()
+
+
+class StoreFactory:
+
+    def __init__(self, path):
+        self.path = path
+
+
+    def create(self, session_id=None):
+        return SyncFsStore(self.path, session_id=session_id)
+
+
+class TestFs(TestStoreBase):
+
+    def setUp(self):
+        super(TestFs, self).setUp()
+        self.store_factory = StoreFactory(self.path).create
+
+
+if __name__ == '__main__':
+    TestStoreBase.link(TestFs)
+    unittest.main()

tests/store/test_rocksdb.py

@@ -0,0 +1,35 @@
+# standard imports
+import unittest
+import logging
+
+# local imports
+from chainsyncer.store.rocksdb import SyncRocksDbStore
+from chainsyncer.unittest.store import (
+        TestStoreBase,
+        filter_change_callback,
+        state_change_callback,
+        )
+
+logging.basicConfig(level=logging.DEBUG)
+logg = logging.getLogger()
+
+class StoreFactory:
+
+    def __init__(self, path):
+        self.path = path
+
+
+    def create(self, session_id=None):
+        return SyncRocksDbStore(self.path, session_id=session_id, state_event_callback=state_change_callback, filter_state_event_callback=filter_change_callback)
+
+
+class TestRocksDb(TestStoreBase):
+
+    def setUp(self):
+        super(TestRocksDb, self).setUp()
+        self.store_factory = StoreFactory(self.path).create
+
+
+if __name__ == '__main__':
+    TestStoreBase.link(TestRocksDb)
+    unittest.main()

tests/test_basic.py

@@ -1,21 +1,74 @@
 # standard imports
 import unittest
-
-# external imports
-from chainlib.chain import ChainSpec
+import tempfile
+import shutil
+import logging
 
 # local imports
-from chainsyncer.backend.memory import MemBackend
+from chainsyncer.session import SyncSession
+from chainsyncer.filter import FilterState
+from chainsyncer.store.fs import SyncFsStore
+from chainsyncer.unittest import (
+        MockStore,
+        MockFilter,
+        )
 
-# testutil imports
-from tests.chainsyncer_base import TestBase
+logging.basicConfig(level=logging.DEBUG)
+logg = logging.getLogger()
 
 
-class TestBasic(TestBase):
+class TestSync(unittest.TestCase):
 
-    def test_hello(self):
-        chain_spec = ChainSpec('evm', 'bloxberg', 8996, 'foo')
-        backend = MemBackend(chain_spec, 'foo') 
+    def setUp(self):
+        self.path = tempfile.mkdtemp()
+        self.store = SyncFsStore(self.path)
+
+
+    def tearDown(self):
+        shutil.rmtree(self.path)
+
+
+    def test_basic(self):
+        store = MockStore(6)
+        state = FilterState(store)
+        session = SyncSession(state)
+
+
+    def test_sum(self):
+        store = MockStore(6)
+        state = FilterState(store)
+
+        b = b'\x2a' * 32
+        fltr = MockFilter('foo', z=b)
+        state.register(fltr)
+
+        b = b'\x0d' * 31
+        fltr = MockFilter('bar', z=b)
+        with self.assertRaises(ValueError):
+            state.register(fltr)
+
+        b = b'\x0d' * 32
+        fltr = MockFilter('bar', z=b)
+        state.register(fltr)
+
+        v = state.sum()
+        self.assertEqual(v.hex(), 'a24abf9fec112b4e0210ae874b4a371f8657b1ee0d923ad6d974aef90bad8550')
+
+
+    def test_session_start(self):
+        store = MockStore(6)
+        state = FilterState(store)
+        session = SyncSession(state)
+        session.start()
+       
+
+    def test_state_dynamic(self):
+        store = MockStore()
+        state = FilterState(store)
+
+        b = b'\x0d' * 32
+        fltr = MockFilter(name='foo', z=b)
+        state.register(fltr)
 
 
 if __name__ == '__main__':

tests/test_database.py

@@ -1,199 +0,0 @@
-# standard imports
-import unittest
-import logging
-
-# external imports
-from chainlib.chain import ChainSpec
-
-# local imports
-from chainsyncer.db.models.base import SessionBase
-from chainsyncer.db.models.filter import BlockchainSyncFilter
-from chainsyncer.backend.sql import SQLBackend
-from chainsyncer.error import LockError
-
-# testutil imports
-from tests.chainsyncer_base import TestBase
-
-logg = logging.getLogger()
-
-
-class TestDatabase(TestBase):
-
-
-    def test_backend_live(self):
-        s = SQLBackend.live(self.chain_spec, 42)
-        self.assertEqual(s.object_id, 1)
-        backend = SQLBackend.first(self.chain_spec)
-        #SQLBackend(self.chain_spec, sync_id)
-        self.assertEqual(backend.object_id, 1)
-
-        bogus_chain_spec = ChainSpec('bogus', 'foo', 13, 'baz')
-        sync_id = SQLBackend.first(bogus_chain_spec)
-        self.assertIsNone(sync_id)
-
-
-    def test_backend_filter_lock(self):
-        s = SQLBackend.live(self.chain_spec, 42)
-
-        s.connect()
-        filter_id = s.db_object_filter.id
-        s.disconnect()
-
-        session = SessionBase.create_session()
-        o = session.query(BlockchainSyncFilter).get(filter_id)
-        self.assertEqual(len(o.flags), 0)
-        session.close()
-
-        s.register_filter(str(0))
-        s.register_filter(str(1))
-
-        s.connect()
-        filter_id = s.db_object_filter.id
-        s.disconnect()
-
-        session = SessionBase.create_session()
-        o = session.query(BlockchainSyncFilter).get(filter_id)
-
-        o.set(1)
-        with self.assertRaises(LockError):
-            o.set(2)
-        o.release()
-        o.set(2)
-
-
-    def test_backend_filter(self):
-        s = SQLBackend.live(self.chain_spec, 42)
-
-        s.connect()
-        filter_id = s.db_object_filter.id
-        s.disconnect()
-
-        session = SessionBase.create_session()
-        o = session.query(BlockchainSyncFilter).get(filter_id)
-        self.assertEqual(len(o.flags), 0)
-        session.close()
-
-        for i in range(9):
-            s.register_filter(str(i))
-
-        s.connect()
-        filter_id = s.db_object_filter.id
-        s.disconnect()
-
-        session = SessionBase.create_session()
-        o = session.query(BlockchainSyncFilter).get(filter_id)
-        self.assertEqual(len(o.flags), 2)
-
-        (t, c, d) = o.target()
-        self.assertEqual(t, (1 << 9) - 1)
-
-        for i in range(9):
-            o.set(i)
-            o.release()
-
-        (f, c, d) = o.cursor()
-        self.assertEqual(f, t)
-        self.assertEqual(c, 9)
-        self.assertEqual(d, o.digest)
-
-        session.close()
-
-
-    def test_backend_retrieve(self):
-        s = SQLBackend.live(self.chain_spec, 42)
-        s.register_filter('foo')
-        s.register_filter('bar')
-        s.register_filter('baz')
-
-        s.set(42, 13)
-
-        s = SQLBackend.first(self.chain_spec)
-        self.assertEqual(s.get(), ((42,13), 0))
-
-
-    def test_backend_initial(self):
-        with self.assertRaises(ValueError):
-            s = SQLBackend.initial(self.chain_spec, 42, 42)
-        
-        with self.assertRaises(ValueError):
-            s = SQLBackend.initial(self.chain_spec, 42, 43)
-        
-        s = SQLBackend.initial(self.chain_spec, 42, 13)
-
-        s.set(43, 13)
-
-        s = SQLBackend.first(self.chain_spec)
-        self.assertEqual(s.get(), ((43,13), 0))
-        self.assertEqual(s.start(), ((13,0), 0))
-
-
-    def test_backend_resume(self):
-        s = SQLBackend.resume(self.chain_spec, 666)
-        self.assertEqual(len(s), 0)
-
-        s = SQLBackend.live(self.chain_spec, 42)
-        original_id = s.object_id
-        s = SQLBackend.resume(self.chain_spec, 666)
-        self.assertEqual(len(s), 1)
-        resumed_id = s[0].object_id
-        self.assertEqual(resumed_id, original_id + 1)
-        self.assertEqual(s[0].get(), ((42, 0), 0))
-
-
-    def test_backend_resume_when_completed(self):
-        s = SQLBackend.live(self.chain_spec, 42)
-
-        s = SQLBackend.resume(self.chain_spec, 666)
-        s[0].set(666, 0)
-    
-        s = SQLBackend.resume(self.chain_spec, 666)
-        self.assertEqual(len(s), 0)
-        
-    
-    def test_backend_resume_several(self):
-        s = SQLBackend.live(self.chain_spec, 42)
-        s.set(43, 13)
-        
-        s = SQLBackend.resume(self.chain_spec, 666)
-        SQLBackend.live(self.chain_spec, 666)
-        s[0].set(123, 2)
-
-        s = SQLBackend.resume(self.chain_spec, 1024)
-        SQLBackend.live(self.chain_spec, 1024) 
-
-        self.assertEqual(len(s), 2)
-        self.assertEqual(s[0].target(), (666, 0))
-        self.assertEqual(s[0].get(), ((123, 2), 0))
-        self.assertEqual(s[1].target(), (1024, 0))
-        self.assertEqual(s[1].get(), ((666, 0), 0))
-
-
-    def test_backend_resume_filter(self):
-        s = SQLBackend.live(self.chain_spec, 42)
-        s.register_filter('foo')
-        s.register_filter('bar')
-        s.register_filter('baz')
-
-        s.set(43, 13)
-        s.begin_filter(0)
-        s.begin_filter(2)
-
-        s = SQLBackend.resume(self.chain_spec, 666)
-        (pair, flags) = s[0].get()
-
-        self.assertEqual(flags, 5)
-
-
-    def test_backend_sql_custom(self):
-        chain_spec = ChainSpec('evm', 'bloxberg', 8996, 'foo')
-        flags = 5
-        flags_target = 1023
-        flag_count = 10
-        backend = SQLBackend.custom(chain_spec, 666, 42, 2, flags, flag_count)
-        self.assertEqual(((42, 2), flags), backend.start())
-        self.assertEqual(((42, 2), flags), backend.get())
-        self.assertEqual((666, flags_target), backend.target())
-
-
-if __name__ == '__main__':
-    unittest.main()

tests/test_driver.py

@@ -0,0 +1,61 @@
+# standard imports
+import unittest
+import tempfile
+import shutil
+import logging
+import stat
+import os
+
+# local imports
+from chainsyncer.store.fs import SyncFsStore
+from chainsyncer.session import SyncSession
+from chainsyncer.error import (
+        LockError,
+        FilterDone,
+        IncompleteFilterError,
+        SyncDone,
+        )
+from chainsyncer.unittest import (
+        MockBlockGenerator,
+        MockFilter,
+        MockChainInterfaceConn,
+        MockTx,
+        MockBlock,
+        MockChainInterface,
+        MockFilterError,
+        )
+from chainsyncer.driver.chain_interface import ChainInterfaceDriver
+
+logging.basicConfig(level=logging.DEBUG)
+logg = logging.getLogger()
+
+
+class TestFilter(unittest.TestCase):
+
+    def setUp(self):
+        self.path = tempfile.mkdtemp()
+        self.store = SyncFsStore(self.path)
+        self.ifc = MockChainInterface()
+        self.conn = MockChainInterfaceConn(self.ifc)
+
+
+    def tearDown(self):
+        shutil.rmtree(self.path)
+
+
+    def test_driver(self):
+        generator = MockBlockGenerator()
+        generator.generate([1, 2], driver=self.conn)
+
+        drv = ChainInterfaceDriver(self.store, self.ifc, target=1)
+
+        fltr_one = MockFilter('foo')
+        self.store.register(fltr_one)
+        with self.assertRaises(SyncDone):
+            drv.run(self.conn)
+
+        self.assertEqual(len(fltr_one.contents), 3)
+
+
+if __name__ == '__main__':
+    unittest.main()

tests/test_file.py

@@ -1,121 +0,0 @@
-# standard imports
-import logging
-import uuid
-import os
-import unittest
-import shutil
-
-# external imports
-from chainlib.chain import ChainSpec
-
-# local imports
-from chainsyncer.backend.file import FileBackend
-
-logging.basicConfig(level=logging.DEBUG)
-logg = logging.getLogger().getChild(__name__)
-
-script_dir = os.path.dirname(__file__)
-tmp_test_dir = os.path.join(script_dir, 'testdata', 'tmp') 
-chainsyncer_test_dir = os.path.join(tmp_test_dir, 'chainsyncer')
-os.makedirs(tmp_test_dir, exist_ok=True)
-
-
-class TestFile(unittest.TestCase):
-
-    def setUp(self):
-        self.chain_spec = ChainSpec('foo', 'bar', 42, 'baz')
-        self.uu = FileBackend.create_object(self.chain_spec, None, base_dir=tmp_test_dir)
-        logg.debug('made uu {} for {}'.format(self.uu, self.chain_spec))
-
-        self.o = FileBackend(self.chain_spec, self.uu, base_dir=tmp_test_dir)
-
-
-    def tearDown(self):
-        self.o.purge()
-        shutil.rmtree(chainsyncer_test_dir)
-
-
-    @unittest.skip('foo')
-    def test_set(self):
-        self.o.set(42, 13)
-
-        o = FileBackend(self.chain_spec, self.o.object_id, base_dir=tmp_test_dir)
-
-        state = o.get()
-
-        self.assertEqual(state[0], 42)
-        self.assertEqual(state[1], 13)
-
-
-    @unittest.skip('foo')
-    def test_initial(self):
-        local_uu = FileBackend.initial(self.chain_spec, 1337, start_block_height=666, base_dir=tmp_test_dir)
-
-        o = FileBackend(self.chain_spec, local_uu, base_dir=tmp_test_dir)
-
-        (pair, filter_stats) = o.target()
-        self.assertEqual(pair[0], 1337)
-        self.assertEqual(pair[1], 0)
-
-        (pair, filter_stats) = o.start()
-        self.assertEqual(pair[0], 666)
-        self.assertEqual(pair[1], 0)
-
-
-    @unittest.skip('foo')
-    def test_resume(self):
-        for i in range(1, 10):
-            local_uu = FileBackend.initial(self.chain_spec, 666, start_block_height=i, base_dir=tmp_test_dir)
-
-        entries = FileBackend.resume(self.chain_spec, base_dir=tmp_test_dir)
-
-        self.assertEqual(len(entries), 10)
-
-        last = -1
-        for o in entries:
-            self.assertLess(last, o.block_height_offset)
-            last = o.block_height_offset
-
-
-    @unittest.skip('foo')
-    def test_first(self):
-        for i in range(1, 10):
-            local_uu = FileBackend.initial(self.chain_spec, 666, start_block_height=i, base_dir=tmp_test_dir)
-
-        first_entry = FileBackend.first(self.chain_spec, base_dir=tmp_test_dir)
-
-        self.assertEqual(first_entry.block_height_offset, 9)
-
-
-    def test_filter(self):
-    
-        self.assertEqual(len(self.o.filter), 1)
-
-        self.o.register_filter('foo')
-        self.o.register_filter('bar')
-
-        o = FileBackend(self.chain_spec, self.uu, base_dir=tmp_test_dir)
-
-        self.assertEqual(o.filter_count, 2)
-        self.assertEqual(o.filter_names, ['foo', 'bar'])
-        self.assertEqual(len(o.filter), 1)
-        
-        self.o.complete_filter(1)
-        self.assertEqual(self.o.filter, b'\x40')
-
-        self.o.complete_filter(0)
-        self.assertEqual(self.o.filter, b'\xc0')
-
-        o = FileBackend(self.chain_spec, self.uu, base_dir=tmp_test_dir)
-        self.assertEqual(o.filter, b'\xc0')
-
-
-        with self.assertRaises(IndexError):
-            self.o.complete_filter(2)
-
-        self.o.register_filter('baz')
-        self.o.complete_filter(2)
-
-
-if __name__ == '__main__':
-    unittest.main()

tests/test_filter.py

@@ -0,0 +1,78 @@
+# standard imports
+import unittest
+import tempfile
+import shutil
+import logging
+import stat
+import os
+
+# local imports
+from chainsyncer.store.fs import SyncFsStore
+from chainsyncer.session import SyncSession
+from chainsyncer.error import (
+        LockError,
+        FilterDone,
+        IncompleteFilterError,
+        )
+from chainsyncer.unittest import (
+        MockFilter,
+        MockConn,
+        MockTx,
+        MockBlock,
+        )
+
+logging.basicConfig(level=logging.DEBUG)
+logg = logging.getLogger()
+
+
+class TestFilter(unittest.TestCase):
+
+    def setUp(self):
+        self.path = tempfile.mkdtemp()
+        self.store = SyncFsStore(self.path)
+        self.session = SyncSession(self.store)
+        self.conn = MockConn()
+
+
+    def tearDown(self):
+        shutil.rmtree(self.path)
+
+
+    def test_filter_basic(self):
+        fltr_one = MockFilter('foo')
+        self.store.register(fltr_one)
+        fltr_two = MockFilter('bar')
+        self.store.register(fltr_two)
+
+        self.session.start()
+
+        tx_hash = os.urandom(32).hex()
+        tx = MockTx(42, tx_hash)
+        block = MockBlock(13, [tx_hash])
+        self.session.filter(self.conn, block, tx)
+        
+        self.assertEqual(len(fltr_one.contents), 1)
+        self.assertEqual(len(fltr_two.contents), 1)
+        
+
+
+    def test_filter_interrupt(self):
+        fltr_one = MockFilter('foo', brk=True)
+        self.store.register(fltr_one)
+        fltr_two = MockFilter('bar')
+        self.store.register(fltr_two)
+
+        self.session.start()
+
+        tx_hash = os.urandom(32).hex()
+        tx = MockTx(42, tx_hash)
+        block = MockBlock(13, [tx_hash])
+        self.session.filter(self.conn, block, tx)
+        
+        self.assertEqual(len(fltr_one.contents), 1)
+        self.assertEqual(len(fltr_two.contents), 0)
+
+
+if __name__ == '__main__':
+    unittest.main()
+

tests/test_helo.py

@@ -1,15 +0,0 @@
-# standard imports
-import unittest
-
-# local imports
-from tests.chainsyncer_base import TestBase
-
-
-class TestHelo(TestBase):
-
-    def test_helo(self):
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()

tests/test_interrupt.py

@@ -1,147 +0,0 @@
-# standard imports
-import logging
-import unittest
-import os
-import tempfile
-
-# external imports
-from chainlib.chain import ChainSpec
-
-# local imports
-from chainsyncer.backend.memory import MemBackend
-from chainsyncer.backend.sql import SQLBackend
-from chainsyncer.backend.file import (
-        FileBackend,
-        data_dir_for,
-    )
-from chainsyncer.error import LockError
-
-# test imports
-from tests.chainsyncer_base import TestBase
-from chainsyncer.unittest.base import (
-        MockBlock,
-        MockConn,
-        TestSyncer,
-        )
-
-logging.basicConfig(level=logging.DEBUG)
-logg = logging.getLogger()
-
-
-class NaughtyCountExceptionFilter:
-
-    def __init__(self, name, croak_on):
-        self.c = 0
-        self.croak = croak_on
-        self.name = name
-
-
-    def filter(self, conn, block, tx, db_session=None):
-        self.c += 1
-        if self.c == self.croak:
-            self.croak = -1
-            raise RuntimeError('foo')
-
-
-    def __str__(self):
-        return '{} {}'.format(self.__class__.__name__, self.name)
-
-
-class CountFilter:
-
-    def __init__(self, name):
-        self.c = 0
-        self.name = name
-
-
-    def filter(self, conn, block, tx, db_session=None):
-        self.c += 1
-
-
-    def __str__(self):
-        return '{} {}'.format(self.__class__.__name__, self.name)
-
-
-
-class TestInterrupt(TestBase):
-
-    def setUp(self):
-        super(TestInterrupt, self).setUp()
-        
-        self.backend = None
-        self.conn = MockConn()
-        self.vectors = [
-                [4, 3, 2],
-                [6, 4, 2],
-                [6, 5, 2],
-                [6, 4, 3],
-                ]
-        self.track_complete = True
-        
-
-    def assert_filter_interrupt(self, vector, chain_interface):
-    
-        logg.debug('running vector {} {}'.format(str(self.backend), vector))
-
-        z = 0
-        for v in vector:
-            z += v
-
-        syncer = TestSyncer(self.backend, chain_interface, vector)
-
-        filters =  [
-            CountFilter('foo'),
-            CountFilter('bar'),
-            NaughtyCountExceptionFilter('xyzzy', croak_on=3),
-            CountFilter('baz'),
-            ]
-
-        for fltr in filters:
-            syncer.add_filter(fltr)
-
-        try:
-            syncer.loop(0.1, self.conn)
-        except RuntimeError:
-            self.croaked = 2
-            logg.info('caught croak')
-            pass
-        (pair, fltr) = self.backend.get()
-        self.assertGreater(fltr, 0)
-
-        try:
-            syncer.loop(0.1, self.conn)
-        except LockError:
-            self.backend.complete_filter(2)
-            syncer.loop(0.1, self.conn)
-
-        for fltr in filters:
-            logg.debug('{} {}'.format(str(fltr), fltr.c))
-            self.assertEqual(fltr.c, z)
-
-
-    def test_filter_interrupt_memory(self):
-        self.track_complete = True
-        for vector in self.vectors:
-            self.backend = MemBackend.custom(self.chain_spec, target_block=len(vector))
-            self.assert_filter_interrupt(vector, self.interface)
-
-    #TODO: implement flag lock in file backend
-    @unittest.expectedFailure
-    def test_filter_interrupt_file(self):
-        #for vector in self.vectors:
-            vector = self.vectors.pop()
-            d = tempfile.mkdtemp()
-            #os.makedirs(data_dir_for(self.chain_spec, 'foo', d))
-            self.backend = FileBackend.initial(self.chain_spec, len(vector), base_dir=d) #'foo', base_dir=d)
-            self.assert_filter_interrupt(vector, self.interface)
-
-
-    def test_filter_interrupt_sql(self):
-        self.track_complete = True
-        for vector in self.vectors:
-            self.backend = SQLBackend.initial(self.chain_spec, len(vector))
-            self.assert_filter_interrupt(vector, self.interface)
-
-
-if __name__ == '__main__':
-    unittest.main()

tests/test_mem.py

@@ -1,32 +0,0 @@
-# standard imports
-import unittest
-import logging
-
-# external imports
-from chainlib.chain import ChainSpec
-
-# local imports
-from chainsyncer.backend.memory import MemBackend
-
-# testutil imports
-from tests.chainsyncer_base import TestBase
-
-logging.basicConfig(level=logging.DEBUG)
-
-
-class TestMem(TestBase):
-
-    def test_backend_mem_custom(self):
-        chain_spec = ChainSpec('evm', 'bloxberg', 8996, 'foo')
-        flags = int(5).to_bytes(2, 'big')
-        flag_count = 10
-        flags_target = (2 ** 10) - 1
-        backend = MemBackend.custom(chain_spec, 666, 42, 2, flags, flag_count, object_id='xyzzy')
-        self.assertEqual(((42, 2), flags), backend.start())
-        self.assertEqual(((42, 2), flags), backend.get())
-        self.assertEqual((666, flags_target), backend.target())
-        self.assertEqual(backend.object_id, 'xyzzy')
-
-
-if __name__ == '__main__':
-    unittest.main()

tests/test_session.py

@@ -0,0 +1,155 @@
+# standard imports
+import unittest
+import tempfile
+import shutil
+import logging
+import stat
+import os
+
+# local imports
+from chainsyncer.store.fs import SyncFsStore
+from chainsyncer.session import SyncSession
+from chainsyncer.error import (
+        LockError,
+        FilterDone,
+        IncompleteFilterError,
+        SyncDone,
+        )
+from chainsyncer.unittest import (
+        MockBlockGenerator,
+        MockFilter,
+        MockConn,
+        MockTx,
+        MockBlock,
+        MockDriver,
+        MockFilterError,
+        state_event_handler,
+        filter_state_event_handler,
+        )
+from chainsyncer.driver import SyncDriver
+
+logging.basicConfig(level=logging.STATETRACE)
+logg = logging.getLogger()
+
+
+class TestFilter(unittest.TestCase):
+
+    def setUp(self):
+        self.path = tempfile.mkdtemp()
+        self.store = SyncFsStore(self.path, state_event_callback=state_event_handler, filter_state_event_callback=filter_state_event_handler)
+        self.conn = MockConn()
+
+
+#    def tearDown(self):
+#        shutil.rmtree(self.path)
+
+
+    def test_filter_basic(self):
+        session = SyncSession(self.store)
+        session.start(target=1)
+        fltr_one = MockFilter('foo')
+        self.store.register(fltr_one)
+
+        tx_hash = os.urandom(32).hex()
+        tx = MockTx(42, tx_hash)
+        block = MockBlock(0, [tx_hash])
+        session.filter(self.conn, block, tx)
+ 
+        tx_hash = os.urandom(32).hex()
+        tx = MockTx(42, tx_hash)
+        block = MockBlock(1, [tx_hash])
+        session.filter(self.conn, block, tx)
+        self.assertEqual(len(fltr_one.contents), 2)
+
+
+    def test_driver(self):
+        drv = MockDriver(self.store, target=1)
+        generator = MockBlockGenerator()
+        generator.generate([1, 2], driver=drv)
+
+        fltr_one = MockFilter('foo')
+        self.store.register(fltr_one)
+        with self.assertRaises(SyncDone):
+            drv.run(self.conn)
+
+        self.assertEqual(len(fltr_one.contents), 3)
+
+
+    def test_driver_interrupt_noresume(self):
+        drv = MockDriver(self.store, target=1)
+        generator = MockBlockGenerator()
+        generator.generate([1], driver=drv)
+
+        fltr_one = MockFilter('foo')
+        self.store.register(fltr_one)
+        fltr_two = MockFilter('bar', brk_hard=1)
+        self.store.register(fltr_two)
+
+        with self.assertRaises(MockFilterError):
+            drv.run(self.conn)
+
+        self.assertEqual(len(fltr_one.contents), 1)
+        self.assertEqual(len(fltr_two.contents), 0)
+
+        store = SyncFsStore(self.path, state_event_callback=state_event_handler, filter_state_event_callback=filter_state_event_handler)
+        
+        fltr_one = MockFilter('foo') #, brk_hard=1)
+        store.register(fltr_one)
+        fltr_two = MockFilter('bar')
+        store.register(fltr_two)
+
+        with self.assertRaises(LockError):
+            drv = MockDriver(store, target=1)
+
+        self.assertEqual(len(fltr_one.contents), 0)
+        self.assertEqual(len(fltr_two.contents), 0)
+
+
+    def test_driver_interrupt_filter(self):
+        drv = MockDriver(self.store, target=1)
+        generator = MockBlockGenerator()
+        generator.generate([1, 1], driver=drv)
+
+        fltr_one = MockFilter('foo')
+        self.store.register(fltr_one)
+        fltr_two = MockFilter('bar', brk=1)
+        self.store.register(fltr_two)
+        fltr_three = MockFilter('baz')
+        self.store.register(fltr_three)
+
+        store = SyncFsStore(self.path, state_event_callback=state_event_handler, filter_state_event_callback=filter_state_event_handler)
+
+        with self.assertRaises(SyncDone):
+            drv.run(self.conn)
+
+        self.assertEqual(len(fltr_one.contents), 2)
+        self.assertEqual(len(fltr_two.contents), 2)
+        self.assertEqual(len(fltr_three.contents), 1)
+
+
+    def test_driver_interrupt_sync(self):
+        drv = MockDriver(self.store, interrupt_block=1, target=2)
+        generator = MockBlockGenerator()
+        generator.generate([3, 1, 2], driver=drv)
+
+        fltr_one = MockFilter('foo')
+        self.store.register(fltr_one)
+
+        drv.run(self.conn, interval=0.1)
+
+        self.assertEqual(len(fltr_one.contents), 3)
+
+        store = SyncFsStore(self.path, state_event_callback=state_event_handler, filter_state_event_callback=filter_state_event_handler)
+        store.register(fltr_one)
+        drv = MockDriver(store)
+        generator.apply(drv, offset=1)
+
+        with self.assertRaises(SyncDone) as e:
+            drv.run(self.conn, interval=0.1)
+            self.assertEqual(e, 2)
+
+        self.assertEqual(len(fltr_one.contents), 6)
+
+
+if __name__ == '__main__':
+    unittest.main()

tests/test_thread.py

@@ -1,12 +0,0 @@
-# standard imports
-import logging
-import unittest
-
-# test imports
-from tests.chainsyncer_base import TestBase
-
-
-class TestThreadRange(TestBase):
-
-    def test_hello(self):
-        ThreadPoolRangeHistorySyncer(None, 3)

tests/test_thread_range.py

@@ -1,114 +0,0 @@
-# standard imports
-import unittest
-import logging
-
-# external imports
-from chainlib.chain import ChainSpec
-from chainlib.eth.unittest.ethtester import EthTesterCase
-from chainlib.eth.nonce import RPCNonceOracle
-from chainlib.eth.gas import (
-        RPCGasOracle,
-        Gas,
-        )
-from chainlib.eth.unittest.base import TestRPCConnection
-
-# local imports
-from chainsyncer.backend.memory import MemBackend
-from chainsyncer.driver.threadrange import (
-        sync_split,
-        ThreadPoolRangeHistorySyncer,
-        )
-from chainsyncer.unittest.base import MockConn
-from chainsyncer.unittest.db import ChainSyncerDb
-
-# testutil imports
-from tests.chainsyncer_base import (
-        EthChainInterface,
-        )
-
-logging.basicConfig(level=logging.DEBUG)
-logg = logging.getLogger()
-
-
-class SyncerCounter:
-
-    def __init__(self):
-        self.hits = []
-
-
-    def filter(self, conn, block, tx, db_session=None):
-        logg.debug('fltr {} {}'.format(block, tx))
-        self.hits.append((block, tx))
-       
-
-class TestBaseEth(EthTesterCase):
-
-    interface = EthChainInterface()
-
-    def setUp(self):
-        super(TestBaseEth, self).setUp()
-        self.db = ChainSyncerDb()
-        self.session = self.db.bind_session()
-
-    def tearDown(self):
-        self.session.commit()
-        self.db.release_session(self.session)
-        #os.unlink(self.db_path)
-
-
-class TestThreadRange(TestBaseEth):
-
-    interface = EthChainInterface()
-
-    def test_range_split_even(self):
-        ranges = sync_split(5, 20, 3)
-        self.assertEqual(len(ranges), 3)
-        self.assertEqual(ranges[0], (5, 9))
-        self.assertEqual(ranges[1], (10, 14))
-        self.assertEqual(ranges[2], (15, 19))
-
-
-    def test_range_split_underflow(self):
-        ranges = sync_split(5, 8, 4)
-        self.assertEqual(len(ranges), 3)
-        self.assertEqual(ranges[0], (5, 5))
-        self.assertEqual(ranges[1], (6, 6))
-        self.assertEqual(ranges[2], (7, 7))
-
-
-    def test_range_syncer_hello(self):
-        #chain_spec = ChainSpec('evm', 'bloxberg', 8996, 'foo')
-        chain_spec = ChainSpec('evm', 'foochain', 42)
-        backend = MemBackend.custom(chain_spec, 20, 5, 3, 5, 10)
-        #syncer = ThreadPoolRangeHistorySyncer(MockConn, 3, backend, self.interface)
-        syncer = ThreadPoolRangeHistorySyncer(3, backend, self.interface)
-        syncer.loop(0.1, None)
-
-
-    def test_range_syncer_content(self):
-        nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
-        gas_oracle = RPCGasOracle(self.rpc)
-
-        self.backend.mine_blocks(10)
-
-        c = Gas(signer=self.signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle, chain_spec=self.chain_spec)
-        (tx_hash, o) = c.create(self.accounts[0], self.accounts[1], 1024) 
-        r = self.rpc.do(o)
-
-        self.backend.mine_blocks(3)
-
-        c = Gas(signer=self.signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle, chain_spec=self.chain_spec)
-        (tx_hash, o) = c.create(self.accounts[0], self.accounts[1], 2048) 
-        r = self.rpc.do(o)
-
-        self.backend.mine_blocks(10)
-
-        backend = MemBackend.custom(self.chain_spec, 20, 5, 3, 5, 10)
-        syncer = ThreadPoolRangeHistorySyncer(3, backend, self.interface)
-        fltr = SyncerCounter()
-        syncer.add_filter(fltr)
-        syncer.loop(0.1, None)
-
-
-if __name__ == '__main__':
-    unittest.main()