fix(sync-wallet): decouple batch broadcast from spend input matching

.github/workflows/check-code.yml

@@ -7,10 +7,15 @@ on:
   pull_request:
     branches: [main]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check-code:
     name: Check Code
     runs-on: ubuntu-latest
+    timeout-minutes: 25
     permissions:
       id-token: write
       contents: read

.github/workflows/test-e2e.yml

@@ -4,10 +4,15 @@ on:
   pull_request:
     branches: [main]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   integration:
     name: End to End Test
     runs-on: ubuntu-latest
+    timeout-minutes: 25
     permissions:
       id-token: write
       contents: read

.github/workflows/test-integration.yml

@@ -4,10 +4,15 @@ on:
   pull_request:
     branches: [main]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   integration:
     name: Integration Test
     runs-on: ubuntu-latest
+    timeout-minutes: 25
     permissions:
       id-token: write
       contents: read

src/batch/repo.rs

@@ -13,6 +13,13 @@ pub struct BatchInfo {
     pub created_ledger_tx_id: LedgerTxId,
 }
 
+pub struct BatchBroadcastLedgerTx<'a> {
+    pub tx: Transaction<'a, Postgres>,
+    pub batch_info: BatchInfo,
+    pub ledger_tx_id: LedgerTxId,
+    pub(crate) was_newly_set: bool,
+}
+
 #[derive(Debug, Clone)]
 pub struct Batches {
     pool: PgPool,
@@ -255,7 +262,7 @@ impl Batches {
         &self,
         bitcoin_tx_id: bitcoin::Txid,
         wallet_id: WalletId,
-    ) -> Result<Option<(Transaction<'_, Postgres>, BatchInfo, LedgerTxId)>, BatchError> {
+    ) -> Result<Option<BatchBroadcastLedgerTx<'_>>, BatchError> {
         let mut tx = self.pool.begin().await?;
         let row = sqlx::query!(
             r#"WITH b AS (
@@ -284,15 +291,16 @@ impl Batches {
         let batch_id = BatchId::from(row.id);
         let payout_queue_id = PayoutQueueId::from(row.payout_queue_id);
         if let Some(ledger_id) = row.ledger_id {
-            return Ok(Some((
+            return Ok(Some(BatchBroadcastLedgerTx {
                 tx,
-                BatchInfo {
+                batch_info: BatchInfo {
                     id: batch_id,
                     payout_queue_id,
                     created_ledger_tx_id,
                 },
-                LedgerTxId::from(ledger_id),
-            )));
+                ledger_tx_id: LedgerTxId::from(ledger_id),
+                was_newly_set: false,
+            }));
         }
         let ledger_transaction_id = LedgerTxId::new();
         sqlx::query!(
@@ -307,15 +315,16 @@ impl Batches {
         .execute(&mut *tx)
         .await?;
 
-        Ok(Some((
+        Ok(Some(BatchBroadcastLedgerTx {
             tx,
-            BatchInfo {
+            batch_info: BatchInfo {
                 id: batch_id,
                 payout_queue_id,
                 created_ledger_tx_id,
             },
-            ledger_transaction_id,
-        )))
+            ledger_tx_id: ledger_transaction_id,
+            was_newly_set: true,
+        }))
     }
 
     #[instrument(name = "batches.set_batch_cancel_ledger_tx_id", skip(self))]