From 4023b7ee0f54dabd656e803629d13c59411a13b8 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Tue, 23 Jan 2024 10:53:16 +0000 Subject: [PATCH 01/12] Add timestamp to devfund script --- scripts/get_devfund_donations.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/get_devfund_donations.py b/scripts/get_devfund_donations.py index c7466a141..9d53cffd8 100644 --- a/scripts/get_devfund_donations.py +++ b/scripts/get_devfund_donations.py @@ -2,6 +2,7 @@ import json import requests import base64 +from datetime import datetime devfund_data_path = os.path.normpath(os.path.join("..", "devfund_pubkey.json")) @@ -19,7 +20,9 @@ for invoice in response_data["invoices"]: if invoice["is_keysend"] and invoice["htlcs"][0]["custom_records"]["34349334"]: + dt = datetime.fromtimestamp(int(invoice["creation_date"])) print(f"Index {invoice['add_index']}") + print(f'Timestamp {dt.strftime("%Y-%m-%d %H:%M:%S")}') print( f"{base64.b64decode(invoice['htlcs'][0]['custom_records']['34349334']).decode('utf-8')}" ) From dc531d13d2c5be9a0e8ede1706e1c1c61701bc74 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Tue, 23 Jan 2024 11:36:23 +0000 Subject: [PATCH 02/12] Update node id on contribute docs --- docs/_config.yml | 2 +- docs/_pages/contribute/07-donate.md | 25 +++++++++++-------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/docs/_config.yml b/docs/_config.yml index b8a72fd6d..c85258051 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -30,7 +30,7 @@ masthead_title : # overrides the website title displayed in the masthe # breadcrumbs : false # true, false (default) words_per_minute : robosats: - node_id : 0282eb467bc073833a039940392592bf10cf338a830ba4e392c1667d7697654c7e + node_id : 037ff12b6a4e4bcb4b944b6d20af08cdff61b3461c1dff0d00a88697414d891bc7 maker_fee : 0.025 # In percent (%) taker_fee : 0.175 # In percent (%) total_fee : 0.2 # In percent (%) diff --git a/docs/_pages/contribute/07-donate.md b/docs/_pages/contribute/07-donate.md index d0bd113ef..632b27df6 100644 --- a/docs/_pages/contribute/07-donate.md +++ b/docs/_pages/contribute/07-donate.md @@ -15,13 +15,11 @@ We do, however, get approached by very enthusiastic bitcoiners who want to boost You can donate the following ways: - - **Zap us on Nostr:** - All Nostr zaps will go towards the social media team. - Here is the nPub for RoboSats account : - - ``` -npub1p2psats79rypr8lpnl9t5qdekfp700x660qsgw284xvq4s09lqrqqk3m82 - ``` + - **Tip the [RoboSats DevFund Node](https://amboss.space/node/{{site.robosats.node_id}}) via KeySend:** +
+ + +
- **Directly tip the developer working on the features you like.** Check the [active PRs](https://github.com/RoboSats/robosats/pulls) and show your support to the developers with via Lightning tips. Simply write a message, for example "@developer_name, I would like to fund your development of this feature with 6000 Sats". The developer should reply with an LN invoice with a long expiration time. @@ -47,14 +45,13 @@ npub1p2psats79rypr8lpnl9t5qdekfp700x660qsgw284xvq4s09lqrqqk3m82 {{site.robosats.leaddev_paynym_code}} ``` - - **Tip the [experimental RoboSats coordinator](https://amboss.space/node/{{site.robosats.node_id}}) via KeySend:** -
- - -
- - + - **Zap us on Nostr:** + All Nostr zaps will go towards the social media team. + Here is the nPub for RoboSats account : + ``` +npub1p2psats79rypr8lpnl9t5qdekfp700x660qsgw284xvq4s09lqrqqk3m82 + ``` From 9d8ba12e9bf89ce7ae8a62a6b1806c503fb5a83b Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Tue, 23 Jan 2024 12:47:31 +0000 Subject: [PATCH 03/12] Fix node id widget to ln adress --- docs/_pages/contribute/07-donate.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_pages/contribute/07-donate.md b/docs/_pages/contribute/07-donate.md index 632b27df6..bd81131a4 100644 --- a/docs/_pages/contribute/07-donate.md +++ b/docs/_pages/contribute/07-donate.md @@ -17,7 +17,7 @@ You can donate the following ways: - **Tip the [RoboSats DevFund Node](https://amboss.space/node/{{site.robosats.node_id}}) via KeySend:**
- +
From f85fb1e79cc4791b00dec13d00aa2c23f7721f27 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Tue, 23 Jan 2024 14:24:27 +0000 Subject: [PATCH 04/12] Update robodevfund address --- docs/_pages/contribute/07-donate.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_pages/contribute/07-donate.md b/docs/_pages/contribute/07-donate.md index bd81131a4..2faf1edbd 100644 --- a/docs/_pages/contribute/07-donate.md +++ b/docs/_pages/contribute/07-donate.md @@ -17,7 +17,7 @@ You can donate the following ways: - **Tip the [RoboSats DevFund Node](https://amboss.space/node/{{site.robosats.node_id}}) via KeySend:**
- +
From e4f562d89bac5e78a62505045d096b97986d3f19 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Wed, 24 Jan 2024 19:46:24 +0000 Subject: [PATCH 05/12] Add RU tutorials by 21ideas and bitkorn --- docs/_data/navigation.yml | 4 ++++ docs/_pages/tutorials/read/how-to-use_ru.md | 13 +++++++++++++ docs/_pages/tutorials/watch/videos-ru.md | 16 ++++++++++++++++ docs/assets/vector/russian.svg | 1 + 4 files changed, 34 insertions(+) create mode 100644 docs/_pages/tutorials/read/how-to-use_ru.md create mode 100644 docs/_pages/tutorials/watch/videos-ru.md create mode 100644 docs/assets/vector/russian.svg diff --git a/docs/_data/navigation.yml b/docs/_data/navigation.yml index beb0ca9f7..1f6a8267e 100644 --- a/docs/_data/navigation.yml +++ b/docs/_data/navigation.yml @@ -91,6 +91,8 @@ tutorial: url: "/watch/fr/" - title: '   Polski' url: "/watch/pl/" + - title: '   Русский' + url: "/watch/ru/" - title: 'Read' url: "/watch/en/" children: @@ -100,6 +102,8 @@ tutorial: url: "/read/es/" - title: '   Deutsch' url: "/read/de/" + - title: '   Русский' + url: "/read/ru/" contribute: - title: 'Contribute' diff --git a/docs/_pages/tutorials/read/how-to-use_ru.md b/docs/_pages/tutorials/read/how-to-use_ru.md new file mode 100644 index 000000000..c1b66715b --- /dev/null +++ b/docs/_pages/tutorials/read/how-to-use_ru.md @@ -0,0 +1,13 @@ +--- +layout: single +title: Самоучитель RoboSats +permalink: /read/ru/ +toc: true +toc_sticky: true +sidebar: + title: 'Учебное пособие' + nav: tutorial +--- +![image](https://21ideas.org/img/main-section/main_light.png) +### RoboSats – Простой и приватный способ обмена биткоина +Великолепное руководство по использованию "RoboSats" от 21ideas.org \ No newline at end of file diff --git a/docs/_pages/tutorials/watch/videos-ru.md b/docs/_pages/tutorials/watch/videos-ru.md new file mode 100644 index 000000000..7ecb47754 --- /dev/null +++ b/docs/_pages/tutorials/watch/videos-ru.md @@ -0,0 +1,16 @@ +--- +layout: single +title: Смотрите и учитесь +permalink: /watch/ru/ +toc: true +toc_sticky: true +sidebar: + title: 'Учебники' + nav: tutorial +src: "_pages/docs/tutorials/videos-ru.md" +--- + +### BitKorn Guide | RoboSats. Покупка и продажа Биткоина + + +{% include add_tutorials %} diff --git a/docs/assets/vector/russian.svg b/docs/assets/vector/russian.svg new file mode 100644 index 000000000..855b805a5 --- /dev/null +++ b/docs/assets/vector/russian.svg @@ -0,0 +1 @@ + \ No newline at end of file From 3b3bada42552cf9f603a2215ab837afdee629fec Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Thu, 25 Jan 2024 15:17:46 +0000 Subject: [PATCH 06/12] Add orangedmike tutorial --- docs/_pages/tutorials/watch/videos-de.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/_pages/tutorials/watch/videos-de.md b/docs/_pages/tutorials/watch/videos-de.md index 1fba7bedf..f1dc3cf4b 100644 --- a/docs/_pages/tutorials/watch/videos-de.md +++ b/docs/_pages/tutorials/watch/videos-de.md @@ -10,6 +10,9 @@ sidebar: src: "_pages/docs/tutorials/videos-de.md" --- +#### OrangedMike: ROBOSATS - Bitcoin Kauf, Verkauf und Swap + + #### Einundzwanzig: Bitcoin unabhängig und ohne Registrierung kaufen From 626bc4876c92a9ee074c26b9188a9328a6ebf836 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 28 Jan 2024 12:15:52 +0000 Subject: [PATCH 07/12] Bump coverage from 7.4.0 to 7.4.1 (#1094) Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.4.0 to 7.4.1. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.4.0...7.4.1) --- updated-dependencies: - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index c4ee4f9f0..ce23ccc74 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,4 +1,4 @@ -coverage==7.4.0 +coverage==7.4.1 ruff==0.1.14 drf-openapi-tester==2.3.3 pre-commit==3.6.0 \ No newline at end of file From 9624f7dd45e038f99ddbb8fe9701beb860555ff3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 28 Jan 2024 12:16:15 +0000 Subject: [PATCH 08/12] Bump npm from 10.3.0 to 10.4.0 in /frontend (#1093) Bumps [npm](https://github.com/npm/cli) from 10.3.0 to 10.4.0. - [Release notes](https://github.com/npm/cli/releases) - [Changelog](https://github.com/npm/cli/blob/latest/CHANGELOG.md) - [Commits](https://github.com/npm/cli/compare/v10.3.0...v10.4.0) --- updated-dependencies: - dependency-name: npm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 260 +++++++++++++++---------------------- frontend/package.json | 2 +- 2 files changed, 103 insertions(+), 159 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 5470651c3..86adaf376 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "frontend", - "version": "0.5.3", + "version": "0.5.4", "license": "ISC", "dependencies": { "@babel/plugin-proposal-class-properties": "^7.18.6", @@ -33,7 +33,7 @@ "js-sha256": "^0.10.1", "leaflet": "^1.9.4", "light-bolt11-decoder": "^3.0.0", - "npm": "^10.3.0", + "npm": "^10.4.0", "openpgp": "^5.11.0", "react": "^18.2.0", "react-countdown": "^2.3.5", @@ -10359,9 +10359,9 @@ } }, "node_modules/npm": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/npm/-/npm-10.3.0.tgz", - "integrity": "sha512-9u5GFc1UqI2DLlGI7QdjkpIaBs3UhTtY8KoCqYJK24gV/j/tByaI4BA4R7RkOc+ASqZMzFPKt4Pj2Z8JcGo//A==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/npm/-/npm-10.4.0.tgz", + "integrity": "sha512-RS7Mx0OVfXlOcQLRePuDIYdFCVBPCNapWHplDK+mh7GDdP/Tvor4ocuybRRPSvfcRb2vjRJt1fHCqw3cr8qACQ==", "bundleDependencies": [ "@isaacs/string-locale-compare", "@npmcli/arborist", @@ -10425,7 +10425,6 @@ "semver", "spdx-expression-parse", "ssri", - "strip-ansi", "supports-color", "tar", "text-table", @@ -10443,8 +10442,8 @@ "@npmcli/map-workspaces": "^3.0.4", "@npmcli/package-json": "^5.0.0", "@npmcli/promise-spawn": "^7.0.1", - "@npmcli/run-script": "^7.0.3", - "@sigstore/tuf": "^2.2.0", + "@npmcli/run-script": "^7.0.4", + "@sigstore/tuf": "^2.3.0", "abbrev": "^2.0.0", "archy": "~1.0.0", "cacache": "^18.0.2", @@ -10490,7 +10489,7 @@ "npm-user-validate": "^2.0.0", "npmlog": "^7.0.1", "p-map": "^4.0.0", - "pacote": "^17.0.5", + "pacote": "^17.0.6", "parse-conflict-json": "^3.0.1", "proc-log": "^3.0.0", "qrcode-terminal": "^0.12.0", @@ -10498,7 +10497,6 @@ "semver": "^7.5.4", "spdx-expression-parse": "^3.0.1", "ssri": "^10.0.5", - "strip-ansi": "^7.1.0", "supports-color": "^9.4.0", "tar": "^6.2.0", "text-table": "~0.2.0", @@ -10553,6 +10551,17 @@ "node": ">=12" } }, + "node_modules/npm/node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "inBundle": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, "node_modules/npm/node_modules/@isaacs/cliui/node_modules/emoji-regex": { "version": "9.2.2", "inBundle": true, @@ -10574,6 +10583,20 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/npm/node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "inBundle": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, "node_modules/npm/node_modules/@isaacs/string-locale-compare": { "version": "1.1.0", "inBundle": true, @@ -10595,7 +10618,7 @@ } }, "node_modules/npm/node_modules/@npmcli/arborist": { - "version": "7.3.0", + "version": "7.3.1", "inBundle": true, "license": "ISC", "dependencies": { @@ -10626,7 +10649,7 @@ "parse-conflict-json": "^3.0.0", "proc-log": "^3.0.0", "promise-all-reject-late": "^1.0.0", - "promise-call-limit": "^1.0.2", + "promise-call-limit": "^3.0.1", "read-package-json-fast": "^3.0.2", "semver": "^7.3.7", "ssri": "^10.0.5", @@ -10811,14 +10834,14 @@ } }, "node_modules/npm/node_modules/@npmcli/run-script": { - "version": "7.0.3", + "version": "7.0.4", "inBundle": true, "license": "ISC", "dependencies": { "@npmcli/node-gyp": "^3.0.0", + "@npmcli/package-json": "^5.0.0", "@npmcli/promise-spawn": "^7.0.0", "node-gyp": "^10.0.0", - "read-package-json-fast": "^3.0.0", "which": "^4.0.0" }, "engines": { @@ -10835,7 +10858,7 @@ } }, "node_modules/npm/node_modules/@sigstore/bundle": { - "version": "2.1.0", + "version": "2.1.1", "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -10845,6 +10868,14 @@ "node": "^16.14.0 || >=18.0.0" } }, + "node_modules/npm/node_modules/@sigstore/core": { + "version": "0.2.0", + "inBundle": true, + "license": "Apache-2.0", + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, "node_modules/npm/node_modules/@sigstore/protobuf-specs": { "version": "0.2.1", "inBundle": true, @@ -10854,11 +10885,12 @@ } }, "node_modules/npm/node_modules/@sigstore/sign": { - "version": "2.2.0", + "version": "2.2.1", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@sigstore/bundle": "^2.1.0", + "@sigstore/bundle": "^2.1.1", + "@sigstore/core": "^0.2.0", "@sigstore/protobuf-specs": "^0.2.1", "make-fetch-happen": "^13.0.0" }, @@ -10867,12 +10899,25 @@ } }, "node_modules/npm/node_modules/@sigstore/tuf": { - "version": "2.2.0", + "version": "2.3.0", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@sigstore/protobuf-specs": "^0.2.1", - "tuf-js": "^2.1.0" + "tuf-js": "^2.2.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/npm/node_modules/@sigstore/verify": { + "version": "0.1.0", + "inBundle": true, + "license": "Apache-2.0", + "dependencies": { + "@sigstore/bundle": "^2.1.1", + "@sigstore/core": "^0.2.0", + "@sigstore/protobuf-specs": "^0.2.1" }, "engines": { "node": "^16.14.0 || >=18.0.0" @@ -10930,14 +10975,11 @@ } }, "node_modules/npm/node_modules/ansi-regex": { - "version": "6.0.1", + "version": "5.0.1", "inBundle": true, "license": "MIT", "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" + "node": ">=8" } }, "node_modules/npm/node_modules/ansi-styles": { @@ -11098,25 +11140,6 @@ "node": ">= 10" } }, - "node_modules/npm/node_modules/cli-columns/node_modules/ansi-regex": { - "version": "5.0.1", - "inBundle": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/npm/node_modules/cli-columns/node_modules/strip-ansi": { - "version": "6.0.1", - "inBundle": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/npm/node_modules/cli-table3": { "version": "0.6.3", "inBundle": true, @@ -11183,25 +11206,6 @@ "node": ">=8.0.0" } }, - "node_modules/npm/node_modules/columnify/node_modules/ansi-regex": { - "version": "5.0.1", - "inBundle": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/npm/node_modules/columnify/node_modules/strip-ansi": { - "version": "6.0.1", - "inBundle": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/npm/node_modules/common-ancestor-path": { "version": "1.0.1", "inBundle": true, @@ -11387,25 +11391,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/npm/node_modules/gauge/node_modules/ansi-regex": { - "version": "5.0.1", - "inBundle": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/npm/node_modules/gauge/node_modules/strip-ansi": { - "version": "6.0.1", - "inBundle": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/npm/node_modules/glob": { "version": "10.3.10", "inBundle": true, @@ -11672,7 +11657,7 @@ } }, "node_modules/npm/node_modules/libnpmdiff": { - "version": "6.0.5", + "version": "6.0.6", "inBundle": true, "license": "ISC", "dependencies": { @@ -11691,7 +11676,7 @@ } }, "node_modules/npm/node_modules/libnpmexec": { - "version": "7.0.6", + "version": "7.0.7", "inBundle": true, "license": "ISC", "dependencies": { @@ -11712,7 +11697,7 @@ } }, "node_modules/npm/node_modules/libnpmfund": { - "version": "5.0.3", + "version": "5.0.4", "inBundle": true, "license": "ISC", "dependencies": { @@ -11747,7 +11732,7 @@ } }, "node_modules/npm/node_modules/libnpmpack": { - "version": "6.0.5", + "version": "6.0.6", "inBundle": true, "license": "ISC", "dependencies": { @@ -11761,7 +11746,7 @@ } }, "node_modules/npm/node_modules/libnpmpublish": { - "version": "9.0.3", + "version": "9.0.4", "inBundle": true, "license": "ISC", "dependencies": { @@ -11771,7 +11756,7 @@ "npm-registry-fetch": "^16.0.0", "proc-log": "^3.0.0", "semver": "^7.3.7", - "sigstore": "^2.1.0", + "sigstore": "^2.2.0", "ssri": "^10.0.5" }, "engines": { @@ -12229,7 +12214,7 @@ } }, "node_modules/npm/node_modules/pacote": { - "version": "17.0.5", + "version": "17.0.6", "inBundle": true, "license": "ISC", "dependencies": { @@ -12248,7 +12233,7 @@ "promise-retry": "^2.0.1", "read-package-json": "^7.0.0", "read-package-json-fast": "^3.0.0", - "sigstore": "^2.0.0", + "sigstore": "^2.2.0", "ssri": "^10.0.0", "tar": "^6.1.11" }, @@ -12324,7 +12309,7 @@ } }, "node_modules/npm/node_modules/promise-call-limit": { - "version": "1.0.2", + "version": "3.0.1", "inBundle": true, "license": "ISC", "funding": { @@ -12486,14 +12471,16 @@ } }, "node_modules/npm/node_modules/sigstore": { - "version": "2.1.0", + "version": "2.2.0", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@sigstore/bundle": "^2.1.0", + "@sigstore/bundle": "^2.1.1", + "@sigstore/core": "^0.2.0", "@sigstore/protobuf-specs": "^0.2.1", - "@sigstore/sign": "^2.1.0", - "@sigstore/tuf": "^2.1.0" + "@sigstore/sign": "^2.2.1", + "@sigstore/tuf": "^2.3.0", + "@sigstore/verify": "^0.1.0" }, "engines": { "node": "^16.14.0 || >=18.0.0" @@ -12600,34 +12587,7 @@ "node": ">=8" } }, - "node_modules/npm/node_modules/string-width-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "inBundle": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/npm/node_modules/string-width-cjs/node_modules/strip-ansi": { - "version": "6.0.1", - "inBundle": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/npm/node_modules/string-width/node_modules/ansi-regex": { - "version": "5.0.1", - "inBundle": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/npm/node_modules/string-width/node_modules/strip-ansi": { + "node_modules/npm/node_modules/strip-ansi": { "version": "6.0.1", "inBundle": true, "license": "MIT", @@ -12638,20 +12598,6 @@ "node": ">=8" } }, - "node_modules/npm/node_modules/strip-ansi": { - "version": "7.1.0", - "inBundle": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/npm/node_modules/strip-ansi-cjs": { "name": "strip-ansi", "version": "6.0.1", @@ -12664,14 +12610,6 @@ "node": ">=8" } }, - "node_modules/npm/node_modules/strip-ansi-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "inBundle": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/npm/node_modules/supports-color": { "version": "9.4.0", "inBundle": true, @@ -12748,7 +12686,7 @@ } }, "node_modules/npm/node_modules/tuf-js": { - "version": "2.1.0", + "version": "2.2.0", "inBundle": true, "license": "MIT", "dependencies": { @@ -12883,14 +12821,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/npm/node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "inBundle": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/npm/node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { "version": "4.3.0", "inBundle": true, @@ -12905,15 +12835,15 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/npm/node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "node_modules/npm/node_modules/wrap-ansi/node_modules/ansi-regex": { "version": "6.0.1", "inBundle": true, "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, "node_modules/npm/node_modules/wrap-ansi/node_modules/emoji-regex": { @@ -12937,6 +12867,20 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/npm/node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "7.1.0", + "inBundle": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, "node_modules/npm/node_modules/write-file-atomic": { "version": "5.0.1", "inBundle": true, diff --git a/frontend/package.json b/frontend/package.json index dd2243a18..3b4eb0217 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -72,7 +72,7 @@ "js-sha256": "^0.10.1", "leaflet": "^1.9.4", "light-bolt11-decoder": "^3.0.0", - "npm": "^10.3.0", + "npm": "^10.4.0", "openpgp": "^5.11.0", "react": "^18.2.0", "react-countdown": "^2.3.5", From e51aceafbc2ead44ae86f5eb7e96bd35881cbebd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 28 Jan 2024 12:16:24 +0000 Subject: [PATCH 09/12] Bump react-i18next from 14.0.0 to 14.0.1 in /frontend (#1092) Bumps [react-i18next](https://github.com/i18next/react-i18next) from 14.0.0 to 14.0.1. - [Changelog](https://github.com/i18next/react-i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/react-i18next/compare/v14.0.0...v14.0.1) --- updated-dependencies: - dependency-name: react-i18next dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 8 ++++---- frontend/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 86adaf376..963f8db85 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -39,7 +39,7 @@ "react-countdown": "^2.3.5", "react-dom": "^18.2.0", "react-grid-layout": "^1.4.4", - "react-i18next": "^14.0.0", + "react-i18next": "^14.0.1", "react-image": "^4.1.0", "react-leaflet": "^4.2.1", "react-qr-code": "^2.0.11", @@ -13567,9 +13567,9 @@ } }, "node_modules/react-i18next": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-14.0.0.tgz", - "integrity": "sha512-OCrS8rHNAmnr8ggGRDxjakzihrMW7HCbsplduTm3EuuQ6fyvWGT41ksZpqbduYoqJurBmEsEVZ1pILSUWkHZng==", + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-14.0.1.tgz", + "integrity": "sha512-TMV8hFismBmpMdIehoFHin/okfvgjFhp723RYgIqB4XyhDobVMyukyM3Z8wtTRmajyFMZrBl/OaaXF2P6WjUAw==", "dependencies": { "@babel/runtime": "^7.22.5", "html-parse-stringify": "^3.0.1" diff --git a/frontend/package.json b/frontend/package.json index 3b4eb0217..cb166fb86 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -78,7 +78,7 @@ "react-countdown": "^2.3.5", "react-dom": "^18.2.0", "react-grid-layout": "^1.4.4", - "react-i18next": "^14.0.0", + "react-i18next": "^14.0.1", "react-image": "^4.1.0", "react-leaflet": "^4.2.1", "react-qr-code": "^2.0.11", From 17fdc423f65d339b55b8a7c58f198f11d65aba66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 28 Jan 2024 12:16:36 +0000 Subject: [PATCH 10/12] Bump @mui/x-date-pickers from 6.19.0 to 6.19.2 in /frontend (#1091) Bumps [@mui/x-date-pickers](https://github.com/mui/mui-x/tree/HEAD/packages/x-date-pickers) from 6.19.0 to 6.19.2. - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/v6.19.2/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v6.19.2/packages/x-date-pickers) --- updated-dependencies: - dependency-name: "@mui/x-date-pickers" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 8 ++++---- frontend/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 963f8db85..00cca9aa0 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -19,7 +19,7 @@ "@mui/material": "^5.15.3", "@mui/system": "^5.15.3", "@mui/x-data-grid": "^6.17.0", - "@mui/x-date-pickers": "^6.19.0", + "@mui/x-date-pickers": "^6.19.2", "@nivo/core": "^0.84.0", "@nivo/line": "^0.84.0", "base-ex": "^0.8.1", @@ -3440,9 +3440,9 @@ } }, "node_modules/@mui/x-date-pickers": { - "version": "6.19.0", - "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-6.19.0.tgz", - "integrity": "sha512-/GccT+iFJTKjI6b9b0MWojyRKnizL/VYYAfPnR1q0wSVVXjYv7a1NK0uQlan4JbnovqoQCNVeTOCy/0bUJyD2Q==", + "version": "6.19.2", + "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-6.19.2.tgz", + "integrity": "sha512-/bdWZabexuz+1rKG15XryxiMGb5D0XVx65NU7CZYKm/1+HuUzc0FX9smKEa/YVZnLSNsAp6SULIyPZtAKE+3AA==", "dependencies": { "@babel/runtime": "^7.23.2", "@mui/base": "^5.0.0-beta.22", diff --git a/frontend/package.json b/frontend/package.json index cb166fb86..08a93f6ff 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -58,7 +58,7 @@ "@mui/material": "^5.15.3", "@mui/system": "^5.15.3", "@mui/x-data-grid": "^6.17.0", - "@mui/x-date-pickers": "^6.19.0", + "@mui/x-date-pickers": "^6.19.2", "@nivo/core": "^0.84.0", "@nivo/line": "^0.84.0", "base-ex": "^0.8.1", From 6297643703b2b0e5ecfdddecc2fb128ad04853fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 28 Jan 2024 12:18:13 +0000 Subject: [PATCH 11/12] Bump @mui/x-data-grid from 6.17.0 to 6.19.2 in /frontend (#1090) Bumps [@mui/x-data-grid](https://github.com/mui/mui-x/tree/HEAD/packages/grid/x-data-grid) from 6.17.0 to 6.19.2. - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/v6.19.2/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v6.19.2/packages/grid/x-data-grid) --- updated-dependencies: - dependency-name: "@mui/x-data-grid" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 10 +++++----- frontend/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 00cca9aa0..298a46e11 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -18,7 +18,7 @@ "@mui/lab": "^5.0.0-alpha.136", "@mui/material": "^5.15.3", "@mui/system": "^5.15.3", - "@mui/x-data-grid": "^6.17.0", + "@mui/x-data-grid": "^6.19.2", "@mui/x-date-pickers": "^6.19.2", "@nivo/core": "^0.84.0", "@nivo/line": "^0.84.0", @@ -3407,12 +3407,12 @@ } }, "node_modules/@mui/x-data-grid": { - "version": "6.17.0", - "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-6.17.0.tgz", - "integrity": "sha512-HlpavV9jR7bLDYfi7n05R0xSsLl5ZxCTy3J5g4OfQtxhg9Zsu1uOkkLfudsM5LFqTbi5o+3PvZ9Kh33VvNUN/w==", + "version": "6.19.2", + "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-6.19.2.tgz", + "integrity": "sha512-+wizP1jEzCKB5BSQ6OD5TP6RspEbWmFWcxi1XBgKrzryUZii1o4G2BW1+d/n4p3xETCUMKRkYfItrOJGlM/dBw==", "dependencies": { "@babel/runtime": "^7.23.2", - "@mui/utils": "^5.14.14", + "@mui/utils": "^5.14.16", "clsx": "^2.0.0", "prop-types": "^15.8.1", "reselect": "^4.1.8" diff --git a/frontend/package.json b/frontend/package.json index 08a93f6ff..2abf87cb6 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -57,7 +57,7 @@ "@mui/lab": "^5.0.0-alpha.136", "@mui/material": "^5.15.3", "@mui/system": "^5.15.3", - "@mui/x-data-grid": "^6.17.0", + "@mui/x-data-grid": "^6.19.2", "@mui/x-date-pickers": "^6.19.2", "@nivo/core": "^0.84.0", "@nivo/line": "^0.84.0", From 4aca6b9184c1c5ae6b86e8b88f5a0da3aca130b5 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Sun, 28 Jan 2024 13:52:30 +0000 Subject: [PATCH 12/12] Add new admin action to close public order --- api/admin.py | 33 +++++++++++++++++++++++++++++++++ api/notifications.py | 6 ++++++ api/tasks.py | 3 +++ 3 files changed, 42 insertions(+) diff --git a/api/admin.py b/api/admin.py index 0846ad678..d853d7da1 100644 --- a/api/admin.py +++ b/api/admin.py @@ -11,6 +11,7 @@ from api.logics import Logics from api.models import Currency, LNPayment, MarketTick, OnchainPayment, Order, Robot from api.utils import objects_to_hyperlinks +from api.tasks import send_notification admin.site.unregister(Group) admin.site.unregister(User) @@ -135,6 +136,7 @@ def _logs(self, obj): return format_html(f'{with_hyperlinks}
') actions = [ + "cancel_public_order", "maker_wins", "taker_wins", "return_everything", @@ -142,6 +144,37 @@ def _logs(self, obj): "compute_median_trade_time", ] + @admin.action(description="Close public order") + def cancel_public_order(self, request, queryset): + """ + Closes an existing Public/Paused order. + """ + for order in queryset: + if order.status in [Order.Status.PUB, Order.Status.PAU]: + if Logics.return_bond(order.maker_bond): + order.update_status(Order.Status.UCA) + self.message_user( + request, + f"Order {order.id} successfully closed", + messages.SUCCESS, + ) + send_notification.delay( + order_id=order.id, message="coordinator_cancelled" + ) + else: + self.message_user( + request, + f"Could not unlock bond of {order.id}", + messages.ERROR, + ) + + else: + self.message_user( + request, + f"Order {order.id} is not public or paused", + messages.ERROR, + ) + @admin.action(description="Solve dispute: maker wins") def maker_wins(self, request, queryset): """ diff --git a/api/notifications.py b/api/notifications.py index 8d1e0e659..c1bd1f469 100644 --- a/api/notifications.py +++ b/api/notifications.py @@ -185,3 +185,9 @@ def new_chat_message(self, order, chat_message): self.send_message(user.robot.telegram_chat_id, text) return + + def coordinator_cancelled(self, order): + if order.maker.robot.telegram_enabled: + text = f"🛠️ Your order with ID {order.id} has been cancelled by the coordinator {config('COORDINATOR_ALIAS', cast=str, default='NoAlias')} for the upcoming maintenance stop." + self.send_message(order.maker.robot.telegram_chat_id, text) + return diff --git a/api/tasks.py b/api/tasks.py index aa8afe187..f91fd25e6 100644 --- a/api/tasks.py +++ b/api/tasks.py @@ -304,4 +304,7 @@ def send_notification(order_id=None, chat_message_id=None, message=None): elif message == "new_chat_message": telegram.new_chat_message(order, chat_message) + elif message == "coordinator_cancelled": + telegram.coordinator_cancelled(order) + return