From cadd1f993d49212590eb5d6716c753b3ad9318a0 Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 28 Aug 2016 15:10:29 -0400 Subject: [PATCH 1/4] clone lbryio/lbry repo in appveyor build script --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3de266531..aaa020c8f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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 From 56e2d77039fb87662c5b8fece6e618016989189e Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 29 Aug 2016 13:44:18 -0400 Subject: [PATCH 2/4] fix _send_name_claim json --- lbrynet/core/LBRYWallet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lbrynet/core/LBRYWallet.py b/lbrynet/core/LBRYWallet.py index 53a7a961e..96b6e6d48 100644 --- a/lbrynet/core/LBRYWallet.py +++ b/lbrynet/core/LBRYWallet.py @@ -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, json.dumps(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, json.dump(metadata), _bid) else: log.info("Updating over own claim") d = self.update_metadata(metadata, claim['value']) From c15af0a63a4ad8c620e65de39aff78b2225e117e Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 29 Aug 2016 13:44:46 -0400 Subject: [PATCH 3/4] =?UTF-8?q?Bump=20version:=200.4.0=20=E2=86=92=200.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- lbrynet/__init__.py | 2 +- packaging/ubuntu/lbry.desktop | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ff3b6d715..126a928f6 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.4.0 +current_version = 0.4.1 commit = True tag = True diff --git a/lbrynet/__init__.py b/lbrynet/__init__.py index 657709bea..b4d7b4ee9 100644 --- a/lbrynet/__init__.py +++ b/lbrynet/__init__.py @@ -1,2 +1,2 @@ -__version__ = "0.4.0" +__version__ = "0.4.1" version = tuple(__version__.split('.')) \ No newline at end of file diff --git a/packaging/ubuntu/lbry.desktop b/packaging/ubuntu/lbry.desktop index 6280feaae..813738769 100644 --- a/packaging/ubuntu/lbry.desktop +++ b/packaging/ubuntu/lbry.desktop @@ -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 From 16710343301d8cab970f43d7ccd63efa7734fc74 Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 29 Aug 2016 14:33:56 -0400 Subject: [PATCH 4/4] fix json bug --- lbrynet/core/LBRYWallet.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lbrynet/core/LBRYWallet.py b/lbrynet/core/LBRYWallet.py index 96b6e6d48..56d5c6645 100644 --- a/lbrynet/core/LBRYWallet.py +++ b/lbrynet/core/LBRYWallet.py @@ -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, json.dumps(metadata), _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, json.dump(metadata), _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)