remove InMemorySignerExt from fiber-lib

Author: chenyukang

crates/fiber-lib/src/fiber/channel.rs

@@ -25,7 +25,6 @@ use crate::{
             calculate_commitment_tx_fee, calculate_shutdown_tx_fee, calculate_tlc_forward_fee,
             shutdown_tx_size,
         },
-        key::blake2b_hash_with_salt,
         network::SendOnionPacketCommand,
         network::{get_chain_hash, sign_network_message, FiberMessageWithTarget},
         types::{
@@ -40,7 +39,7 @@ use crate::{
     now_timestamp_as_millis_u64, NetworkServiceEvent,
 };
 use crate::{debug_event, fiber::types::TxAbort, utils::tx::compute_tx_message};
-use ckb_hash::{blake2b_256, new_blake2b};
+use ckb_hash::blake2b_256;
 use ckb_sdk::{util::blake160, Since, SinceType};
 use ckb_types::{
     core::{
@@ -52,22 +51,21 @@ use ckb_types::{
     H256,
 };
 use fiber_types::{
-    AddTlcCommand, AppliedFlags, AwaitingChannelReadyFlags, AwaitingTxSignaturesFlags,
-    BasicMppPaymentData, ChannelActorData, ChannelAnnouncement, ChannelBasePublicKeys,
-    ChannelConstraints, ChannelFlags, ChannelOpenRecord, ChannelState, ChannelTlcInfo,
-    ChannelUpdate, ChannelUpdateChannelFlags, ChannelUpdateMessageFlags, CloseFlags,
-    CollaboratingFundingTxFlags, CommitmentNumbers, EcdsaSignature, Hash256, InMemorySigner,
-    InboundTlcStatus, NegotiatingFundingFlags, OutboundTlcStatus, PaymentCustomRecords,
-    PeeledPaymentOnionPacket, PendingNotifySettleTlc, PrevTlcInfo, Privkey, Pubkey,
-    PublicChannelInfo, RemoveTlcFulfill, RemoveTlcReason, RetryableTlcOperation, RevocationData,
-    RevokeAndAck, SettlementData, SettlementTlc, ShutdownInfo, ShuttingDownFlags,
-    SigningCommitmentFlags, TLCId, TlcErr, TlcErrData, TlcErrPacket, TlcErrorCode, TlcInfo,
-    TlcStatus, NO_SHARED_SECRET,
+    blake2b_hash_with_salt, derive_tlc_pubkey, AddTlcCommand, AppliedFlags,
+    AwaitingChannelReadyFlags, AwaitingTxSignaturesFlags, BasicMppPaymentData, ChannelActorData,
+    ChannelAnnouncement, ChannelBasePublicKeys, ChannelConstraints, ChannelFlags,
+    ChannelOpenRecord, ChannelState, ChannelTlcInfo, ChannelUpdate, ChannelUpdateChannelFlags,
+    ChannelUpdateMessageFlags, CloseFlags, CollaboratingFundingTxFlags, CommitmentNumbers,
+    EcdsaSignature, Hash256, InMemorySigner, InboundTlcStatus, Musig2Context,
+    NegotiatingFundingFlags, OutboundTlcStatus, PaymentCustomRecords, PeeledPaymentOnionPacket,
+    PendingNotifySettleTlc, PrevTlcInfo, Privkey, Pubkey, PublicChannelInfo, RemoveTlcFulfill,
+    RemoveTlcReason, RetryableTlcOperation, RevocationData, RevokeAndAck, SettlementData,
+    SettlementTlc, ShutdownInfo, ShuttingDownFlags, SigningCommitmentFlags, TLCId, TlcErr,
+    TlcErrData, TlcErrPacket, TlcErrorCode, TlcInfo, TlcStatus, NO_SHARED_SECRET,
 };
 use molecule::prelude::{Builder, Entity};
 #[cfg(test)]
 use musig2::BinaryEncoding;
-use musig2::SecNonceBuilder;
 use musig2::{
     aggregate_partial_signatures,
     errors::{RoundFinalizeError, SigningError, VerifyError},
@@ -3222,24 +3220,6 @@ fn derive_temp_channel_id_from_tlc_key(tlc_basepoint: &Pubkey) -> Hash256 {
     new_channel_id_from_seed(&preimage)
 }
 
-pub fn get_commitment_secret(commitment_seed: &[u8; 32], commitment_number: u64) -> [u8; 32] {
-    // Note that here, we hold the same assumption to bolts for commitment number,
-    // i.e. this number should be in the range [0, 2^48).
-    let mut res: [u8; 32] = *commitment_seed;
-    for i in 0..48 {
-        let bitpos = 47 - i;
-        if commitment_number & (1 << bitpos) == (1 << bitpos) {
-            res[bitpos / 8] ^= 1 << (bitpos & 7);
-            res = blake2b_256(res);
-        }
-    }
-    res
-}
-
-pub fn get_commitment_point(commitment_seed: &[u8; 32], commitment_number: u64) -> Pubkey {
-    Privkey::from(&get_commitment_secret(commitment_seed, commitment_number)).pubkey()
-}
-
 pub(crate) fn get_funding_and_reserved_amount(
     total_amount: u128,
     shutdown_script: &Script,
@@ -7103,119 +7083,3 @@ impl From<&AcceptChannel> for ChannelBasePublicKeys {
         }
     }
 }
-
-pub(crate) fn get_tweak_by_commitment_point(commitment_point: &Pubkey) -> [u8; 32] {
-    let mut hasher = new_blake2b();
-    hasher.update(&commitment_point.serialize());
-    let mut result = [0u8; 32];
-    hasher.finalize(&mut result);
-    result
-}
-
-pub(crate) fn derive_private_key(secret: &Privkey, commitment_point: &Pubkey) -> Privkey {
-    secret.tweak(get_tweak_by_commitment_point(commitment_point))
-}
-
-fn derive_public_key(base_key: &Pubkey, commitment_point: &Pubkey) -> Pubkey {
-    base_key.tweak(get_tweak_by_commitment_point(commitment_point))
-}
-
-pub(crate) fn derive_tlc_pubkey(base_key: &Pubkey, commitment_point: &Pubkey) -> Pubkey {
-    derive_public_key(base_key, commitment_point)
-}
-
-pub enum Musig2Context {
-    Commitment,
-    Revoke,
-}
-
-impl std::fmt::Display for Musig2Context {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let context_str = match self {
-            Musig2Context::Commitment => "COMMITMENT",
-            Musig2Context::Revoke => "REVOKE",
-        };
-        write!(f, "{}", context_str)
-    }
-}
-
-/// Extension trait providing methods for `InMemorySigner` that depend on
-/// fiber-lib-only functions (key derivation, ckb_hash, Musig2Context).
-pub trait InMemorySignerExt {
-    /// Generate an `InMemorySigner` from a seed.
-    fn generate_from_seed(params: &[u8]) -> InMemorySigner;
-    /// Get the base public keys for this signer.
-    fn get_base_public_keys(&self) -> ChannelBasePublicKeys;
-    /// Returns the commitment point for the given commitment number.
-    fn get_commitment_point(&self, commitment_number: u64) -> Pubkey;
-    /// Returns the commitment secret for the given commitment number.
-    fn get_commitment_secret(&self, commitment_number: u64) -> [u8; 32];
-    /// Derive the TLC key for the given commitment number.
-    fn derive_tlc_key(&self, new_commitment_number: u64) -> Privkey;
-    /// Derive a musig2 nonce for the given commitment number and context.
-    fn derive_musig2_nonce(&self, commitment_number: u64, context: Musig2Context) -> SecNonce;
-}
-
-impl InMemorySignerExt for InMemorySigner {
-    fn generate_from_seed(params: &[u8]) -> InMemorySigner {
-        let seed = ckb_hash::blake2b_256(params);
-
-        let commitment_seed = {
-            let mut hasher = new_blake2b();
-            hasher.update(&seed);
-            hasher.update(&b"commitment seed"[..]);
-            let mut result = [0u8; 32];
-            hasher.finalize(&mut result);
-            result
-        };
-
-        let key_derive = |seed: &[u8], info: &[u8]| {
-            let result = blake2b_hash_with_salt(seed, info);
-            Privkey::from_slice(&result)
-        };
-
-        let funding_key = key_derive(&seed, b"funding key");
-        let tlc_base_key = key_derive(funding_key.as_ref(), b"HTLC base key");
-        let musig2_base_nonce = key_derive(tlc_base_key.as_ref(), b"musig nocne");
-
-        InMemorySigner {
-            funding_key,
-            tlc_base_key,
-            musig2_base_nonce,
-            commitment_seed,
-        }
-    }
-
-    fn get_base_public_keys(&self) -> ChannelBasePublicKeys {
-        ChannelBasePublicKeys {
-            funding_pubkey: self.funding_key.pubkey(),
-            tlc_base_key: self.tlc_base_key.pubkey(),
-        }
-    }
-
-    /// Returns the commitment point for the given commitment number.
-    ///
-    /// The commitment point is the public key derived from the commitment seed and the commitment number.
-    /// The commitment point is used to derive the pubkeys used in the TLC (htlc and revocation outputs).
-    fn get_commitment_point(&self, commitment_number: u64) -> Pubkey {
-        get_commitment_point(&self.commitment_seed, commitment_number)
-    }
-
-    fn get_commitment_secret(&self, commitment_number: u64) -> [u8; 32] {
-        get_commitment_secret(&self.commitment_seed, commitment_number)
-    }
-
-    fn derive_tlc_key(&self, new_commitment_number: u64) -> Privkey {
-        let per_commitment_point = self.get_commitment_point(new_commitment_number);
-        derive_private_key(&self.tlc_base_key, &per_commitment_point)
-    }
-
-    fn derive_musig2_nonce(&self, commitment_number: u64, context: Musig2Context) -> SecNonce {
-        let commitment_point = self.get_commitment_point(commitment_number);
-        let seckey = derive_private_key(&self.musig2_base_nonce, &commitment_point);
-
-        SecNonceBuilder::new(seckey.as_ref())
-            .with_extra_input(&context.to_string())
-            .build()
-    }
-}

crates/fiber-lib/src/fiber/key.rs

@@ -1,4 +1,3 @@
-use ckb_hash::new_blake2b;
 use serde::{Deserialize, Serialize};
 use std::{fs, path::Path};
 use tracing::warn;
@@ -138,12 +137,3 @@ pub(crate) fn read_secret_key(path: &Path) -> Result<Option<KeyPair>, Error> {
             .map_err(|_| Error::new(ErrorKind::InvalidData, "invalid secret key data"))
     })
 }
