From 9da33b60e66449d09c1754fedaf8e7678cd64a57 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Thu, 9 Jun 2022 03:56:17 -0700 Subject: [PATCH] Lower time between retries to 1min. Disable ResetMC. Increase timeout. --- .env-sample | 2 +- api/tasks.py | 9 +++++---- frontend/src/components/TradeBox.js | 2 +- frontend/src/locales/ca.json | 2 +- frontend/src/locales/de.json | 2 +- frontend/src/locales/en.json | 2 +- frontend/src/locales/es.json | 2 +- frontend/src/locales/fr.json | 2 +- frontend/src/locales/pl.json | 2 +- frontend/src/locales/ru.json | 2 +- 10 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.env-sample b/.env-sample index efc7b203..799143f6 100644 --- a/.env-sample +++ b/.env-sample @@ -63,7 +63,7 @@ MAX_BOND_SIZE = 15 # Time out penalty for canceling takers in SECONDS PENALTY_TIMEOUT = 60 # Time between routing attempts of buyer invoice in MINUTES -RETRY_TIME = 5 +RETRY_TIME = 1 # Platform activity limits MAX_PUBLIC_ORDERS = 100 diff --git a/api/tasks.py b/api/tasks.py index ffe50e67..b35bc928 100644 --- a/api/tasks.py +++ b/api/tasks.py @@ -82,8 +82,8 @@ def follow_send_payment(hash): request = LNNode.routerrpc.SendPaymentRequest( payment_request=lnpayment.invoice, fee_limit_sat=fee_limit_sat, - timeout_seconds=60, - ) # time out payment in 60 seconds + timeout_seconds=75, + ) # time out payment in 75 seconds order = lnpayment.order_paid try: @@ -133,8 +133,9 @@ def follow_send_payment(hash): print(context) # If failed due to not route, reset mission control. (This won't scale well, just a temporary fix) - if response.failure_reason==2: - LNNode.resetmc() + # ResetMC deactivate temporary for tests + #if response.failure_reason==2: + # LNNode.resetmc() return False, context diff --git a/frontend/src/components/TradeBox.js b/frontend/src/components/TradeBox.js index d162e9ff..c4afc652 100644 --- a/frontend/src/components/TradeBox.js +++ b/frontend/src/components/TradeBox.js @@ -1239,7 +1239,7 @@ handleRatingRobosatsChange=(e)=>{ - {t("RoboSats will try to pay your invoice 3 times every 5 minutes. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.")} + {t("RoboSats will try to pay your invoice 3 times with a one minute pause in between. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.")} diff --git a/frontend/src/locales/ca.json b/frontend/src/locales/ca.json index cc2c6cb7..0e6ccc7a 100644 --- a/frontend/src/locales/ca.json +++ b/frontend/src/locales/ca.json @@ -323,7 +323,7 @@ "Lightning Routing Failed":"Ha fallat l'enrutament Lightning", "Your invoice has expired or more than 3 payment attempts have been made. Muun wallet is not recommended. ":"La teva factura ha expirat o s'han fet més de 3 intents de pagament. La cartera Muun no està recomanada. ", "Check the list of compatible wallets":"Mira la llista de carteres compatibles", - "RoboSats will try to pay your invoice 3 times every 5 minutes. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.":"RoboSats intentarà pagar la teva factura 3 cops cada 5 minuts. Si segueix fallant, podràs presentar una nova factura. Comprova si tens suficient liquiditat entrant. Recorda que els nodes de Lightning han d'estar en línia per poder rebre pagaments.", + "RoboSats will try to pay your invoice 3 times with a one minute pause in between. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.":"RoboSats intentarà pagar la teva factura 3 cops cada 1 minut. Si segueix fallant, podràs presentar una nova factura. Comprova si tens suficient liquiditat entrant. Recorda que els nodes de Lightning han d'estar en línia per poder rebre pagaments.", "Next attempt in":"Proper intent en", "Do you want to open a dispute?":"Vols obrir una disputa?", "The RoboSats staff will examine the statements and evidence provided. You need to build a complete case, as the staff cannot read the chat. It is best to provide a burner contact method with your statement. The satoshis in the trade escrow will be sent to the dispute winner, while the dispute loser will lose the bond.":"L'equip de RoboSats examinarà les declaracions i evidències presentades. Com l'equip no pot llegir el xat necessites escriure una declaració completa i exhaustiva. És millor donar un mètode de contacte d'usar i llençar amb la teva declaració. Els Sats del col·lateral seran enviats al guanyador de la disputa, mientres que el perdedor perderà la seva fiança.", diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 3cc4b9e6..8fdaeb23 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -345,7 +345,7 @@ "Lightning Routing Failed":"Lightning-Weiterleitung fehlgeschlagen", "Your invoice has expired or more than 3 payment attempts have been made.":"Deine Invoice ist abgelaufen oder mehr als 3 Zahlungs-Versuche sind fehlgeschlagen. Reiche eine neue Invoice ein", "Check the list of compatible wallets":"Prüfe die Liste mit kompatiblen Wallets", - "RoboSats will try to pay your invoice 3 times every 5 minutes. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.":"RoboSats wird alle 5 Minuten 3 mal versuchen, deine Invoice auszuzahlen. Wenn es weiter fehlschlägt, kannst du eine neue Invoice einfügen. Prüfe deine Inbound-Liquidität. Denk daran, dass deine Lightning-Node erreichbar sein muss, um die Zahlung zu erhalten.Denk daran, dass deine Lightning-Node erreichbar sein muss, um die Zahlung zu erhalten.", + "RoboSats will try to pay your invoice 3 times with a one minute pause in between. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.""RoboSats will try to pay your invoice 3 times with a one minute pause in between. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.":"RoboSats wird alle eine Minute 3 mal versuchen, deine Invoice auszuzahlen. Wenn es weiter fehlschlägt, kannst du eine neue Invoice einfügen. Prüfe deine Inbound-Liquidität. Denk daran, dass deine Lightning-Node erreichbar sein muss, um die Zahlung zu erhalten.Denk daran, dass deine Lightning-Node erreichbar sein muss, um die Zahlung zu erhalten.", "Next attempt in":"Nächster Versuch in", "Do you want to open a dispute?":"Möchtest du einen Fall eröffnen?", "The RoboSats staff will examine the statements and evidence provided. You need to build a complete case, as the staff cannot read the chat. It is best to provide a burner contact method with your statement. The satoshis in the trade escrow will be sent to the dispute winner, while the dispute loser will lose the bond.":"Das RoboSats-Team wird die Aussagen und Beweise prüfen. Du musst die vollständige Situation erklären, wir können den Chat nicht sehen. Benutze am besten Wegwerf-Kontakt-Infos. Die hinterlegten Satoshis gehen an den Fall-Gewinner, der Verlierer verliert seine Kaution.", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 73f1ba85..7f0fbeaa 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -348,7 +348,7 @@ "Lightning Routing Failed":"Lightning Routing Failed", "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.":"Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.", "Check the list of compatible wallets":"Check the list of compatible wallets", - "RoboSats will try to pay your invoice 3 times every 5 minutes. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.":"RoboSats will try to pay your invoice 3 times every 5 minutes. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.", + "RoboSats will try to pay your invoice 3 times with a one minute pause in between. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.":"RoboSats will try to pay your invoice 3 times with a one minute pause in between. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.", "Next attempt in":"Next attempt in", "Do you want to open a dispute?":"Do you want to open a dispute?", "The RoboSats staff will examine the statements and evidence provided. You need to build a complete case, as the staff cannot read the chat. It is best to provide a burner contact method with your statement. The satoshis in the trade escrow will be sent to the dispute winner, while the dispute loser will lose the bond.":"The RoboSats staff will examine the statements and evidence provided. You need to build a complete case, as the staff cannot read the chat. It is best to provide a burner contact method with your statement. The satoshis in the trade escrow will be sent to the dispute winner, while the dispute loser will lose the bond.", diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json index e68d222f..ef03aad3 100644 --- a/frontend/src/locales/es.json +++ b/frontend/src/locales/es.json @@ -347,7 +347,7 @@ "Lightning Routing Failed": "Fallo en el enrutamiento de Lightning", "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.": "Tu factura ha expirado o se han hecho más de 3 intentos de pago. Entrega una nueva factura.", "Check the list of compatible wallets": "Mira la lista de carteras compatibles", - "RoboSats will try to pay your invoice 3 times every 5 minutes. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.": "RoboSats intentará pagar tu factura 3 veces cada 5 minutos. Si sigue fallando, podrás presentar una nueva factura. Comprueba si tienes suficiente liquidez entrante. Recuerda que los nodos de Lightning tienen que estar en línea para poder recibir pagos.", + "RoboSats will try to pay your invoice 3 times with a one minute pause in between. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.": "RoboSats intentará pagar tu factura 3 veces con una pausa de un minuto entre intento. Si sigue fallando, podrás presentar una nueva factura. Comprueba si tienes suficiente liquidez entrante. Recuerda que los nodos de Lightning tienen que estar en línea para poder recibir pagos.", "Next attempt in": "Próximo intento en", "Do you want to open a dispute?": "¿Quieres abrir una disputa?", "The RoboSats staff will examine the statements and evidence provided. You need to build a complete case, as the staff cannot read the chat. It is best to provide a burner contact method with your statement. The satoshis in the trade escrow will be sent to the dispute winner, while the dispute loser will lose the bond.": "El equipo de RoboSats examinará las declaraciones y evidencias presentadas. Como el equipo no puede leer el chat, necesitas escribir una declaració completa y exhaustiva. Es mejor dar un método de contacto de usar y tirar con tu declaración. Los Sats del colateral serán enviados al ganador de la disputa, mientras que el perdedor perderá la fianza.", diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index 6f41bbe6..b6644221 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -306,7 +306,7 @@ "Lightning Routing Failed":"Échec du routage Lightning", "Your invoice has expired or more than 3 payment attempts have been made.":"Votre facture a expiré ou plus de 3 tentatives de paiement ont été effectuées. Le porte-monnaie Muun n'est pas recommandé.", "Check the list of compatible wallets":"Vérifier la liste des portefeuilles compatibles", - "RoboSats will try to pay your invoice 3 times every 5 minutes. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.":"RoboSats essaiera de payer votre facture 3 fois toutes les 5 minutes. S'il continue à échouer, vous pourrez soumettre une nouvelle facture. Vérifiez si vous avez suffisamment de liquidité entrante. N'oubliez pas que les nœuds lightning doivent être en ligne pour pouvoir recevoir des paiements.", + "RoboSats will try to pay your invoice 3 times with a one minute pause in between. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.":"RoboSats essaiera de payer votre facture 3 fois toutes les 1 minute. S'il continue à échouer, vous pourrez soumettre une nouvelle facture. Vérifiez si vous avez suffisamment de liquidité entrante. N'oubliez pas que les nœuds lightning doivent être en ligne pour pouvoir recevoir des paiements.", "Next attempt in":"Prochaine tentative en", "Do you want to open a dispute?":"Voulez-vous ouvrir un litige?", "The RoboSats staff will examine the statements and evidence provided. You need to build a complete case, as the staff cannot read the chat. It is best to provide a burner contact method with your statement. The satoshis in the trade escrow will be sent to the dispute winner, while the dispute loser will lose the bond.":"Le personnel de RoboSats examinera les déclarations et les preuves fournies. Vous devez constituer un dossier complet, car le personnel ne peut pas lire le chat. Il est préférable de fournir une méthode de contact jetable avec votre déclaration. Les satoshis dans le dépôt seront envoyés au gagnant du litige, tandis que le perdant du litige perdra la caution.", diff --git a/frontend/src/locales/pl.json b/frontend/src/locales/pl.json index ed52225b..e304a7c2 100644 --- a/frontend/src/locales/pl.json +++ b/frontend/src/locales/pl.json @@ -306,7 +306,7 @@ "Lightning Routing Failed":"Lightning Niepowodzenie routingu", "Your invoice has expired or more than 3 payment attempts have been made.":"Twoja faktura wygasła lub wykonano więcej niż 3 próby płatności. Muun Wallet nie jest zalecany. ", "Check the list of compatible wallets":"Sprawdź listę kompatybilnych wallets", - "RoboSats will try to pay your invoice 3 times every 5 minutes. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.":"RoboSats będzie próbował zapłacić fakturę 3 razy co 5 minut. Jeśli to się nie powiedzie, będziesz mógł wystawić nową fakturę. Sprawdź, czy masz wystarczającą płynność przychodzącą. Pamiętaj, że węzły pioruna muszą być online, aby otrzymywać płatności.", + "RoboSats will try to pay your invoice 3 times with a one minute pause in between. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.":"RoboSats będzie próbował zapłacić fakturę 3 razy co 1 minut. Jeśli to się nie powiedzie, będziesz mógł wystawić nową fakturę. Sprawdź, czy masz wystarczającą płynność przychodzącą. Pamiętaj, że węzły pioruna muszą być online, aby otrzymywać płatności.", "Next attempt in":"Następna próba za", "Do you want to open a dispute?":"Chcesz otworzyć spór?", "The RoboSats staff will examine the statements and evidence provided. You need to build a complete case, as the staff cannot read the chat. It is best to provide a burner contact method with your statement. The satoshis in the trade escrow will be sent to the dispute winner, while the dispute loser will lose the bond.":"Pracownicy RoboSats przeanalizują przedstawione oświadczenia i dowody. Musisz zbudować kompletną sprawę, ponieważ personel nie może czytać czatu. W oświadczeniu najlepiej podać metodę kontaktu z palnikiem. Satoshi w depozycie handlowym zostaną wysłane do zwycięzcy sporu, podczas gdy przegrany sporu straci obligację.", diff --git a/frontend/src/locales/ru.json b/frontend/src/locales/ru.json index d86a716d..45aac3b0 100644 --- a/frontend/src/locales/ru.json +++ b/frontend/src/locales/ru.json @@ -345,7 +345,7 @@ "Lightning Routing Failed":"Раутинг через Lightning не удался", "Your invoice has expired or more than 3 payment attempts have been made. Submit a new invoice.":"Срок действия Вашего инвойса истёк или было сделано более трёх попыток оплаты. Отправьте новый инвойс.", "Check the list of compatible wallets":"Проверьте список совместимых кошельков", - "RoboSats will try to pay your invoice 3 times every 5 minutes. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.":"RoboSats будет пытаться оплатить Ваш инвойс 3и раза каждые 5ть минут. Если это не удастся, Вы сможете отправить новый инвойс. Проверьте, достаточно ли у Вас входящей ликвидности. Помните, что ноды Lightning должны быть подключены к сети, чтобы получать платежи.", + "RoboSats will try to pay your invoice 3 times with a one minute pause in between. If it keeps failing, you will be able to submit a new invoice. Check whether you have enough inbound liquidity. Remember that lightning nodes must be online in order to receive payments.":"RoboSats будет пытаться оплатить Ваш инвойс 3и раза каждые 1ть минут. Если это не удастся, Вы сможете отправить новый инвойс. Проверьте, достаточно ли у Вас входящей ликвидности. Помните, что ноды Lightning должны быть подключены к сети, чтобы получать платежи.", "Next attempt in":"Следующая попытка через", "Do you want to open a dispute?":"Хотите ли Вы открыть диспут?", "The RoboSats staff will examine the statements and evidence provided. You need to build a complete case, as the staff cannot read the chat. It is best to provide a burner contact method with your statement. The satoshis in the trade escrow will be sent to the dispute winner, while the dispute loser will lose the bond.":"Персонал RoboSats рассмотрит предоставленные заявления и доказательства. Вам необходимо построить полное дело, так как сотрудники не могут читать чат. Лучше всего указать одноразовый метод контакта вместе с Вашим заявлением. Сатоши в эскроу сделки будут отправлены победителю диспута, а проигравший в диспуте потеряет залог.",