diff --git a/__pycache__/__init__.cpython-37.pyc b/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..8db4a969fd3ea01599d3d31adc68d2e14b673022 Binary files /dev/null and b/__pycache__/__init__.cpython-37.pyc differ diff --git a/__pycache__/cellframenet.cpython-37.pyc b/__pycache__/cellframenet.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..bdb4cc7f84da573e2cf145c16a64fec006fff8ee Binary files /dev/null and b/__pycache__/cellframenet.cpython-37.pyc differ diff --git a/__pycache__/contract.cpython-37.pyc b/__pycache__/contract.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b5ae506b9ef65332e9d046b0399066b2b8378602 Binary files /dev/null and b/__pycache__/contract.cpython-37.pyc differ diff --git a/__pycache__/helpers.cpython-37.pyc b/__pycache__/helpers.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..db096034f51049524f9353c66adab1f8ceaf1266 Binary files /dev/null and b/__pycache__/helpers.cpython-37.pyc differ diff --git a/cellframenet.py b/cellframenet.py index 68ad4f73e018f36c9f7077453c7e282ce15c2969..b228048f35756c8197582e2eb4bfefc3a9e7ded5 100644 --- a/cellframenet.py +++ b/cellframenet.py @@ -10,9 +10,9 @@ from DAP.Crypto import HashFast from DAP.Core import logIt from datetime import datetime import hashlib - +import sys import json -from cfhelpers.helpers import json_dump, find_tx_out +from pycfhelpers.helpers import json_dump, find_tx_out class TSD: TYPE_UNKNOWN = 0x0000 @@ -208,8 +208,8 @@ class CellframeNetwork: for atom in atoms: - event = DAG.fromAtom(atom[0], atom[1]) - + #event = DAG.fromAtom(atom[0], atom[1]) + event = DAG.fromAtom(atom) if not event.datum.isDatumTokenEmission(): continue @@ -407,25 +407,25 @@ class CellframeNetwork: return txs, legder def all_tx_from_blocks(self): - - iterator = self.main.createAtomItem(False) + #logIt.error("DIR MAIN {}!".format(dir(self.main))) + iterator = self.main.createAtomIter(False) ptr = self.main.atomIterGetFirst(iterator) if not ptr: logIt.error("Can't iterate over blocks in {}!".format(self.name)) return [] - + logIt.notice("ptr = {}" .format(ptr)) aptr, size = ptr #iterate over blocks: atom-pointer should not be none, and size shoud be >0 - while aptr: + while ptr: - if size <= 0: #skip such blocks - aptr, size = self.main.atomIterGetNext(iter) + if size <= 0: + aptr, size = self.main.atomIterGetNext(iterator) continue - block = Block.fromAtom(aptr, size) - + block = Block.fromAtom(aptr) + if not block.datums: aptr, size = self.main.atomIterGetNext(iterator) continue @@ -437,3 +437,4 @@ class CellframeNetwork: continue aptr, size = self.main.atomIterGetNext(iterator) +