BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

trustedcoin: do not call make_unsigned_transaction twice

This commit is contained in:
ThomasV 2016-02-02 14:02:41 +01:00
parent 5aa0a87d7a
commit a43b0395d4
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/trustedcoin/trustedcoin.py
View File

@ -206,38 +206,36 @@ class Wallet_2fa(Multisig_Wallet):
def can_sign_without_server(self): def can_sign_without_server(self):
return self.master_private_keys.get('x2/') is not None return self.master_private_keys.get('x2/') is not None
def extra_fee(self, tx=None): def extra_fee(self):
if self.can_sign_without_server(): if self.can_sign_without_server():
return 0 return 0
if self.billing_info.get('tx_remaining'): if self.billing_info.get('tx_remaining'):
return 0 return 0
if self.is_billing: if self.is_billing:
return 0 return 0
# trustedcoin won't charge if the total inputs is lower than their fee
price = int(self.price_per_tx.get(1)) price = int(self.price_per_tx.get(1))
assert price <= 100000 assert price <= 100000
if tx and tx.input_value() < price:
self.print_error("not charging for this tx")
return 0
return price return price
def make_unsigned_transaction(self, coins, outputs, config, def make_unsigned_transaction(self, coins, outputs, config,
fixed_fee=None, change_addr=None): fixed_fee=None, change_addr=None):
tx = BIP32_Wallet.make_unsigned_transaction( mk_tx = lambda o: BIP32_Wallet.make_unsigned_transaction(
self, coins, outputs, config, fixed_fee, change_addr) self, coins, o, config, fixed_fee, change_addr)
# Plain TX was good. Now add trustedcoin fee.
fee = self.extra_fee() fee = self.extra_fee()
if fee: if fee:
address = self.billing_info['billing_address'] address = self.billing_info['billing_address']
outputs = outputs + [(TYPE_ADDRESS, address, fee)] fee_output = (TYPE_ADDRESS, address, fee)
try: try:
return BIP32_Wallet.make_unsigned_transaction( tx = mk_tx(outputs + [fee_output])
self, coins, outputs, config, fixed_fee, change_addr)
except NotEnoughFunds: except NotEnoughFunds:
# trustedcoin won't charge if the total inputs is # trustedcoin won't charge if the total inputs is
# lower than their fee # lower than their fee
tx = mk_tx(outputs)
if tx.input_value() >= fee: if tx.input_value() >= fee:
raise raise
self.print_error("not charging for this tx")
else:
tx = mk_tx(outputs)
return tx return tx
def sign_transaction(self, tx, password): def sign_transaction(self, tx, password):