Latest from master + price fix

.bowerrc

@@ -1 +1 @@
-{ "directory": "www/bower_components" }
+{ "directory": "www/bower_components","registry": "https://registry.bower.io" }

api/armory_service.py

@@ -2,32 +2,33 @@
 import os, sys, re, random,pybitcointools, bitcoinrpc, math, hashlib
 from decimal import Decimal
 from flask import Flask, request, jsonify, abort, json, make_response
-from msc_apps import *
-tools_dir = os.environ.get('TOOLSDIR')
-lib_path = os.path.abspath(tools_dir)
-sys.path.append(lib_path)
-data_dir_root = os.environ.get('DATADIR')
+#from msc_apps import *
+from rpcclient import *
+#tools_dir = os.environ.get('TOOLSDIR')
+#lib_path = os.path.abspath(tools_dir)
+#sys.path.append(lib_path)
+#data_dir_root = os.environ.get('DATADIR')
 
-sys.path.append("/usr/lib/armory/")
+#sys.path.append("/usr/lib/armory/")
+sys.path.append("/usr/local/lib/armory/")
 from armoryengine.ALL import *
 
 app = Flask(__name__)
 app.debug = True
-conn = getRPCconn()
 
 @app.route('/getunsigned', methods=['POST'])
 def generate_unsigned():
     unsigned_hex = request.form['unsigned_hex']
     pubkey = request.form['pubkey']
-    ripemd160 = hashlib.new('ripemd160')
-    ripemd160.update(hashlib.sha256(hex_to_binary(pubkey)).digest())
-    pubKeyHash = binary_to_hex(ripemd160.digest())
+    #ripemd160 = hashlib.new('ripemd160')
+    #ripemd160.update(hashlib.sha256(hex_to_binary(pubkey)).digest())
+    #pubKeyHash = binary_to_hex(ripemd160.digest())
     try:
         tnet_ = request.form['testnet']
     except KeyError, e:
         tnet_ = 0
     #Translate raw txn
-    decoded_tx = conn.decoderawtransaction(unsigned_hex)
+    decoded_tx = decoderawtransaction(unsigned_hex)['result']
     #spending_txid= decoded_tx['vin'][0]['txid']
     #spending_tx_raw = conn.getrawtransaction(spending_txid, False)
     #spending_tx_decoded = conn.decoderawtransaction(spending_tx_raw)
@@ -44,14 +45,15 @@ def generate_unsigned():
     i_k = []
     for intx in decoded_tx['vin']:
       spending_txid= intx['txid']
-      spending_tx_raw = conn.getrawtransaction(spending_txid, False)
-      spending_tx_decoded = conn.decoderawtransaction(spending_tx_raw)
-      i_vout = -1
-      for each in spending_tx_decoded['vout']:
-        info=each['scriptPubKey']['asm'].split(' ')
-        print "\nArmoryService: Searching for pubKey:", pubKeyHash, "| ASM Info:",info
-        if len(info) > 3 and info[0] != "OP_RETURN" and info[2] == pubKeyHash:
-          i_vout = each['n']
+      i_vout = intx['vout']
+      spending_tx_raw = getrawtransaction(spending_txid)['result']['hex']
+      #spending_tx_decoded = decoderawtransaction(spending_tx_raw)['result']
+      #i_vout = -1
+      #for each in spending_tx_decoded['vout']:
+      #  info=each['scriptPubKey']['asm'].split(' ')
+      #  print "\nArmoryService: Searching for pubKey:", pubKeyHash, "| ASM Info:",info
+      #  if len(info) > 3 and info[0] != "OP_RETURN" and info[2] == pubKeyHash:
+      #    i_vout = each['n']
 
       i_k.append ({'contribid': '',
                       'contriblabel': '',
@@ -73,7 +75,7 @@ def generate_unsigned():
                        'magicbytes': tnet,
                        'p2shscript': '',
                        'txoutscript': o['scriptPubKey']['hex'],
-                       'txoutvalue': int( o['value'] * Decimal(1e8) ),
+                       'txoutvalue': int( Decimal(o['value']) * Decimal(1e8) ),
                        'version': 1,
                        'wltlocator': ''}) 
 

