Skip to content

Commit cc1b9df

Browse files
committed
Fix impl signatures.
1 parent 1215707 commit cc1b9df

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

lightning/src/sign/mod.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ use crate::events::bump_transaction::HTLCDescriptor;
4242
use crate::ln::channel::ANCHOR_OUTPUT_VALUE_SATOSHI;
4343
use crate::ln::{chan_utils, PaymentPreimage};
4444
use crate::ln::chan_utils::{HTLCOutputInCommitment, make_funding_redeemscript, ChannelPublicKeys, HolderCommitmentTransaction, ChannelTransactionParameters, CommitmentTransaction, ClosingTransaction};
45-
use crate::ln::msgs::{UnsignedChannelAnnouncement, UnsignedGossipMessage};
45+
use crate::ln::msgs::{PartialSignatureWithNonce, UnsignedChannelAnnouncement, UnsignedGossipMessage};
4646
use crate::ln::script::ShutdownScript;
4747
use crate::offers::invoice::UnsignedBolt12Invoice;
4848
use crate::offers::invoice_request::UnsignedInvoiceRequest;
@@ -1127,35 +1127,35 @@ impl TaprootChannelSigner for InMemorySigner {
11271127
todo!()
11281128
}
11291129

1130-
fn partially_sign_counterparty_commitment(&self, commitment_tx: &CommitmentTransaction, preimages: Vec<PaymentPreimage>, secp_ctx: &Secp256k1<All>) -> Result<(PartialSignature, Vec<Signature>), ()> {
1130+
fn partially_sign_counterparty_commitment(&self, commitment_tx: &CommitmentTransaction, preimages: Vec<PaymentPreimage>, secp_ctx: &Secp256k1<All>) -> Result<(PartialSignatureWithNonce, Vec<schnorr::Signature>), ()> {
11311131
todo!()
11321132
}
11331133

1134-
fn partially_sign_holder_commitment_and_htlcs(&self, commitment_tx: &HolderCommitmentTransaction, secp_ctx: &Secp256k1<All>) -> Result<(PartialSignature, Vec<Signature>), ()> {
1134+
fn partially_sign_holder_commitment_and_htlcs(&self, commitment_tx: &HolderCommitmentTransaction, secp_ctx: &Secp256k1<All>) -> Result<(PartialSignature, Vec<schnorr::Signature>), ()> {
11351135
todo!()
11361136
}
11371137

1138-
fn sign_justice_revoked_output(&self, justice_tx: &Transaction, input: usize, amount: u64, per_commitment_key: &SecretKey, secp_ctx: &Secp256k1<All>) -> Result<Signature, ()> {
1138+
fn sign_justice_revoked_output(&self, justice_tx: &Transaction, input: usize, amount: u64, per_commitment_key: &SecretKey, secp_ctx: &Secp256k1<All>) -> Result<schnorr::Signature, ()> {
11391139
todo!()
11401140
}
11411141

1142-
fn sign_justice_revoked_htlc(&self, justice_tx: &Transaction, input: usize, amount: u64, per_commitment_key: &SecretKey, htlc: &HTLCOutputInCommitment, secp_ctx: &Secp256k1<All>) -> Result<Signature, ()> {
1142+
fn sign_justice_revoked_htlc(&self, justice_tx: &Transaction, input: usize, amount: u64, per_commitment_key: &SecretKey, htlc: &HTLCOutputInCommitment, secp_ctx: &Secp256k1<All>) -> Result<schnorr::Signature, ()> {
11431143
todo!()
11441144
}
11451145

1146-
fn sign_holder_htlc_transaction(&self, htlc_tx: &Transaction, input: usize, htlc_descriptor: &HTLCDescriptor, secp_ctx: &Secp256k1<All>) -> Result<Signature, ()> {
1146+
fn sign_holder_htlc_transaction(&self, htlc_tx: &Transaction, input: usize, htlc_descriptor: &HTLCDescriptor, secp_ctx: &Secp256k1<All>) -> Result<schnorr::Signature, ()> {
11471147
todo!()
11481148
}
11491149

1150-
fn sign_counterparty_htlc_transaction(&self, htlc_tx: &Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, htlc: &HTLCOutputInCommitment, secp_ctx: &Secp256k1<All>) -> Result<Signature, ()> {
1150+
fn sign_counterparty_htlc_transaction(&self, htlc_tx: &Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, htlc: &HTLCOutputInCommitment, secp_ctx: &Secp256k1<All>) -> Result<schnorr::Signature, ()> {
11511151
todo!()
11521152
}
11531153

11541154
fn partially_sign_closing_transaction(&self, closing_tx: &ClosingTransaction, secp_ctx: &Secp256k1<All>) -> Result<PartialSignature, ()> {
11551155
todo!()
11561156
}
11571157

1158-
fn sign_holder_anchor_input(&self, anchor_tx: &Transaction, input: usize, secp_ctx: &Secp256k1<All>) -> Result<Signature, ()> {
1158+
fn sign_holder_anchor_input(&self, anchor_tx: &Transaction, input: usize, secp_ctx: &Secp256k1<All>) -> Result<schnorr::Signature, ()> {
11591159
todo!()
11601160
}
11611161
}

lightning/src/util/enforcing_trait_impls.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ use crate::events::bump_transaction::HTLCDescriptor;
3131
use crate::util::ser::{Writeable, Writer};
3232
use crate::io::Error;
3333
use crate::ln::features::ChannelTypeFeatures;
34+
use crate::ln::msgs::PartialSignatureWithNonce;
3435
#[cfg(taproot)]
3536
use crate::sign::taproot::TaprootChannelSigner;
3637

@@ -255,7 +256,7 @@ impl TaprootChannelSigner for EnforcingSigner {
255256
todo!()
256257
}
257258

258-
fn partially_sign_counterparty_commitment(&self, commitment_tx: &CommitmentTransaction, preimages: Vec<PaymentPreimage>, secp_ctx: &Secp256k1<All>) -> Result<(PartialSignature, Vec<secp256k1::schnorr::Signature>), ()> {
259+
fn partially_sign_counterparty_commitment(&self, commitment_tx: &CommitmentTransaction, preimages: Vec<PaymentPreimage>, secp_ctx: &Secp256k1<All>) -> Result<(PartialSignatureWithNonce, Vec<secp256k1::schnorr::Signature>), ()> {
259260
todo!()
260261
}
261262

0 commit comments

Comments
 (0)