Add additional defi header fields and token_id in TxOut

Author: Jouzo

bitcoin/src/bip152.rs

@@ -232,7 +232,7 @@ impl HeaderAndShortIds {
         }
 
         Ok(HeaderAndShortIds {
-            header: block.header,
+            header: block.header.clone(),
             nonce,
             // Provide coinbase prefilled.
             prefilled_txs: prefilled,

bitcoin/src/blockdata/block.rs

@@ -38,7 +38,7 @@ pub use crate::{
 /// ### Bitcoin Core References
 ///
 /// * [CBlockHeader definition](https://github.com/bitcoin/bitcoin/blob/345457b542b6a980ccfbc868af0970a6f91d1b82/src/primitives/block.h#L20)
-#[derive(Copy, PartialEq, Eq, Clone, PartialOrd, Ord, Hash)]
+#[derive(PartialEq, Eq, Clone, PartialOrd, Ord, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub struct Header {
@@ -52,11 +52,24 @@ pub struct Header {
     pub time: u32,
     /// The target value below which the blockhash must lie.
     pub bits: CompactTarget,
-    /// The nonce, selected to obtain a low enough blockhash.
-    pub nonce: u32,
+    pub stake_modifier: [u8; 32],
+    pub deprecated_height: u64,
+    pub minted_blocks: u64,
+    pub sig: Vec<u8>,
 }
 
-impl_consensus_encoding!(Header, version, prev_blockhash, merkle_root, time, bits, nonce);
+impl_consensus_encoding!(
+    Header,
+    version,
+    prev_blockhash,
+    merkle_root,
+    time,
+    bits,
+    stake_modifier,
+    deprecated_height,
+    minted_blocks,
+    sig
+);
 
 impl Header {
     /// The number of bytes that the block header contributes to the size of a block.
@@ -109,7 +122,11 @@ impl fmt::Debug for Header {
             .field("merkle_root", &self.merkle_root)
             .field("time", &self.time)
             .field("bits", &self.bits)
-            .field("nonce", &self.nonce)
+            .field("bits", &self.bits)
+            .field("stake_modifier", &self.stake_modifier)
+            .field("deprecated_height", &self.deprecated_height)
+            .field("minted_blocks", &self.minted_blocks)
+            .field("sig", &self.sig)
             .finish()
     }
 }

bitcoin/src/blockdata/constants.rs

@@ -7,6 +7,7 @@
 //! single transaction.
 //!
 
+use alloc::vec;
 use core::default::Default;
 
 use hashes::{sha256d, Hash};
@@ -79,7 +80,11 @@ fn bitcoin_genesis_tx() -> Transaction {
     let script_bytes = hex!("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f");
     let out_script =
         script::Builder::new().push_slice(script_bytes).push_opcode(OP_CHECKSIG).into_script();
-    ret.output.push(TxOut { value: Amount::from_sat(50 * 100_000_000), script_pubkey: out_script });
+    ret.output.push(TxOut {
+        value: Amount::from_sat(50 * 100_000_000),
+        script_pubkey: out_script,
+        unused_token_id: 0,
+    });
 
     // end
     ret
@@ -98,7 +103,10 @@ pub fn genesis_block(network: Network) -> Block {
                 merkle_root,
                 time: 1231006505,
                 bits: CompactTarget::from_consensus(0x1d00ffff),
-                nonce: 2083236893,
+                stake_modifier: [0u8; 32],
+                deprecated_height: 0,
+                minted_blocks: 0,
+                sig: vec![],
             },
             txdata,
         },
@@ -109,7 +117,10 @@ pub fn genesis_block(network: Network) -> Block {
                 merkle_root,
                 time: 1296688602,
                 bits: CompactTarget::from_consensus(0x1d00ffff),
-                nonce: 414098458,
+                stake_modifier: [0u8; 32],
+                deprecated_height: 0,
+                minted_blocks: 0,
+                sig: vec![],
             },
             txdata,
         },
@@ -120,7 +131,10 @@ pub fn genesis_block(network: Network) -> Block {
                 merkle_root,
                 time: 1598918400,
                 bits: CompactTarget::from_consensus(0x1e0377ae),
-                nonce: 52613770,
+                stake_modifier: [0u8; 32],
+                deprecated_height: 0,
+                minted_blocks: 0,
+                sig: vec![],
             },
             txdata,
         },
@@ -131,7 +145,10 @@ pub fn genesis_block(network: Network) -> Block {
                 merkle_root,
                 time: 1296688602,
                 bits: CompactTarget::from_consensus(0x207fffff),
-                nonce: 2,
+                stake_modifier: [0u8; 32],
+                deprecated_height: 0,
+                minted_blocks: 0,
+                sig: vec![],
             },
             txdata,
         },