api/balancehelper.py

@@ -29,12 +29,10 @@ def get_balancedata(address):
                              atx.propertyid) s2
                         on s1.propertyid=s2.propertyid) f1
                      inner join smartproperties sp
-                     on f1.propertyid=sp.propertyid and (sp.protocol='Omni' or sp.protocol='Mastercoin' or sp.protocol='Bitcoin')
+                     on f1.propertyid=sp.propertyid and (sp.protocol='Omni' or sp.protocol='Bitcoin')
                      order by f1.propertyid""",(addr,addr))
 
     balance_data = { 'balance': [] }
-    #out, err = run_command(TIMEOUT+ 'sx balance -j ' + addr )
-    #out, err = run_command(TIMEOUT+"curl -s http://btc.blockr.io/api/v1/address/balance/"+addr)
     ret = bc_getbalance(addr)
     out = ret['bal']
     err = ret['error']
@@ -47,21 +45,22 @@ def get_balancedata(address):
         res['pendingpos'] = str(long(balrow[3]))
         res['pendingneg'] = str(long(balrow[4]))
         if cID == '0':
-          #get btc balance from sx
+          #get btc balance from bc api's
           if err != None or out == '':
-            btc_balance[ 'value' ] = str(long(-555))
+            #btc_balance[ 'value' ] = str(long(-555))
+            btc_balance[ 'value' ] = str(long(0))
+            btc_balance[ 'error' ] = True
           else:
             try:
-              if balrow[4] < 0:
-                #res['value'] = str(long( json.loads( out )[0][ 'paid' ]) + str(long(balrow[4]))
-                #res['value'] = str(long( json.loads( out )['data']['balance']*1e8) + str(long(balrow[4]))
-                res['value'] = str(long( out ) + long(balrow[4]))
-              else:
-                #res['value'] = str(long( json.loads( out )[0][ 'paid' ]))
-                #res['value'] = str(long( json.loads( out )['data']['balance']*1e8))
-                res['value'] = str(long( out ))
+              #if balrow[4] < 0:
+              #  res['value'] = str(long( out ) + long(balrow[4]))
+              #else:
+              #unconfirmed btc already handled in api response
+              res['value'] = str(long( out ))
             except ValueError:
-              btc_balance[ 'value' ] = str(long(-555))
+              #btc_balance[ 'value' ] = str(long(-555))
+              btc_balance[ 'value' ] = str(long(0))
+              btc_balance[ 'error' ] = True
         else:
           #get regular balance from db
           if balrow[4] < 0:
@@ -80,16 +79,20 @@ def get_balancedata(address):
         addbtc=False
 
     if addbtc:
-      btc_balance = { 'symbol': 'BTC', 'divisible': True, 'id' : 0 }
+      btc_balance = { 'symbol': 'BTC', 'divisible': True, 'id' : 0, 'error' : False }
       if err != None or out == '':
-        btc_balance[ 'value' ] = str(long(-555))
+        #btc_balance[ 'value' ] = str(long(-555))
+        btc_balance[ 'value' ] = str(long(0))
+        btc_balance[ 'error' ] = True
       else:
         try:
           #btc_balance[ 'value' ] = str(long( json.loads( out )[0][ 'paid' ]))
           #btc_balance[ 'value' ] = str(long( json.loads( out )['data']['balance']*1e8 ))
           btc_balance[ 'value' ] = str(long( out ))
         except ValueError:
-          btc_balance[ 'value' ] = str(long(-555))
+          #btc_balance[ 'value' ] = str(long(-555))
+          btc_balance[ 'value' ] = str(long(0))
+          btc_balance[ 'error' ] = True
       btc_balance['pendingpos'] = str(long(0))
       btc_balance['pendingneg'] = str(long(0))
       balance_data['balance'].append(btc_balance)
@@ -99,15 +102,7 @@ def get_balancedata(address):
 
 
 def get_bulkbalancedata(addresses):
-    list=""
-    for a in addresses:
-      if list == "":
-        list = a
-      else:
-        list += ","+a
-
-    baldata=bc_getbulkbalance(list)
-    btclist = baldata['bal']
+    btclist=bc_getbulkbalance(addresses)
 
     retval = {}
 
@@ -138,16 +133,18 @@ def get_bulkbalancedata(addresses):
                              atx.propertyid) s2
                         on s1.propertyid=s2.propertyid) f1
                      inner join smartproperties sp
-                     on f1.propertyid=sp.propertyid and (sp.protocol='Omni' or sp.protocol='Mastercoin' or sp.protocol='Bitcoin')
+                     on f1.propertyid=sp.propertyid and (sp.protocol='Omni' or sp.protocol='Bitcoin')
                      order by f1.propertyid""",(addr,addr))
 
       balance_data = { 'balance': [] }
