Make inner key public, so a struct can be instantiated by simply let payment_key = DelayedPaymentKey(pk).

Author: yellowred

lightning/src/ln/channel_keys.rs

@@ -18,7 +18,6 @@ use bitcoin::secp256k1::Secp256k1;
 use bitcoin::secp256k1;
 use crate::ln::msgs::DecodeError;
 use crate::util::ser::Readable;
-use bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE;
 use crate::io;
 use crate::util::ser::Writer;
 use crate::util::ser::Writeable;
@@ -80,10 +79,6 @@ macro_rules! key_read_write {
             fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
                 self.0.serialize().write(w)
             }
-        
-            fn serialized_length(&self) -> usize {
-                PUBLIC_KEY_SIZE
-            }
         }
 
         impl Readable for $SelfT {
@@ -99,14 +94,14 @@ macro_rules! key_read_write {
 
 /// Used to generate [`local_delayedpubkey`](https://github.com/lightning/bolts/blob/master/03-transactions.md#key-derivation) for the latest state of a channel.
 #[derive(PartialEq, Eq, Clone, Copy, Debug, Hash)]
-pub struct DelayedPaymentBasepoint(PublicKey);
+pub struct DelayedPaymentBasepoint(pub PublicKey);
 basepoint_impl!(DelayedPaymentBasepoint);
 key_read_write!(DelayedPaymentBasepoint);
 
 /// [delayedpubkey](https://github.com/lightning/bolts/blob/master/03-transactions.md#localpubkey-local_htlcpubkey-remote_htlcpubkey-local_delayedpubkey-and-remote_delayedpubkey-derivation)
 /// Used to regenerate the scripts required for a penalty transaction or a spend from a force closed channel.
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]
-pub struct DelayedPaymentKey(PublicKey);
+pub struct DelayedPaymentKey(pub PublicKey);
 
 impl DelayedPaymentKey {
     key_impl!(DelayedPaymentBasepoint, "delayedpubkey");
@@ -115,15 +110,15 @@ key_read_write!(DelayedPaymentKey);
 
 /// Used to generate [localpubkey](https://github.com/lightning/bolts/blob/master/03-transactions.md#key-derivation) for the latest state of a channel.
 #[derive(PartialEq, Eq, Clone, Copy, Debug, Hash)]
-pub struct PaymentBasepoint(PublicKey);
+pub struct PaymentBasepoint(pub PublicKey);
 basepoint_impl!(PaymentBasepoint);
 key_read_write!(PaymentBasepoint);
 
 
 /// [localpubkey](https://github.com/lightning/bolts/blob/master/03-transactions.md#localpubkey-local_htlcpubkey-remote_htlcpubkey-local_delayedpubkey-and-remote_delayedpubkey-derivation)
 /// Used to generate commitment transaction's to_remote ouput.
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]
-pub struct PaymentKey(PublicKey);
+pub struct PaymentKey(pub PublicKey);
 
 impl PaymentKey {
     key_impl!(PaymentBasepoint, "localpubkey");
@@ -132,15 +127,15 @@ key_read_write!(PaymentKey);
 
 /// Used to generate [htlcpubkey](https://github.com/lightning/bolts/blob/master/03-transactions.md#key-derivation) for the latest state of a channel.
 #[derive(PartialEq, Eq, Clone, Copy, Debug, Hash)]
-pub struct HtlcBasepoint(PublicKey);
+pub struct HtlcBasepoint(pub PublicKey);
 basepoint_impl!(HtlcBasepoint);
 key_read_write!(HtlcBasepoint);
 
 
 /// [htlcpubkey](https://github.com/lightning/bolts/blob/master/03-transactions.md#localpubkey-local_htlcpubkey-remote_htlcpubkey-local_delayedpubkey-and-remote_delayedpubkey-derivation)
 /// Used to generate HTLC outputs.
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]
-pub struct HtlcKey(PublicKey);
+pub struct HtlcKey(pub PublicKey);
 
 impl HtlcKey {
     key_impl!(HtlcBasepoint, "htlcpubkey");
@@ -164,15 +159,15 @@ fn derive_public_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitm
 
 /// Used to generate [htlcpubkey](https://github.com/lightning/bolts/blob/master/03-transactions.md#key-derivation) for the latest state of a channel.
 #[derive(PartialEq, Eq, Clone, Copy, Debug, Hash)]
-pub struct RevocationBasepoint(PublicKey);
+pub struct RevocationBasepoint(pub PublicKey);
 basepoint_impl!(RevocationBasepoint);
 key_read_write!(RevocationBasepoint);
 
 
 /// [htlcpubkey](https://github.com/lightning/bolts/blob/master/03-transactions.md#localpubkey-local_htlcpubkey-remote_htlcpubkey-local_delayedpubkey-and-remote_delayedpubkey-derivation)
 /// Used to generate HTLC outputs.
 #[derive(PartialEq, Eq, Clone, Copy, Debug, Hash)]
-pub struct RevocationKey(PublicKey);
+pub struct RevocationKey(pub PublicKey);
 
 impl RevocationKey {
     /// Derives a per-commitment-transaction revocation public key from its constituent parts. This is