kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-23 19:31:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

use virtualchain's bitcoin key classes

Browse Source
This commit is contained in:
Jude Nelson
2016-08-01 17:35:23 -04:00
parent ae0f59b21b
commit 18aba7382b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
blockstack/lib/scripts.py
View File

@@ -23,7 +23,8 @@
from utilitybelt import is_hex, is_valid_int
from binascii import hexlify, unhexlify
from pybitcoin import BitcoinPrivateKey, BitcoinPublicKey, script_to_hex, make_pay_to_address_script, analyze_private_key
from virtualchain import BitcoinPrivateKey, BitcoinPublicKey
from pybitcoin import script_to_hex, make_pay_to_address_script, analyze_private_key
from pybitcoin.transactions.outputs import calculate_change_amount
import virtualchain
@@ -254,10 +255,10 @@ def tx_serialize_and_sign_multi( inputs, outputs, private_keys ):
private_key_objs = []
for pk in private_keys:
if isinstance( pk, pybitcoin.BitcoinPrivateKey ):
if isinstance( pk, BitcoinPrivateKey ):
private_key_objs.append( pk )
else:
private_key_objs.append( pybitcoin.BitcoinPrivateKey( pk ) )
private_key_objs.append( BitcoinPrivateKey( pk ) )
# make the transaction
unsigned_tx = pybitcoin.serialize_transaction( inputs, outputs )
@@ -383,7 +384,7 @@ def tx_make_subsidizable( blockstack_tx, fee_cb, max_fee, subsidy_key, utxo_clie
return None
else:
log.debug("%s will subsidize %s satoshi" % (pybitcoin.BitcoinPrivateKey( subsidy_key ).public_key().address(), dust_fee + op_fee ))
log.debug("%s will subsidize %s satoshi" % (BitcoinPrivateKey( subsidy_key ).public_key().address(), dust_fee + op_fee ))
subsidy_output = tx_make_subsidization_output( payer_utxo_inputs, payer_address, op_fee, dust_fee )