Merge branch 'master' into v0.10

Cargo.toml

@@ -28,7 +28,7 @@ single_use_seals = "0.10.0"
 
 [package]
 name = "bp-core"
-version = "0.10.7"
+version = "0.10.8"
 description = "Bitcoin protocol core library (BP Core Lib)"
 keywords = ["lnp-bp", "smart-contracts", "bitcoin", "blockchain"]
 categories = ["cryptography"]
@@ -56,8 +56,8 @@ strict_types = { version = "1.6.0", optional = true }
 commit_verify = { workspace = true }
 single_use_seals = { workspace = true }
 bp-primitives = { version = "0.10.6", path = "./primitives" }
-bp-dbc = { version = "0.10.7", path = "./dbc" }
-bp-seals = { version = "0.10.7", path = "./seals" }
+bp-dbc = { version = "0.10.8", path = "./dbc" }
+bp-seals = { version = "0.10.8", path = "./seals" }
 serde_crate = { package = "serde", version = "1", features = ["derive"], optional = true }
 
 [features]

dbc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bp-dbc"
-version = "0.10.7"
+version = "0.10.8"
 description = "Deterministic bitcoin commitments library"
 keywords = ["lnp-bp", "bitcoin", "blockchain", "smart-contracts", "single-use-seals"]
 categories = ["cryptography", "encoding"]
@@ -18,7 +18,7 @@ path = "src/lib.rs"
 
 [dependencies]
 amplify = { workspace = true }
-base85 = "1.1.1"
+base85 = "1.2.1"
 strict_encoding = { workspace = true }
 commit_verify = { workspace = true, features = ["rand"] }
 bp-primitives = { version = "0.10.6", path = "../primitives" }

dbc/src/tapret/tapscript.rs

@@ -83,9 +83,10 @@ impl Display for TapretCommitment {
 impl FromStr for TapretCommitment {
  type Err = DeserializeError;
  fn from_str(s: &str) -> Result<Self, Self::Err> {
- let data = base85::decode(s).ok_or_else(|| {
+ let data = base85::decode(s).map_err(|err| {
  DecodeError::DataIntegrityError(format!(
- "invalid Base85 encoding of tapret data \"{s}\""
+ "invalid Base85 encoding of tapret data \"{s}\": {}",
+ err.to_string().to_lowercase()
  ))
  })?;
  let data = Confined::try_from(data).map_err(DecodeError::from)?;

seals/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bp-seals"
-version = "0.10.7"
+version = "0.10.8"
 description = "Bitcoin protocol single-use-seals library"
 keywords = ["lnp-bp", "bitcoin", "blockchain", "smart-contracts", "single-use-seals"]
 categories = ["cryptography", "encoding"]

seals/src/txout/blind.rs

@@ -170,15 +170,25 @@ impl<Id: SealTxid> BlindSeal<Id> {
  }
 
  /// Creates new seal using TapretFirst closing method for the provided
- /// outpoint and seal closing method. Uses `thread_rng` to initialize
- /// blinding factor.
+ /// outpoint. Uses `thread_rng` to initialize blinding factor.
+ pub fn tapret_first_from(outpoint: Outpoint) -> Self {
+ BlindSeal::tapret_first(outpoint.txid, outpoint.vout)
+ }
+
+ /// Creates new seal using OpretFirst closing method for the provided
+ /// outpoint. Uses `thread_rng` to initialize blinding factor.
+ pub fn opret_first_from(outpoint: Outpoint) -> Self {
+ BlindSeal::opret_first(outpoint.txid, outpoint.vout)
+ }
+
+ /// Creates new seal using TapretFirst closing method for the provided
+ /// outpoint. Uses `thread_rng` to initialize blinding factor.
  pub fn tapret_first(txid: impl Into<Id>, vout: impl Into<Vout>) -> Self {
  BlindSeal::with_rng(CloseMethod::TapretFirst, txid, vout, &mut thread_rng())
  }
 
  /// Creates new seal using OpretFirst closing method for the provided
- /// outpoint and seal closing method. Uses `thread_rng` to initialize
- /// blinding factor.
+ /// outpoint. Uses `thread_rng` to initialize blinding factor.
  pub fn opret_first(txid: impl Into<Id>, vout: impl Into<Vout>) -> Self {
  BlindSeal::with_rng(CloseMethod::OpretFirst, txid, vout, &mut thread_rng())
  }

seals/src/txout/seal.rs

@@ -146,6 +146,11 @@ impl From<&Txid> for TxPtr {
  fn from(txid: &Txid) -> Self { TxPtr::Txid(*txid) }
 }
 
+impl From<[u8; 32]> for TxPtr {
+ #[inline]
+ fn from(txid: [u8; 32]) -> Self { TxPtr::Txid(txid.into()) }
+}
+
 impl SealTxid for TxPtr {
  fn txid(&self) -> Option<Txid> {
  match self {