diff --git a/api/units/all-features.txt b/api/units/all-features.txt index 5698c7c89..0f5a1c0f2 100644 --- a/api/units/all-features.txt +++ b/api/units/all-features.txt @@ -673,6 +673,7 @@ pub bitcoin_units::amount::Denomination::MilliBitcoin pub bitcoin_units::amount::Denomination::Satoshi pub bitcoin_units::amount::ParseDenominationError::PossiblyConfusing(bitcoin_units::amount::PossiblyConfusingDenominationError) pub bitcoin_units::amount::ParseDenominationError::Unknown(bitcoin_units::amount::UnknownDenominationError) +pub const bitcoin_units::Amount::FIFTY_BTC: Self pub const bitcoin_units::Amount::MAX: Self pub const bitcoin_units::Amount::MAX_MONEY: Self pub const bitcoin_units::Amount::MIN: Self @@ -680,6 +681,7 @@ pub const bitcoin_units::Amount::ONE_BTC: Self pub const bitcoin_units::Amount::ONE_SAT: Self pub const bitcoin_units::Amount::SIZE: usize pub const bitcoin_units::Amount::ZERO: Self +pub const bitcoin_units::SignedAmount::FIFTY_BTC: Self pub const bitcoin_units::SignedAmount::MAX: Self pub const bitcoin_units::SignedAmount::MAX_MONEY: Self pub const bitcoin_units::SignedAmount::MIN: Self diff --git a/api/units/alloc-only.txt b/api/units/alloc-only.txt index 6274ad864..499372621 100644 --- a/api/units/alloc-only.txt +++ b/api/units/alloc-only.txt @@ -611,6 +611,7 @@ pub bitcoin_units::amount::Denomination::MilliBitcoin pub bitcoin_units::amount::Denomination::Satoshi pub bitcoin_units::amount::ParseDenominationError::PossiblyConfusing(bitcoin_units::amount::PossiblyConfusingDenominationError) pub bitcoin_units::amount::ParseDenominationError::Unknown(bitcoin_units::amount::UnknownDenominationError) +pub const bitcoin_units::Amount::FIFTY_BTC: Self pub const bitcoin_units::Amount::MAX: Self pub const bitcoin_units::Amount::MAX_MONEY: Self pub const bitcoin_units::Amount::MIN: Self @@ -618,6 +619,7 @@ pub const bitcoin_units::Amount::ONE_BTC: Self pub const bitcoin_units::Amount::ONE_SAT: Self pub const bitcoin_units::Amount::SIZE: usize pub const bitcoin_units::Amount::ZERO: Self +pub const bitcoin_units::SignedAmount::FIFTY_BTC: Self pub const bitcoin_units::SignedAmount::MAX: Self pub const bitcoin_units::SignedAmount::MAX_MONEY: Self pub const bitcoin_units::SignedAmount::MIN: Self diff --git a/api/units/no-features.txt b/api/units/no-features.txt index 5c448c09e..4532ae555 100644 --- a/api/units/no-features.txt +++ b/api/units/no-features.txt @@ -595,6 +595,7 @@ pub bitcoin_units::amount::Denomination::MilliBitcoin pub bitcoin_units::amount::Denomination::Satoshi pub bitcoin_units::amount::ParseDenominationError::PossiblyConfusing(bitcoin_units::amount::PossiblyConfusingDenominationError) pub bitcoin_units::amount::ParseDenominationError::Unknown(bitcoin_units::amount::UnknownDenominationError) +pub const bitcoin_units::Amount::FIFTY_BTC: Self pub const bitcoin_units::Amount::MAX: Self pub const bitcoin_units::Amount::MAX_MONEY: Self pub const bitcoin_units::Amount::MIN: Self @@ -602,6 +603,7 @@ pub const bitcoin_units::Amount::ONE_BTC: Self pub const bitcoin_units::Amount::ONE_SAT: Self pub const bitcoin_units::Amount::SIZE: usize pub const bitcoin_units::Amount::ZERO: Self +pub const bitcoin_units::SignedAmount::FIFTY_BTC: Self pub const bitcoin_units::SignedAmount::MAX: Self pub const bitcoin_units::SignedAmount::MAX_MONEY: Self pub const bitcoin_units::SignedAmount::MIN: Self diff --git a/bitcoin/examples/taproot-psbt.rs b/bitcoin/examples/taproot-psbt.rs index 16b065099..d75b4e14f 100644 --- a/bitcoin/examples/taproot-psbt.rs +++ b/bitcoin/examples/taproot-psbt.rs @@ -49,7 +49,7 @@ const UTXO_1: P2trUtxo = P2trUtxo { script_pubkey: UTXO_SCRIPT_PUBKEY, pubkey: UTXO_PUBKEY, master_fingerprint: UTXO_MASTER_FINGERPRINT, - amount_in_sats: Amount::from_int_btc_const(50), + amount_in_sats: Amount::FIFTY_BTC, derivation_path: BIP86_DERIVATION_PATH, }; @@ -60,7 +60,7 @@ const UTXO_2: P2trUtxo = P2trUtxo { script_pubkey: UTXO_SCRIPT_PUBKEY, pubkey: UTXO_PUBKEY, master_fingerprint: UTXO_MASTER_FINGERPRINT, - amount_in_sats: Amount::from_int_btc_const(50), + amount_in_sats: Amount::FIFTY_BTC, derivation_path: BIP86_DERIVATION_PATH, }; @@ -71,7 +71,7 @@ const UTXO_3: P2trUtxo = P2trUtxo { script_pubkey: UTXO_SCRIPT_PUBKEY, pubkey: UTXO_PUBKEY, master_fingerprint: UTXO_MASTER_FINGERPRINT, - amount_in_sats: Amount::from_int_btc_const(50), + amount_in_sats: Amount::FIFTY_BTC, derivation_path: BIP86_DERIVATION_PATH, }; diff --git a/bitcoin/src/blockdata/constants.rs b/bitcoin/src/blockdata/constants.rs index dd45b1c88..e1f15030c 100644 --- a/bitcoin/src/blockdata/constants.rs +++ b/bitcoin/src/blockdata/constants.rs @@ -113,7 +113,7 @@ fn bitcoin_genesis_tx(params: &Params) -> Transaction { }); ret.output.push(TxOut { - value: Amount::from_sat_unchecked(50 * 100_000_000), + value: Amount::FIFTY_BTC, script_pubkey: out_script, }); diff --git a/units/src/amount/signed.rs b/units/src/amount/signed.rs index ada79d170..82a07fa05 100644 --- a/units/src/amount/signed.rs +++ b/units/src/amount/signed.rs @@ -55,6 +55,8 @@ impl SignedAmount { pub const ONE_SAT: Self = SignedAmount(1); /// Exactly one bitcoin. pub const ONE_BTC: Self = SignedAmount(100_000_000); + /// Exactly fifty bitcoin. + pub const FIFTY_BTC: Self = Self::from_sat_unchecked(50 * 100_000_000); /// The maximum value allowed as an amount. Useful for sanity checking. pub const MAX_MONEY: Self = SignedAmount(21_000_000 * 100_000_000); /// The minimum value of an amount. diff --git a/units/src/amount/unsigned.rs b/units/src/amount/unsigned.rs index 443b1fcd8..d3c494921 100644 --- a/units/src/amount/unsigned.rs +++ b/units/src/amount/unsigned.rs @@ -58,6 +58,8 @@ impl Amount { pub const ONE_SAT: Self = Amount(1); /// Exactly one bitcoin. pub const ONE_BTC: Self = Self::from_int_btc_const(1); + /// Exactly fifty bitcoin. + pub const FIFTY_BTC: Self = Self::from_sat_unchecked(50 * 100_000_000); /// The maximum value allowed as an amount. Useful for sanity checking. pub const MAX_MONEY: Self = Self::from_int_btc_const(21_000_000); /// The minimum value of an amount.