From ae6f6e9dfa10dcec17acf7d032e02a48b5b5fd1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sa=C5=82aban?= Date: Sun, 7 Jan 2018 01:26:50 +0100 Subject: [PATCH] Return payment id in transfers --- monero/backends/jsonrpc.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/monero/backends/jsonrpc.py b/monero/backends/jsonrpc.py index 9268532..3e502bf 100644 --- a/monero/backends/jsonrpc.py +++ b/monero/backends/jsonrpc.py @@ -112,24 +112,19 @@ class JSONRPCWallet(object): 'mixin': mixin, 'priority': priority, 'unlock_time': 0, - 'payment_id': payment_id, + 'payment_id': str(PaymentID(payment_id)), 'get_tx_keys': True, 'get_tx_hex': True, 'new_algorithm': True, } _transfers = self.raw_request('transfer_split', data) - keys = ('txid', 'amount', 'fee', 'key', 'blob') - return [ - Transfer(**self._tx2dict(tx)) for tx in [ - dict(_tx) for _tx in map( - lambda vs: zip(keys,vs), - zip( - *[_transfers[k] for k in ( - 'tx_hash_list', 'amount_list', 'fee_list', 'tx_key_list', 'tx_blob_list') - ] - )) - ] - ] + _pertx = [dict(_tx) for _tx in map( + lambda vs: zip(('txid', 'amount', 'fee', 'key', 'blob', 'payment_id'), vs), + zip(*[_transfers[k] for k in ( + 'tx_hash_list', 'amount_list', 'fee_list', 'tx_key_list', 'tx_blob_list')]))] + for d in _pertx: + d['payment_id'] = payment_id + return [Transfer(**self._tx2dict(tx)) for tx in _pertx] def raw_request(self, method, params=None): hdr = {'Content-Type': 'application/json'}