Compare commits
18 Commits
53b06859fc
...
release-v0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cd98a8eb64 | ||
|
|
0bc9d3a5db | ||
|
|
cd3c8e7c26 | ||
|
|
ff9bbbfe06 | ||
|
|
47aab3140f | ||
|
|
5512c9fd7f | ||
|
|
d0614fd7a3 | ||
|
|
84223fabb0 | ||
|
|
4938a203f2 | ||
|
|
2a641567ba | ||
|
|
fbeece4fc9 | ||
|
|
6906e8ac1b | ||
|
|
1a86d371c3 | ||
|
|
e6c1c86dff | ||
|
|
ee8ab69d57 | ||
|
|
2279ed84dc | ||
|
|
497793ae8c | ||
|
|
052c722d76 |
12
.github/workflows/ci.yml
vendored
@@ -1,6 +1,16 @@
|
|||||||
name: ci
|
name: ci
|
||||||
|
|
||||||
on: [push, pull_request]
|
on:
|
||||||
|
push:
|
||||||
|
paths-ignore:
|
||||||
|
- 'doc/**'
|
||||||
|
- '**/README.md'
|
||||||
|
- '**/LICENSE'
|
||||||
|
pull_request:
|
||||||
|
paths-ignore:
|
||||||
|
- 'doc/**'
|
||||||
|
- '**/README.md'
|
||||||
|
- '**/LICENSE'
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
name = "basicswap"
|
name = "basicswap"
|
||||||
|
|
||||||
__version__ = "0.15.0"
|
__version__ = "0.15.1"
|
||||||
|
|||||||
@@ -459,7 +459,7 @@ def describeEventEntry(event_type, event_msg):
|
|||||||
if event_type == EventLogTypes.LOCK_TX_B_INVALID:
|
if event_type == EventLogTypes.LOCK_TX_B_INVALID:
|
||||||
return "Detected invalid lock Tx B"
|
return "Detected invalid lock Tx B"
|
||||||
if event_type == EventLogTypes.LOCK_TX_A_REFUND_TX_PUBLISHED:
|
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:
|
if event_type == EventLogTypes.LOCK_TX_A_REFUND_SPEND_TX_PUBLISHED:
|
||||||
return "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:
|
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:
|
if event_type == EventLogTypes.LOCK_TX_B_SPEND_TX_PUBLISHED:
|
||||||
return "Lock tx B spend tx published"
|
return "Lock tx B spend tx published"
|
||||||
if event_type == EventLogTypes.LOCK_TX_A_REFUND_TX_SEEN:
|
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:
|
if event_type == EventLogTypes.LOCK_TX_A_REFUND_SPEND_TX_SEEN:
|
||||||
return "Lock tx A refund spend tx seen in chain"
|
return "Lock tx A refund spend tx seen in chain"
|
||||||
if event_type == EventLogTypes.SYSTEM_WARNING:
|
if event_type == EventLogTypes.SYSTEM_WARNING:
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ PIVX_VERSION_TAG = os.getenv("PIVX_VERSION_TAG", "")
|
|||||||
DASH_VERSION = os.getenv("DASH_VERSION", "22.1.3")
|
DASH_VERSION = os.getenv("DASH_VERSION", "22.1.3")
|
||||||
DASH_VERSION_TAG = os.getenv("DASH_VERSION_TAG", "")
|
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", "")
|
FIRO_VERSION_TAG = os.getenv("FIRO_VERSION_TAG", "")
|
||||||
|
|
||||||
NAV_VERSION = os.getenv("NAV_VERSION", "7.0.3")
|
NAV_VERSION = os.getenv("NAV_VERSION", "7.0.3")
|
||||||
|
|||||||
@@ -221,7 +221,7 @@ def startXmrDaemon(node_dir, bin_dir, daemon_bin, opts=[]):
|
|||||||
|
|
||||||
def startXmrWalletDaemon(node_dir, bin_dir, wallet_bin, opts=[]):
|
def startXmrWalletDaemon(node_dir, bin_dir, wallet_bin, opts=[]):
|
||||||
daemon_path = os.path.expanduser(os.path.join(bin_dir, wallet_bin))
|
daemon_path = os.path.expanduser(os.path.join(bin_dir, wallet_bin))
|
||||||
args = [daemon_path, "--non-interactive"]
|
args = [daemon_path]
|
||||||
|
|
||||||
needs_rewrite: bool = False
|
needs_rewrite: bool = False
|
||||||
config_to_remove = [
|
config_to_remove = [
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 848 B |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 906 B |
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 810 B |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 968 B |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 943 B |
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 743 B After Width: | Height: | Size: 989 B |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 5.3 KiB |
@@ -168,7 +168,7 @@ Install Homebrew (See https://brew.sh/):
|
|||||||
|
|
||||||
Dependencies:
|
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.
|
Close the terminal and open a new one to update the python symlinks.
|
||||||
|
|
||||||
|
|||||||
@@ -13,4 +13,4 @@ VOLUME $MONERO_DATA
|
|||||||
COPY entrypoint.sh /entrypoint.sh
|
COPY entrypoint.sh /entrypoint.sh
|
||||||
ENTRYPOINT ["/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"]
|
||||||
|
|||||||
@@ -13,4 +13,4 @@ VOLUME $WOWNERO_DATA
|
|||||||
COPY entrypoint.sh /entrypoint.sh
|
COPY entrypoint.sh /entrypoint.sh
|
||||||
ENTRYPOINT ["/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"]
|
||||||
|
|||||||
6
guix.scm
@@ -135,15 +135,15 @@
|
|||||||
(define-public basicswap
|
(define-public basicswap
|
||||||
(package
|
(package
|
||||||
(name "basicswap")
|
(name "basicswap")
|
||||||
(version "0.15.0")
|
(version "0.15.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "https://github.com/basicswap/basicswap")
|
(url "https://github.com/basicswap/basicswap")
|
||||||
(commit "336e92fff6faaf644d09438e4bcccffcea723cf0")))
|
(commit "0bc9d3a5db40f54d79e2ab18be58b6bbc20740d1")))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1x75jj7bf7f488dm77b3pb4pd7a50pxnwmp144mv9g2x455pjbc2"))
|
"1x6c6hynvbayq4cyv9s6vwgsgdmhm7r1av6iy7pax103lj20habf"))
|
||||||
(file-name (git-file-name name version))))
|
(file-name (git-file-name name version))))
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
|
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ dev = [
|
|||||||
"pre-commit",
|
"pre-commit",
|
||||||
"pytest",
|
"pytest",
|
||||||
"ruff",
|
"ruff",
|
||||||
"black==25.9.0",
|
"black==25.11.0",
|
||||||
"selenium",
|
"selenium",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||