Skip to content

[dependency-upgrade] Upgrade kyoto 0.5.0 → 0.6.0 #672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xsiddharthks merged 1 commit into from
Jun 10, 2026
Merged

[dependency-upgrade] Upgrade kyoto 0.5.0 → 0.6.0 #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ sui-http = "0.2.0"
bitcoin = { version = "0.32.8", features =["serde"] }
corepc-client = { version = "0.10.0", features = ["client-sync"] }
jsonrpc = "0.18.0"
kyoto = { package = "bip157", version = "0.5.0" }
kyoto = { package = "bip157", version = "0.6.0" }

@dlukegordon dlukegordon Jun 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we calling bip157 kyoto?

lru = "0.16"

# Dependencies for grpc and protobuf
Expand Down
32 changes: 16 additions & 16 deletions crates/hashi/src/btc_monitor/monitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::time::Duration;

use anyhow::Result;
use kyoto::FeeRate;
use kyoto::HeaderCheckpoint;
use kyoto::HashCheckpoint;
use kyoto::Warning;
use lru::LruCache;
use rand::Rng;
Expand Down Expand Up @@ -68,7 +68,7 @@ struct CachedDepositEntry {
}

struct DepositLookupCache {
tx_blocks: LruCache<bitcoin::Txid, HeaderCheckpoint>,
tx_blocks: LruCache<bitcoin::Txid, HashCheckpoint>,
block_heights: LruCache<bitcoin::BlockHash, u32>,
transactions: LruCache<bitcoin::Txid, Arc<bitcoin::Transaction>>,
}
Expand Down Expand Up @@ -118,13 +118,13 @@ impl SharedDepositLookupCache {
self.lock().clear();
}

fn get_tx_block(&self, txid: &bitcoin::Txid) -> Option<HeaderCheckpoint> {
fn get_tx_block(&self, txid: &bitcoin::Txid) -> Option<HashCheckpoint> {
let result = self.lock().tx_blocks.get(txid).copied();
self.record_request("tx_block", result.is_some());
result
}

fn put_tx_block(&self, txid: bitcoin::Txid, block_info: HeaderCheckpoint) {
fn put_tx_block(&self, txid: bitcoin::Txid, block_info: HashCheckpoint) {
self.lock().tx_blocks.put(txid, block_info);
}

Expand Down Expand Up @@ -191,7 +191,7 @@ pub struct Monitor {
bitcoind_rpc: Arc<corepc_client::client_sync::v29::Client>,
client_tx: tokio::sync::mpsc::Sender<MonitorMessage>,
requester: kyoto::Requester,
tip: Option<HeaderCheckpoint>,
tip: Option<HashCheckpoint>,
block_height_tx: tokio::sync::watch::Sender<u32>,
pending_deposits: Vec<PendingDeposit>,
pending_deposit_workers: JoinSet<()>,
Expand All @@ -216,12 +216,12 @@ impl Monitor {
fn build_kyoto_node(config: &MonitorConfig) -> (kyoto::Node, kyoto::Client) {
let checkpoint = match config.network {
bitcoin::Network::Bitcoin if config.start_height > 709_631 => {
kyoto::HeaderCheckpoint::taproot_activation()
kyoto::HashCheckpoint::taproot_activation()
}
bitcoin::Network::Bitcoin if config.start_height > 481_823 => {
kyoto::HeaderCheckpoint::segwit_activation()
kyoto::HashCheckpoint::segwit_activation()
}
network => kyoto::HeaderCheckpoint::from_genesis(network),
network => kyoto::HashCheckpoint::from_genesis(network),
};

let mut builder = kyoto::Builder::new(config.network)
Expand Down Expand Up @@ -486,7 +486,7 @@ impl Monitor {
self.metrics
.kyoto_best_height
.set(indexed_header.height as i64);
self.tip = Some(kyoto::HeaderCheckpoint::new(
self.tip = Some(kyoto::HashCheckpoint::new(
indexed_header.height,
indexed_header.block_hash(),
));
Expand All @@ -505,7 +505,7 @@ impl Monitor {
self.metrics.kyoto_reorgs.inc();
self.deposit_lookup_cache.clear();
if let Some(new_tip) = accepted.last() {
self.tip = Some(kyoto::HeaderCheckpoint::new(
self.tip = Some(kyoto::HashCheckpoint::new(
new_tip.height,
new_tip.block_hash(),
));
Expand Down Expand Up @@ -780,7 +780,7 @@ impl Monitor {
}

async fn process_pending_deposit(
tip: HeaderCheckpoint,
tip: HashCheckpoint,
confirmation_threshold: u32,
bitcoind_rpc: Arc<corepc_client::client_sync::v29::Client>,
requester: kyoto::Requester,
Expand Down Expand Up @@ -871,7 +871,7 @@ impl Monitor {
height
}
};
let block_info = kyoto::HeaderCheckpoint {
let block_info = kyoto::HashCheckpoint {
height,
hash: block_hash,
};
Expand Down Expand Up @@ -1280,7 +1280,7 @@ mod tests {
fn deposit_lookup_cache_records_and_clears_entries() {
let txid = make_outpoint(1).txid;
let block_hash = block_hash(2);
let block_info = HeaderCheckpoint::new(42, block_hash);
let block_info = HashCheckpoint::new(42, block_hash);
let metrics = Arc::new(fresh_metrics());
let cache = SharedDepositLookupCache::new(metrics.clone());

Expand All @@ -1304,7 +1304,7 @@ mod tests {
fn deposit_lookup_cache_invalidates_tx_entries_only() {
let txid = make_outpoint(1).txid;
let block_hash = block_hash(2);
let block_info = HeaderCheckpoint::new(42, block_hash);
let block_info = HashCheckpoint::new(42, block_hash);
let cache = SharedDepositLookupCache::new(Arc::new(fresh_metrics()));

cache.put_tx_block(txid, block_info);
Expand All @@ -1320,7 +1320,7 @@ mod tests {
let metrics = Arc::new(fresh_metrics());
let cache = SharedDepositLookupCache::new(metrics.clone());
let txid = make_outpoint(1).txid;
let block_info = HeaderCheckpoint::new(42, block_hash(2));
let block_info = HashCheckpoint::new(42, block_hash(2));
cache.put_tx_block(txid, block_info);
let (client_tx, _client_rx) = tokio::sync::mpsc::channel(10);
let mut result_rxs = Vec::new();
Expand All @@ -1331,7 +1331,7 @@ mod tests {
pending_deposit_for(bitcoin::OutPoint { txid, vout });
result_rxs.push(result_rx);
Monitor::process_pending_deposit(
HeaderCheckpoint::new(50, block_hash(3)),
HashCheckpoint::new(50, block_hash(3)),
100,
Arc::new(corepc_client::client_sync::v29::Client::new(
"http://127.0.0.1:1",
Expand Down
Loading