bitcoin/src/blockdata/transaction.rs

@@ -504,12 +504,17 @@ pub struct TxOut {
     pub value: Amount,
     /// The script which must be satisfied for the output to be spent.
     pub script_pubkey: ScriptBuf,
+    /// Unused. Legacy token_id
+    pub unused_token_id: u8,
 }
 
 impl TxOut {
     /// This is used as a "null txout" in consensus signing code.
-    pub const NULL: Self =
-        TxOut { value: Amount::from_sat(0xffffffffffffffff), script_pubkey: ScriptBuf::new() };
+    pub const NULL: Self = TxOut {
+        value: Amount::from_sat(0xffffffffffffffff),
+        script_pubkey: ScriptBuf::new(),
+        unused_token_id: 0,
+    };
 
     /// The weight of this output.
     ///
@@ -548,6 +553,7 @@ impl TxOut {
         TxOut {
             value: Amount::from_sat(dust_amount + 1), // minimal non-dust amount is one higher than dust amount
             script_pubkey,
+            unused_token_id: 0,
         }
     }
 }
@@ -1006,7 +1012,7 @@ impl Decodable for Version {
     }
 }
 
-impl_consensus_encoding!(TxOut, value, script_pubkey);
+impl_consensus_encoding!(TxOut, value, script_pubkey, unused_token_id);
 
 impl Encodable for OutPoint {
     fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {

bitcoin/src/internal_macros.rs

@@ -5,14 +5,15 @@
 //! Macros meant to be used inside the Rust Bitcoin library.
 //!
 
+#[macro_export]
 macro_rules! impl_consensus_encoding {
     ($thing:ident, $($field:ident),+) => (
         impl $crate::consensus::Encodable for $thing {
             #[inline]
-            fn consensus_encode<R: $crate::io::Write + ?Sized>(
+            fn consensus_encode<R: io::Write + ?Sized>(
                 &self,
                 r: &mut R,
-            ) -> Result<usize, $crate::io::Error> {
+            ) -> Result<usize, io::Error> {
                 let mut len = 0;
                 $(len += self.$field.consensus_encode(r)?;)+
                 Ok(len)
@@ -22,7 +23,7 @@ macro_rules! impl_consensus_encoding {
         impl $crate::consensus::Decodable for $thing {
 
             #[inline]
-            fn consensus_decode_from_finite_reader<R: $crate::io::Read + ?Sized>(
+            fn consensus_decode_from_finite_reader<R: io::Read + ?Sized>(
                 r: &mut R,
             ) -> Result<$thing, $crate::consensus::encode::Error> {
                 Ok($thing {
@@ -31,7 +32,7 @@ macro_rules! impl_consensus_encoding {
             }
 
             #[inline]
-            fn consensus_decode<R: $crate::io::Read + ?Sized>(
+            fn consensus_decode<R: io::Read + ?Sized>(
                 r: &mut R,
             ) -> Result<$thing, $crate::consensus::encode::Error> {
                 let mut r = r.take($crate::consensus::encode::MAX_VEC_SIZE as u64);

bitcoin/src/lib.rs

@@ -113,7 +113,7 @@ pub mod sign_message;
 pub mod string;
 pub mod taproot;
 
-use bitcoin_io::io;
+pub use bitcoin_io::io;
 
 #[rustfmt::skip]                // Keep public re-exports separate.
 #[doc(inline)]

bitcoin/src/merkle_tree/block.rs

@@ -123,7 +123,7 @@ impl MerkleBlock {
         let matches: Vec<bool> = block_txids.iter().map(match_txids).collect();
 
         let pmt = PartialMerkleTree::from_txids(block_txids, &matches);
-        MerkleBlock { header: *header, txn: pmt }
+        MerkleBlock { header: header.clone(), txn: pmt }
     }
 
     /// Extract the matching txid's represented by this partial merkle tree

bitcoin/src/p2p/message_compact_blocks.rs

@@ -4,8 +4,8 @@
 //! BIP152  Compact Blocks network messages
 //!
 
-use crate::bip152;
 use crate::internal_macros::impl_consensus_encoding;
+use crate::{bip152, io};
 
 /// sendcmpct message
 #[derive(PartialEq, Eq, Clone, Debug, Copy, PartialOrd, Ord, Hash)]

bitcoin/src/p2p/message_filter.rs

@@ -7,6 +7,7 @@
 
 use crate::hash_types::{BlockHash, FilterHash, FilterHeader};
 use crate::internal_macros::impl_consensus_encoding;
+use crate::io;
 
 /// getcfilters message
 #[derive(PartialEq, Eq, Clone, Debug)]