try87-4

src/block_mine/block.rs

@@ -67,7 +67,7 @@ pub fn valid_block_header() -> Result<()> {
     let map = create_txid_tx_map()?;
     let (merkel_root, coinbase_tx, coinbase_txid, txids) = generate_roots(map.clone())?;
 
-    let time_stamp_int: u32 = 1713166289;
+    let time_stamp_int: u32 = 1713276373;
     let time_stamp = hex::encode(time_stamp_int.to_le_bytes());
 
     let target = "0000ffff00000000000000000000000000000000000000000000000000000000";

src/block_mine/merkle_root.rs

@@ -9,7 +9,7 @@ use super::serialise_tx::double_sha256;
 pub fn generate_roots(
     map: Vec<(String, Transaction, String, usize, u64)>,
 ) -> Result<(String, String, String, Vec<String>)> {
-    let tx_weight_limit = 3999000;
+    let tx_weight_limit = 3996000;
     let mut current_tx_weight = 0;
     let mut txids: Vec<String> = Vec::new();
     let mut wtxids: Vec<String> = Vec::new();

src/block_mine/serialise_tx.rs

@@ -41,8 +41,8 @@ pub fn create_txid_tx_map() -> Result<Vec<(String, Transaction, String, usize, u
                             // Find the correct position to insert the transaction based on its fees
                             let position = map
                                 .iter()
-                                .position(|(_, _, _, net_weight, gas_fees)| {
-                                    fees / tx_weight as u64 > *gas_fees / (*net_weight as u64)
+                                .position(|(_, _, _, _, gas_fees)| {
+                                    fees > *gas_fees
                                 })
                                 .unwrap_or(map.len());
                             map.insert(position, (txid, transaction, wtxid, tx_weight, fees));
@@ -157,9 +157,9 @@ fn serialise_tx(tx: &Transaction) -> Result<(bool, Vec<u8>, Vec<u8>, usize, u64)
         witness_bytes += 1 + 1;
 
         // INPUT COUNT
-        if tx.vin.len() >= 50 {
-            return Ok((false, Vec::new(), Vec::new(), 0, 0));
-        }
+        // if tx.vin.len() >= 50 {
+        //     return Ok((false, Vec::new(), Vec::new(), 0, 0));
+        // }
         raw_tx.push(tx.vin.len().try_into()?);
         raw_wtx.push(tx.vin.len().try_into()?);
 
@@ -224,9 +224,9 @@ fn serialise_tx(tx: &Transaction) -> Result<(bool, Vec<u8>, Vec<u8>, usize, u64)
 
             non_witness_bytes += 8;
 
-            if scriptpubkey.len() >= 50 {
-                return Ok((false, Vec::new(), Vec::new(), 0, 0));
-            }
+            // if scriptpubkey.len() >= 50 {
+            //     return Ok((false, Vec::new(), Vec::new(), 0, 0));
+            // }
             raw_tx.push(scriptpubkey.len().try_into()?);
             raw_wtx.push(scriptpubkey.len().try_into()?);
             raw_tx.extend_from_slice(&scriptpubkey);

src/validation_checks/p2wpkh.rs

@@ -99,7 +99,7 @@ mod test {
     #[test]
     fn test2() -> Result<()> {
         let path =
-            "./mempool/fcc4d2ad88b7a040dc98ae29946b794258ae7c8ba1a4300a6fc761d0c9cb6a1f.json";
+            "./mempool/0a5d6ddc87a9246297c1038d873eec419f04301197d67b9854fa2679dbe3bd65.json";
 
         // Read the JSON file
         let data = fs::read_to_string(path).expect("Unable to read file");