diff --git a/bitcoin/src/lib.rs b/bitcoin/src/lib.rs index af6386a40..c55a2a64c 100644 --- a/bitcoin/src/lib.rs +++ b/bitcoin/src/lib.rs @@ -120,14 +120,15 @@ pub mod taproot; pub use primitives::{ block::{ Block, BlockHash, Checked as BlockChecked, Header as BlockHeader, - Unchecked as BlockUnchecked, Validation as BlockValidation, WitnessCommitment, + Unchecked as BlockUnchecked, Validation as BlockValidation, Version as BlockVersion, + WitnessCommitment, }, merkle_tree::{TxMerkleNode, WitnessMerkleNode}, opcodes::Opcode, pow::CompactTarget, // No `pow` module outside of `primitives`. script::{Script, ScriptBuf}, sequence::{self, Sequence}, // No `sequence` module outside of `primitives`. - transaction::{OutPoint, Transaction, TxIn, TxOut, Txid, Wtxid}, + transaction::{OutPoint, Transaction, TxIn, TxOut, Txid, Version as TxVersion, Wtxid}, witness::Witness, }; #[doc(inline)] diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs index 5cd715063..346ab202b 100644 --- a/primitives/src/lib.rs +++ b/primitives/src/lib.rs @@ -74,14 +74,14 @@ pub use self::{ }; #[doc(inline)] pub use self::{ - block::{BlockHash, Header as BlockHeader, WitnessCommitment}, + block::{BlockHash, Header as BlockHeader, Version as BlockVersion, WitnessCommitment}, locktime::{absolute, relative}, merkle_tree::{TxMerkleNode, WitnessMerkleNode}, opcodes::Opcode, pow::CompactTarget, sequence::Sequence, taproot::{TapBranchTag, TapLeafHash, TapLeafTag, TapNodeHash, TapTweakHash, TapTweakTag}, - transaction::{OutPoint, Txid, Wtxid}, + transaction::{OutPoint, Txid, Version as TxVersion, Wtxid}, }; #[rustfmt::skip]