-      #out, err = run_command(TIMEOUT+ 'sx balance -j ' + addr )
-      #out, err = run_command(TIMEOUT+"curl -s http://btc.blockr.io/api/v1/address/balance/"+addr)
-      if address in btclist:
-        out = btclist[address]
-        err = None
-      else:
+      try:
+        if address in btclist:
+          out = btclist[address]
+          err = None
+        else:
+          out = ''
+          err = "Missing"
+      except TypeError:
         out = ''
         err = "Missing"
 
@@ -160,19 +157,22 @@ def get_bulkbalancedata(addresses):
         res['pendingpos'] = str(long(balrow[3]))
         res['pendingneg'] = str(long(balrow[4]))
         if cID == '0':
-          #get btc balance from sx
+          #get btc balance from bc api's
           if err != None or out == '':
-            btc_balance[ 'value' ] = str(long(-555))
+            #btc_balance[ 'value' ] = str(long(-555))
+            btc_balance[ 'value' ] = str(long(0))
+            btc_balance[ 'error' ] = True
           else:
             try:
-              if balrow[4] < 0:
-                #res['value'] = str(long( json.loads( out )[0][ 'paid' ]) + str(long(balrow[4]))
-                res['value'] = str(long( out ) + long(balrow[4]))
-              else:
-                #res['value'] = str(long( json.loads( out )[0][ 'paid' ]))
-                res['value'] = str(long( out ))
+              #if balrow[4] < 0:
+              #  res['value'] = str(long( out ) + long(balrow[4]))
+              #else:
+              #unconfirmed btc already handled in api response
+              res['value'] = str(long( out ))
             except ValueError:
-              btc_balance[ 'value' ] = str(long(-555))
+              #btc_balance[ 'value' ] = str(long(-555))
+              btc_balance[ 'value' ] = str(long(0))
+              btc_balance[ 'error' ] = True
         else:
           #get regular balance from db
           if balrow[4] < 0:
@@ -191,15 +191,19 @@ def get_bulkbalancedata(addresses):
           addbtc=False
 
       if addbtc:
-        btc_balance = { 'symbol': 'BTC', 'divisible': True, 'id' : 0 }
+        btc_balance = { 'symbol': 'BTC', 'divisible': True, 'id' : 0 ,'error' : False}
         if err != None or out == '':
-          btc_balance[ 'value' ] = str(long(-555))
+          #btc_balance[ 'value' ] = str(long(-555))
+          btc_balance[ 'value' ] = str(long(0))
+          btc_balance[ 'error' ] = True
         else:
           try:
             #btc_balance[ 'value' ] = str(long( json.loads( out )[0][ 'paid' ]))
             btc_balance[ 'value' ] = str(long(  out ))
           except ValueError:
-            btc_balance[ 'value' ] = str(long(-555))
+            #btc_balance[ 'value' ] = str(long(-555))
+            btc_balance[ 'value' ] = str(long(0))
+            btc_balance[ 'error' ] = True
         btc_balance['pendingpos'] = str(long(0))
         btc_balance['pendingneg'] = str(long(0))
         balance_data['balance'].append(btc_balance)