Backport Thunder 0.12.0, bump version for release 0.12.0

Cargo.toml

@@ -7,7 +7,7 @@ authors = ["Ash Manning <[email protected]>"]
 edition = "2024"
 license-file = "LICENSE.txt"
 publish = false
-version = "0.11.8"
+version = "0.12.0"
 
 [workspace.dependencies]
 anyhow = "1.0.72"
@@ -41,13 +41,13 @@ uuid = "1.13.1"
 
 [workspace.dependencies.bip300301_enforcer_lib]
 default-features = false
-git = "https://github.com/Ash-L2L/bip300301_enforcer"
-rev = "273fee8295aa55314333342ad6479b488cae3a0a"
+git = "https://github.com/LayerTwo-Labs/bip300301_enforcer"
+rev = "933ffcdd988959f2bb9bd7dd89d1cbb23c2f52c4"
 
 [workspace.dependencies.bip300301_enforcer_integration_tests]
 default-features = false
-git = "https://github.com/Ash-L2L/bip300301_enforcer"
-rev = "273fee8295aa55314333342ad6479b488cae3a0a"
+git = "https://github.com/LayerTwo-Labs/bip300301_enforcer"
+rev = "933ffcdd988959f2bb9bd7dd89d1cbb23c2f52c4"
 
 [workspace.dependencies.l2l-openapi]
 git = "https://github.com/Ash-L2L/l2l-openapi"

app/app.rs

@@ -186,8 +186,7 @@ impl App {
         .await?
         {
             return Err(tonic::Status::aborted(format!(
-                "{} is not supported in mainchain client",
-                validator_service_name
+                "{validator_service_name} is not supported in mainchain client",
             )));
         }
         tracing::info!("Verified existence of {}", validator_service_name);
@@ -254,7 +253,7 @@ impl App {
             config.network,
             cusf_mainchain,
             cusf_mainchain_wallet,
-            local_pool.clone(),
+            &runtime,
             #[cfg(feature = "zmq")]
             config.zmq_addr,
         ))?;

app/gui/bitassets/all_bitassets.rs

@@ -126,25 +126,22 @@ impl AllBitAssets {
             if let Some(bitasset_data) = bitassets.get(&name_hash_pattern) {
                 show_bitasset_with_data(ui, &name_hash_pattern, bitasset_data);
             };
-            if let Ok(bitasset_id_pattern) = BitAssetId::from_hex(&self.query) {
-                if let Some(bitasset_data) = bitassets.get(&bitasset_id_pattern)
-                {
-                    show_bitasset_with_data(
-                        ui,
-                        &bitasset_id_pattern,
-                        bitasset_data,
-                    );
-                }
+            if let Ok(bitasset_id_pattern) = BitAssetId::from_hex(&self.query)
+                && let Some(bitasset_data) = bitassets.get(&bitasset_id_pattern)
+            {
+                show_bitasset_with_data(
+                    ui,
+                    &bitasset_id_pattern,
+                    bitasset_data,
+                );
             };
             if let Ok(bitasset_seq_id_pattern) =
                 self.query.parse().map(BitAssetSeqId)
-            {
-                if let Some(bitasset_id) =
+                && let Some(bitasset_id) =
                     seq_id_to_bitasset_id.get(&bitasset_seq_id_pattern)
-                {
-                    let bitasset_data = &bitassets[bitasset_id];
-                    show_bitasset_with_data(ui, bitasset_id, bitasset_data);
-                }
+            {
+                let bitasset_data = &bitassets[bitasset_id];
+                show_bitasset_with_data(ui, bitasset_id, bitasset_data);
             }
         }
     }

app/gui/bitassets/dutch_auction_explorer.rs

@@ -119,14 +119,9 @@ impl DutchAuctionExplorer {
                         );
                     })
             } else if let Ok(auction_id) = DutchAuctionId::from_hex(&self.query)
+                && let Some(auction_state) = auctions.get(&auction_id)
             {
-                if let Some(auction_state) = auctions.get(&auction_id) {
-                    show_dutch_auction_with_state(
-                        ui,
-                        auction_id,
-                        auction_state,
-                    );
-                }
+                show_dutch_auction_with_state(ui, auction_id, auction_state);
             }
         });
     }

app/gui/coins/tx_creator.rs

