From bbc11ef73883d910d46f875583f14f3fd923915a Mon Sep 17 00:00:00 2001 From: Jonathan Moody <103143855+moodyjon@users.noreply.github.com> Date: Mon, 18 Jul 2022 14:43:24 -0400 Subject: [PATCH 1/2] Refactor _old_get_temp_claim_info(), eliminating "bid" arg. Obtain the value from txo.amount. --- lbry/extras/daemon/daemon.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lbry/extras/daemon/daemon.py b/lbry/extras/daemon/daemon.py index 5072935b44..c6aec5d243 100644 --- a/lbry/extras/daemon/daemon.py +++ b/lbry/extras/daemon/daemon.py @@ -2784,7 +2784,7 @@ async def jsonrpc_channel_create( wallet.save() await self.broadcast_or_release(tx, blocking) self.component_manager.loop.create_task(self.storage.save_claims([self._old_get_temp_claim_info( - tx, txo, claim_address, claim, name, dewies_to_lbc(amount) + tx, txo, claim_address, claim, name )])) self.component_manager.loop.create_task(self.analytics_manager.send_new_channel()) else: @@ -2943,7 +2943,7 @@ async def jsonrpc_channel_update( wallet.save() await self.broadcast_or_release(tx, blocking) self.component_manager.loop.create_task(self.storage.save_claims([self._old_get_temp_claim_info( - tx, new_txo, claim_address, new_txo.claim, new_txo.claim_name, dewies_to_lbc(amount) + tx, new_txo, claim_address, new_txo.claim, new_txo.claim_name )])) self.component_manager.loop.create_task(self.analytics_manager.send_new_channel()) else: @@ -3542,7 +3542,7 @@ async def jsonrpc_stream_create( async def save_claims(): await self.storage.save_claims([self._old_get_temp_claim_info( - tx, new_txo, claim_address, claim, name, dewies_to_lbc(amount) + tx, new_txo, claim_address, claim, name )]) if file_path is not None: await self.storage.save_content_claim(file_stream.stream_hash, new_txo.id) @@ -3779,7 +3779,7 @@ async def jsonrpc_stream_update( async def save_claims(): await self.storage.save_claims([self._old_get_temp_claim_info( - tx, new_txo, claim_address, new_txo.claim, new_txo.claim_name, dewies_to_lbc(amount) + tx, new_txo, claim_address, new_txo.claim, new_txo.claim_name )]) if stream_hash: await self.storage.save_content_claim(stream_hash, new_txo.id) @@ -5479,11 +5479,11 @@ async def resolve(self, accounts, urls, **kwargs): return results @staticmethod - def _old_get_temp_claim_info(tx, txo, address, claim_dict, name, bid): + def _old_get_temp_claim_info(tx, txo, address, claim_dict, name): return { "claim_id": txo.claim_id, "name": name, - "amount": bid, + "amount": dewies_to_lbc(txo.amount), "address": address, "txid": tx.id, "nout": txo.position, From e51e682849252b06159813b1071eac75a372be55 Mon Sep 17 00:00:00 2001 From: Jonathan Moody <103143855+moodyjon@users.noreply.github.com> Date: Wed, 20 Jul 2022 11:44:34 -0400 Subject: [PATCH 2/2] Obtain "amount" from new_txo.amount when calling save_supports(). --- lbry/extras/daemon/daemon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lbry/extras/daemon/daemon.py b/lbry/extras/daemon/daemon.py index c6aec5d243..9f3ac5630c 100644 --- a/lbry/extras/daemon/daemon.py +++ b/lbry/extras/daemon/daemon.py @@ -4349,7 +4349,7 @@ async def jsonrpc_support_create( 'nout': tx.position, 'address': claim_address, 'claim_id': claim_id, - 'amount': dewies_to_lbc(amount) + 'amount': dewies_to_lbc(new_txo.amount) }]}) self.component_manager.loop.create_task(self.analytics_manager.send_claim_action('new_support')) else: