.env-sample

@@ -24,7 +24,7 @@ MONGO_URI='mongodb://username:password@localhost'
 
 # lightning invoice expiration time in milliseconds
 INVOICE_EXPIRATION_WINDOW=3600000
-# lightning hold invoice expiration time in seconds
+# This is the time that a taker has to pay the invoice (seller) or add a new invoice (buyer), in seconds
 HOLD_INVOICE_EXPIRATION_WINDOW=600
 
 CHANNEL='@p2plnbotchannel'
@@ -71,4 +71,13 @@ DISPUTE_CHANNEL='@p2plnbotDispute'
 COMMUNITY_TTL=31
 
 # nostr bot private key
-NOSTR_SK=''
+NOSTR_SK=''
+
+# Number of currencies allowed in a community
+COMMUNITY_CURRENCIES=20
+
+# List of relays to connect to
+RELAYS='ws://localhost:7000,ws://localhost:8000,ws://localhost:9000'
+
+# Seconds to wait to allow disputes to be started
+DISPUTE_START_WINDOW=600

.eslintrc.json

@@ -12,6 +12,7 @@
   "rules": {
     "no-underscore-dangle": "off",
     "camelcase": "off",
-    "eqeqeq": "off"
+    "eqeqeq": "off",
+    "no-void": "off"
   }
 }

.github/workflows/code-linter.yaml

@@ -1,7 +1,7 @@
 name: Auto Check Lint
 on:
-  pull_request: 
-    branches: ['main']
+  - pull_request
+  - push
 
 jobs: 
   Lint:
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 18.x
       - run: |
           npm ci
           npm run lint

.github/workflows/integrate.yaml

@@ -1,23 +1,31 @@
-name: integracion continua con node.js
+name: NodeJS Continuous Integration
 
-on: [push, pull_request]
+on: 
+  push:
+  pull_request:
+  workflow_dispatch:
+
+  # see https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
+  schedule:
+    - cron: "0 0 * * *"
 
 jobs:
   ci_to_main:
     runs-on: ubuntu-latest
+    container:
+      image: 'ubuntu:24.04'
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 14.x
+
       - name: Update apt and install required packages
         run: |
-          sudo apt update
-          sudo apt install --yes --no-install-recommends curl
-          sudo apt-get install --yes gnupg
+          apt update --yes
+          apt install --yes sudo
+          sudo apt install --yes --no-install-recommends npm
 
-      - name: Import the public key used by the package management system
+      - name: Import MongoDB's public key for the package management system
         run: |
+          sudo apt install --yes --no-install-recommends curl gnupg
           sudo rm -f /etc/ssl/certs/ca-bundle.crt
           sudo apt reinstall --yes ca-certificates
           sudo update-ca-certificates
@@ -33,9 +41,7 @@ jobs:
       - name: Check Mongo version
         run: mongod --version
       - name: Start MongoDB
-        run: sudo service mongod start
-      - name: Verify that MongoDB has started successfully
-        run: sudo service mongod status
+        run: sudo nohup mongod --quiet --config /etc/mongod.conf &
 
       - name: Create database
         run: |
@@ -50,14 +56,14 @@ jobs:
           
           mongosh --eval 'db.getSiblingDB("lnp2pbot").createCollection("mycollection")'
 
-      - run: npm install @types/node @types/i18n
-      - run: tsc
+      - run: npm install @types/node @types/i18n @types/mocha
+      - run: npx tsc
       - run: npm ci
       - name: Run tests
         env:
           DB_USER: ''
           DB_PASS: ''
-          DB_HOST: 'localhost'
+          DB_HOST: '127.0.0.1'
           DB_PORT: '27017'
           DB_NAME: 'lnp2pbot'
         run: npm test

.gitignore

@@ -1,4 +1,6 @@
 node_modules
 .env
 admin.macaroon
-tls.cert
+tls.cert
+dist/
+.history/

CONTRIBUTING.md

