milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge rust-bitcoin/rust-bitcoin#3915: Add FIFTY_BTC const to the amount types 

e0028239cf api: Run just check-api (Tobin C. Harding)
5eb5941215 Add FIFTY_BTC const to the amount types (Tobin C. Harding)

Pull request description:

  The mining reward for the first epoc is 50 bitcoin. For mainnet this is old news but for regtest it is still relevant.

  Add and use a new const `FIFTY_BTC` to the `Amount` type. To keep the amount types uniform also add it to the `SignedAmount`.

ACKs for top commit:
  storopoli:
    ACK e0028239cf
  jamillambert:
    ACK e0028239cf
  apoelstra:
    ACK e0028239cf207660deb2873a92bacfa1315af634; successfully ran local tests

Tree-SHA512: 623ed8b1f5fe8dd95309179308fea83d68be4349becf6305769b0378cc9032961df2c062dc2bf702fec5e2394e8abb7360d2be6f19b6cf505db8769a5ae39e16
This commit is contained in:
merge-script 2025-01-20 02:42:45 +00:00
parent 3985333e23 e0028239cf
commit 05c28cf31d
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
7 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/units/all-features.txt
View File

@ -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

2
api/units/alloc-only.txt
View File

@ -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

2
api/units/no-features.txt
View File

@ -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

6
bitcoin/examples/taproot-psbt.rs
View File

@ -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,
};

2
bitcoin/src/blockdata/constants.rs
View File

@ -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,
});

2
units/src/amount/signed.rs
View File

@ -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.

2
units/src/amount/unsigned.rs
View File

@ -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.