Skip to content

Dev fix #449

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
eigmax merged 2 commits into from
Aug 26, 2026
Merged

Dev fix #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f7fdb2
fix pegout api
Aug 24, 2026
246663f
update bitvm-gc deps
Aug 26, 2026
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
6 changes: 3 additions & 3 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.

4 changes: 2 additions & 2 deletions node/src/bin/send_pegout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ enum Commands {
#[arg(long, default_value_t = false)]
dry_run: bool,

/// Skip graphs whose instances are locked by another withdrawal
/// Skip candidates blocked by another withdrawal, including stale predecessors
#[arg(long, default_value_t = false)]
skip_locked: bool,
},
Expand All @@ -70,7 +70,7 @@ enum Commands {
#[arg(long, default_value_t = false)]
dry_run: bool,

/// Skip graphs whose instances are locked by another withdrawal
/// Skip candidates blocked by another withdrawal, including stale predecessors
#[arg(long, default_value_t = false)]
skip_locked: bool,

Expand Down
3 changes: 2 additions & 1 deletion node/src/rpc_service/bitvm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ pub struct PegoutRequest {
pub graph_id: Option<String>,
#[serde(default)]
pub dry_run: bool,
/// Skip graphs whose instances are temporarily locked by another withdrawal.
/// Skip candidate graphs, and their stale predecessors, when their instances are
/// locked by another withdrawal.
#[serde(default)]
pub skip_locked: bool,
}
Expand Down
166 changes: 131 additions & 35 deletions node/src/rpc_service/handler/bitvm_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1790,8 +1790,8 @@ fn sats_to_token_amount(amount_sats: u64, token_decimals: u8) -> U256 {
/// - `graph_id`: Optional preferred UUID of the graph to pegout. If it has
/// already been claimed by another graph, the next eligible graph is used.
/// - `dry_run`: If true, validate but skip the actual initWithdraw call (default: false)
/// - `skip_locked`: If true, skip an instance temporarily locked by another
/// withdrawal and search for another withdrawable graph (default: false).
/// - `skip_locked`: If true, skip a candidate whose instance is locked by another
/// withdrawal, including a stale locked predecessor (default: false).
///
/// # Returns
///
Expand Down Expand Up @@ -1917,6 +1917,9 @@ pub async fn pegout(
"skipped obsolete graph while selecting pegout candidate"
);
}
skipped_graph_ids.insert(graph.graph_id);
preferred_graph_id = None;
continue;
}
PeginStatus::Locked if !payload.skip_locked => {
return error_response(
Expand All @@ -1933,43 +1936,136 @@ pub async fn pegout(
skipped_graph_id = %graph.graph_id,
"skipped graph whose instance is locked by another withdrawal"
);
skipped_graph_ids.insert(graph.graph_id);
preferred_graph_id = None;
continue;
}
_ => break (graph, pegin_data),
_ => {}
}

skipped_graph_ids.insert(graph.graph_id);
preferred_graph_id = None;
};

let mut storage_process = app_state.local_db.acquire().await.api_error("PEGOUT_ERROR")?;

// Check previous graph readiness
if graph.kickoff_index > 0 {
let pre_graphs = storage_process
.get_operator_graphs(
GraphQuery::default()
.with_operator_pubkey(graph.operator_pubkey.clone())
.with_kickoff_index(graph.kickoff_index - 1),
)
.await
.api_error("PEGOUT_ERROR")?;
if !pre_graphs.is_empty()
&& [
GraphStatus::OperatorDataPushed.to_string(),
GraphStatus::OperatorKickOff.to_string(),
GraphStatus::Challenge.to_string(),
]
.contains(&pre_graphs[0].status)
{
return error_response(
"PEGOUT_ERROR".to_string(),
format!(
"graph {} not ready: previous graph {} still in status {}",
graph.graph_id, pre_graphs[0].graph_id, pre_graphs[0].status
),
);
if graph.kickoff_index > 0 {
let previous_graph = {
let mut storage_process =
app_state.local_db.acquire().await.api_error("PEGOUT_ERROR")?;
storage_process
.get_operator_graphs(
GraphQuery::default()
.with_operator_pubkey(graph.operator_pubkey.clone())
.with_kickoff_index(graph.kickoff_index - 1),
)
.await
.api_error("PEGOUT_ERROR")?
.into_iter()
.next()
};

if let Some(previous_graph) = previous_graph {
let previous_status = match GraphStatus::from_str(&previous_graph.status) {
Ok(status) => status,
Err(_) => {
return error_response(
"PEGOUT_ERROR".to_string(),
format!(
"graph {} has an unknown previous graph {} status {}",
graph.graph_id, previous_graph.graph_id, previous_graph.status
),
);
}
};
match previous_status {
// A higher-index graph can only reach OperatorDataPushed after these
// graphs have become stale, so they must not block its withdrawal.
GraphStatus::OperatorPresigned | GraphStatus::CommitteePresigned => {}
GraphStatus::Obsoleted
| GraphStatus::Skipped
| GraphStatus::OperatorTake1
| GraphStatus::OperatorTake2
| GraphStatus::Disprove => {}
GraphStatus::OperatorDataPushed => {
let previous_pegin_data = app_state
.goat_client
.gateway_get_pegin_data(&previous_graph.instance_id)
.await
.api_error("PEGOUT_ERROR")?;
let previous_withdraw_data = app_state
.goat_client
.gateway_get_withdraw_data(&previous_graph.graph_id)
.await
.api_error("PEGOUT_ERROR")?;
match previous_pegin_data.status {
PeginStatus::Claimed => {}
PeginStatus::Locked
if previous_withdraw_data.status == WithdrawStatus::None
&& payload.skip_locked =>
{
info!(
instance_id = %graph.instance_id,
graph_id = %graph.graph_id,
previous_graph_id = %previous_graph.graph_id,
"previous graph is locked by another withdrawal; continuing pegout"
);
}
PeginStatus::Locked
if previous_withdraw_data.status == WithdrawStatus::None =>
{
return error_response(
"PEGOUT_IN_PROGRESS".to_string(),
format!(
"graph {} is blocked because previous graph {} is locked by another withdrawal; retry later or set skip_locked=true",
graph.graph_id, previous_graph.graph_id
),
);
}
PeginStatus::Withdrawable => {
return error_response(
"PEGOUT_ERROR".to_string(),
format!(
"graph {} not ready: previous graph {} is still withdrawable",
graph.graph_id, previous_graph.graph_id
),
);
}
previous_pegin_status => {
return error_response(
"PEGOUT_ERROR".to_string(),
format!(
"graph {} not ready: previous graph {} is in status {} with pegin status {:?} and withdraw status {:?}",
graph.graph_id,
previous_graph.graph_id,
previous_graph.status,
previous_pegin_status,
previous_withdraw_data.status
),
);
}
}
}
GraphStatus::PreKickoff
| GraphStatus::OperatorKickOff
| GraphStatus::Challenge => {
return error_response(
"PEGOUT_ERROR".to_string(),
format!(
"graph {} not ready: previous graph {} is in active pegout status {}",
graph.graph_id, previous_graph.graph_id, previous_graph.status
),
);
}
_ => {
return error_response(
"PEGOUT_ERROR".to_string(),
format!(
"graph {} not ready: previous graph {} has unexpected status {}",
graph.graph_id, previous_graph.graph_id, previous_graph.status
),
);
}
}
}
}
}

break (graph, pegin_data);
};

let amount = graph.amount;
if amount <= 0 {
Expand Down
Loading