move rgb resolvers implementation to rgb-std

Cargo.toml

@@ -29,8 +29,6 @@ strict_types = "2.7.2"
 commit_verify = "0.11.0-beta.9"
 bp-core = "0.11.1-alpha.1"
 bp-std = { version = "0.11.1-alpha.1", features = ["client-side-validation"] }
-bp-electrum = "0.11.1-alpha.1"
-bp-esplora = { version = "0.11.1-alpha.1", default-features = false }
 bp-wallet = { version = "0.11.1-alpha.1" }
 rgb-std = { version = "0.11.1-alpha.1" }
 rgb-psbt = { version = "0.11.1-alpha.1", path = "psbt" }
@@ -62,12 +60,10 @@ crate-type = ["cdylib", "rlib"]
 amplify = { workspace = true }
 nonasync = { workspace = true }
 baid64 = { workspace = true }
-bp-electrum = { workspace = true, optional = true }
 commit_verify = { workspace = true }
 strict_types = { workspace = true }
 bp-core = { workspace = true }
 bp-std = { workspace = true }
-bp-esplora = { workspace = true, optional = true }
 bp-wallet = { workspace = true }
 rgb-std = { workspace = true }
 rgb-psbt = { workspace = true }
@@ -90,17 +86,18 @@ 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", "bp-esplora/blocking", "bp-esplora/blocking-https"]
-esplora_blocking-wasm = ["bp-esplora", "bp-esplora/blocking-wasm"]
-electrum_blocking = ["bp-electrum"]
-mempool_blocking = ["esplora_blocking"]
+esplora_blocking = ["rgb-std/esplora_blocking"]
+esplora_blocking-wasm = ["rgb-std/esplora_blocking-wasm"]
+electrum_blocking = ["rgb-std/electrum_blocking"]
+mempool_blocking = ["rgb-std/mempool_blocking"]
 serde = ["serde_crate", "serde_yaml", "bp-std/serde", "rgb-psbt/serde"]
 
 [package.metadata.docs.rs]
 features = ["all"]
 
 [patch.crates-io]
-bp-electrum = { git = "https://github.com/zoedberg/bp-electrum-client", branch = "0.11.1-2" }
+bp-electrum = { git = "https://github.com/zoedberg/bp-electrum-client", branch = "remove_bpstd" }
+bp-esplora = { git = "https://github.com/zoedberg/bp-esplora-client", branch = "remove_bpstd" }
 bp-wallet = { git = "https://github.com/zoedberg/bp-wallet", branch = "0.11.1-2" }
 rgb-core = { git = "https://github.com/zoedberg/rgb-core", branch = "0.11.1-2" }
 rgb-std = { git = "https://github.com/zoedberg/rgb-std", branch = "0.11.1-2" }

cli/src/args.rs

@@ -30,9 +30,9 @@ use bpstd::{Network, Wpkh, XpubDerivable};
 use bpwallet::cli::{Args as BpArgs, Config, DescriptorOpts};
 use bpwallet::Wallet;
 use rgb::persistence::Stock;
-use rgb::resolvers::AnyResolver;
 use rgb::validation::ResolveWitness;
 use rgb::{ChainNet, RgbDescr, RgbWallet, TapretKey, WalletError};
+use rgbstd::indexers::AnyResolver;
 use rgbstd::persistence::fs::FsBinStore;
 use strict_types::encoding::{DecodeError, DeserializeError};