mirror of
https://github.com/LBRYFoundation/LBRY-Vault.git
synced 2025-08-28 16:01:30 +00:00
fee is an int
This commit is contained in:
parent
29ff2e2134
commit
72aefa7c16
1 changed files with 4 additions and 3 deletions
|
@ -225,7 +225,7 @@ class Wallet:
|
||||||
self.gap_limit = 5 # configuration
|
self.gap_limit = 5 # configuration
|
||||||
self.host = 'ecdsa.org'
|
self.host = 'ecdsa.org'
|
||||||
self.port = 50000
|
self.port = 50000
|
||||||
self.fee = 0.005
|
self.fee = 50000
|
||||||
self.version = WALLET_VERSION
|
self.version = WALLET_VERSION
|
||||||
self.servers = ['ecdsa.org','electrum.novit.ro'] # list of default servers
|
self.servers = ['ecdsa.org','electrum.novit.ro'] # list of default servers
|
||||||
|
|
||||||
|
@ -383,12 +383,13 @@ class Wallet:
|
||||||
self.seed, self.addresses, self.private_keys,
|
self.seed, self.addresses, self.private_keys,
|
||||||
self.change_addresses, self.status, self.history,
|
self.change_addresses, self.status, self.history,
|
||||||
self.labels, self.addressbook) = sequence
|
self.labels, self.addressbook) = sequence
|
||||||
|
self.fee = int(self.fee)
|
||||||
except:
|
except:
|
||||||
# it is safer to exit immediately
|
# it is safer to exit immediately
|
||||||
print "Error; could not parse wallet."
|
print "Error; could not parse wallet."
|
||||||
exit(1)
|
exit(1)
|
||||||
if self.version != WALLET_VERSION:
|
if self.version != WALLET_VERSION:
|
||||||
raise BaseException("Wallet version error.\nPlease move your balance to a new wallet.\nSee the release notes for more informations.")
|
raise BaseException("Wallet version error.\nPlease move your balance to a new wallet.\nSee the release notes for more information.")
|
||||||
self.update_tx_history()
|
self.update_tx_history()
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
@ -610,7 +611,7 @@ class Wallet:
|
||||||
def mktx(self, to_address, amount, label, password, fee=None):
|
def mktx(self, to_address, amount, label, password, fee=None):
|
||||||
if not self.is_valid(to_address):
|
if not self.is_valid(to_address):
|
||||||
return False, "Invalid address"
|
return False, "Invalid address"
|
||||||
if fee is None: fee = int( self.fee )
|
if fee is None: fee = self.fee
|
||||||
try:
|
try:
|
||||||
inputs, outputs = wallet.choose_inputs_outputs( to_address, amount, fee, password )
|
inputs, outputs = wallet.choose_inputs_outputs( to_address, amount, fee, password )
|
||||||
if not inputs:
|
if not inputs:
|
||||||
|
|
Loading…
Add table
Reference in a new issue