diff --git a/wudder/__init__.py b/wudder/__init__.py index 81343f1..a945f73 100644 --- a/wudder/__init__.py +++ b/wudder/__init__.py @@ -3,4 +3,4 @@ from .wudder import * -__version__ = '3.2110.0' +__version__ = '3.2111.0' diff --git a/wudder/client.py b/wudder/client.py index a4d807f..47d7c69 100644 --- a/wudder/client.py +++ b/wudder/client.py @@ -4,7 +4,7 @@ from .utils import retry from . import exceptions from . import utils -from .event import Event, Fragment +from .event import Event from easygraphql import GraphQL from threading import Thread import time diff --git a/wudder/utils.py b/wudder/utils.py index d4d6dda..6ca00b6 100644 --- a/wudder/utils.py +++ b/wudder/utils.py @@ -113,7 +113,7 @@ def check_proof(compound_proof: str = None, if blocktree_proof is None: block_proof_result['verified_hash'] = \ - tree_proof[1:graphn.HASH_LENGTH + 1] + tree_proof[1:graphn.HASH_LENGTH + 1] return block_proof_result # Are proofs linked? (2/2) @@ -206,7 +206,8 @@ def get_event_tx(event: Event) -> dict: tx = { 'cthash': cthash(event.dict), 'version': graphn.PROTOCOL_VERSION, - 'from': [event.trace] + 'from': [event.trace], + 'timestamp': event.timestamp, } if event.type == EventTypes.TRACE: diff --git a/wudder/wudder.py b/wudder/wudder.py index 007b3e4..b17afdd 100644 --- a/wudder/wudder.py +++ b/wudder/wudder.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- from . import utils -from . import graphn from .event import Event, Fragment, EventTypes from .client import WudderClient from digsig import PrivateKey, EcdsaPrivateKey, EcdsaFormats, EcdsaModes @@ -74,7 +73,8 @@ def send( full_signature=True, sighash_signature=False, ) -> str: - event_type = EventTypes.TRACE if trace is None else EventTypes.ADD_EVENT + event_type = (EventTypes.TRACE if trace is None + else EventTypes.ADD_EVENT) fragments = [Fragment(**fragment) for fragment in fragments] event = Event(fragments=fragments, trace=trace, event_type=event_type) if direct: @@ -90,15 +90,21 @@ def send_many( ) -> str: processed_events = [] for event_bundle in event_bundles: - event_bundle['trace'] = event_bundle['trace'] if 'trace' in event_bundle else None - event_bundle['type'] = EventTypes.TRACE if event_bundle['trace'] is None else EventTypes.ADD_EVENT + event_bundle['trace'] \ + = event_bundle['trace'] if 'trace' in event_bundle else None + event_bundle['type'] \ + = (EventTypes.TRACE if event_bundle['trace'] is None + else EventTypes.ADD_EVENT) event = Event(event_dict=event_bundle) processed_events.append({ 'event': event, 'title': event_bundle['title'] }) - return self._send_many_events(processed_events, full_signature, - sighash_signature) + return self._send_many_events( + processed_events, + full_signature, + sighash_signature + ) def corroborate(self, trace: str, direct=False): raise NotImplementedError @@ -214,7 +220,7 @@ def _send_event( def _send_many_events( self, - processed_events: List[Event], + processed_events: List[Dict], full_signature: bool, sighash_signature: bool, ) -> List[str]: