Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-08-24 14:15:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

minimal rust version: 1.85, fix monero-rs expect(...) panic

Browse source
This commit is contained in:
Binarybaron 2025-06-20 21:07:23 +02:00
parent 12fac99d80
commit 1d300ddcbc
6 changed files with 2052 additions and 776 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/draft-new-release.yml vendored
View file

@ -57,7 +57,7 @@ jobs:
id: make-commit
env:
DPRINT_VERSION: "0.50.0"
RUST_TOOLCHAIN: "1.82"
RUST_TOOLCHAIN: "1.85"
run: |
rustup component add rustfmt --toolchain "$RUST_TOOLCHAIN-x86_64-unknown-linux-gnu"
curl -fsSL https://dprint.dev/install.sh | sh -s $DPRINT_VERSION

2817
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

1
Cargo.toml
View file

@ -8,7 +8,6 @@ opt-level = 0
[patch.crates-io]
# patch until new release https://github.com/thomaseizinger/rust-jsonrpc-client/pull/51
jsonrpc_client = { git = "https://github.com/delta1/rust-jsonrpc-client.git", rev = "3b6081697cd616c952acb9c2f02d546357d35506" }
monero = { git = "https://github.com/comit-network/monero-rs", rev = "818f38b" }
# patch until new release https://github.com/bitcoindevkit/bdk/pull/1766
bdk_wallet = { git = "https://github.com/Einliterflasche/bdk", branch = "bump/rusqlite-0.32", package = "bdk_wallet" }

4
Dockerfile
View file

@ -36,8 +36,8 @@ RUN apt-get update && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
# Install Rust 1.82
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.82.0
# Install Rust 1.85
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.85.0
ENV PATH="/root/.cargo/bin:${PATH}"
COPY . .

2
rust-toolchain.toml
View file

@ -1,5 +1,5 @@
[toolchain]
# also update this in the readme, changelog, and github actions
channel = "1.82"
channel = "1.85"
components = ["clippy"]
targets = ["armv7-unknown-linux-gnueabihf"]

2
swap/Cargo.toml
View file

@ -42,7 +42,7 @@ hex = "0.4"
libp2p = { version = "0.53.2", features = ["tcp", "yamux", "dns", "noise", "request-response", "ping", "rendezvous", "identify", "macros", "cbor", "json", "tokio", "serde", "rsa"] }
libp2p-community-tor = { git = "https://github.com/umgefahren/libp2p-tor", branch = "main", features = ["listen-onion-service"] }
moka = { version = "0.12", features = ["sync", "future"] }
monero = { version = "0.12", features = ["serde_support"] }
monero = { version = "0.21" }
monero-rpc = { path = "../monero-rpc" }
monero-rpc-pool = { path = "../monero-rpc-pool" }
monero-sys = { path = "../monero-sys" }