Fix 2WPD withdrawal bundle submitted bug, update deps

.github/workflows/check_lint_build.yaml

@@ -61,6 +61,16 @@ jobs:
           chmod +x bitcoin-patched-bins/bitcoin-cli
           popd
 
+      - name: Download bitcoin unpatched
+        run: |
+          pushd ..
+          wget https://bitcoincore.org/bin/bitcoin-core-30.2/bitcoin-30.2-x86_64-linux-gnu.tar.gz
+          tar -xf bitcoin-30.2-x86_64-linux-gnu.tar.gz
+          rm bitcoin-30.2-x86_64-linux-gnu.tar.gz
+          mv bitcoin-30.2/bin bitcoin-unpatched-bins
+          rm -r bitcoin-30.2
+          popd
+
       - name: Download latest bip300301_enforcer
         run: |
           pushd ..
@@ -113,6 +123,7 @@ jobs:
         run: |
           export BIP300301_ENFORCER='../bip300301-enforcer'
           export BITCOIND='../bitcoin-patched-bins/bitcoind'
+          export BITCOIND_UNPATCHED='../bitcoin-unpatched-bins/bitcoind'
           export BITCOIN_CLI='../bitcoin-patched-bins/bitcoin-cli'
           export ELECTRS='../electrs/target/release/electrs'
           export THUNDER_APP='target/debug/thunder_app'

Cargo.toml

@@ -39,12 +39,12 @@ uuid = "1.13.1"
 [workspace.dependencies.bip300301_enforcer_lib]
 default-features = false
 git = "https://github.com/LayerTwo-Labs/bip300301_enforcer"
-rev = "a8d169ee34aeddf6d354aa52376d847831d7fbb3"
+rev = "9c3eb0bdcb5b9a458e6f92cafb8bdbf76a860f74"
 
 [workspace.dependencies.bip300301_enforcer_integration_tests]
 default-features = false
 git = "https://github.com/LayerTwo-Labs/bip300301_enforcer"
-rev = "a8d169ee34aeddf6d354aa52376d847831d7fbb3"
+rev = "9c3eb0bdcb5b9a458e6f92cafb8bdbf76a860f74"
 
 [workspace.dependencies.l2l-openapi]
 git = "https://github.com/Ash-L2L/l2l-openapi"

app/gui/withdrawals.rs

@@ -10,7 +10,7 @@ impl Withdrawals {
     pub fn show(&mut self, app: Option<&App>, ui: &mut egui::Ui) {
         ui.heading("Pending withdrawals");
         let bundle = app.and_then(|app| {
-            app.node.get_pending_withdrawal_bundle().ok().flatten()
+            app.node.try_get_pending_withdrawal_bundle().ok().flatten()
         });
         if let Some(bundle) = bundle {
             let mut spent_utxos: Vec<_> = bundle.spend_utxos().iter().collect();

app/rpc_server.rs

@@ -206,7 +206,7 @@ impl RpcServer for RpcServerImpl {
     ) -> RpcResult<Option<WithdrawalBundle>> {
         self.app
             .node
-            .get_pending_withdrawal_bundle()
+            .try_get_pending_withdrawal_bundle()
             .map_err(custom_err)
     }
 

integration_tests/Cargo.toml

@@ -18,7 +18,7 @@ jsonrpsee = { workspace = true }
 libtest-mimic = "0.8.1"
 reserve-port = "2.0.1"
 thiserror = { workspace = true }
-thunder = { path = "../lib" }
+thunder = { path = "../lib", features = ["clap"] }
 thunder_app_rpc_api = { path = "../rpc-api" }
 tracing = { workspace = true }
 tracing-indicatif = "0.3.8"

integration_tests/example.env

@@ -1,5 +1,6 @@
 BIP300301_ENFORCER='../bip300301_enforcer/target/debug/bip300301_enforcer'
-BITCOIND='../bitcoin/build/src/bitcoind'
+BITCOIND='../bitcoin-patched/build/src/bitcoind'
+BITCOIND_UNPATCHED='../bitcoin/build/src/bitcoind'
 BITCOIN_CLI='../bitcoin/build/src/bitcoin-cli'
 ELECTRS='../electrs/target/release/electrs'
 THUNDER_APP='target/debug/thunder_app'

integration_tests/ibd.rs

@@ -5,8 +5,9 @@ use std::net::SocketAddr;
 use bip300301_enforcer_integration_tests::{
     integration_test::{activate_sidechain, fund_enforcer, propose_sidechain},
     setup::{
-        Mode, Network, PostSetup as EnforcerPostSetup, Sidechain as _,
-        setup as setup_enforcer,
+        Mode, Network, PostSetup as EnforcerPostSetup,
+        PreSetup as EnforcerPreSetup, SetupOpts as EnforcerSetupOpts,
+        Sidechain as _,
     },
     util::{AbortOnDrop, AsyncTrial, TestFailureCollector, TestFileRegistry},
 };
@@ -33,13 +34,14 @@ async fn setup(
     bin_paths: BinPaths,
     res_tx: mpsc::UnboundedSender<anyhow::Result<()>>,
 ) -> anyhow::Result<(EnforcerPostSetup, ThunderNodes)> {
-    let mut enforcer_post_setup = setup_enforcer(
-        &bin_paths.others,
-        Network::Regtest,
-        Mode::Mempool,
-        res_tx.clone(),
-    )
-    .await?;
+    let enforcer_pre_setup =
+        EnforcerPreSetup::new(bin_paths.others, Network::Regtest)?;
+    let mut enforcer_post_setup = {
+        let setup_opts: EnforcerSetupOpts = Default::default();
+        enforcer_pre_setup
+            .setup(Mode::Mempool, setup_opts, res_tx.clone())
+            .await?
+    };
     let sidechain_sender = PostSetup::setup(
         Init {
             thunder_app: bin_paths.thunder.clone(),