Skip to content

Commit

Permalink
Merge pull request #1196 from achamely/master
Browse files Browse the repository at this point in the history 
PendingTX support
  • Loading branch information
@achamely
achamely committed Jan 16, 2015
2 parents aeee7d4 + 5cd1c7b commit d832343
Show file tree
Hide file tree
Showing 20 changed files with 838 additions and 334 deletions.
20 changes: 10 additions & 10 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ module.exports = function(grunt) {
directory: 'www/bower_components/bitcoinjs-lib'
}
},
"crypto-js": {
"crypto-js": {
options: {
repository: "https://github.com/scintill/crypto-js.git",
branch: 'master',
directory: 'www/bower_components/bitcoinjs-lib/src/crypto-js'
}
}
}
},
shell: {
html: {
Expand Down Expand Up @@ -59,14 +59,14 @@ module.exports = function(grunt) {
},
command: 'npm install ; npm run minify'
},
"omni-websocket": {
options: {
execOptions: {
cwd: "api/websocket"
}
},
command: 'npm install'
},
"omni-websocket": {
options: {
execOptions: {
cwd: "api/websocket"
}
},
command: 'npm install'
},
cryptolib: {
options: {
stdout: true,
Expand Down
86 changes: 86 additions & 0 deletions api/balancehelper.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
import json
from msc_apps import *

def get_balancedata(address):
addr = re.sub(r'\W+', '', address) #check alphanumeric
ROWS=dbSelect("""select
f1.propertyid, sp.propertytype, f1.balanceavailable, f1.pendingpos, f1.pendingneg
from
(select
COALESCE(s1.propertyid,s2.propertyid) as propertyid, COALESCE(s1.balanceavailable,0) as balanceavailable,
COALESCE(s2.pendingpos,0) as pendingpos,COALESCE(s2.pendingneg,0) as pendingneg
from
(select propertyid,balanceavailable
from addressbalances
where address=%s) s1
full join
(SELECT atx.propertyid,
sum(CASE WHEN atx.balanceavailablecreditdebit > 0 THEN atx.balanceavailablecreditdebit ELSE 0 END) AS pendingpos,
sum(CASE WHEN atx.balanceavailablecreditdebit < 0 THEN atx.balanceavailablecreditdebit ELSE 0 END) AS pendingneg
from
addressesintxs atx, transactions tx
where
atx.txdbserialnum=tx.txdbserialnum
and tx.txstate='pending'
and tx.txdbserialnum<-1
and atx.address=%s
group by
atx.propertyid) s2
on s1.propertyid=s2.propertyid) f1
inner join smartproperties sp
on f1.propertyid=sp.propertyid and (sp.protocol='Mastercoin' or sp.protocol='Bitcoin')
order by f1.propertyid""",(addr,addr))

balance_data = { 'balance': [] }
out, err = run_command(TIMEOUT+ 'sx balance -j ' + addr )
for balrow in ROWS:
cID = str(int(balrow[0])) #currency id
sym_t = ('BTC' if cID == '0' else ('MSC' if cID == '1' else ('TMSC' if cID == '2' else 'SP' + cID) ) ) #symbol template
#1 = new indivisible property, 2=new divisible property (per spec)
divi = True if int(balrow[1]) == 2 else False
res = { 'symbol' : sym_t, 'divisible' : divi, 'id' : cID }
res['pendingpos'] = ('%.8f' % float(balrow[3])).rstrip('0').rstrip('.')
res['pendingneg'] = ('%.8f' % float(balrow[4])).rstrip('0').rstrip('.')
if cID == '0':
#get btc balance from sx
if err != None or out == '':
btc_balance[ 'value' ] = int(-555)
else:
try:
if balrow[4] < 0:
res['value'] = int( json.loads( out )[0][ 'paid' ]) + int(balrow[4])
else:
res['value'] = int( json.loads( out )[0][ 'paid' ])
except ValueError:
btc_balance[ 'value' ] = int(-555)
else:
#get regular balance from db
if balrow[4] < 0:
#update the 'available' balance immediately when the sender sent something. prevent double spend
res['value'] = ('%.8f' % float( (balrow[2]+balrow[4]) )).rstrip('0').rstrip('.')
else:
res['value'] = ('%.8f' % float(balrow[2])).rstrip('0').rstrip('.')

#res['reserved_balance'] = ('%.8f' % float(balrow[5])).rstrip('0').rstrip('.')
balance_data['balance'].append(res)

#check if we got BTC data from DB, if not trigger manually add
addbtc=True
for x in balance_data['balance']:
if "BTC" in x['symbol']:
addbtc=False

if addbtc:
btc_balance = { 'symbol': 'BTC', 'divisible': True, 'id' : 0 }
if err != None or out == '':
btc_balance[ 'value' ] = int(-555)
else:
try:
btc_balance[ 'value' ] = int( json.loads( out )[0][ 'paid' ])
except ValueError:
btc_balance[ 'value' ] = int(-555)
btc_balance['pendingpos'] = int(0)
btc_balance['pendingneg'] = int(0)
balance_data['balance'].append(btc_balance)

return balance_data
232 changes: 232 additions & 0 deletions api/decode.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,232 @@
from flask import Flask, abort, json, jsonify
import hashlib
import pybitcointools
import decimal
from rpcclient import *

app = Flask(__name__)
app.debug = True

@app.route('/<rawhex>')
def decode_handler(rawhex):
return jsonify(decode(rawhex))


def getinputs(rawtx):
retval={'invalid':False, 'inputs':{}}
for input in rawtx['vin']:
prevtx=getrawtransaction(input['txid'])
if prevtx['result']['vout'][input['vout']]['scriptPubKey']['type'] not in ['pubkeyhash','scripthash']:
#Valid MP tx's only have pubkeyhash and scripthash as inputs
retval['invalid']=True
inputamount= int(decimal.Decimal(str( prevtx['result']['vout'][input['vout']]['value']))*decimal.Decimal(1e8))
for addr in prevtx['result']['vout'][input['vout']]['scriptPubKey']['addresses']:
if addr in retval['inputs']:
retval['inputs'][addr] += inputamount
else:
retval['inputs'][addr] = inputamount
return retval


def decode(rawhex):

rawBTC = decoderawtransaction(rawhex)['result']
sia=0
reference=""
inputs=getinputs(rawBTC)
senders=inputs['inputs']
for sender in senders:
if senders[sender] > sia:
reference = sender
sia = senders[sender]

if reference == "":
retval = {"Error":"Can\'t decode MP TX. No valid sending address found."}
return {'Sender':reference,'BTC':rawBTC, 'MP':retval,'inputs':senders}

if inputs['invalid']:
retval = {"Error":"Can\'t decode MP TX. Invalid input type detected"}
return {'Sender':reference,'BTC':rawBTC, 'MP':retval,'inputs':senders}


#senders = rawtx['result']['vout'][rawBTC['vin'][0]['vout']]['scriptPubKey']['addresses']
#reference = senders[0]

#get all multisigs
multisig_output = []
dest=""
for output in rawBTC['vout']:
if output['scriptPubKey']['type'] == 'multisig':
multisig_output.append(output) #grab msigs
elif output['scriptPubKey']['type'] in ['pubkeyhash','scripthash']:
try:
for address in output['scriptPubKey']['addresses']:
if address not in ['1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P','mpexoDuSkGGqvqrkrjiFng38QPkJQVFyqv'] and address not in reference:
dest=address
#return on first successful dest address per spec (highest vout)
break
except KeyError:
pass

#extract compressed keys
scriptkeys = []
for output in multisig_output: #seqnums start at 1, so adjust range
split_script = output['scriptPubKey']['asm'].split(' ')
for val in split_script:
if len(val) == 66:
scriptkeys.append(val)

#filter keys that are ref
nonrefkeys = []

#check for testnet addresses
if reference[:1] in ['2','m','n']:
#testnet address
offset=111
else:
offset=0

for compressedkey in scriptkeys:
if pybitcointools.pubtoaddr(compressedkey,offset) not in senders :
nonrefkeys.append(compressedkey)

max_seqnum = len(nonrefkeys)
sha_keys = [ hashlib.sha256(reference).digest().encode('hex').upper()] #first sha256 of ref addr, see class B for more info
for i in range(max_seqnum):
if i < (max_seqnum-1):
sha_keys.append(hashlib.sha256(sha_keys[i]).digest().encode('hex').upper()) #keep sha'ing to generate more packets

pairs = []
for i in range(len(nonrefkeys)):
pairs.append((nonrefkeys[i], sha_keys[i] ))

packets = []
for pair in pairs:
obpacket = pair[0].upper()[2:-2]
shaaddress = pair[1][:-2]
print 'Obfus/SHA', obpacket, shaaddress
datapacket = ''
for i in range(len(obpacket)):
if obpacket[i] == shaaddress[i]:
datapacket = datapacket + '0'
else:
bin_ob = int('0x' + obpacket[i], 16)
bin_sha = int('0x' + shaaddress[i], 16)
xored = hex(bin_ob ^ bin_sha)[2:].upper()
datapacket = datapacket + xored
packets.append(datapacket)

long_packet = ''
for packet in packets:
print 'Decoded packet #' + str(packet[0:2]) + ' : ' + packet
long_packet += packet[2:]

retval=""
if long_packet[4:8] == '0032':
#Create Fixed Issuance
spare_bytes = ''.join(long_packet[22:])
#DEBUG print spare_bytes.split('00')
len_var_fields = len(''.join(spare_bytes.split('00')[0:5])+'0000000000')
#DEBUG print len_var_fields, spare_bytes[len_var_fields:len_var_fields+16],spare_bytes

retval = { 'TxVersion': int(long_packet[0:4],16),
'TxType': int(long_packet[4:8],16),
'TxTypeString': 'Create Fixed Issuance',
'Ecosystem': int(long_packet[8:10],16),
'Property Type': int(long_packet[10:14],16),
'Previous Property ID': int(long_packet[14:22],16),
'Property Category': spare_bytes.split('00')[0].decode('hex'),
'Property Subcategory': spare_bytes.split('00')[1].decode('hex'),
'Property Name': spare_bytes.split('00')[2].decode('hex'),
'Property URL': spare_bytes.split('00')[3].decode('hex'),
'Property Data': ''.join(spare_bytes.split('00')[4]).decode('hex'),
'Number of Properties: ': int(str(int(spare_bytes[len_var_fields:len_var_fields+16],16)))
}

if long_packet[4:8] == '0033':
#Create Variable issuance (Crowdsale)
spare_bytes = ''.join(long_packet[22:])
#DEBUG print spare_bytes.split('00')
len_var_fields = len(''.join(spare_bytes.split('00')[0:5])+'0000000000')
#DEBUG print len_var_fields, spare_bytes[len_var_fields:len_var_fields+16],spare_bytes

retval = { 'TxVersion': int(long_packet[0:4],16),
'TxType': int(long_packet[4:8],16),
'TxTypeString': 'Create Variable Issuance (Crowdsale)',
'Ecosystem': int(long_packet[8:10],16),
'Property Type': int(long_packet[10:14],16),
'Previous Property ID': int(long_packet[14:22],16),
'Property Category': spare_bytes.split('00')[0].decode('hex'),
'Property Subcategory': spare_bytes.split('00')[1].decode('hex'),
'Property Name': spare_bytes.split('00')[2].decode('hex'),
'Property URL': spare_bytes.split('00')[3].decode('hex'),
'Property Data': ''.join(spare_bytes.split('00')[4]).decode('hex'),
'PropertyID Desired': str(int(spare_bytes[len_var_fields:len_var_fields+8],16)),
'Number of Properties': str(int(spare_bytes[len_var_fields+8:len_var_fields+8+16],16)),
'Deadline': str(int(spare_bytes[len_var_fields+8+16:len_var_fields+8+16+16],16)),
'Earlybird Bonus': str(int(spare_bytes[len_var_fields+8+16+16:len_var_fields+8+16+16+2],16)),
'Percentage for Issuer': str(int(spare_bytes[len_var_fields+8+16+16+2:len_var_fields+8+16+16+2+2],16))
}

if long_packet[4:8] == '0000':
#simple send
retval = { 'TxVersion': int(long_packet[0:4],16),
'TxType': int(long_packet[4:8],16),
'TxTypeString': 'Simple Send',
'PropertyID': int(long_packet[8:16],16),
'Amount': int(long_packet[16:32],16)
}

if long_packet[4:8] == '0003':
#STO
retval = { 'TxVersion': int(long_packet[0:4],16),
'TxType': int(long_packet[4:8],16),
'TxTypeString': 'Send To Owners',
'PropertyID': int(long_packet[8:16],16),
'Amount': int(long_packet[16:32],16)
}

if long_packet[4:8] == '0014':
#DEx Sell Offer
retval = { 'TxVersion': int(long_packet[0:4],16),
'TxType': int(long_packet[4:8],16),
'TxTypeString': 'DEx Sell Offer',
'PropertyID': int(long_packet[8:16],16),
'Amount': int(long_packet[16:32],16),
'BTCDesired': int(long_packet[32:48],16),
'TimePeriod': int(long_packet[48:50],16),
'FeeRequired': int(long_packet[50:66],16),
'Action': int(long_packet[66:68],16)
}

if long_packet[4:8] == '0035':
#Close Crowdsale Manually
retval = { 'TxVersion': int(long_packet[0:4],16),
'TxType': int(long_packet[4:8],16),
'TxTypeString': 'Close Crowdsale Manually',
'PropertyID': int(long_packet[8:16],16)
}

if long_packet[4:8] == '0037':
#grant properties
retval = { 'TxVersion': int(long_packet[0:4],16),
'TxType': int(long_packet[4:8],16),
'TxTypeString': 'Grant Properties',
'PropertyID': int(long_packet[8:16],16),
'Amount': int(long_packet[16:32],16)
}

if long_packet[4:8] == '0038':
#revoke properties
retval = { 'TxVersion': int(long_packet[0:4],16),
'TxType': int(long_packet[4:8],16),
'TxTypeString': 'Revoke Properties',
'PropertyID': int(long_packet[8:16],16),
'Amount': int(long_packet[16:32],16)
}

if retval == "":
retval = {"Error":"Can\'t decode MP TX"}
dest = ""
print retval
return {'Sender':reference,'Receiver':dest,'MP':retval,'BTC':rawBTC, 'inputs':senders}
Loading

0 comments on commit d832343

Please sign in to comment.