Poll mempool entries interatively #410
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
Previously, we'd utilized `getrawmempool`'s `verbose` flag to retrieve additional information about mempool entries. However, when the mempool is full this could lead to errors as `lightning-block-sync`'s HTTP client limits responses to a maximum of ~8MB. Here, we switch to only query the non-verbose entries (i.e., txid only), and retrieve the needed information iteratively via follow-up calls to `getmempoolentry`, which shouldn't suffer from the same issue.
jkczyz
previously approved these changes
Nov 22, 2024
src/chain/bitcoind_rpc.rs
Outdated
Comment on lines
124
to
141
| pub(crate) async fn get_mempool_entry(&self, txid: &Txid) -> std::io::Result<MempoolEntry> { | ||
| let txid_hex = bitcoin::consensus::encode::serialize_hex(txid); | ||
| let txid_json = serde_json::json!(txid_hex); | ||
| self.rpc_client | ||
| .call_method::<GetMempoolEntryResponse>("getmempoolentry", &vec![txid_json]) | ||
| .await | ||
| .map(|resp| MempoolEntry { txid: txid.clone(), height: resp.height, time: resp.time }) | ||
| } | ||
|
|
||
| pub(crate) async fn get_mempool_entries(&self) -> std::io::Result<Vec<MempoolEntry>> { | ||
| let mempool_txids = self.get_raw_mempool().await?; | ||
| let mut mempool_entries = Vec::with_capacity(mempool_txids.len()); | ||
| for txid in &mempool_txids { | ||
| let entry = self.get_mempool_entry(txid).await?; | ||
| mempool_entries.push(entry); | ||
| } | ||
| Ok(mempool_entries) | ||
| } |
There was a problem hiding this comment.
A little cleaner as:
diff --git a/src/chain/bitcoind_rpc.rs b/src/chain/bitcoind_rpc.rs
index c0b4cf9..871dd8a 100644
--- a/src/chain/bitcoind_rpc.rs
+++ b/src/chain/bitcoind_rpc.rs
@@ -121,19 +121,19 @@ impl BitcoindRpcClient {
.map(|resp| resp.0)
}
- pub(crate) async fn get_mempool_entry(&self, txid: &Txid) -> std::io::Result<MempoolEntry> {
- let txid_hex = bitcoin::consensus::encode::serialize_hex(txid);
+ pub(crate) async fn get_mempool_entry(&self, txid: Txid) -> std::io::Result<MempoolEntry> {
+ let txid_hex = bitcoin::consensus::encode::serialize_hex(&txid);
let txid_json = serde_json::json!(txid_hex);
self.rpc_client
.call_method::<GetMempoolEntryResponse>("getmempoolentry", &vec![txid_json])
.await
- .map(|resp| MempoolEntry { txid: txid.clone(), height: resp.height, time: resp.time })
+ .map(|resp| MempoolEntry { txid, height: resp.height, time: resp.time })
}
pub(crate) async fn get_mempool_entries(&self) -> std::io::Result<Vec<MempoolEntry>> {
let mempool_txids = self.get_raw_mempool().await?;
let mut mempool_entries = Vec::with_capacity(mempool_txids.len());
- for txid in &mempool_txids {
+ for txid in mempool_txids {
let entry = self.get_mempool_entry(txid).await?;
mempool_entries.push(entry);
}There was a problem hiding this comment.
Now added as a fixup (let me know if I can squash) and also included a commit dropping all the vec! allocations in the call_method calls which turned out to be unnecessary.
Polling every second may be overly aggressive, especially when we're polling the mempool. Here, we relax the chain polling interval a bit.
tnull
force-pushed
the
2024-11-iterative-mempool-retrieval
branch
from
a79f6f0 to
002c402
Compare
Squashed without further changes. |
jkczyz
approved these changes
Nov 23, 2024
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.
Previously, we'd utilized
getrawmempool'sverboseflag to retrieve additional information about mempool entries. However, depending on the mempool size this could lead to errors aslightning-block-sync's HTTPclient limits responses to a maximum of ~8MB.
Here, we switch to only query the non-verbose entries (i.e., txid only), and retrieve the needed information iteratively via follow-up calls to
getmempoolentry, which shouldn't suffer from the same issue.