-
-pub(crate) fn blake2b_hash_with_salt(data: &[u8], salt: &[u8]) -> [u8; 32] {
-    let mut hasher = new_blake2b();
-    hasher.update(salt);
-    hasher.update(data);
-    let mut result = [0u8; 32];
-    hasher.finalize(&mut result);
-    result
-}

crates/fiber-lib/src/fiber/network.rs

@@ -58,7 +58,6 @@ use super::channel::{
 };
 use super::gossip::{GossipActorMessage, GossipMessageStore, GossipMessageUpdates};
 use super::graph::{NetworkGraph, NetworkGraphStateStore, OwnedChannelUpdateEvent};
-use super::key::blake2b_hash_with_salt;
 use super::types::{
     BroadcastMessageWithTimestamp, FiberMessage, ForwardTlcResult, GossipMessage, Init, OpenChannel,
 };
@@ -97,12 +96,13 @@ use fiber_types::protocol::AnnouncedNodeName;
 #[cfg(any(debug_assertions, test, feature = "bench"))]
 use fiber_types::SessionRoute;
 use fiber_types::{
-    AddTlcCommand, AwaitingTxSignaturesFlags, ChannelOpenRecord, ChannelOpeningStatus,
-    ChannelState, ChannelTlcInfo, CloseFlags, EcdsaSignature, EntityHex, FeatureVector, Hash256,
-    NodeAnnouncement, PaymentCustomRecords, PaymentStatus, PeeledPaymentOnionPacket,
-    PersistentNetworkActorState, PrevTlcInfo, Privkey, Pubkey, PublicChannelInfo, RemoveTlcFulfill,
-    RemoveTlcReason, RetryableTlcOperation, RevocationData, RouterHop, SettlementData,
-    ShuttingDownFlags, TLCId, TlcErr, TlcErrPacket, TlcErrorCode, TrampolineContext, UdtCfgInfos,
+    blake2b_hash_with_salt, AddTlcCommand, AwaitingTxSignaturesFlags, ChannelOpenRecord,
+    ChannelOpeningStatus, ChannelState, ChannelTlcInfo, CloseFlags, EcdsaSignature, EntityHex,
+    FeatureVector, Hash256, NodeAnnouncement, PaymentCustomRecords, PaymentStatus,
+    PeeledPaymentOnionPacket, PersistentNetworkActorState, PrevTlcInfo, Privkey, Pubkey,
+    PublicChannelInfo, RemoveTlcFulfill, RemoveTlcReason, RetryableTlcOperation, RevocationData,
+    RouterHop, SettlementData, ShuttingDownFlags, TLCId, TlcErr, TlcErrPacket, TlcErrorCode,
+    TrampolineContext, UdtCfgInfos,
 };
 
 pub const FIBER_PROTOCOL_ID: ProtocolId = ProtocolId::new(42);

