Skip to content

Commit f015712

Browse files
committed
move rgb resolvers implementation to rgb-std
1 parent 3429058 commit f015712

File tree

9 files changed

+27
-548
lines changed

9 files changed

+27
-548
lines changed

Cargo.lock

+13-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+6-9
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ strict_types = "2.7.2"
2929
commit_verify = "0.11.0-beta.9"
3030
bp-core = "0.11.1-alpha.1"
3131
bp-std = { version = "0.11.1-alpha.1", features = ["client-side-validation"] }
32-
bp-electrum = "0.11.1-alpha.1"
33-
bp-esplora = { version = "0.11.1-alpha.1", default-features = false }
3432
bp-wallet = { version = "0.11.1-alpha.1" }
3533
rgb-std = { version = "0.11.1-alpha.1" }
3634
rgb-psbt = { version = "0.11.1-alpha.1", path = "psbt" }
@@ -62,12 +60,10 @@ crate-type = ["cdylib", "rlib"]
6260
amplify = { workspace = true }
6361
nonasync = { workspace = true }
6462
baid64 = { workspace = true }
65-
bp-electrum = { workspace = true, optional = true }
6663
commit_verify = { workspace = true }
6764
strict_types = { workspace = true }
6865
bp-core = { workspace = true }
6966
bp-std = { workspace = true }
70-
bp-esplora = { workspace = true, optional = true }
7167
bp-wallet = { workspace = true }
7268
rgb-std = { workspace = true }
7369
rgb-psbt = { workspace = true }
@@ -90,17 +86,18 @@ default = []
9086
all = ["esplora_blocking", "electrum_blocking", "mempool_blocking", "serde", "log", "fs", "cli"]
9187
fs = ["serde", "bp-wallet/fs", "rgb-std/fs"]
9288
cli = ["fs", "bp-wallet/cli"]
93-
esplora_blocking = ["bp-esplora", "bp-esplora/blocking", "bp-esplora/blocking-https"]
94-
esplora_blocking-wasm = ["bp-esplora", "bp-esplora/blocking-wasm"]
95-
electrum_blocking = ["bp-electrum"]
96-
mempool_blocking = ["esplora_blocking"]
89+
esplora_blocking = ["rgb-std/esplora_blocking"]
90+
esplora_blocking-wasm = ["rgb-std/esplora_blocking-wasm"]
91+
electrum_blocking = ["rgb-std/electrum_blocking"]
92+
mempool_blocking = ["rgb-std/mempool_blocking"]
9793
serde = ["serde_crate", "serde_yaml", "bp-std/serde", "rgb-psbt/serde"]
9894

9995
[package.metadata.docs.rs]
10096
features = ["all"]
10197

10298
[patch.crates-io]
103-
bp-electrum = { git = "https://github.com/zoedberg/bp-electrum-client", branch = "0.11.1-2" }
99+
bp-electrum = { git = "https://github.com/zoedberg/bp-electrum-client", branch = "remove_bpstd" }
100+
bp-esplora = { git = "https://github.com/zoedberg/bp-esplora-client", branch = "remove_bpstd" }
104101
bp-wallet = { git = "https://github.com/zoedberg/bp-wallet", branch = "0.11.1-2" }
105102
rgb-core = { git = "https://github.com/zoedberg/rgb-core", branch = "0.11.1-2" }
106103
rgb-std = { git = "https://github.com/zoedberg/rgb-std", branch = "0.11.1-2" }

cli/src/args.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ use bpstd::{Network, Wpkh, XpubDerivable};
3030
use bpwallet::cli::{Args as BpArgs, Config, DescriptorOpts};
3131
use bpwallet::Wallet;
3232
use rgb::persistence::Stock;
33-
use rgb::resolvers::AnyResolver;
3433
use rgb::validation::ResolveWitness;
3534
use rgb::{ChainNet, RgbDescr, RgbWallet, TapretKey, WalletError};
35+
use rgbstd::indexers::AnyResolver;
3636
use rgbstd::persistence::fs::FsBinStore;
3737
use strict_types::encoding::{DecodeError, DeserializeError};
3838

src/indexers/any.rs

-128
This file was deleted.

0 commit comments

Comments
 (0)