Skip to content

Commit f8df3cb

Browse files
committed
Stop writing EcdsaChannelSigner
EcdsaChannelSigner is no longer deserialized as of version 0.0.113 and downgrades before version 0.0.119 are no longer supported.
1 parent 8f1dc54 commit f8df3cb

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

lightning/src/chain/onchaintx.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use crate::chain::channelmonitor::{ANTI_REORG_DELAY, CLTV_SHARED_CLAIM_BUFFER};
3333
use crate::chain::package::{PackageSolvingData, PackageTemplate};
3434
use crate::chain::transaction::MaybeSignedTransaction;
3535
use crate::util::logger::Logger;
36-
use crate::util::ser::{Readable, ReadableArgs, MaybeReadable, UpgradableRequired, Writer, Writeable, VecWriter};
36+
use crate::util::ser::{Readable, ReadableArgs, MaybeReadable, UpgradableRequired, Writer, Writeable};
3737

3838
use crate::io;
3939
use crate::prelude::*;
@@ -312,12 +312,9 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
312312

313313
self.channel_transaction_parameters.write(writer)?;
314314

315-
let mut key_data = VecWriter(Vec::new());
316-
self.signer.write(&mut key_data)?;
317-
assert!(key_data.0.len() < core::usize::MAX);
318-
assert!(key_data.0.len() < core::u32::MAX as usize);
319-
(key_data.0.len() as u32).write(writer)?;
320-
writer.write_all(&key_data.0[..])?;
315+
// Write a zero-length signer. The data was no longer deserialized as of version 0.0.113 and
316+
// downgrades before version 0.0.119 are no longer supported.
317+
0u32.write(writer)?;
321318

322319
writer.write_all(&(self.pending_claim_requests.len() as u64).to_be_bytes())?;
323320
for (ref ancestor_claim_txid, request) in self.pending_claim_requests.iter() {

0 commit comments

Comments
 (0)