From 28abd0380f51ea1cdecbb4366c4c581cc3d2e515 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Sat, 22 Jan 2022 09:01:57 -0800 Subject: [PATCH] FIx collection of typos --- README.md | 2 +- api/management/commands/clean_orders.py | 2 +- api/models.py | 4 ++-- frontend/src/components/InfoDialog.js | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 71503250..224c0bf5 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Alice wants to buy satoshis privately: See [CONTRIBUTING.md](CONTRIBUTING.md) ## Original idea -The concept of a simple custody-minimized lightning exchange using hold invoices is heavily inspired by [P2PLNBOT](https://github.com/grunch/p2plnbot) by @grunch +The concept of a simple custody-minimized lightning exchange using hold invoices is heavily inspired in [P2PLNBOT](https://github.com/grunch/p2plnbot) by @grunch ## License diff --git a/api/management/commands/clean_orders.py b/api/management/commands/clean_orders.py index 923ba3e7..845a2c8b 100644 --- a/api/management/commands/clean_orders.py +++ b/api/management/commands/clean_orders.py @@ -22,7 +22,7 @@ class Command(BaseCommand): Order.Status.DIS, Order.Status.CCA, Order.Status.PAY, Order.Status.SUC, Order.Status.FAI, Order.Status.MLD, - Order.Status.TLD] + Order.Status.TLD, Order.Status.WFR] while True: time.sleep(5) diff --git a/api/models.py b/api/models.py index 52997568..01ef8117 100644 --- a/api/models.py +++ b/api/models.py @@ -175,12 +175,12 @@ class Order(models.Model): 8 : 60*int(config('INVOICE_AND_ESCROW_DURATION')), # 'Waiting only for buyer invoice' 9 : 60*60*int(config('FIAT_EXCHANGE_DURATION')), # 'Sending fiat - In chatroom' 10 : 60*60*int(config('FIAT_EXCHANGE_DURATION')), # 'Fiat sent - In chatroom' - 11 : 10*24*60*60, # 'In dispute' + 11 : 1*24*60*60, # 'In dispute' 12 : 0, # 'Collaboratively cancelled' 13 : 24*60*60, # 'Sending satoshis to buyer' 14 : 24*60*60, # 'Sucessful trade' 15 : 24*60*60, # 'Failed lightning network routing' - 16 : 24*60*60, # 'Wait for dispute resolution' + 16 : 10*24*60*60, # 'Wait for dispute resolution' 17 : 24*60*60, # 'Maker lost dispute' 18 : 24*60*60, # 'Taker lost dispute' } diff --git a/frontend/src/components/InfoDialog.js b/frontend/src/components/InfoDialog.js index d06baf6b..a49f06e4 100644 --- a/frontend/src/components/InfoDialog.js +++ b/frontend/src/components/InfoDialog.js @@ -24,13 +24,13 @@ export default class InfoDialog extends Component { Both have to post a small bond using lightning to prove they are real robots. Then, Alice posts the trade collateral also using a lightning hold invoice. RoboSats locks the invoice until Alice confirms she - received the fiat. Then the satoshis to Bob. Enjoy your satoshis, + received the fiat, then the satoshis are released to Bob. Enjoy your satoshis, Bob!

At no point, AdequateAlice01 and BafflingBob02 have to trust the bitcoin to each other. In case they have a conflict, RoboSats staff - will help resolving the dispute. You can find an step-by-step - description of the trade pipeline on our GitHub Readme

+ will help resolving the dispute. You can find a step-by-step + description of the trade pipeline in 'How it works'

What payment methods are accepted? @@ -79,10 +79,10 @@ export default class InfoDialog extends Component { In addition, disputes are solved by the RoboSats staff.

-

Trust requirements are minimized, however there is still one way - RoboSats could run away with your satoshis, by not releasing - the satoshis to the buyer. It could be argued that such move is not on - RoboSats interest as it would damage thereputation for a small payout. +

Trust requirements are minimal, however there is still one way RoboSats + could run away with your satoshis: by not releasing + the satoshis to the buyer. It could be argued that such move is not on RoboSats + interest as it would damage the reputation for a small payout. However, you should hesitate and only trade small quantities at a time. For large amounts use an onchain escrow service such as Bisq