Smart Property support

README.md

@@ -5,6 +5,7 @@ mastercoin-tools
 * Package of mastercoin related tools.
 * The intention is to help finalizing the mastercoin spec, and enable easy further coding.
 
+For API documentation, please [Read The Docs](http://mastercoin-tools-installer.readthedocs.org/en/latest/).
 
 ## Based on what? ##
 * The code uses the package sx, which is libbitcoin based.

msc_bootstrap.py

@@ -16,17 +16,11 @@
 import sys
 import operator
 import time
-from msc_utils_bitcoin import *
+from msc_utils_parsing import *
 
 def main():
-
     msc_globals.init()
 
-    # full story format or just csv
-    output_format='csv'
-    if len(sys.argv) > 1:
-        if sys.argv[1]=='story':
-            output_format='story' # a.k.a long format
     # get all tx of exodus address
     history=get_history(exodus_address)
     # sort
@@ -47,20 +41,19 @@ def main():
             if block_timestamp == None:
                 error('failed to get timestamp: '+err)
             try:
-            	tx_sec_before_deadline=exodus_bootstrap_deadline-block_timestamp
+                tx_sec_before_deadline=exodus_bootstrap_orig_deadline-block_timestamp
             except TypeError:
-            	error('bad block timestamp')
+                error('bad block timestamp')
             # bonus is 10% for a week
             bonus=max((tx_sec_before_deadline+0.0)/(3600*24*7*10.0)*100,0)
             dacoins=str('{:.0f}'.format(int(value)*(100+bonus)))
             json_tx=get_tx(tx_hash)
             # give dacoins to highest contributing address.
             output_dict={} # dict to collect outputs per address
             for i in json_tx['inputs']:
-                prev_tx_hash=i['previous_output'].split(':')[0]
-                prev_tx_output_index=i['previous_output'].split(':')[1]
-                json_prev_tx=get_tx(prev_tx_hash)
-                output_value=json_prev_tx['outputs'][int(prev_tx_output_index)]['value']
+                output_value=get_value_from_output(i['previous_output'])
+                if output_value==None:
+                    error('failed get_value_from_output')                
                 if output_dict.has_key(i['address']):
                     output_dict[i['address']]+=output_value
                 else:
@@ -76,17 +69,10 @@ def main():
             parsed['invalid']=False
             parsed['tx_time']=str(block_timestamp)+'000'
             try:
-            	filename='tx/'+parsed['tx_hash']+'.json'
-                try:
-                    f=open(filename, 'w')
-                    f.write('[')
-                    json.dump(parsed, f)
-                    f.write(']\n')
-                    f.close()
-                except OSError:
-                    info("dump to file error for "+tx_hash)
+                filename='tx/'+parsed['tx_hash']+'.json'
+                atomic_json_dump(parsed, filename)
             except IndexError:
-            	info("cannot parse 'tx_hash' in "+tx_hash)
+                info("cannot parse 'tx_hash' in "+tx_hash)
 
 
 if __name__ == "__main__":

msc_globals.py

@@ -11,7 +11,9 @@
 # globals.py
 
 def init():
+    global s # silent mode
     global last_block
     global d # debug mode
     last_block=0
     d=False
+    s=False

msc_parse.py

@@ -22,7 +22,7 @@ def parse():
     ######################################
     # reading and setting options values #
     ######################################
-
+    info('Initializing globals...')
     msc_globals.init()
 
     parser = OptionParser("usage: %prog [options]")
@@ -40,13 +40,15 @@ def parse():
     (options, args) = parser.parse_args()
     msc_globals.d=options.debug_mode
     single_tx=options.single_tx
+    archive=options.archive
     requested_block_height=options.starting_block_height
 
     # show debug on
     if msc_globals.d:
         debug('debug is on')
 
     # don't bother parsing if no new block was generated since last validation
+    info('Determining last validated block...')
     last_validated_block=0
     try:
         f=open(LAST_VALIDATED_BLOCK_NUMBER_FILE,'r')
@@ -91,18 +93,18 @@ def parse():
 
     # to catch chain reorgs, check 5 blocks back
     starting_block_height = int(starting_block_height) - 5
-
-    archive=options.archive
-
     info('starting parsing at block '+str(starting_block_height))
 
     if single_tx == None:
+        info('Retreiving history and sorting data...')
         # get all tx of exodus address
         history=get_history(exodus_address)
         history.sort(key=output_height)
+        # Oddly enough this next print statement corrects the parsing-behind bug
+        print "Last 5 transactions of Exodus", history[-5:]
     else:
         # build fake history of length 1 (debug purposes)
-        json_tx=get_json_tx(get_raw_tx(single_tx))
+        json_tx=get_tx(single_tx)
         marker_number=-1
         marker_value=-1
         i=0
@@ -129,6 +131,8 @@ def parse():
 
     # go over transaction from all history of 1EXoDus address
     last_block=0
+
+    info('Parsing transactions...')
     for tx_dict in history:
         value=tx_dict['value']
         if starting_block_height != None:
@@ -158,10 +162,6 @@ def parse():
         outputs_list=json_tx['outputs']
         (outputs_list_no_exodus, outputs_to_exodus, different_outputs_values, invalid)=examine_outputs(outputs_list, tx_hash, raw_tx)
 
-        if invalid != None:
-            info(str(invalid[1])+' on '+tx_hash)
-            parsed['invalid']=invalid
-
         num_of_outputs=len(outputs_list)
 
         (block_timestamp, err)=get_block_timestamp(int(block))
@@ -184,7 +184,11 @@ def parse():
                 parsed['block']=str(block)
                 parsed['index']=str(index)
                 if not parsed.has_key('invalid'):
-                    parsed['invalid']=False
+                    if invalid != None:
+                        info(str(invalid[1])+' on '+tx_hash)
+                        parsed['invalid']=invalid
+                    else:
+                        parsed['invalid']=False
                 parsed['tx_time']=str(block_timestamp)+'000'
                 debug(str(parsed))
                 filename='tx/'+parsed['tx_hash']+'.json'
@@ -196,15 +200,12 @@ def parse():
                     try:
                         orig_json=json.load(f)[0]
                     except (KeyError, ValueError):
-                        try:
-                            orig_json=json.load(f)
-                        except ValueError:
-                            error('failed loading json from '+filename)
+                        error('failed loading json from '+filename)
                     f.close()
                     # verify bootstrap block
                     if orig_json.has_key('block'):
                         orig_block=orig_json['block']
-                        debug('found this tx already on (previous) block '+orig_block)
+                        debug('found this tx already on (previous) block '+str(orig_block))
                         if int(orig_block)>last_exodus_bootstrap_block:
                             debug('but it is post exodus - ignoring')
                             orig_json=None
@@ -213,12 +214,9 @@ def parse():
                 except IOError:
                      pass
                 if orig_json != None: # it was an exodus tx
-                    if len(orig_json)==1:
-                        new_json=[orig_json[0],parsed]
-                        atomic_json_dump(new_json, filename, add_brackets=False)
-                        info('basic tx was also exodus on '+tx_hash)
-                    else:
-                        info('basic tx is already present on exodus on '+tx_hash)
+                    new_json=[orig_json,parsed]
+                    atomic_json_dump(new_json, filename, add_brackets=False)
+                    info('basic tx was also exodus on '+tx_hash)
                 else:
                     atomic_json_dump(parsed, filename)
             else: # num_of_outputs <= 2 and not multisig
@@ -243,7 +241,11 @@ def parse():
                 parsed['block']=str(block)
                 parsed['index']=str(index)
                 if not parsed.has_key('invalid'):
-                    parsed['invalid']=False
+                    if invalid != None:
+                        info(str(invalid[1])+' on '+tx_hash)
+                        parsed['invalid']=invalid
+                    else:
+                        parsed['invalid']=False
                 parsed['tx_time']=str(block_timestamp)+'000'
                 debug(str(parsed))
                 filename='tx/'+parsed['tx_hash']+'.json'
@@ -258,7 +260,11 @@ def parse():
                     parsed['block']=str(block)
                     parsed['index']=str(index)
                     if not parsed.has_key('invalid'):
-                        parsed['invalid']=False
+                        if invalid != None:
+                            info(str(invalid[1])+' on '+tx_hash)
+                            parsed['invalid']=invalid
+                        else:
+                            parsed['invalid']=False
                     parsed['tx_time']=str(block_timestamp)+'000'
                     debug(str(parsed))
                     filename='tx/'+parsed['tx_hash']+'.json'
@@ -270,7 +276,8 @@ def parse():
         if single_tx == None and block != None:
             msc_globals.last_block=block
 
-    rev=get_revision_dict( last_block, options.repository_path )
+    info('Finished, dumping last_block and revision.json...')
+    rev=get_revision_dict(last_block, options.repository_path)
     atomic_json_dump(rev, 'www/revision.json', add_brackets=False)
 
     if archive: