Skip to content

Commit

Permalink
Not commit tx/blocks to DB. Extracting public key from txin
Browse files Browse the repository at this point in the history
  • Loading branch information
@shivaenigma
shivaenigma committed Oct 11, 2015
1 parent dce2931 commit 91abc49
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 211 deletions.
210 changes: 9 additions & 201 deletions Abe/DataStore.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1020,213 +1020,20 @@ def find_prev(store, hash):
int(nTime))

def import_block(store, b, chain_ids=None, chain=None):

print "Processing block " + store.hashout_hex(b['hash'][::-1])
# Import new transactions.

if chain_ids is None:
chain_ids = frozenset() if chain is None else frozenset([chain.id])

b['value_in'] = 0
b['value_out'] = 0
b['value_destroyed'] = 0
tx_hash_array = []

# In the common case, all the block's txins _are_ linked, and we
# can avoid a query if we notice this.
all_txins_linked = True

for pos in xrange(len(b['transactions'])):
tx = b['transactions'][pos]

if 'hash' not in tx:
if chain is None:
store.log.debug("Falling back to SHA256 transaction hash")
tx['hash'] = util.double_sha256(tx['__data__'])
else:
tx['hash'] = chain.transaction_hash(tx['__data__'])

tx_hash_array.append(tx['hash'])
tx['tx_id'] = store.tx_find_id_and_value(tx, pos == 0)

if tx['tx_id']:
all_txins_linked = False
else:
if store.commit_bytes == 0:
tx['tx_id'] = store.import_and_commit_tx(tx, pos == 0, chain)
else:
tx['tx_id'] = store.import_tx(tx, pos == 0, chain)
if tx.get('unlinked_count', 1) > 0:
all_txins_linked = False

if tx['value_in'] is None:
b['value_in'] = None
elif b['value_in'] is not None:
b['value_in'] += tx['value_in']
b['value_out'] += tx['value_out']
b['value_destroyed'] += tx['value_destroyed']

# Get a new block ID.
block_id = int(store.new_id("block"))
b['block_id'] = block_id

if chain is not None:
# Verify Merkle root.
if b['hashMerkleRoot'] != chain.merkle_root(tx_hash_array):
raise MerkleRootMismatch(b['hash'], tx_hash_array)

# Look for the parent block.
hashPrev = b['hashPrev']
if chain is None:
# XXX No longer used.
is_genesis = hashPrev == util.GENESIS_HASH_PREV
else:
is_genesis = hashPrev == chain.genesis_hash_prev

(prev_block_id, prev_height, prev_work, prev_satoshis,
prev_seconds, prev_ss, prev_total_ss, prev_nTime) = (
(None, -1, 0, 0, 0, 0, 0, b['nTime'])
if is_genesis else
store.find_prev(hashPrev))

b['prev_block_id'] = prev_block_id
b['height'] = None if prev_height is None else prev_height + 1
b['chain_work'] = util.calculate_work(prev_work, b['nBits'])

if prev_seconds is None:
b['seconds'] = None
else:
b['seconds'] = prev_seconds + b['nTime'] - prev_nTime
if prev_satoshis is None or prev_satoshis < 0 or b['value_in'] is None:
# XXX Abuse this field to save work in adopt_orphans.
b['satoshis'] = -1 - b['value_destroyed']
else:
b['satoshis'] = prev_satoshis + b['value_out'] - b['value_in'] \
- b['value_destroyed']

if prev_satoshis is None or prev_satoshis < 0:
ss_created = None
b['total_ss'] = None
else:
ss_created = prev_satoshis * (b['nTime'] - prev_nTime)
b['total_ss'] = prev_total_ss + ss_created

if b['height'] is None or b['height'] < 2:
b['search_block_id'] = None
else:
b['search_block_id'] = store.get_block_id_at_height(
util.get_search_height(int(b['height'])),
None if prev_block_id is None else int(prev_block_id))

# Insert the block table row.
try:
store.sql(
"""INSERT INTO block (
block_id, block_hash, block_version, block_hashMerkleRoot,
block_nTime, block_nBits, block_nNonce, block_height,
prev_block_id, block_chain_work, block_value_in,
block_value_out, block_total_satoshis,
block_total_seconds, block_total_ss, block_num_tx,
search_block_id
) VALUES (
?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
)""",
(block_id, store.hashin(b['hash']), store.intin(b['version']),
store.hashin(b['hashMerkleRoot']), store.intin(b['nTime']),
store.intin(b['nBits']), store.intin(b['nNonce']),
b['height'], prev_block_id,
store.binin_int(b['chain_work'], WORK_BITS),
store.intin(b['value_in']), store.intin(b['value_out']),
store.intin(b['satoshis']), store.intin(b['seconds']),
store.intin(b['total_ss']),
len(b['transactions']), b['search_block_id']))

except store.dbmodule.DatabaseError:

if store.commit_bytes == 0:
# Rollback won't undo any previous changes, since we
# always commit.
store.rollback()
# If the exception is due to another process having
# inserted the same block, it is okay.
row = store.selectrow("""
SELECT block_id, block_satoshi_seconds
FROM block
WHERE block_hash = ?""",
(store.hashin(b['hash']),))
if row:
store.log.info("Block already inserted; block_id %d unsued",
block_id)
b['block_id'] = int(row[0])
b['ss'] = None if row[1] is None else int(row[1])
store.offer_block_to_chains(b, chain_ids)
return

