update all_tx_from_blocks for RC

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)
+