From 20b186587968e967a8bedcc6fd51ac360cb65e38 Mon Sep 17 00:00:00 2001
From: Jonathan Moody <103143855+moodyjon@users.noreply.github.com>
Date: Fri, 16 Sep 2022 11:01:13 -0500
Subject: [PATCH] Don't use retriable_call(). Add handling for
 InsufficientFundsError.

---
 lbry/wallet/usage_payment.py | 54 +++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/lbry/wallet/usage_payment.py b/lbry/wallet/usage_payment.py
index 13fcf2fe1..44c4b14d5 100644
--- a/lbry/wallet/usage_payment.py
+++ b/lbry/wallet/usage_payment.py
@@ -1,9 +1,8 @@
 import asyncio
 import logging
-import sys
-import traceback
 
 from lbry.error import (
+    InsufficientFundsError,
     ServerPaymentFeeAboveMaxAllowedError,
     ServerPaymentInvalidAddressError,
     ServerPaymentWalletLockedError
@@ -26,67 +25,66 @@ class WalletServerPayer:
         self.max_fee = max_fee
         self._on_payment_controller = StreamController()
         self.on_payment = self._on_payment_controller.stream
-        self.on_payment.listen(None, on_error=lambda e: logging.warning(e.args[0]))
+        self.on_payment.listen(None, on_error=lambda e: log.warning(e.args[0]))
 
     async def pay(self):
         while self.running:
             try:
                 await self._pay()
-            except BaseException:
-                if self.running:
-                    traceback.print_exception(*sys.exc_info())
-                    log.warning("Caught exception: %s", sys.exc_info()[0].__name__)
-                else:
-                    log.warning("Caught exception: %s", sys.exc_info()[0].__name__)
+            except (asyncio.TimeoutError, ConnectionError):
+                if not self.running:
+                    break
+                delay = max(self.payment_period / 24, 10)
+                log.warning("Payement failed. Will retry after %g seconds.", delay)
+                asyncio.sleep(delay)
+            except Exception:
+                log.exception("Unexpected exception. Payment task exiting early.")
                 raise
-                #if not self.running:
-                #    raise
 
     async def _pay(self):
         while self.running:
-            log.info("pay loop: before sleep")
             await asyncio.sleep(self.payment_period)
-            log.info("pay loop: before get_server_features")
-            features = await self.ledger.network.retriable_call(self.ledger.network.get_server_features)
-            log.info("pay loop: received features: %s", str(features))
+            features = await self.ledger.network.get_server_features()
+            log.debug("pay loop: received server features: %s", str(features))
             address = features['payment_address']
             amount = str(features['daily_fee'])
             if not address or not amount:
-                log.warning("pay loop: no address or no amount")
+                log.debug("pay loop: no address or no amount")
                 continue
 
             if not self.ledger.is_pubkey_address(address):
-                log.warning("pay loop: address not pubkey")
+                log.info("pay loop: address not pubkey")
                 self._on_payment_controller.add_error(ServerPaymentInvalidAddressError(address))
                 continue
 
             if self.wallet.is_locked:
-                log.warning("pay loop: wallet is locked")
+                log.info("pay loop: wallet is locked")
                 self._on_payment_controller.add_error(ServerPaymentWalletLockedError())
                 continue
 
             amount = lbc_to_dewies(features['daily_fee'])  # check that this is in lbc and not dewies
             limit = lbc_to_dewies(self.max_fee)
             if amount > limit:
-                log.warning("pay loop: amount (%d) > limit (%d)", amount, limit)
+                log.info("pay loop: amount (%d) > limit (%d)", amount, limit)
                 self._on_payment_controller.add_error(
                     ServerPaymentFeeAboveMaxAllowedError(features['daily_fee'], self.max_fee)
                 )
                 continue
 
-            log.info("pay loop: before transaction create")
-            tx = await Transaction.create(
-                [],
-                [Output.pay_pubkey_hash(amount, self.ledger.address_to_hash160(address))],
-                self.wallet.get_accounts_or_all(None),
-                self.wallet.get_account_or_default(None)
-            )
+            try:
+                tx = await Transaction.create(
+                    [],
+                    [Output.pay_pubkey_hash(amount, self.ledger.address_to_hash160(address))],
+                    self.wallet.get_accounts_or_all(None),
+                    self.wallet.get_account_or_default(None)
+                )
+            except InsufficientFundsError as e:
+                self._on_payment_controller.add_error(e)
+                continue
 
-            log.info("pay loop: before transaction broadcast")
             await self.ledger.broadcast_or_release(tx, blocking=True)
             if self.analytics_manager:
                 await self.analytics_manager.send_credits_sent()
-            log.info("pay loop: after transaction broadcast")
             self._on_payment_controller.add(tx)
 
     async def start(self, ledger=None, wallet=None):