LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

Merge pull request #540 from lbryio/fix_getpubkey

Browse source 
fix wallet_public_key API command
This commit is contained in:
Alex Grin 2017-03-17 17:49:29 -04:00 committed by GitHub
commit cb4c93bcd9
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -19,7 +19,7 @@ at anytime.
* *
### Fixed ### Fixed
* * Fix wallet_public_key API command
* *
* *

5
docs/index.md
View file

@ -633,8 +633,9 @@ Returns:
Get public key from wallet address Get public key from wallet address
Args: Args:
'wallet': (str) wallet address in base58 'address': (str) wallet address in base58
Returns: Returns:
(str) Public key in hex encoding (list) list of public keys associated with address.
Could contain more than one public key if multisig.
``` ```

6
lbrynet/core/Wallet.py
View file

@ -1101,8 +1101,10 @@ class LBRYumWallet(Wallet):
def _address_is_mine(self, address): def _address_is_mine(self, address):
return self._run_cmd_as_defer_succeed('ismine', address) return self._run_cmd_as_defer_succeed('ismine', address)
def get_pub_keys(self, wallet): # returns a list of public keys associated with address
return self._run_cmd_as_defer_succeed('getpubkyes', wallet) # (could be multiple public keys if a multisig address)
def get_pub_keys(self, address):
return self._run_cmd_as_defer_succeed('getpubkeys', address)
def _save_wallet(self, val): def _save_wallet(self, val):
self.wallet.storage.write() self.wallet.storage.write()

10
lbrynet/lbrynet_daemon/Daemon.py
View file

@ -2052,18 +2052,20 @@ class Daemon(AuthJSONRPCServer):
return self.jsonrpc_wallet_public_key(wallet) return self.jsonrpc_wallet_public_key(wallet)
@AuthJSONRPCServer.auth_required @AuthJSONRPCServer.auth_required
def jsonrpc_wallet_public_key(self, wallet): def jsonrpc_wallet_public_key(self, address):
""" """
Get public key from wallet address Get public key from wallet address
Args: Args:
'wallet': (str) wallet address in base58 'address': (str) wallet address in base58
Returns: Returns:
(str) Public key in hex encoding (list) list of public keys associated with address.
Could contain more than one public key if multisig.
""" """
d = self.session.wallet.get_pub_keys(wallet) d = self.session.wallet.get_pub_keys(address)
d.addCallback(lambda r: self._render_response(r)) d.addCallback(lambda r: self._render_response(r))
return d
@AuthJSONRPCServer.auth_required @AuthJSONRPCServer.auth_required
def jsonrpc_get_new_address(self): def jsonrpc_get_new_address(self):