Merge pull request #390 from nahuhh/xmr_interactive

xmr: --non-interactive doesnt have any functionality on wallet
Merge pull request #398 from basicswap/dependabot/pip/dev/black-25.11.0
2025-11-14 14:28:11 +01:00 · 2025-11-11 08:27:51 +00:00 · 2025-11-11 08:27:34 +00:00 · 2025-11-11 08:27:17 +00:00 · 2025-11-11 08:27:04 +00:00 · 2025-11-11 08:26:27 +00:00
8 changed files with 19 additions and 9 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,16 @@
 name: ci

-on: [push, pull_request]
+on:
+  push:
+    paths-ignore:
+      - 'doc/**'
+      - '**/README.md'
+      - '**/LICENSE'
+  pull_request:
+    paths-ignore:
+      - 'doc/**'
+      - '**/README.md'
+      - '**/LICENSE'

 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
--- a/basicswap/basicswap_util.py
+++ b/basicswap/basicswap_util.py
@@ -459,7 +459,7 @@ def describeEventEntry(event_type, event_msg):
    if event_type == EventLogTypes.LOCK_TX_B_INVALID:
        return "Detected invalid lock Tx B"
    if event_type == EventLogTypes.LOCK_TX_A_REFUND_TX_PUBLISHED:
-        return "Lock tx A refund tx published"
+        return "Lock tx A pre-refund tx published"
    if event_type == EventLogTypes.LOCK_TX_A_REFUND_SPEND_TX_PUBLISHED:
        return "Lock tx A refund spend tx published"
    if event_type == EventLogTypes.LOCK_TX_A_REFUND_SWIPE_TX_PUBLISHED:
@@ -471,7 +471,7 @@ def describeEventEntry(event_type, event_msg):
    if event_type == EventLogTypes.LOCK_TX_B_SPEND_TX_PUBLISHED:
        return "Lock tx B spend tx published"
    if event_type == EventLogTypes.LOCK_TX_A_REFUND_TX_SEEN:
-        return "Lock tx A refund tx seen in chain"
+        return "Lock tx A pre-refund tx seen in chain"
    if event_type == EventLogTypes.LOCK_TX_A_REFUND_SPEND_TX_SEEN:
        return "Lock tx A refund spend tx seen in chain"
    if event_type == EventLogTypes.SYSTEM_WARNING:
--- a/basicswap/bin/prepare.py
+++ b/basicswap/bin/prepare.py
@@ -85,7 +85,7 @@ PIVX_VERSION_TAG = os.getenv("PIVX_VERSION_TAG", "")
 DASH_VERSION = os.getenv("DASH_VERSION", "22.1.3")
 DASH_VERSION_TAG = os.getenv("DASH_VERSION_TAG", "")

-FIRO_VERSION = os.getenv("FIRO_VERSION", "0.14.14.3")
+FIRO_VERSION = os.getenv("FIRO_VERSION", "0.14.15.0")
 FIRO_VERSION_TAG = os.getenv("FIRO_VERSION_TAG", "")

 NAV_VERSION = os.getenv("NAV_VERSION", "7.0.3")
--- a/basicswap/bin/run.py
+++ b/basicswap/bin/run.py
@@ -221,7 +221,7 @@ def startXmrDaemon(node_dir, bin_dir, daemon_bin, opts=[]):

 def startXmrWalletDaemon(node_dir, bin_dir, wallet_bin, opts=[]):
    daemon_path = os.path.expanduser(os.path.join(bin_dir, wallet_bin))
-    args = [daemon_path, "--non-interactive"]
+    args = [daemon_path]

    needs_rewrite: bool = False
    config_to_remove = [
--- a/doc/install.md
+++ b/doc/install.md
@@ -168,7 +168,7 @@ Install Homebrew (See https://brew.sh/):

 Dependencies:

-    brew install python git gnupg pkg-config jq
+    brew install python git gnupg pkg-config jq zeromq

 Close the terminal and open a new one to update the python symlinks.

--- a/docker/production/monero_wallet/Dockerfile
+++ b/docker/production/monero_wallet/Dockerfile
@@ -13,4 +13,4 @@ VOLUME $MONERO_DATA
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

-CMD ["/monero/monero-wallet-rpc", "--non-interactive", "--config-file=/data/monero_wallet.conf", "--confirm-external-bind"]
+CMD ["/monero/monero-wallet-rpc", "--config-file=/data/monero_wallet.conf", "--confirm-external-bind"]
--- a/docker/production/wownero_wallet/Dockerfile
+++ b/docker/production/wownero_wallet/Dockerfile
@@ -13,4 +13,4 @@ VOLUME $WOWNERO_DATA
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

-CMD ["/wownero/wownero-wallet-rpc", "--non-interactive", "--config-file=/data/wownero-wallet-rpc.conf", "--confirm-external-bind"]
+CMD ["/wownero/wownero-wallet-rpc", "--config-file=/data/wownero-wallet-rpc.conf", "--confirm-external-bind"]
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,7 +36,7 @@ dev = [
    "pre-commit",
    "pytest",
    "ruff",
-    "black==25.9.0",
+    "black==25.11.0",
    "selenium",
 ]
Author	SHA1	Message	Date
tecnovert	d0614fd7a3	Merge pull request #390 from nahuhh/xmr_interactive xmr: --non-interactive doesnt have any functionality on wallet	2025-11-11 08:27:51 +00:00
tecnovert	84223fabb0	Merge pull request #398 from basicswap/dependabot/pip/dev/black-25.11.0 build(deps-dev): bump black from 25.9.0 to 25.11.0	2025-11-11 08:27:34 +00:00
tecnovert	4938a203f2	Merge pull request #394 from tecnovert/event_text doc: clarify LOCK_TX_A_REFUND event descriptions	2025-11-11 08:27:17 +00:00
tecnovert	2a641567ba	Merge pull request #393 from justanwar/firo_v0141500_hardfork firo: v0.14.15.0 hardfork 2025-11-19 mandatory	2025-11-11 08:27:04 +00:00
tecnovert	fbeece4fc9	Merge pull request #389 from nahuhh/ignore-docs ci: don't run on documentation updates	2025-11-11 08:26:27 +00:00
tecnovert	6906e8ac1b	Merge pull request #388 from nahuhh/mac_zmq docs: add zeromq to mac dependencies	2025-11-11 08:26:08 +00:00
dependabot[bot]	1a86d371c3	build(deps-dev): bump black from 25.9.0 to 25.11.0 Bumps [black](https://github.com/psf/black) from 25.9.0 to 25.11.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/25.9.0...25.11.0) --- updated-dependencies: - dependency-name: black dependency-version: 25.11.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-11-10 07:19:44 +00:00
tecnovert	e6c1c86dff	doc: clarify LOCK_TX_A_REFUND event descriptions "Lock tx A refund tx seen in chain" is confusing as that tx must still be spent for the refund to occur.	2025-10-28 23:40:36 +02:00
justanwar	ee8ab69d57	firo: v0.14.15.0 hardfork 2025-11-19 mandatory	2025-10-25 22:52:53 +08:00
nahuhh	2279ed84dc	xmr: --non-interactive doesnt have any functionality on wallet	2025-10-23 15:56:56 +00:00
nahuhh	497793ae8c	ci: don't run on documentation updates	2025-10-22 15:27:18 +00:00
gerlofvanek	052c722d76	docs: add zeromq to mac dependencies	2025-10-22 15:14:20 +00:00