Skip to content

fix: require committee signatures for force-skip penalties #527

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

Open
KSlashh wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: require committee signatures for force-skip penalties #527

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
30 changes: 15 additions & 15 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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ members = [
default-members = ["node"]

[workspace.dependencies]
bitvm = { git = "https://github.com/GOATNetwork/BitVM.git", branch = "gc-v2" }
goat = { git = "https://github.com/GOATNetwork/BitVM.git", branch = "gc-v2" }
bitvm = { git = "https://github.com/GOATNetwork/BitVM.git", branch = "committee-force-skip" }
goat = { git = "https://github.com/GOATNetwork/BitVM.git", branch = "committee-force-skip" }

libp2p = { version = "0.57.1", features = ["tokio", "kad", "noise", "tcp", "yamux", "rsa", "ping"] }
libp2p-swarm-derive = "0.36.0"
Expand Down
150 changes: 149 additions & 1 deletion crates/bitvm-gc/src/committee/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ pub fn operator_challenge_nack_pre_sign_num(watchtower_num: usize) -> usize {
pub fn operator_commit_timeout_pre_sign_num() -> usize {
2
}
pub fn force_skip_kickoff_pre_sign_num() -> usize {
1
}
pub fn quick_challenge_pre_sign_num() -> usize {
1
}
pub fn disprove_pre_sign_num(verifier_num: usize) -> usize {
verifier_num * 2
}
Expand Down Expand Up @@ -138,6 +144,10 @@ pub struct CommitteeMusig2Data<T> {
pub operator_challenge_nack: Vec<T>,
pub operator_commit_timeout: Vec<T>,
pub disprove: Vec<T>,
/// Input 1 (the force-skip connector) of Force-Skip-Kickoff.
pub force_skip_kickoff: Vec<T>,
/// Input 1 (the force-skip connector) of Quick-Challenge.
pub quick_challenge: Vec<T>,
}

pub type CommitteeSecNonces = CommitteeMusig2Data<SecNonce>;
Expand Down Expand Up @@ -170,6 +180,14 @@ impl<T> CommitteeMusig2Data<T> {
self.disprove.len() == disprove_pre_sign_num(verifier_num),
"invalid number of disprove"
);
ensure!(
self.force_skip_kickoff.len() == force_skip_kickoff_pre_sign_num(),
"invalid number of force skip kickoff"
);
ensure!(
self.quick_challenge.len() == quick_challenge_pre_sign_num(),
"invalid number of quick challenge"
);
Ok(())
}

Expand All @@ -182,6 +200,8 @@ impl<T> CommitteeMusig2Data<T> {
operator_challenge_nack: vec![],
operator_commit_timeout: vec![],
disprove: vec![],
force_skip_kickoff: vec![],
quick_challenge: vec![],
}
}
}
Expand Down Expand Up @@ -287,6 +307,20 @@ pub fn committee_presign_sighash_digest(graph: &BitvmGcGraph) -> Result<[u8; 32]
TapSighashType::None,
)?;
}
add_sighash(
&mut hasher,
b"force_skip_kickoff/1/none",
&graph.force_skip_kickoff,
1,
TapSighashType::None,
)?;
add_sighash(
&mut hasher,
b"quick_challenge/1/none",
&graph.quick_challenge,
1,
TapSighashType::None,
)?;
Ok(hasher.finalize().into())
}

Expand Down Expand Up @@ -438,6 +472,26 @@ pub fn committee_pre_sign(
res.disprove = disprove_sigs;
}

{
// force skip kickoff
let sec_nonces = committee_member_sec_nonce.force_skip_kickoff.try_into().unwrap();
let agg_nonces = committee_agg_nonce.force_skip_kickoff.try_into().unwrap();
match graph.force_skip_kickoff.pre_sign(&committee_context, &sec_nonces, &agg_nonces) {
Ok(v) => res.force_skip_kickoff = v.to_vec(),
Err(e) => bail!("fail to pre-sign {}: {e}", graph.force_skip_kickoff.name()),
};
}

{
// quick challenge
let sec_nonces = committee_member_sec_nonce.quick_challenge.try_into().unwrap();
let agg_nonces = committee_agg_nonce.quick_challenge.try_into().unwrap();
match graph.quick_challenge.pre_sign(&committee_context, &sec_nonces, &agg_nonces) {
Ok(v) => res.quick_challenge = v.to_vec(),
Err(e) => bail!("fail to pre-sign {}: {e}", graph.quick_challenge.name()),
};
}

Ok(res)
}

Expand Down Expand Up @@ -480,6 +534,8 @@ pub fn nonces_aggregation(pub_nonces_vec: &[CommitteePubNonces]) -> Result<Commi
operator_challenge_nack: aggregate_field(pub_nonces_vec, |c| &c.operator_challenge_nack)?,
operator_commit_timeout: aggregate_field(pub_nonces_vec, |c| &c.operator_commit_timeout)?,
disprove: aggregate_field(pub_nonces_vec, |c| &c.disprove)?,
force_skip_kickoff: aggregate_field(pub_nonces_vec, |c| &c.force_skip_kickoff)?,
quick_challenge: aggregate_field(pub_nonces_vec, |c| &c.quick_challenge)?,
})
}

