chore: update patches

Cargo.toml

@@ -104,7 +104,17 @@ 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" }
+bp-consensus = { git = "https://github.com/BP-WG/bp-core", branch = "develop" }
+bp-dbc = { git = "https://github.com/BP-WG/bp-core", branch = "develop" }
+bp-seals = { git = "https://github.com/BP-WG/bp-core", branch = "develop" }
+bp-core = { git = "https://github.com/BP-WG/bp-core", branch = "develop" }
+bp-invoice = { git = "https://github.com/BP-WG/bp-std", branch = "develop" }
+bp-derive = { git = "https://github.com/BP-WG/bp-std", branch = "develop" }
+descriptors = { git = "https://github.com/BP-WG/bp-std", branch = "develop" }
+psbt = { git = "https://github.com/BP-WG/bp-std", branch = "develop" }
+bp-std = { git = "https://github.com/BP-WG/bp-std", branch = "develop" }
 bp-esplora = { git = "https://github.com/BP-WG/bp-esplora-client", branch = "master" }
-rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "fix/273" }
-rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "fix/rgb-252" }
+bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "develop" }
+rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "develop" }
+rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "develop" }
+rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "develop" }

src/indexers/electrum_blocking.rs

@@ -22,6 +22,7 @@
 // limitations under the License.
 
 use std::iter;
+use std::num::NonZeroU32;
 
 use bp::ConsensusDecode;
 use bpstd::{Network, Tx, Txid};
@@ -124,8 +125,10 @@ impl RgbResolver for Client {
  let tx_height = u32::try_from(get_merkle_res.block_height)
  .map_err(|_| s!("impossible height value"))?;
 
+ let height =
+ check!(NonZeroU32::new(tx_height).ok_or(Error::InvalidResponse(tx_details.clone())));
  let pos = check!(
- WitnessPos::new(tx_height, block_time)
+ WitnessPos::bitcoin(height, block_time)
  .ok_or(Error::InvalidResponse(tx_details.clone()))
  );
 

src/indexers/esplora_blocking.rs

@@ -19,6 +19,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::num::NonZeroU32;
+
 use bp::Tx;
 use bpstd::{Network, Txid};
 use esplora::BlockingClient;
@@ -48,7 +50,10 @@ impl RgbResolver for BlockingClient {
  .and_then(|h| status.block_time.map(|t| (h, t)))
  {
  Some((h, t)) => {
- WitnessOrd::Mined(WitnessPos::new(h, t as i64).ok_or(Error::InvalidServerData)?)
+ let height = NonZeroU32::new(h).ok_or(Error::InvalidServerData)?;
+ WitnessOrd::Mined(
+ WitnessPos::bitcoin(height, t as i64).ok_or(Error::InvalidServerData)?,
+ )
  }
  None => WitnessOrd::Tentative,
  };