Merge remote-tracking branch 'origin/master'

This commit is contained in:
David Amrhein 2016-08-29 16:22:16 -04:00
commit 7e021746e4
5 changed files with 12 additions and 10 deletions

View file

@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.4.0
current_version = 0.4.1
commit = True
tag = True

View file

@ -47,7 +47,9 @@ init:
- ps: C:\Python27\Scripts\pip.exe install base58==0.2.2
- ps: C:\Python27\Scripts\pip.exe install googlefinance==0.7
- ps: C:\Python27\Scripts\pip.exe install git+https://github.com/lbryio/lbryum.git
- ps: cd C:\projects\lbry
- ps: cd C:\temp
- ps: git clone --depth 1 https://github.com/lbryio/lbry.git
- ps: cd C:\temp\lbry
build_script:
- cmd: C:\Python27\python.exe setup_win32.py build bdist_msi

View file

@ -1,2 +1,2 @@
__version__ = "0.4.0"
__version__ = "0.4.1"
version = tuple(__version__.split('.'))

View file

@ -431,10 +431,10 @@ class LBRYWallet(object):
def _claim_or_update(claim, metadata, _bid):
if not claim:
log.info("No claim yet, making a new one")
return self._send_name_claim(name, metadata.as_json(), _bid)
return self._send_name_claim(name, metadata, _bid)
if not claim['is_mine']:
log.info("Making a contesting claim")
return self._send_name_claim(name, metadata.as_json(), _bid)
return self._send_name_claim(name, metadata, _bid)
else:
log.info("Updating over own claim")
d = self.update_metadata(metadata, claim['value'])
@ -1018,7 +1018,7 @@ class LBRYcrdWallet(LBRYWallet):
def _send_name_claim_rpc(self, name, value, amount):
rpc_conn = self._get_rpc_conn()
try:
return str(rpc_conn.claimname(name, value, amount))
return str(rpc_conn.claimname(name, json.dumps(value), amount))
except JSONRPCException as e:
if 'message' in e.error and e.error['message'] == "Insufficient funds":
raise InsufficientFundsError()
@ -1242,7 +1242,7 @@ class LBRYumWallet(LBRYWallet):
def send_claim(address):
cmd = known_commands['claimname']
func = getattr(self.cmd_runner, cmd.name)
return threads.deferToThread(func, address, amount, name, val)
return threads.deferToThread(func, address, amount, name, json.dumps(val))
d = self.get_new_address()
d.addCallback(send_claim)
d.addCallback(self._broadcast_transaction)
@ -1256,8 +1256,8 @@ class LBRYumWallet(LBRYWallet):
def _send_name_claim_update(self, name, claim_id, txid, value, amount):
def send_claim_update(address):
decoded_claim_id = claim_id.decode('hex')[::-1]
metadata = json.dumps(Metadata(value))
log.info("updateclaim %s %s %f %s %s '%s'", txid, address, amount, name, decoded_claim_id.encode('hex'), json.dumps(metadata))
metadata = json.dumps(value)
log.info("updateclaim %s %s %f %s %s '%s'", txid, address, amount, name, decoded_claim_id.encode('hex'), metadata)
cmd = known_commands['updateclaim']
func = getattr(self.cmd_runner, cmd.name)
return threads.deferToThread(func, txid, address, amount, name, decoded_claim_id, metadata)

View file

@ -1,5 +1,5 @@
[Desktop Entry]
Version=0.4.0
Version=0.4.1
Name=LBRY
Comment=The world's first user-owned content marketplace
Icon=lbry