d0s3t3ch
/
wownero-python
mirror of https://git.wownero.com/lza_menace/wownero-python.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bugfixing: mixin vs ringsize, get_addresses() in wallet

This commit is contained in:
Michał Sałaban 2018-01-13 22:24:17 +01:00
parent a1849cab8d
commit 1be5d0b063
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
monero/account.py
View File

@ -36,23 +36,23 @@ class Account(object):
def get_transactions_out(self):
return self._backend.get_transactions_out(account=self.index)
def transfer(self, address, amount, priority=prio.NORMAL, mixin=5, payment_id=None, unlock_time=0):
def transfer(self, address, amount, priority=prio.NORMAL, ringsize=5, payment_id=None, unlock_time=0):
return self._backend.transfer(
[(address, amount)],
priority,
mixin,
ringsize,
payment_id,
unlock_time,
account=self.index)
def transfer_multiple(self, destinations, priority=prio.NORMAL, mixin=5, payment_id=None, unlock_time=0):
def transfer_multiple(self, destinations, priority=prio.NORMAL, ringsize=5, payment_id=None, unlock_time=0):
"""
destinations = [(address, amount), ...]
"""
return self._backend.transfer(
destinations,
priority,
mixin,
ringsize,
payment_id,
unlock_time,
account=self.index)

4
monero/backends/jsonrpc.py
View File

@ -115,13 +115,13 @@ class JSONRPCWallet(object):
'blob': tx.get('blob', None),
}
def transfer(self, destinations, priority, mixin, payment_id=None, unlock_time=0, account=0):
def transfer(self, destinations, priority, ringsize, payment_id=None, unlock_time=0, account=0):
data = {
'account_index': account,
'destinations': list(map(
lambda dst: {'address': str(address(dst[0])), 'amount': to_atomic(dst[1])},
destinations)),
'mixin': mixin,
'mixin': ringsize - 1,
'priority': priority,
'unlock_time': 0,
'get_tx_keys': True,

13
monero/wallet.py
View File

@ -34,9 +34,12 @@ class Wallet(object):
def get_balance(self, unlocked=False):
return self.accounts[0].get_balance(unlocked=unlocked)
def get_address(self, index=0):
def get_address(self):
return self.accounts[0].get_addresses()[0]
def get_addresses(self):
return self.accounts[0].get_addresses()
def new_address(self, label=None):
return self.accounts[0].new_address(label=label)
@ -49,22 +52,22 @@ class Wallet(object):
def get_transactions_out(self):
return self.accounts[0].get_transactions_out()
def transfer(self, address, amount, priority=prio.NORMAL, mixin=5, payment_id=None, unlock_time=0):
def transfer(self, address, amount, priority=prio.NORMAL, ringsize=5, payment_id=None, unlock_time=0):
return self.accounts[0].transfer(
address,
amount,
priority=priority,
mixin=mixin,
ringsize=ringsize,
payment_id=None,
unlock_time=unlock_time)
def transfer_multiple(self, destinations, priority=prio.NORMAL, mixin=5, payment_id=None, unlock_time=0):
def transfer_multiple(self, destinations, priority=prio.NORMAL, ringsize=5, payment_id=None, unlock_time=0):
"""
destinations = [(address, amount), ...]
"""
return self.accounts[0].transfer_multiple(
destinations,
priority=priority,
mixin=mixin,
ringsize=ringsize,
payment_id=None,
unlock_time=unlock_time)