diff --git a/bitcoin/examples/ecdsa-psbt-simple.rs b/bitcoin/examples/ecdsa-psbt-simple.rs index 0a4c0f436..03a4e3744 100644 --- a/bitcoin/examples/ecdsa-psbt-simple.rs +++ b/bitcoin/examples/ecdsa-psbt-simple.rs @@ -23,7 +23,6 @@ //! //! The miner's fee will be 10,000 satoshis. use std::collections::BTreeMap; -use std::str::FromStr; use bitcoin::address::script_pubkey::ScriptBufExt as _; use bitcoin::bip32::{ChildNumber, DerivationPath, Fingerprint, IntoDerivationPath, Xpriv, Xpub}; @@ -85,7 +84,7 @@ fn get_internal_address_xpriv( // The address to send to. fn receivers_address() -> Address { - Address::from_str("bc1q7cyrfmck2ffu2ud3rn5l5a8yv6f0chkp0zpemf") + "bc1q7cyrfmck2ffu2ud3rn5l5a8yv6f0chkp0zpemf".parse::>() .expect("a valid address") .require_network(Network::Bitcoin) .expect("valid address for mainnet") @@ -93,7 +92,7 @@ fn receivers_address() -> Address { // The dummy unspent transaction outputs that we control. fn dummy_unspent_transaction_outputs() -> Vec<(OutPoint, TxOut)> { - let script_pubkey_1 = Address::from_str("bc1qrwuu3ydv0jfza4a0ehtfd03m9l4vw3fy0hfm50") + let script_pubkey_1 = "bc1qrwuu3ydv0jfza4a0ehtfd03m9l4vw3fy0hfm50".parse::>() .expect("a valid address") .require_network(Network::Bitcoin) .expect("valid address for mainnet") @@ -106,7 +105,7 @@ fn dummy_unspent_transaction_outputs() -> Vec<(OutPoint, TxOut)> { let utxo_1 = TxOut { value: DUMMY_UTXO_AMOUNT_INPUT_1, script_pubkey: script_pubkey_1 }; - let script_pubkey_2 = Address::from_str("bc1qy7swwpejlw7a2rp774pa8rymh8tw3xvd2x2xkd") + let script_pubkey_2 = "bc1qy7swwpejlw7a2rp774pa8rymh8tw3xvd2x2xkd".parse::>() .expect("a valid address") .require_network(Network::Bitcoin) .expect("valid address for mainnet") diff --git a/bitcoin/examples/ecdsa-psbt.rs b/bitcoin/examples/ecdsa-psbt.rs index c616ef258..14a898145 100644 --- a/bitcoin/examples/ecdsa-psbt.rs +++ b/bitcoin/examples/ecdsa-psbt.rs @@ -30,7 +30,6 @@ use std::collections::BTreeMap; use std::fmt; -use std::str::FromStr; use bitcoin::address::script_pubkey::ScriptBufExt as _; use bitcoin::bip32::{ChildNumber, DerivationPath, Fingerprint, IntoDerivationPath, Xpriv, Xpub}; @@ -175,7 +174,7 @@ impl WatchOnly { /// Creates the PSBT, in BIP174 parlance this is the 'Creator'. fn create_psbt(&self, secp: &Secp256k1) -> Result { - let to_address = Address::from_str(RECEIVE_ADDRESS)?.require_network(Network::Regtest)?; + let to_address = RECEIVE_ADDRESS.parse::>()?.require_network(Network::Regtest)?; let to_amount = OUTPUT_AMOUNT_BTC.parse::()?; let (_, change_address, _) = self.change_address(secp)?; diff --git a/bitcoin/examples/sign-tx-segwit-v0.rs b/bitcoin/examples/sign-tx-segwit-v0.rs index 34f6646e7..ebada8279 100644 --- a/bitcoin/examples/sign-tx-segwit-v0.rs +++ b/bitcoin/examples/sign-tx-segwit-v0.rs @@ -2,8 +2,6 @@ //! Demonstrate creating a transaction that spends to and from p2wpkh outputs. -use std::str::FromStr; - use bitcoin::address::script_pubkey::ScriptBufExt as _; use bitcoin::locktime::absolute; use bitcoin::secp256k1::{rand, Message, Secp256k1, SecretKey, Signing}; @@ -102,7 +100,7 @@ fn senders_keys(secp: &Secp256k1) -> (SecretKey, WPubkeyHash) { /// /// (FWIW this is a random mainnet address from block 80219.) fn receivers_address() -> Address { - Address::from_str("bc1q7cyrfmck2ffu2ud3rn5l5a8yv6f0chkp0zpemf") + "bc1q7cyrfmck2ffu2ud3rn5l5a8yv6f0chkp0zpemf".parse::>() .expect("a valid address") .require_network(Network::Bitcoin) .expect("valid address for mainnet") diff --git a/bitcoin/examples/sign-tx-taproot.rs b/bitcoin/examples/sign-tx-taproot.rs index adfcec3ae..857385837 100644 --- a/bitcoin/examples/sign-tx-taproot.rs +++ b/bitcoin/examples/sign-tx-taproot.rs @@ -2,8 +2,6 @@ //! Demonstrate creating a transaction that spends to and from p2tr outputs. -use std::str::FromStr; - use bitcoin::address::script_pubkey::ScriptBufExt as _; use bitcoin::key::{Keypair, TapTweak, TweakedKeypair, UntweakedPublicKey}; use bitcoin::locktime::absolute; @@ -99,7 +97,7 @@ fn senders_keys(secp: &Secp256k1) -> Keypair { /// /// (FWIW this is an arbitrary mainnet address from block 805222.) fn receivers_address() -> Address { - Address::from_str("bc1p0dq0tzg2r780hldthn5mrznmpxsxc0jux5f20fwj0z3wqxxk6fpqm7q0va") + "bc1p0dq0tzg2r780hldthn5mrznmpxsxc0jux5f20fwj0z3wqxxk6fpqm7q0va".parse::>() .expect("a valid address") .require_network(Network::Bitcoin) .expect("valid address for mainnet") diff --git a/bitcoin/examples/taproot-psbt-simple.rs b/bitcoin/examples/taproot-psbt-simple.rs index 09d202fcf..81bf759c6 100644 --- a/bitcoin/examples/taproot-psbt-simple.rs +++ b/bitcoin/examples/taproot-psbt-simple.rs @@ -21,7 +21,6 @@ //! //! The miner's fee will be 10,000 satoshis. use std::collections::BTreeMap; -use std::str::FromStr; use bitcoin::address::script_pubkey::ScriptBufExt as _; use bitcoin::bip32::{ChildNumber, DerivationPath, Fingerprint, IntoDerivationPath, Xpriv, Xpub}; @@ -95,7 +94,7 @@ fn get_tap_key_origin( // The address to send to. fn receivers_address() -> Address { - Address::from_str("bc1p0dq0tzg2r780hldthn5mrznmpxsxc0jux5f20fwj0z3wqxxk6fpqm7q0va") + "bc1p0dq0tzg2r780hldthn5mrznmpxsxc0jux5f20fwj0z3wqxxk6fpqm7q0va".parse::>() .expect("a valid address") .require_network(Network::Bitcoin) .expect("valid address for mainnet") @@ -104,7 +103,7 @@ fn receivers_address() -> Address { // The dummy unspent transaction outputs that we control. fn dummy_unspent_transaction_outputs() -> Vec<(OutPoint, TxOut)> { let script_pubkey_1 = - Address::from_str("bc1p80lanj0xee8q667aqcnn0xchlykllfsz3gu5skfv9vjsytaujmdqtv52vu") + "bc1p80lanj0xee8q667aqcnn0xchlykllfsz3gu5skfv9vjsytaujmdqtv52vu".parse::>() .unwrap() .require_network(Network::Bitcoin) .unwrap() @@ -118,7 +117,7 @@ fn dummy_unspent_transaction_outputs() -> Vec<(OutPoint, TxOut)> { let utxo_1 = TxOut { value: DUMMY_UTXO_AMOUNT_INPUT_1, script_pubkey: script_pubkey_1 }; let script_pubkey_2 = - Address::from_str("bc1pfd0jmmdnp278vppcw68tkkmquxtq50xchy7f6wdmjtjm7fgsr8dszdcqce") + "bc1pfd0jmmdnp278vppcw68tkkmquxtq50xchy7f6wdmjtjm7fgsr8dszdcqce".parse::>() .unwrap() .require_network(Network::Bitcoin) .unwrap() diff --git a/bitcoin/examples/taproot-psbt.rs b/bitcoin/examples/taproot-psbt.rs index 486211ab1..ddfcc28f4 100644 --- a/bitcoin/examples/taproot-psbt.rs +++ b/bitcoin/examples/taproot-psbt.rs @@ -76,7 +76,6 @@ const UTXO_3: P2trUtxo = P2trUtxo { }; use std::collections::BTreeMap; -use std::str::FromStr; use bitcoin::address::script_pubkey::{BuilderExt as _, ScriptBufExt as _}; use bitcoin::bip32::{ChildNumber, DerivationPath, Fingerprint, Xpriv, Xpub}; @@ -101,10 +100,10 @@ fn main() -> Result<(), Box> { // Just some addresses for outputs from our wallets. Not really important. let to_address = - Address::from_str("bcrt1p0p3rvwww0v9znrclp00uneq8ytre9kj922v8fxhnezm3mgsmn9usdxaefc")? + "bcrt1p0p3rvwww0v9znrclp00uneq8ytre9kj922v8fxhnezm3mgsmn9usdxaefc".parse::>()? .require_network(Network::Regtest)?; let change_address = - Address::from_str("bcrt1pz449kexzydh2kaypatup5ultru3ej284t6eguhnkn6wkhswt0l7q3a7j76")? + "bcrt1pz449kexzydh2kaypatup5ultru3ej284t6eguhnkn6wkhswt0l7q3a7j76".parse::>()? .require_network(Network::Regtest)?; let amount_to_send_in_sats = Amount::ONE_BTC; let change_amount = UTXO_1 diff --git a/bitcoin/src/address/mod.rs b/bitcoin/src/address/mod.rs index b41952e7d..80e37a4ba 100644 --- a/bitcoin/src/address/mod.rs +++ b/bitcoin/src/address/mod.rs @@ -309,7 +309,7 @@ pub enum AddressData { /// ``` /// # use std::str::FromStr; /// # use bitcoin::address::{Address, NetworkChecked}; -/// let address: Address = Address::from_str("132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM") +/// let address: Address = "132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM".parse::>() /// .unwrap().assume_checked(); /// assert_eq!(address.to_string(), "132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM"); /// ``` @@ -317,7 +317,7 @@ pub enum AddressData { /// ```ignore /// # use std::str::FromStr; /// # use bitcoin::address::{Address, NetworkChecked}; -/// let address: Address = Address::from_str("132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM") +/// let address: Address = "132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM".parse::>() /// .unwrap(); /// let s = address.to_string(); // does not compile /// ``` @@ -329,7 +329,7 @@ pub enum AddressData { /// ``` /// # use std::str::FromStr; /// # use bitcoin::address::{Address, NetworkUnchecked}; -/// let address: Address = Address::from_str("132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM") +/// let address: Address = "132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM".parse::>() /// .unwrap(); /// assert_eq!(format!("{:?}", address), "Address(132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM)"); /// ``` @@ -337,7 +337,7 @@ pub enum AddressData { /// ``` /// # use std::str::FromStr; /// # use bitcoin::address::{Address, NetworkChecked}; -/// let address: Address = Address::from_str("132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM") +/// let address: Address = "132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM".parse::>() /// .unwrap().assume_checked(); /// assert_eq!(format!("{:?}", address), "132F25rTsvBdp9JzLLBHP5mvGY66i1xdiM"); /// ```