crates/fiber-lib/src/fiber/tests/channel.rs

@@ -1,5 +1,4 @@
 use crate::ckb::tests::test_utils::complete_commitment_tx;
-use crate::fiber::channel::InMemorySignerExt;
 use crate::fiber::channel::{
     AddTlcResponse, UpdateCommand, MAX_COMMITMENT_DELAY_EPOCHS, MIN_COMMITMENT_DELAY_EPOCHS,
     XUDT_COMPATIBLE_WITNESS,
@@ -22,8 +21,8 @@ use crate::{
     ckb::contracts::{get_cell_deps, Contract},
     fiber::{
         channel::{
-            derive_private_key, derive_tlc_pubkey, ChannelActorStateStore, ChannelCommand,
-            ChannelCommandWithId, RemoveTlcCommand, ShutdownCommand, DEFAULT_COMMITMENT_FEE_RATE,
+            ChannelActorStateStore, ChannelCommand, ChannelCommandWithId, RemoveTlcCommand,
+            ShutdownCommand, DEFAULT_COMMITMENT_FEE_RATE,
         },
         config::DEFAULT_AUTO_ACCEPT_CHANNEL_CKB_FUNDING_AMOUNT,
         network::{AcceptChannelCommand, OpenChannelCommand},
@@ -39,9 +38,9 @@ use ckb_types::{
     prelude::{AsTransactionBuilder, Builder, Entity, Pack, Unpack},
 };
 use fiber_types::{
-    AddTlcCommand, ChannelState, HashAlgorithm, InMemorySigner, NegotiatingFundingFlags,
-    OutboundTlcStatus, PaymentHopData, PaymentStatus, Privkey, RemoveTlcFulfill, RemoveTlcReason,
-    TLCId, TlcErrorCode, TlcStatus, NO_SHARED_SECRET,
+    derive_private_key, derive_tlc_pubkey, AddTlcCommand, ChannelState, HashAlgorithm,
+    InMemorySigner, NegotiatingFundingFlags, OutboundTlcStatus, PaymentHopData, PaymentStatus,
+    Privkey, RemoveTlcFulfill, RemoveTlcReason, TLCId, TlcErrorCode, TlcStatus, NO_SHARED_SECRET,
 };
 use fiber_types::{CloseFlags, FeatureVector};
 use musig2::secp::Point;

crates/fiber-lib/src/fiber/tests/settle_tlc_set_command_tests.rs

@@ -1,6 +1,5 @@
 //! Tests for SettleTlcSetCommand
 
-use crate::fiber::channel::InMemorySignerExt;
 use crate::fiber::channel::{ChannelActorState, ChannelActorStateStore};
 use crate::fiber::settle_tlc_set_command::{SettleTlcSetCommand, TlcSettlement};
 use crate::fiber::types::{Hash256, HoldTlc, Pubkey, RemoveTlcReason};

crates/fiber-lib/src/store/sample/sample_channel.rs

@@ -12,7 +12,6 @@ use musig2::secp::MaybeScalar;
 use musig2::SecNonceBuilder;
 
 use crate::fiber::channel::ChannelActorState;
-use crate::fiber::channel::InMemorySignerExt;
 use crate::fiber::{
     AddTlcCommand, AppliedFlags, ChannelActorData, ChannelAnnouncement, ChannelBasePublicKeys,
     ChannelConstraints, ChannelState, ChannelTlcInfo, ChannelUpdate, ChannelUpdateChannelFlags,

crates/fiber-lib/src/store/tests/store.rs

@@ -6,6 +6,7 @@ use crate::fiber::types::new_channel_update_unsigned;
 use crate::fiber::types::*;
 #[allow(unused)]
 use crate::fiber::{
+    blake2b_hash_with_salt,
     config::{DEFAULT_TLC_EXPIRY_DELTA, MAX_PAYMENT_TLC_EXPIRY_LIMIT},
     graph::*,
     payment::{PaymentSessionExt, SendPaymentDataBuilder},
@@ -31,7 +32,6 @@ use crate::time::SystemTime;
 use crate::watchtower::*;
 #[cfg(not(target_arch = "wasm32"))]
 use ckb_hash::blake2b_256;
-use ckb_hash::new_blake2b;
 use ckb_types::packed::*;
 use ckb_types::prelude::*;
 use ckb_types::H256;
@@ -468,14 +468,6 @@ fn test_channel_state_serialize() {
     assert_eq!(flags, new_flags);
 }
 
-fn blake2b_hash_with_salt(data: &[u8], salt: &[u8]) -> [u8; 32] {
-    let mut hasher = new_blake2b();
-    hasher.update(salt);
-    hasher.update(data);
-    let mut result = [0u8; 32];
-    hasher.finalize(&mut result);
-    result
-}
 #[cfg(not(target_arch = "wasm32"))]
 #[cfg_attr(not(target_arch = "wasm32"), test)]
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]