# This is not an expected error, or our caller may have to
# rewind a block file. Let them deal with it.
raise

# List the block's transactions in block_tx.
for tx_pos in xrange(len(b['transactions'])):
tx = b['transactions'][tx_pos]
store.sql("""
INSERT INTO block_tx
(block_id, tx_id, tx_pos)
VALUES (?, ?, ?)""",
(block_id, tx['tx_id'], tx_pos))
store.log.info("block_tx %d %d", block_id, tx['tx_id'])

if b['height'] is not None:
store._populate_block_txin(block_id)

if all_txins_linked or not store._has_unlinked_txins(block_id):
b['ss_destroyed'] = store._get_block_ss_destroyed(
block_id, b['nTime'],
map(lambda tx: tx['tx_id'], b['transactions']))
if ss_created is None or prev_ss is None:
b['ss'] = None
else:
b['ss'] = prev_ss + ss_created - b['ss_destroyed']

store.sql("""
UPDATE block
SET block_satoshi_seconds = ?,
block_ss_destroyed = ?
WHERE block_id = ?""",
(store.intin(b['ss']),
store.intin(b['ss_destroyed']),
block_id))
else:
b['ss_destroyed'] = None
b['ss'] = None

# Store the inverse hashPrev relationship or mark the block as
# an orphan.
if prev_block_id:
store.sql("""
INSERT INTO block_next (block_id, next_block_id)
VALUES (?, ?)""", (prev_block_id, block_id))
elif not is_genesis:
store.sql("INSERT INTO orphan_block (block_id, block_hashPrev)" +
" VALUES (?, ?)", (block_id, store.hashin(b['hashPrev'])))

for row in store.selectall("""
SELECT block_id FROM orphan_block WHERE block_hashPrev = ?""",
(store.hashin(b['hash']),)):
(orphan_id,) = row
store.sql("UPDATE block SET prev_block_id = ? WHERE block_id = ?",
(block_id, orphan_id))
store.sql("""
INSERT INTO block_next (block_id, next_block_id)
VALUES (?, ?)""", (block_id, orphan_id))
store.sql("DELETE FROM orphan_block WHERE block_id = ?",
(orphan_id,))

# offer_block_to_chains calls adopt_orphans, which propagates
# block_height and other cumulative data to the blocks
# attached above.
store.offer_block_to_chains(b, chain_ids)
for tx in b['transactions']:
for txin in tx['txIn']:
if txin['prevout_hash'] != "\x00"*32:
pubkey = deserialize.extract_public_key(txin['scriptSig'])
hashd = store.hashout_hex(pubkey)
print hashd
print base58.public_key_to_bc_address(pubkey)

return block_id

def _populate_block_txin(store, block_id):
# Create rows in block_txin. In case of duplicate transactions,
Expand Down Expand Up @@ -2728,6 +2535,7 @@ def get_tx(rpc_tx_hash):

# Load all blocks starting at the current file and offset.
def catch_up_dir(store, dircfg):
print dircfg
def open_blkfile(number):
store._refresh_dircfg(dircfg)
blkfile = {
Expand Down
5 changes: 3 additions & 2 deletions Abe/base58.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ def b58decode(v, length):
# Needed for RIPEMD160 hash function, used to compute
# Bitcoin addresses from internal public keys.
import Crypto.Hash.SHA256 as SHA256
import Crypto.Hash.RIPEMD160 as RIPEMD160
import Crypto.Hash.RIPEMD as RIPEMD160
have_crypto = True
except ImportError:
except ImportError, e:
print e
have_crypto = False

def hash_160(public_key):
Expand Down
9 changes: 4 additions & 5 deletions Abe/deserialize.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
#
#
#

from BCDataStream import *
from enumeration import Enumeration
from base58 import public_key_to_bc_address, hash_160_to_bc_address
Expand Down Expand Up @@ -311,7 +307,6 @@ def extract_public_key(bytes, version='\x00'):
decoded = [ x for x in script_GetOp(bytes) ]
except struct.error:
return "(None)"

# non-generated TxIn transactions push a signature
# (seventy-something bytes) and then their public key
# (33 or 65 bytes) onto the stack:
Expand Down Expand Up @@ -347,4 +342,8 @@ def extract_public_key(bytes, version='\x00'):
if match_decoded(decoded, match):
return hash_160_to_bc_address(decoded[1][1], version="\x05")

if len(decoded) == 1 and decoded[0][0] < opcodes.OP_PUSHDATA1:
#A script sig in txin
#return the public key
return decoded[0][1][0:65]
return "(None)"
6 changes: 3 additions & 3 deletions abe.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
#connect-args {"user":"root","db":"abe"}

# SQLite3 example:
#dbtype = sqlite3
#connect-args = abe.sqlite
dbtype = sqlite3
connect-args = abe.sqlite

# Oracle example:
#dbtype=cx_Oracle
Expand Down Expand Up @@ -334,4 +334,4 @@
# "default" to let Abe choose. The "loader" specified in a "datadir"
# entry takes precedence over "default-loader".
#
#default-loader = default
default-loader = blkfile

0 comments on commit 91abc49

Please sign in to comment.