diff --git a/bindings/bdk-kotlin/demo/src/main/kotlin/Main.kt b/bindings/bdk-kotlin/demo/src/main/kotlin/Main.kt index 45cd0a8..2c6629b 100644 --- a/bindings/bdk-kotlin/demo/src/main/kotlin/Main.kt +++ b/bindings/bdk-kotlin/demo/src/main/kotlin/Main.kt @@ -18,8 +18,8 @@ fun getTransaction(wallet: OnlineWalletInterface, transactionId: String): Option .stream() .filter({ when (it) { - is Transaction.Confirmed -> it.details.id.equals(transactionId) - is Transaction.Unconfirmed -> it.details.id.equals(transactionId) + is Transaction.Confirmed -> it.details.txid.equals(transactionId) + is Transaction.Unconfirmed -> it.details.txid.equals(transactionId) } }) .findFirst() @@ -32,7 +32,7 @@ val unconfirmedFirstThenByTimestampDescending = (a is Transaction.Confirmed && b is Transaction.Confirmed) -> { val comparison = b.confirmation.timestamp.compareTo(a.confirmation.timestamp) when { - comparison == 0 -> b.details.id.compareTo(a.details.id) + comparison == 0 -> b.details.txid.compareTo(a.details.txid) else -> comparison } } diff --git a/src/bdk.udl b/src/bdk.udl index 2d8061c..0597368 100644 --- a/src/bdk.udl +++ b/src/bdk.udl @@ -70,7 +70,7 @@ dictionary TransactionDetails { u64? fees; u64 received; u64 sent; - string id; + string txid; }; dictionary Confirmation { diff --git a/src/lib.rs b/src/lib.rs index 7b1c854..d88d7d6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -66,7 +66,7 @@ pub struct TransactionDetails { pub fees: Option, pub received: u64, pub sent: u64, - pub id: String, + pub txid: String, } type Confirmation = ConfirmationTime; @@ -86,7 +86,7 @@ impl From<&bdk::TransactionDetails> for TransactionDetails { fn from(x: &bdk::TransactionDetails) -> TransactionDetails { TransactionDetails { fees: x.fee, - id: x.txid.to_string(), + txid: x.txid.to_string(), received: x.received, sent: x.sent, }