Skip to content

Commit 94849ea

Browse files
committed
Remove need to fetch transfers on spark event
Before we needed to fetch our transfers to be able to get the payment data for the transfer event. This was fixed in the spark-sdk so now we can just update to that commit and no longer need to fetch the info.
1 parent eb7a680 commit 94849ea

2 files changed

Lines changed: 2 additions & 13 deletions

File tree

orange-sdk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ bitcoin-payment-instructions = { version = "0.4.0", features = ["http"] }
1818
chrono = { version = "0.4", default-features = false }
1919
rand = { version = "0.8.5", optional = true }
2020
reqwest = { version = "0.12.23", default-features = false, features = ["rustls-tls"] }
21-
spark-wallet = { git = "https://github.com/breez/spark-sdk.git", rev = "5bfde1b207849db2ae02f57714a80efb3f04e0d2", optional = true }
21+
spark-wallet = { git = "https://github.com/breez/spark-sdk.git", rev = "8b787473a5df61892712e90a01288640d77045a8", optional = true }
2222
tokio = { version = "1.0", default-features = false, features = ["rt-multi-thread", "sync"] }
2323
uuid = { version = "1.0", default-features = false, optional = true }
2424
cdk = { version = "0.12.0", default-features = false, features = ["wallet"], optional = true }

orange-sdk/src/trusted_wallet/spark.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -349,18 +349,7 @@ impl Spark {
349349
log_info!(l, "Payments synced to storage");
350350
}
351351

352-
// todo: SSP should really include the user request in the event
353-
// but for now we have to fetch it ourselves if it's not present
354-
let user_request = match transfer.user_request.clone() {
355-
Some(req) => Some(req),
356-
None => {
357-
let transfers = w.list_transfers(None).await.unwrap_or_default();
358-
transfers.into_iter().find(|t| t.id == transfer.id)
359-
.and_then(|t| t.user_request)
360-
}
361-
};
362-
363-
match user_request {
352+
match transfer.user_request {
364353
None => {
365354
log_debug!(l, "Transfer claimed without user request: {transfer:?}");
366355
},

0 commit comments

Comments
 (0)