Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.81.0
- uses: dtolnay/rust-toolchain@1.85.0
with:
components: rustfmt, clippy

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.81.0 # The version in our `Cargo.toml`
- uses: dtolnay/rust-toolchain@1.85.0 # The version in our `Cargo.toml`
with:
components: rustfmt, clippy
- uses: taiki-e/install-action@cargo-hack
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: dtolnay/rust-toolchain@1.81.0
- uses: dtolnay/rust-toolchain@1.85.0
with:
# Common bare-metal Cortex-M target (no_std: `core` + `alloc`).
targets: thumbv7em-none-eabi
Expand Down
169 changes: 165 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ default-members = [
]

[workspace.package]
rust-version = "1.81.0" # MSRV declaration
rust-version = "1.85.0" # MSRV declaration
readme = "README.md"

# Version Convention: Use major.minor only (e.g., "1.9" not "1.9.1")
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y \

RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
ENV PATH="/root/.cargo/bin:${PATH}"
RUN rustup default 1.81.0
RUN rustup default 1.85.0

WORKDIR /opt/app

Expand Down
7 changes: 6 additions & 1 deletion crates/floresta-watch-only/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ kv = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true, features = ["alloc"] }
tracing = { workspace = true }
bdk_wallet = { optional = true, git = "https://github.com/thunderbiscuit/bdk_wallet", branch = "feature/multi-keychain-wallet", features = ["rusqlite"] }
rusqlite = { version = "0.31", optional = true, features = [ "bundled" ], default-features = false }
refinery = { version = "0.8.0", optional = true, features = ["rusqlite"] }

# Local dependencies
floresta-chain = { workspace = true }
Expand All @@ -25,8 +28,10 @@ floresta-common = { workspace = true, features = ["descriptors-no-std"] }
rand = { workspace = true }

[features]
default = ["std"]
default = ["std", "sqlite", "bdk-provider"]
memory-database = []
sqlite = ["rusqlite", "refinery"]
bdk-provider = ["bdk_wallet"]
# The default features in common are `std` and `descriptors-std` (which is a superset of `descriptors-no-std`)
std = ["floresta-common/default", "serde/std"]

Expand Down
Loading
Loading