Skip to content

Commit 01d737f

Browse files
committed
Update Taproot usages with local_nonce
1 parent eef1528 commit 01d737f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

lightning/src/sign/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ use core::convert::TryInto;
5454
use core::ops::Deref;
5555
use core::sync::atomic::{AtomicUsize, Ordering};
5656
#[cfg(taproot)]
57-
use musig2::types::{PartialSignature, PublicNonce};
57+
use musig2::types::{PartialSignature, PublicNonce, SecretNonce};
5858
use crate::io::{self, Error};
5959
use crate::ln::features::ChannelTypeFeatures;
6060
use crate::ln::msgs::{DecodeError, MAX_VALUE_MSAT};
@@ -1129,11 +1129,11 @@ impl TaprootChannelSigner for InMemorySigner {
11291129
todo!()
11301130
}
11311131

1132-
fn partially_sign_counterparty_commitment(&self, commitment_tx: &CommitmentTransaction, preimages: Vec<PaymentPreimage>, secp_ctx: &Secp256k1<All>) -> Result<(PartialSignatureWithNonce, Vec<schnorr::Signature>), ()> {
1132+
fn partially_sign_counterparty_commitment(&self, counterparty_nonce: PublicNonce, commitment_tx: &CommitmentTransaction, preimages: Vec<PaymentPreimage>, secp_ctx: &Secp256k1<All>) -> Result<(PartialSignatureWithNonce, Vec<schnorr::Signature>), ()> {
11331133
todo!()
11341134
}
11351135

1136-
fn partially_sign_holder_commitment_and_htlcs(&self, commitment_number: u64, commitment_tx: &HolderCommitmentTransaction, secp_ctx: &Secp256k1<All>) -> Result<(PartialSignature, Vec<schnorr::Signature>), ()> {
1136+
fn partially_sign_holder_commitment_and_htlcs(&self, local_nonce: SecretNonce, commitment_number: u64, commitment_tx: &HolderCommitmentTransaction, secp_ctx: &Secp256k1<All>) -> Result<(PartialSignature, Vec<schnorr::Signature>), ()> {
11371137
todo!()
11381138
}
11391139

lightning/src/util/test_channel_signer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use bitcoin::secp256k1::All;
2626
use bitcoin::secp256k1::{SecretKey, PublicKey};
2727
use bitcoin::secp256k1::{Secp256k1, ecdsa::Signature};
2828
#[cfg(taproot)]
29-
use musig2::types::{PartialSignature, PublicNonce};
29+
use musig2::types::{PartialSignature, PublicNonce, SecretNonce};
3030
use crate::events::bump_transaction::HTLCDescriptor;
3131
use crate::util::ser::{Writeable, Writer};
3232
use crate::io::Error;
@@ -257,11 +257,11 @@ impl TaprootChannelSigner for TestChannelSigner {
257257
todo!()
258258
}
259259

260-
fn partially_sign_counterparty_commitment(&self, commitment_tx: &CommitmentTransaction, preimages: Vec<PaymentPreimage>, secp_ctx: &Secp256k1<All>) -> Result<(PartialSignatureWithNonce, Vec<secp256k1::schnorr::Signature>), ()> {
260+
fn partially_sign_counterparty_commitment(&self, counterparty_nonce: PublicNonce, commitment_tx: &CommitmentTransaction, preimages: Vec<PaymentPreimage>, secp_ctx: &Secp256k1<All>) -> Result<(PartialSignatureWithNonce, Vec<secp256k1::schnorr::Signature>), ()> {
261261
todo!()
262262
}
263263

264-
fn partially_sign_holder_commitment_and_htlcs(&self, commitment_number: u64, commitment_tx: &HolderCommitmentTransaction, secp_ctx: &Secp256k1<All>) -> Result<(PartialSignature, Vec<secp256k1::schnorr::Signature>), ()> {
264+
fn partially_sign_holder_commitment_and_htlcs(&self, local_nonce: SecretNonce, commitment_number: u64, commitment_tx: &HolderCommitmentTransaction, secp_ctx: &Secp256k1<All>) -> Result<(PartialSignature, Vec<secp256k1::schnorr::Signature>), ()> {
265265
todo!()
266266
}
267267

0 commit comments

Comments
 (0)