Fix script order in gossip key mismatch error.

[rust-lightning] / lightning / src / onion_message / messenger.rs

diff --git a/lightning/src/onion_message/messenger.rs b/lightning/src/onion_message/messenger.rs
index 2b2b11345773e6727e0187e7e99a269072491b00..c264cbc387f2609a1b8a56c204b4102cdbf433e1 100644 (file)
--- a/lightning/src/onion_message/messenger.rs
+++ b/lightning/src/onion_message/messenger.rs
@@ -196,7 +196,7 @@ impl<Signer: Sign, K: Deref, L: Deref> OnionMessenger<Signer, K, L>
                                Hmac::from_engine(hmac).into_inner()
                        };
                        match self.keys_manager.ecdh(Recipient::Node, &msg.onion_routing_packet.public_key,
-                               Some(&blinding_factor))
+                               Some(&Scalar::from_be_bytes(blinding_factor).unwrap()))
                        {
                                Ok(ss) => ss.secret_bytes(),
                                Err(()) => {
@@ -248,7 +248,7 @@ impl<Signer: Sign, K: Deref, L: Deref> OnionMessenger<Signer, K, L>
                                                                        sha.input(control_tlvs_ss.as_ref());
                                                                        Sha256::from_engine(sha).into_inner()
                                                                };
-                                                               let mut next_blinding_point = msg.blinding_point;
+                                                               let next_blinding_point = msg.blinding_point;
                                                                match next_blinding_point.mul_tweak(&self.secp_ctx, &Scalar::from_be_bytes(blinding_factor).unwrap()) {
                                                                        Ok(bp) => bp,
                                                                        Err(e) => {
@@ -261,6 +261,7 @@ impl<Signer: Sign, K: Deref, L: Deref> OnionMessenger<Signer, K, L>
                                                onion_routing_packet: outgoing_packet,
                                        },
                                );
+                               log_trace!(self.logger, "Forwarding an onion message to peer {}", next_node_id);
                        },
                        Err(e) => {
                                log_trace!(self.logger, "Errored decoding onion message packet: {:?}", e);