@@ -13,7 +13,7 @@ Most communication about @lnp2pbot happens on the main [Telegram group](https://
 All @lnp2pbot contributors submit changes via pull requests. The workflow is as follows:
 
  - Fork the repository
- - Create a topic branch from the `master` branch
+ - Create a topic branch from the `main` branch
  - Commit patches
  - Squash redundant or unnecessary commits
  - Submit a pull request from your topic branch back to the `main` branch of the main repository
@@ -41,6 +41,8 @@ Please note that Pull Requests marked `NACK` and/or GitHub's `Change requested`
 
 We ~~try to~~ use [Airbnb javascript style guide](https://github.com/airbnb/javascript) in order to have a cleaner code.
 
+All new code should be TypeScript. The use of `any` type is discouraged, except in the tests.
+
 ### Configure Git user name and email metadata
 
 See https://help.github.com/articles/setting-your-username-in-git/ for instructions.
@@ -63,10 +65,6 @@ From https://chris.beams.io/posts/git-commit/#seven-rules:
 See https://github.com/blog/2144-gpg-signature-verification for background and
 https://help.github.com/articles/signing-commits-with-gpg/ for instructions.
 
-### Use an editor that supports Editorconfig
-
-The [.editorconfig](.editorconfig) settings in this repository ensure consistent management of whitespace. Most modern editors support it natively or with plugin. See http://editorconfig.org for details.
-
 ### Keep the git history clean
 
-It's very important to keep the git history clear, light and easily browsable. This means contributors must make sure their pull requests include only meaningful commits (if they are redundant or were added after a review, they should be removed) and _no merge commits_.
+It's very important to keep the git history clear, light and easily browsable. This means contributors must make sure their pull requests include only meaningful commits (if they are redundant or were added after a review, they should be removed) and _no merge commits_.

README.md

@@ -43,13 +43,16 @@ Only if both parties cancel cooperatively the order is canceled and seller's fun
 If users have a disagreement on canceling or don't want to go forward they can start a dispute.
 
 ## Disputes
-Both parties can start a dispute at any moment, after a dispute is started a human will be notified with all the information, this human will contact both parties to evaluate the situation and take a decision.
+Both parties can start a dispute at any moment, after a dispute is started a human (aka "solver") will be notified with all the information, this solver will contact both parties to evaluate the situation and take a decision.
 
-After a user starts a dispute, both parties will have increased by **1** their own `dispute` field in database and after **2** disputes users will be banned from using the bot.
+After a user starts a dispute, both parties will have increased by **1** their own `dispute` field in database. If during a dispute it is proven that there is a malicious user, the solver can ban that user, and they will no longer be able to use the bot anymore.
 
 ## Incentive to release funds
 A seller that didn't release funds to the buyer can't open or take another order from the bot and probably will be involved in a dispute from the buyer damaging his/her reputation
 
+## Communities
+Anyone who already has or creates a Telegram group can include the [bot](https://t.me/lnp2pbot) inside to facilitate buying and selling bitcoin among its members. The group administrator will earn a commission for transactions conducted within their community, and they can also offer discounts on the fees that the bot charges within their community.
+
 # Financial Support
 **LNp2pBot** is an open source project. We are not a company, we don't do ICOs or dark business, we are just people that wants bring solutions to the people using the best open source money in the world. Our work depends on the financial collaboration of the users.
 
@@ -111,7 +114,7 @@ $ npm start
 $ npm test
 ```
 # Documentation
-You can find documentation in [english](https://lnp2pbot.com/learn) and [spanish](https://lnp2pbot.com/aprende).
+You can find documentation in [English](https://lnp2pbot.com/learn), [Spanish](https://lnp2pbot.com/aprende), [Portuguese](https://lnp2pbot.com/aprenda), [French](https://lnp2pbot.com/apprendre) and [Persian](https://lnp2pbot.com/farsi-doc)
 
 # Contribute
 

app.js → app.ts

@@ -1,9 +1,10 @@
-require('dotenv').config();
-const { SocksProxyAgent } = require('socks-proxy-agent');
-const { start } = require('./bot');
-const mongoConnect = require('./db_connect');
+import "dotenv/config";
+import { SocksProxyAgent } from "socks-proxy-agent";
+import { MainContext, start } from "./bot/start";
+import { connect as mongoConnect } from './db_connect'
 const { resubscribeInvoices } = require('./ln');
-const logger = require('./logger');
+import { logger } from "./logger";
+import { Telegraf } from "telegraf";
 const { delay } = require('./util');
 
 (async () => {
@@ -23,7 +24,7 @@ const { delay } = require('./util');
   mongoose.connection
     .once('open', async () => {
       logger.info('Connected to Mongo instance.');
-      let options = { handlerTimeout: 60000 };
+      let options: Partial<Telegraf.Options<MainContext>> = { handlerTimeout: 60000 };
       if (process.env.SOCKS_PROXY_HOST) {
         const agent = new SocksProxyAgent(process.env.SOCKS_PROXY_HOST);
         options = {
@@ -32,10 +33,10 @@ const { delay } = require('./util');
           },
         };
       }
-      const bot = start(process.env.BOT_TOKEN, options);
+      const bot = start(String(process.env.BOT_TOKEN), options);
       // Wait 1 seconds before try to resubscribe hold invoices
       await delay(1000);
       await resubscribeInvoices(bot);
     })
-    .on('error', error => logger.error(`Error connecting to Mongo: ${error}`));
+    .on('error', (error: Error) => logger.error(`Error connecting to Mongo: ${error}`));
 })();