Expand Down Expand Up @@ -596,6 +652,32 @@ pub fn signature_aggregation(
}
res.disprove = disprove_sigs;

// force skip kickoff
let force_skip_kickoff_agg_nonces = agg_nonces.force_skip_kickoff.clone().try_into().unwrap();
let force_skip_kickoff_partial_sigs =
[partial_sigs.iter().map(|r| r.force_skip_kickoff[0]).collect()];
match graph.force_skip_kickoff.aggregate_pre_sigs(
&context,
&force_skip_kickoff_partial_sigs,
&force_skip_kickoff_agg_nonces,
) {
Ok(v) => res.force_skip_kickoff = v.to_vec(),
Err(e) => bail!("fail to aggregate pre-sigs {}: {e}", graph.force_skip_kickoff.name()),
};

// quick challenge
let quick_challenge_agg_nonces = agg_nonces.quick_challenge.clone().try_into().unwrap();
let quick_challenge_partial_sigs =
[partial_sigs.iter().map(|r| r.quick_challenge[0]).collect()];
match graph.quick_challenge.aggregate_pre_sigs(
&context,
&quick_challenge_partial_sigs,
&quick_challenge_agg_nonces,
) {
Ok(v) => res.quick_challenge = v.to_vec(),
Err(e) => bail!("fail to aggregate pre-sigs {}: {e}", graph.quick_challenge.name()),
};

Ok(res)
}

Expand Down Expand Up @@ -905,6 +987,27 @@ pub fn verify_graph_committee_partial_sigs(
)?;
}

verify_pre_signed_input(
&graph.force_skip_kickoff,
committee_pubkeys,
committee_pubkey,
&pub_nonces.force_skip_kickoff[0],
partial_sigs.force_skip_kickoff[0],
&agg_nonces.force_skip_kickoff[0],
1,
TapSighashType::None,
)?;
verify_pre_signed_input(
&graph.quick_challenge,
committee_pubkeys,
committee_pubkey,
&pub_nonces.quick_challenge[0],
partial_sigs.quick_challenge[0],
&agg_nonces.quick_challenge[0],
1,
TapSighashType::None,
)?;

Ok(())
}

Expand Down Expand Up @@ -950,6 +1053,18 @@ pub fn verify_graph_committee_pre_signatures(graph: &BitvmGcGraph) -> Result<()>
verify_taproot_pre_signed_input(tx, &committee_pubkey, 0, TapSighashType::None)?;
verify_taproot_pre_signed_input(tx, &committee_pubkey, 1, TapSighashType::None)?;
}
verify_taproot_pre_signed_input(
&graph.force_skip_kickoff,
&committee_pubkey,
1,
TapSighashType::None,
)?;
verify_taproot_pre_signed_input(
&graph.quick_challenge,
&committee_pubkey,
1,
TapSighashType::None,
)?;
Ok(())
}

Expand Down Expand Up @@ -1040,6 +1155,15 @@ pub fn push_committee_pre_signatures(
);
}

// force skip kickoff and quick challenge
let force_skip_connector = graph.parameters.force_skip_connector();
graph
.force_skip_kickoff
.push_pre_sigs(&force_skip_connector, sigs.force_skip_kickoff.clone().try_into().unwrap());
graph
.quick_challenge
.push_pre_sigs(&force_skip_connector, sigs.quick_challenge.clone().try_into().unwrap());

graph.committee_pre_signed = true;
Ok(())
}
Expand Down Expand Up @@ -1138,6 +1262,28 @@ pub fn generate_nonce_from_seed(
index += 1;
}
}
{
// force skip kickoff
for _ in 0..force_skip_kickoff_pre_sign_num() {
let (sec_nonce, pub_nonce, nonce_sig) =
generate_nonce(signer_keypair, &graph_seed, index);
pub_nonces.force_skip_kickoff.push(pub_nonce);
sec_nonces.force_skip_kickoff.push(sec_nonce);
nonce_sigs.force_skip_kickoff.push(nonce_sig);
index += 1;
}
}
{
// quick challenge
for _ in 0..quick_challenge_pre_sign_num() {
let (sec_nonce, pub_nonce, nonce_sig) =
generate_nonce(signer_keypair, &graph_seed, index);
pub_nonces.quick_challenge.push(pub_nonce);
sec_nonces.quick_challenge.push(sec_nonce);
nonce_sigs.quick_challenge.push(nonce_sig);
index += 1;
}
}
(pub_nonces, sec_nonces, nonce_sigs)
}

Expand Down Expand Up @@ -1176,7 +1322,9 @@ pub fn verify_nonce_signatures(
&pub_nonces.operator_commit_timeout,
&nonce_sigs.operator_commit_timeout,
)
&& verify_vec(pubkey, &pub_nonces.disprove, &nonce_sigs.disprove))
&& verify_vec(pubkey, &pub_nonces.disprove, &nonce_sigs.disprove)
&& verify_vec(pubkey, &pub_nonces.force_skip_kickoff, &nonce_sigs.force_skip_kickoff)
&& verify_vec(pubkey, &pub_nonces.quick_challenge, &nonce_sigs.quick_challenge))
}

pub(crate) fn generate_nonce(
Expand Down
Loading
Loading