Merge pull request #19 from synonymdev/feat/emit-replaced-tx-conflicts

ovitrif · web-flow · commit ae16bb60058a · 2025-11-25T20:37:55.000+01:00
Emit replaced tx conflicts
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@
     - `OnchainTransactionReceived`: Emitted when a new unconfirmed transaction is
       first detected in the mempool (instant notification for incoming payments!)
     - `OnchainTransactionConfirmed`: Emitted when a transaction receives confirmations
-    - `OnchainTransactionReplaced`: Emitted when a transaction is replaced (via RBF or different transaction using a commmon input)
+    - `OnchainTransactionReplaced`: Emitted when a transaction is replaced (via RBF or different transaction using a common input). Includes the replaced transaction ID and the list of conflicting replacement transaction IDs.
     - `OnchainTransactionReorged`: Emitted when a previously confirmed transaction
       becomes unconfirmed due to a blockchain reorg
     - `OnchainTransactionEvicted`: Emitted when a transaction is evicted from the mempool
diff --git a/MOBILE_DEVELOPER_GUIDE.md b/MOBILE_DEVELOPER_GUIDE.md
@@ -41,7 +41,8 @@ These events notify you about Bitcoin transactions affecting your onchain wallet
 - **When**: Transaction is replaced via Replace-By-Fee (RBF)
 - **Use Case**: Update UI to show the transaction was replaced
 - **Fields**:
-  - `txid`: Transaction ID of the replacement transaction
+  - `txid`: Transaction ID of the transaction that was replaced (the old transaction)
+  - `conflicts`: Array of transaction IDs that replaced this transaction (the replacement transactions)
 
 #### `OnchainTransactionReorged`
 - **When**: Previously confirmed transaction becomes unconfirmed due to blockchain reorg
@@ -201,8 +202,8 @@ class WalletEventHandler {
         case .onchainTransactionConfirmed(let txid, let blockHash, let blockHeight, let confirmationTime, let details):
             handleConfirmedTransaction(txid: txid, height: blockHeight, details: details)
 
-        case .onchainTransactionReplaced(let txid):
-            handleReplacedTransaction(txid: txid)
+        case .onchainTransactionReplaced(let txid, let conflicts):
+            handleReplacedTransaction(txid: txid, conflicts: conflicts)
 
         case .onchainTransactionReorged(let txid):
             handleReorgedTransaction(txid: txid)
@@ -278,14 +279,27 @@ func handleConfirmedTransaction(txid: String, height: UInt32, details: Transacti
     }
 }
 