@@ -501,10 +501,10 @@ impl TxCreator {
             Ok(None) => option_dropdown.join(),
             Err(ref mut bad_value) => {
                 let text_edit = ui.add(egui::TextEdit::singleline(bad_value));
-                if text_edit.changed() {
-                    if let Ok(value) = try_from_str(bad_value.clone()) {
-                        try_set.0 = Ok(Some(value));
-                    }
+                if text_edit.changed()
+                    && let Ok(value) = try_from_str(bad_value.clone())
+                {
+                    try_set.0 = Ok(Some(value));
                 }
                 option_dropdown.join() | text_edit
             }

app/gui/coins/utxo_selector.rs

@@ -153,8 +153,7 @@ impl UtxoSelector {
                     bitcoin::Amount::from_sat(total_confirmed_value)
                         + total_unconfirmed_value;
                 ui.monospace(format!(
-                    "Total: ₿{total_value} (₿{} unconfirmed)",
-                    total_unconfirmed_value
+                    "Total: ₿{total_value} (₿{total_unconfirmed_value} unconfirmed)",
                 ));
             } else {
                 ui.monospace(format!(
@@ -248,7 +247,7 @@ pub fn show_utxo(
                     if show_asset_id {
                         ui.monospace_selectable_singleline(
                             true,
-                            format!("{}", asset_id),
+                            format!("{asset_id}"),
                         );
                     }
                     ui.monospace_selectable_singleline(

app/main.rs

@@ -91,8 +91,20 @@ fn set_tracing_subscriber(
             ("", saturating_pred_level(log_level)),
             ("bip300301", log_level),
             ("jsonrpsee_core::tracing", log_level),
+            (
+                "h2::codec::framed_read",
+                saturating_pred_level(saturating_pred_level(log_level)),
+            ),
+            (
+                "h2::codec::framed_write",
+                saturating_pred_level(saturating_pred_level(log_level)),
+            ),
             ("plain_bitassets", log_level),
             ("plain_bitassets_app", log_level),
+            (
+                "tower::buffer::worker",
+                saturating_pred_level(saturating_pred_level(log_level)),
+            ),
         ]);
         let directives_str =
             match std::env::var(tracing_filter::EnvFilter::DEFAULT_ENV) {

deny.toml

@@ -272,11 +272,11 @@ allow-registry = ["https://github.com/rust-lang/crates.io-index"]
 # List of URLs for allowed Git repositories
 allow-git = [
     "https://github.com/Ash-L2L/bip300301.git",
-    "https://github.com/Ash-L2L/bip300301_enforcer.git",
     "https://github.com/Ash-L2L/l2l-openapi.git",
     "https://gitlab.com/A-Manning/leonhard-llc-ops",
     "https://github.com/erikjohnston/ouroboros.git?rev=ea82b33947f60c511dac6eb3815b6af3f6c3f555",
-    "https://github.com/LayerTwo-Labs/cusf-enforcer-mempool.git",
+    "https://github.com/LayerTwo-Labs/bip300301_enforcer.git",
+    "https://github.com/mit-dci/rustreexo.git",
     "https://github.com/torkelrogstad/cusf-enforcer-mempool.git",
 ]
 

integration_tests/ibd.rs

@@ -143,6 +143,13 @@ async fn initial_block_download_task(
     tracing::debug!("Sender has connection to syncer");
     // Wait for sync to occur
     sleep(std::time::Duration::from_secs(10)).await;
+    // Check peer connections
+    let () = check_peer_connection(
+        &bitassets_nodes.syncer,
+        bitassets_nodes.sender.net_addr().into(),
+    )
+    .await?;
+    tracing::debug!("Syncer still has connection to sender");
     // Check that sender and syncer have all blocks
     {
         let sender_blocks =

lib/Cargo.toml

@@ -15,6 +15,7 @@ tonic-build = "0.12.3"
 [dependencies]
 addr = "0.15.6"
 anyhow = { workspace = true, features = ["backtrace"] }
+async-lock = "3.4.0"
 bech32 = "0.11.0"
 bincode = { workspace = true }
 bitcoin = { workspace = true, features = ["serde"] }
@@ -65,6 +66,17 @@ zeromq = { version = "0.4.1", optional = true }
 clap = ["dep:clap"]
 zmq = ["dep:zeromq"]
 
+[dependencies.educe]
+version = "0.6.0"
+default-features = false
+features = ["Clone", "Debug"]
+
+
+[dependencies.governor]
+version = "0.8.1"
+default-features = false
+features = ["quanta", "std"]
+
 [lints]
 workspace = true