Remove electrum tip query on start #708
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dangeross
reviewed
Feb 3, 2025
lib/core/src/chain/liquid.rs
Outdated
Comment on lines
101
to
102
| println!("Fetching block headers none"); | ||
| // https://github.com/bitcoindevkit/rusprintln!("Fetching block headers");t-electrum-client/issues/124 |
There was a problem hiding this comment.
Suggested change
| println!("Fetching block headers none"); | |
| // https://github.com/bitcoindevkit/rusprintln!("Fetching block headers");t-electrum-client/issues/124 | |
| // https://github.com/bitcoindevkit/rust-electrum-client/issues/124 |
dangeross
reviewed
Feb 3, 2025
lib/core/src/chain/liquid.rs
Outdated
| let new_tip: Option<u32> = match maybe_popped_header { | ||
| Some(popped_header) => Some(popped_header.height.try_into()?), | ||
| None => { | ||
| // https://github.com/bitcoindevkit/rusprintln!("Fetching block headers");t-electrum-client/issues/124 |
There was a problem hiding this comment.
Suggested change
| // https://github.com/bitcoindevkit/rusprintln!("Fetching block headers");t-electrum-client/issues/124 | |
| // https://github.com/bitcoindevkit/rust-electrum-client/issues/124 |
There was a problem hiding this comment.
Oh... how did it got there.
Done
lib/core/src/chain/bitcoin.rs
Outdated
| } | ||
|
|
||
| Ok(tip.clone()) | ||
| let tip = new_tip.ok_or_else(|| anyhow!("Failed to get tip"))?; |
There was a problem hiding this comment.
Nit: the new_tip name no longer makes sense. Maybe rename to maybe_tip? We can even get rid of it and return the tip directly within the match.
lib/core/src/chain/liquid.rs
Outdated
Comment on lines
97
to
112
| let new_tip: Option<u32> = match maybe_popped_header { | ||
| Some(popped_header) => Some(popped_header.height.try_into()?), | ||
| None => { | ||
| // https://github.com/bitcoindevkit/rust-electrum-client/issues/124 | ||
| // It might be that the client has reconnected and subscriptions don't persist | ||
| // across connections. Calling `client.ping()` won't help here because the | ||
| // successful retry will prevent us knowing about the reconnect. | ||
| if let Ok(header) = client.block_headers_subscribe_raw() { | ||
| Some(header.height.try_into()?) | ||
| } else { | ||
| None | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| let tip: u32 = new_tip.ok_or_else(|| anyhow!("Failed to get tip"))?; |
There was a problem hiding this comment.
Nit: Same as above. The name new_tip doesn't fit. We can return within the match.
danielgranhao
approved these changes
Feb 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ElecturmClient needs to be initialized with the current tip which forced us to query right on start which caused up to several seconds of sdk initialization.
Since we don't really need lwk ElectrumClient to use electrum this PR shifts to use the underline Client directly and saves this startup time and reduced it to less than a millisecond.
Edit: It turns out that also Electurm client initialization has some overhead as it tries to connect. I changed the code to use lazy initialization of electrum which causes the startup flow to complete instantly now.