-func handleReplacedTransaction(txid: String) {
+func handleReplacedTransaction(txid: String, conflicts: [String]) {
     DispatchQueue.main.async {
         self.updateTransactionStatus(txid: txid, status: .replaced)
-        self.showNotification(
-            title: "Transaction Replaced",
-            body: "Transaction was replaced via RBF",
-            txid: txid
-        )
+        
+        if conflicts.isEmpty {
+            self.showNotification(
+                title: "Transaction Replaced",
+                body: "Transaction was replaced via RBF",
+                txid: txid
+            )
+        } else {
+            self.showNotification(
+                title: "Transaction Replaced",
+                body: "Transaction was replaced by \(conflicts.count) transaction(s)",
+                txid: txid
+            )
+            // Track replacement transactions
+            for conflictTxid in conflicts {
+                self.trackReplacementTransaction(originalTxid: txid, replacementTxid: conflictTxid)
+            }
+        }
     }
 }
 
@@ -460,7 +474,7 @@ class WalletEventHandler(private val node: Node) {
             }
 
             is Event.OnchainTransactionReplaced -> {
-                handleReplacedTransaction(event.txid)
+                handleReplacedTransaction(event.txid, event.conflicts)
             }
 
             is Event.OnchainTransactionReorged -> {
@@ -556,14 +570,27 @@ class TransactionNotificationManager(private val context: Context) {
         }
     }
 
-    fun handleReplacedTransaction(txid: String) {
+    fun handleReplacedTransaction(txid: String, conflicts: List<String>) {
         GlobalScope.launch(Dispatchers.Main) {
             updateTransactionStatus(txid, TransactionStatus.REPLACED)
-            showNotification(
-                title = "Transaction Replaced",
-                message = "Transaction was replaced via RBF",
-                txid = txid
-            )
+            
+            if (conflicts.isEmpty()) {
+                showNotification(
+                    title = "Transaction Replaced",
+                    message = "Transaction was replaced via RBF",
+                    txid = txid
+                )
+            } else {
+                showNotification(
+                    title = "Transaction Replaced",
+                    message = "Transaction was replaced by ${conflicts.size} transaction(s)",
+                    txid = txid
+                )
+                // Track replacement transactions
+                conflicts.forEach { conflictTxid ->
+                    trackReplacementTransaction(originalTxid = txid, replacementTxid = conflictTxid)
+                }
+            }
         }
     }
 
diff --git a/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/arm64-v8a/libldk_node.so b/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/arm64-v8a/libldk_node.so
diff --git a/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/armeabi-v7a/libldk_node.so b/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/armeabi-v7a/libldk_node.so
diff --git a/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/x86_64/libldk_node.so b/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/x86_64/libldk_node.so
diff --git a/bindings/kotlin/ldk-node-android/lib/src/main/kotlin/org/lightningdevkit/ldknode/ldk_node.android.kt b/bindings/kotlin/ldk-node-android/lib/src/main/kotlin/org/lightningdevkit/ldknode/ldk_node.android.kt
@@ -8336,6 +8336,7 @@ object FfiConverterTypeEvent : FfiConverterRustBuffer<Event>{
                 )
             11 -> Event.OnchainTransactionReplaced(
                 FfiConverterTypeTxid.read(buf),
+                FfiConverterSequenceTypeTxid.read(buf),
                 )
             12 -> Event.OnchainTransactionReorged(
                 FfiConverterTypeTxid.read(buf),
@@ -8476,6 +8477,7 @@ object FfiConverterTypeEvent : FfiConverterRustBuffer<Event>{
             (
                 4UL
                 + FfiConverterTypeTxid.allocationSize(value.`txid`)
+                + FfiConverterSequenceTypeTxid.allocationSize(value.`conflicts`)
             )
         }
         is Event.OnchainTransactionReorged -> {
@@ -8614,6 +8616,7 @@ object FfiConverterTypeEvent : FfiConverterRustBuffer<Event>{
             is Event.OnchainTransactionReplaced -> {
                 buf.putInt(11)
                 FfiConverterTypeTxid.write(value.`txid`, buf)
+                FfiConverterSequenceTypeTxid.write(value.`conflicts`, buf)
                 Unit
             }
             is Event.OnchainTransactionReorged -> {
@@ -11364,6 +11367,31 @@ object FfiConverterSequenceTypeSocketAddress: FfiConverterRustBuffer<List<Socket
 
 
 
+
+object FfiConverterSequenceTypeTxid: FfiConverterRustBuffer<List<Txid>> {
+    override fun read(buf: ByteBuffer): List<Txid> {
+        val len = buf.getInt()
+        return List<Txid>(len) {
+            FfiConverterTypeTxid.read(buf)
+        }
+    }
+
+    override fun allocationSize(value: List<Txid>): ULong {
+        val sizeForLength = 4UL
+        val sizeForItems = value.sumOf { FfiConverterTypeTxid.allocationSize(it) }
+        return sizeForLength + sizeForItems
+    }
+
+    override fun write(value: List<Txid>, buf: ByteBuffer) {
+        buf.putInt(value.size)
+        value.iterator().forEach {
+            FfiConverterTypeTxid.write(it, buf)
+        }
+    }
+}
+
+
+
 object FfiConverterMapStringString: FfiConverterRustBuffer<Map<kotlin.String, kotlin.String>> {
     override fun read(buf: ByteBuffer): Map<kotlin.String, kotlin.String> {
         val len = buf.getInt()
diff --git a/bindings/kotlin/ldk-node-android/lib/src/main/kotlin/org/lightningdevkit/ldknode/ldk_node.common.kt b/bindings/kotlin/ldk-node-android/lib/src/main/kotlin/org/lightningdevkit/ldknode/ldk_node.common.kt
@@ -1278,6 +1278,7 @@ sealed class Event {
     @kotlinx.serialization.Serializable
     data class OnchainTransactionReplaced(
         val `txid`: Txid,
+        val `conflicts`: List<Txid>,
     ) : Event() {
     }
     @kotlinx.serialization.Serializable
@@ -1916,6 +1917,8 @@ sealed class VssHeaderProviderException(message: String): kotlin.Exception(messa
 
 
 
+
+
 
 
 
diff --git a/bindings/ldk_node.udl b/bindings/ldk_node.udl
@@ -431,7 +431,7 @@ interface Event {
 	ChannelClosed(ChannelId channel_id, UserChannelId user_channel_id, PublicKey? counterparty_node_id, ClosureReason? reason);
 	OnchainTransactionConfirmed(Txid txid, BlockHash block_hash, u32 block_height, u64 confirmation_time, TransactionDetails details);
 	OnchainTransactionReceived(Txid txid, TransactionDetails details);
-	OnchainTransactionReplaced(Txid txid);
+	OnchainTransactionReplaced(Txid txid, sequence<Txid> conflicts);
 	OnchainTransactionReorged(Txid txid);
 	OnchainTransactionEvicted(Txid txid);
 	SyncProgress(SyncType sync_type, u8 progress_percent, u32 current_block_height, u32 target_block_height);
diff --git a/bindings/swift/Sources/LDKNode/LDKNode.swift b/bindings/swift/Sources/LDKNode/LDKNode.swift
@@ -5848,8 +5848,7 @@ public enum Event {
     case channelClosed(channelId: ChannelId, userChannelId: UserChannelId, counterpartyNodeId: PublicKey?, reason: ClosureReason?)
     case onchainTransactionConfirmed(txid: Txid, blockHash: BlockHash, blockHeight: UInt32, confirmationTime: UInt64, details: TransactionDetails)
     case onchainTransactionReceived(txid: Txid, details: TransactionDetails)
-    case onchainTransactionReplaced(txid: Txid
-    )
+    case onchainTransactionReplaced(txid: Txid, conflicts: [Txid])
     case onchainTransactionReorged(txid: Txid
     )
     case onchainTransactionEvicted(txid: Txid
@@ -5885,8 +5884,7 @@ public struct FfiConverterTypeEvent: FfiConverterRustBuffer {
 
         case 10: return try .onchainTransactionReceived(txid: FfiConverterTypeTxid.read(from: &buf), details: FfiConverterTypeTransactionDetails.read(from: &buf))
 
-        case 11: return try .onchainTransactionReplaced(txid: FfiConverterTypeTxid.read(from: &buf)
-            )
+        case 11: return try .onchainTransactionReplaced(txid: FfiConverterTypeTxid.read(from: &buf), conflicts: FfiConverterSequenceTypeTxid.read(from: &buf))
 
         case 12: return try .onchainTransactionReorged(txid: FfiConverterTypeTxid.read(from: &buf)
             )
@@ -5981,9 +5979,10 @@ public struct FfiConverterTypeEvent: FfiConverterRustBuffer {
             FfiConverterTypeTxid.write(txid, into: &buf)
             FfiConverterTypeTransactionDetails.write(details, into: &buf)
 
-        case let .onchainTransactionReplaced(txid):
+        case let .onchainTransactionReplaced(txid, conflicts):
             writeInt(&buf, Int32(11))
             FfiConverterTypeTxid.write(txid, into: &buf)
+            FfiConverterSequenceTypeTxid.write(conflicts, into: &buf)
 
         case let .onchainTransactionReorged(txid):
             writeInt(&buf, Int32(12))
@@ -8613,6 +8612,28 @@ private struct FfiConverterSequenceTypeSocketAddress: FfiConverterRustBuffer {
     }
 }
 
+private struct FfiConverterSequenceTypeTxid: FfiConverterRustBuffer {
+    typealias SwiftType = [Txid]
+
+    static func write(_ value: [Txid], into buf: inout [UInt8]) {
+        let len = Int32(value.count)
+        writeInt(&buf, len)
+        for item in value {
+            FfiConverterTypeTxid.write(item, into: &buf)
+        }
+    }
+
+    static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> [Txid] {
+        let len: Int32 = try readInt(&buf)
+        var seq = [Txid]()
+        seq.reserveCapacity(Int(len))
+        for _ in 0 ..< len {
+            try seq.append(FfiConverterTypeTxid.read(from: &buf))
+        }
+        return seq
+    }
+}
+
 private struct FfiConverterDictionaryStringString: FfiConverterRustBuffer {
     static func write(_ value: [String: String], into buf: inout [UInt8]) {
         let len = Int32(value.count)
diff --git a/src/chain/mod.rs b/src/chain/mod.rs
@@ -411,9 +411,15 @@ where
 				);
 				// We don't emit an event for chain tip changes as this is too noisy
 			},
-			BdkWalletEvent::TxReplaced { txid, .. } => {
-				log_info!(logger, "Onchain transaction {} was replaced", txid);
-				let event = Event::OnchainTransactionReplaced { txid };
+			BdkWalletEvent::TxReplaced { txid, conflicts, .. } => {
+				let conflict_txids: Vec<Txid> = conflicts.iter().map(|(_, conflict_txid)| *conflict_txid).collect();
+				log_info!(
+					logger,
+					"Onchain transaction {} was replaced by {} transaction(s)",
+					txid,
+					conflict_txids.len()
+				);
+				let event = Event::OnchainTransactionReplaced { txid, conflicts: conflict_txids };
 				event_queue.add_event(event).map_err(|e| {
 					log_error!(logger, "Failed to push onchain event to queue: {}", e);
 					e
diff --git a/src/event.rs b/src/event.rs
@@ -255,8 +255,8 @@ use std::time::Duration;
 ///             println!("Amount: {} sats", details.amount_sats);
 ///             node.event_handled()?;
 ///         },
-///         Event::OnchainTransactionReplaced { txid } => {
-///             println!("Transaction {} was replaced (RBF)", txid);
+///         Event::OnchainTransactionReplaced { txid, conflicts } => {
+///             println!("Transaction {} was replaced (RBF) by {} transaction(s)", txid, conflicts.len());
 ///             node.event_handled()?;
 ///         },
 ///         Event::OnchainTransactionReorged { txid } => {
@@ -589,8 +589,11 @@ pub enum Event {
 	/// # let node = builder.build().unwrap();
 	/// # node.start().unwrap();
 	/// match node.wait_next_event() {
-	///     Event::OnchainTransactionReplaced { txid } => {
-	///         println!("Transaction {} was replaced", txid);
+	///     Event::OnchainTransactionReplaced { txid, conflicts } => {
+	///         println!("Transaction {} was replaced by {} transaction(s)", txid, conflicts.len());
+	///         for conflict_txid in conflicts {
+	///             println!("  Replacement transaction: {}", conflict_txid);
+	///         }
 	///         node.event_handled().unwrap();
 	///     },
 	///     _ => {}
@@ -599,6 +602,12 @@ pub enum Event {
 	OnchainTransactionReplaced {
 		/// The transaction ID that was replaced.
 		txid: bitcoin::Txid,
+		/// The transaction IDs that replaced this transaction (conflicts).
+		///
+		/// These are the transactions that share inputs with the replaced transaction
+		/// and caused it to be replaced. Typically there will be one replacement transaction,
+		/// but multiple are possible.
+		conflicts: Vec<bitcoin::Txid>,
 	},
 	/// An onchain transaction became unconfirmed due to a chain reorganization.
 	///
@@ -854,6 +863,7 @@ impl_writeable_tlv_based_enum!(Event,
 	},
 	(10, OnchainTransactionReplaced) => {
 		(0, txid, required),
+		(1, conflicts, required_vec),
 	},
 	(11, OnchainTransactionReorged) => {
 		(0, txid, required),
diff --git a/tests/integration_tests_rust.rs b/tests/integration_tests_rust.rs
@@ -1715,7 +1715,10 @@ fn test_event_serialization_roundtrip() {
 	test_roundtrip(event);
 
 	// Test OnchainTransactionReplaced
-	let event = Event::OnchainTransactionReplaced { txid: Txid::from_slice(&[6; 32]).unwrap() };
+	let event = Event::OnchainTransactionReplaced {
+		txid: Txid::from_slice(&[6; 32]).unwrap(),
+		conflicts: vec![Txid::from_slice(&[7; 32]).unwrap()],
+	};
 	test_roundtrip(event);
 
 	// Test OnchainTransactionReorged
