Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/fix/252' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
dr-orlovsky committed Sep 20, 2024
2 parents 22e50ec + 419264c commit 1a78901
Show file tree
Hide file tree
Showing 12 changed files with 250 additions and 245 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ jobs:
matrix:
os: [ ubuntu-22.04, ubuntu-latest, macos-13, macos-latest, windows-2019, windows-latest ]
steps:
- uses: ilammy/setup-nasm@v1
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- name: Platform ${{matrix.os}}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
matrix:
os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
steps:
- uses: ilammy/setup-nasm@v1
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- name: Test ${{matrix.os}}
Expand All @@ -31,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@nightly
- uses: dtolnay/rust-toolchain@stable
- uses: jetli/[email protected]
- name: Add wasm32 target
run: rustup target add wasm32-unknown-unknown
Expand Down
123 changes: 51 additions & 72 deletions Cargo.lock

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

9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ bp-core = "0.11.0-beta.8"
bp-seals = "0.11.0-beta.8"
bp-std = "0.11.0-beta.8"
bp-electrum = "0.11.0-beta.8"
bp-esplora = { version = "0.11.0-beta.8", default-features = false, features = ["blocking"] }
bp-esplora = { version = "0.11.0-beta.8", default-features = false, git = "https://github.com/BP-WG/bp-esplora-client", branch = "master" }
descriptors = "0.11.0-beta.8"
psbt = { version = "0.11.0-beta.8", features = ["client-side-validation"] }
bp-wallet = { version = "0.11.0-beta.8" }
Expand Down Expand Up @@ -90,11 +90,12 @@ getrandom = { version = "0.2", features = ["js"] }
wasm-bindgen-test = "0.3"

[features]
default = ["esplora_blocking", "mempool_blocking"]
default = []
all = ["esplora_blocking", "electrum_blocking", "mempool_blocking", "serde", "log", "fs", "cli"]
fs = ["serde", "bp-wallet/fs", "rgb-std/fs"]
cli = ["fs", "bp-wallet/cli"]
esplora_blocking = ["bp-esplora"]
esplora_blocking = ["bp-esplora", "bp-esplora/blocking"]
esplora_blocking-wasm = ["bp-esplora", "bp-esplora/blocking-wasm"]
electrum_blocking = ["bp-electrum"]
mempool_blocking = ["esplora_blocking"]
serde = ["serde_crate", "serde_yaml", "bp-std/serde", "descriptors/serde", "rgb-psbt/serde"]
Expand All @@ -103,4 +104,4 @@ serde = ["serde_crate", "serde_yaml", "bp-std/serde", "descriptors/serde", "rgb-
features = ["all"]

[patch.crates-io]
bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "develop" }
rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "fix/rgb-252" }
1 change: 0 additions & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ bp-std = { workspace = true, features = ["serde"] }
bp-wallet = { workspace = true, features = ["cli"] }
psbt = { workspace = true }
rgb-std = { workspace = true, features = ["serde"] }
rgb-interfaces = { version = "0.11.0-beta.8", features = ["fs"] }
rgb-runtime = { version = "0.11.0-beta.8", path = "..", features = ["electrum_blocking", "esplora_blocking", "log", "serde", "fs", "cli"] }
log = { workspace = true }
env_logger = "0.11.5"
Expand Down
Loading

0 comments on commit 1a78901

Please sign in to comment.