From e131cb840d09dea658cb418bec11c4d0c5c2f803 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Tue, 22 Oct 2024 16:32:54 +0800
Subject: [PATCH 01/31] add invoice currency check with chain network

---
 src/rpc/invoice.rs | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/rpc/invoice.rs b/src/rpc/invoice.rs
index 61a3583cb..2fc352088 100644
--- a/src/rpc/invoice.rs
+++ b/src/rpc/invoice.rs
@@ -1,3 +1,4 @@
+use crate::fiber::config::CkbNetwork;
 use crate::fiber::hash_algorithm::HashAlgorithm;
 use crate::fiber::serde_utils::{U128Hex, U64Hex};
 use crate::fiber::types::{Hash256, Privkey};
@@ -65,11 +66,12 @@ trait InvoiceRpc {
 pub(crate) struct InvoiceRpcServerImpl<S> {
     store: S,
     keypair: Option<(PublicKey, SecretKey)>,
+    currency: Option<Currency>,
 }
 
 impl<S> InvoiceRpcServerImpl<S> {
     pub(crate) fn new(store: S, config: Option<FiberConfig>) -> Self {
-        let keypair = config.map(|config| {
+        let config = config.map(|config| {
             let kp = config
                 .read_or_generate_secret_key()
                 .expect("read or generate secret key");
@@ -81,9 +83,25 @@ impl<S> InvoiceRpcServerImpl<S> {
                 PublicKey::from_slice(secio_kp.public_key().inner_ref()).expect("valid public key"),
                 private_key.into(),
             );
-            keypair
+
+            // restrict currency to be the same as network
+            let currency = match config.network {
+                Some(CkbNetwork::Mainnet) => Some(Currency::Fibb),
+                Some(CkbNetwork::Testnet) => Some(Currency::Fibt),
+                Some(_) => Some(Currency::Fibd),
+                _ => None,
+            };
+
+            (keypair, currency)
         });
-        Self { store, keypair }
+        Self {
+            store,
+            keypair: config.as_ref().map(|(kp, _)| kp.clone()),
+            currency: config
+                .as_ref()
+                .map(|(_, currency)| *currency)
+                .unwrap_or_default(),
+        }
     }
 }
 
@@ -96,6 +114,15 @@ where
         &self,
         params: NewInvoiceParams,
     ) -> Result<NewInvoiceResult, ErrorObjectOwned> {
+        if let Some(currency) = self.currency {
+            if currency != params.currency {
+                return Err(ErrorObjectOwned::owned(
+                    CALL_EXECUTION_FAILED_CODE,
+                    format!("Currency must be {:?} with the chain network", currency),
+                    Some(params),
+                ));
+            }
+        }
         let mut invoice_builder = InvoiceBuilder::new(params.currency)
             .amount(Some(params.amount))
             .payment_preimage(params.payment_preimage);

From e2bd3dc00188bd32c1fff725f3321d639448bc5b Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Tue, 22 Oct 2024 14:48:21 +0800
Subject: [PATCH 02/31] Return channel outpoint for rpc list_channels

---
 src/fiber/channel.rs                          | 46 ++++++++++---------
 src/rpc/channel.rs                            | 10 +++-
 .../03-get-auto-accepted-channel.bru          |  1 +
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/fiber/channel.rs b/src/fiber/channel.rs
index 64a1475d8..5525efd2d 100644
--- a/src/fiber/channel.rs
+++ b/src/fiber/channel.rs
@@ -411,12 +411,12 @@ where
                         .collect();
                     debug!(
                         "Updating funding tx witnesses of {:?} to {:?}",
-                        state.get_funding_transaction().calc_tx_hash(),
+                        state.must_get_funding_transaction().calc_tx_hash(),
                         new_witnesses.iter().map(|x| hex::encode(x.as_slice()))
                     );
                     state.funding_tx = Some(
                         state
-                            .get_funding_transaction()
+                            .must_get_funding_transaction()
                             .as_advanced_builder()
                             .set_witnesses(new_witnesses)
                             .build()
@@ -425,8 +425,8 @@ where
                     self.network
                         .send_message(NetworkActorMessage::new_event(
                             NetworkActorEvent::FundingTransactionPending(
-                                state.get_funding_transaction().clone(),
-                                state.get_funding_transaction_outpoint(),
+                                state.must_get_funding_transaction().clone(),
+                                state.must_get_funding_transaction_outpoint(),
                                 state.get_id(),
                             ),
                         ))
@@ -731,7 +731,7 @@ where
         };
         TlcErr::new_channel_fail(
             error_code,
-            state.get_funding_transaction_outpoint(),
+            state.must_get_funding_transaction_outpoint(),
             channel_update,
         )
     }
@@ -1829,7 +1829,7 @@ where
                             NetworkActorEvent::ChannelReady(
                                 channel.get_id(),
                                 channel.get_remote_peer_id(),
-                                channel.get_funding_transaction_outpoint(),
+                                channel.must_get_funding_transaction_outpoint(),
                             ),
                         ))
                         .expect(ASSUME_NETWORK_ACTOR_ALIVE);
@@ -2487,7 +2487,7 @@ impl ChannelActorState {
             Some(x) => x,
             // We have not created a channel announcement yet.
             None => {
-                let channel_outpoint = self.get_funding_transaction_outpoint();
+                let channel_outpoint = self.must_get_funding_transaction_outpoint();
                 let capacity = if self.funding_udt_type_script.is_some() {
                     self.get_total_udt_amount()
                 } else {
@@ -2672,7 +2672,7 @@ impl ChannelActorState {
                     Some(fee_proportional_millionths),
                 ) => Some(ChannelUpdate::new_unsigned(
                     Default::default(),
-                    self.get_funding_transaction_outpoint(),
+                    self.must_get_funding_transaction_outpoint(),
                     std::time::UNIX_EPOCH.elapsed().unwrap().as_secs(),
                     message_flags,
                     0,
@@ -3028,7 +3028,7 @@ impl ChannelActorState {
         let key_agg_ctx = self.get_musig2_agg_context();
         let channel_id = self.get_id();
         let peer_id = self.get_remote_peer_id();
-        let channel_outpoint = self.get_funding_transaction_outpoint();
+        let channel_outpoint = self.must_get_funding_transaction_outpoint();
 
         let partial_signature: PartialSignature = sign_partial(
             &key_agg_ctx,
@@ -3624,20 +3624,22 @@ impl ChannelActorState {
         self.remote_channel_public_keys.as_ref().unwrap()
     }
 
-    pub fn get_funding_transaction(&self) -> &Transaction {
+    pub fn must_get_funding_transaction(&self) -> &Transaction {
         self.funding_tx
             .as_ref()
             .expect("Funding transaction is present")
     }
 
-    pub fn get_funding_transaction_outpoint(&self) -> OutPoint {
-        let tx = self.get_funding_transaction();
-        debug!(
-            "Funding transaction lock args: {:?}",
-            tx.raw().outputs().get(0).unwrap().lock().args()
-        );
-        // By convention, the funding tx output for the channel is the first output.
-        OutPoint::new(tx.calc_tx_hash(), 0)
+    pub fn get_funding_transaction_outpoint(&self) -> Option<OutPoint> {
+        self.funding_tx.as_ref().map(|tx| {
+            // By convention, the funding tx output for the channel is the first output.
+            OutPoint::new(tx.calc_tx_hash(), 0)
+        })
+    }
+
+    pub fn must_get_funding_transaction_outpoint(&self) -> OutPoint {
+        self.get_funding_transaction_outpoint()
+            .expect("Funding transaction outpoint is present")
     }
 
     pub fn get_funding_transaction_block_number(&self) -> BlockNumber {
@@ -4087,7 +4089,7 @@ impl ChannelActorState {
         partial_signatures: [PartialSignature; 2],
         tx: &TransactionView,
     ) -> Result<TransactionView, ProcessingChannelError> {
-        let funding_out_point = self.get_funding_transaction_outpoint();
+        let funding_out_point = self.must_get_funding_transaction_outpoint();
         debug_assert_eq!(
             tx.input_pts_iter().next().as_ref(),
             Some(&funding_out_point),
@@ -4656,7 +4658,7 @@ impl ChannelActorState {
                 NetworkActorEvent::ChannelReady(
                     self.get_id(),
                     peer_id.clone(),
-                    self.get_funding_transaction_outpoint(),
+                    self.must_get_funding_transaction_outpoint(),
                 ),
             ))
             .expect(ASSUME_NETWORK_ACTOR_ALIVE);
@@ -5091,7 +5093,7 @@ impl ChannelActorState {
         let cell_deps = get_cell_deps(vec![Contract::FundingLock], &self.funding_udt_type_script);
         let tx_builder = TransactionBuilder::default().cell_deps(cell_deps).input(
             CellInput::new_builder()
-                .previous_output(self.get_funding_transaction_outpoint())
+                .previous_output(self.must_get_funding_transaction_outpoint())
                 .build(),
         );
 
@@ -5178,7 +5180,7 @@ impl ChannelActorState {
         local: bool,
     ) -> (TransactionView, TransactionView) {
         let commitment_tx = {
-            let funding_out_point = self.get_funding_transaction_outpoint();
+            let funding_out_point = self.must_get_funding_transaction_outpoint();
             let cell_deps =
                 get_cell_deps(vec![Contract::FundingLock], &self.funding_udt_type_script);
             let (output, output_data) = self.build_commitment_transaction_output(local);
diff --git a/src/rpc/channel.rs b/src/rpc/channel.rs
index cc369e818..91aded08c 100644
--- a/src/rpc/channel.rs
+++ b/src/rpc/channel.rs
@@ -6,13 +6,16 @@ use crate::fiber::{
     graph::PaymentSessionStatus,
     hash_algorithm::HashAlgorithm,
     network::{AcceptChannelCommand, OpenChannelCommand, SendPaymentCommand},
-    serde_utils::{U128Hex, U64Hex},
+    serde_utils::{EntityHex, U128Hex, U64Hex},
     types::{Hash256, LockTime, Pubkey, RemoveTlcFulfill, TlcErr, TlcErrPacket, TlcErrorCode},
     NetworkActorCommand, NetworkActorMessage,
 };
 use crate::{handle_actor_call, handle_actor_cast, log_and_error};
 use ckb_jsonrpc_types::{EpochNumberWithFraction, Script};
-use ckb_types::core::{EpochNumberWithFraction as EpochNumberWithFractionCore, FeeRate};
+use ckb_types::{
+    core::{EpochNumberWithFraction as EpochNumberWithFractionCore, FeeRate},
+    packed::OutPoint,
+};
 use jsonrpsee::{
     core::async_trait,
     proc_macros::rpc,
@@ -95,6 +98,8 @@ pub(crate) struct ListChannelsResult {
 #[derive(Clone, Serialize)]
 pub(crate) struct Channel {
     channel_id: Hash256,
+    #[serde_as(as = "Option<EntityHex>")]
+    channel_outpoint: Option<OutPoint>,
     #[serde_as(as = "DisplayFromStr")]
     peer_id: PeerId,
     funding_udt_type_script: Option<Script>,
@@ -369,6 +374,7 @@ where
                     .get_channel_actor_state(&channel_id)
                     .map(|state| Channel {
                         channel_id,
+                        channel_outpoint: state.get_funding_transaction_outpoint(),
                         peer_id,
                         funding_udt_type_script: state
                             .funding_udt_type_script
diff --git a/tests/bruno/e2e/open-use-close-a-channel/03-get-auto-accepted-channel.bru b/tests/bruno/e2e/open-use-close-a-channel/03-get-auto-accepted-channel.bru
index eaf76c579..6428adfbc 100644
--- a/tests/bruno/e2e/open-use-close-a-channel/03-get-auto-accepted-channel.bru
+++ b/tests/bruno/e2e/open-use-close-a-channel/03-get-auto-accepted-channel.bru
@@ -31,6 +31,7 @@ body:json {
 assert {
   res.body.error: isUndefined
   res.body.result.channels: isDefined
+  res.body.result.channels[0].channel_outpoint: isDefined
 }
 
 script:post-response {

From 90030d8409ba7de5040c8d34b32cebf2efa96ccd Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Tue, 22 Oct 2024 14:59:50 +0800
Subject: [PATCH 03/31] Return is_public for rpc list_channels

---
 src/rpc/channel.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/rpc/channel.rs b/src/rpc/channel.rs
index 91aded08c..9ee5dc423 100644
--- a/src/rpc/channel.rs
+++ b/src/rpc/channel.rs
@@ -98,6 +98,7 @@ pub(crate) struct ListChannelsResult {
 #[derive(Clone, Serialize)]
 pub(crate) struct Channel {
     channel_id: Hash256,
+    is_public: bool,
     #[serde_as(as = "Option<EntityHex>")]
     channel_outpoint: Option<OutPoint>,
     #[serde_as(as = "DisplayFromStr")]
@@ -374,6 +375,7 @@ where
                     .get_channel_actor_state(&channel_id)
                     .map(|state| Channel {
                         channel_id,
+                        is_public: state.is_public(),
                         channel_outpoint: state.get_funding_transaction_outpoint(),
                         peer_id,
                         funding_udt_type_script: state

From fd32df9452b30671adb3634c7803006c7a3f71a2 Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Wed, 30 Oct 2024 14:00:52 +0900
Subject: [PATCH 04/31] chore: rename cltv

---
 src/fiber/graph.rs       | 22 +++++++++++-----------
 src/fiber/network.rs     |  6 +++---
 src/fiber/path.rs        |  6 +++---
 src/fiber/tests/graph.rs | 26 +++++++++++++-------------
 src/fiber/tests/path.rs  | 18 +++++++++---------
 src/rpc/channel.rs       |  6 +++---
 6 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/fiber/graph.rs b/src/fiber/graph.rs
index 5a6d0345c..e22e9628e 100644
--- a/src/fiber/graph.rs
+++ b/src/fiber/graph.rs
@@ -113,8 +113,8 @@ pub struct ChannelUpdateInfo {
     pub timestamp: u64,
     /// Whether the channel can be currently used for payments (in this one direction).
     pub enabled: bool,
-    /// The difference in CLTV values that you must have when routing through this channel.
-    pub cltv_expiry_delta: u64,
+    /// The difference in htlc expiry values that you must have when routing through this channel (in milliseconds).
+    pub htlc_expiry_delta: u64,
     /// The minimum value, which must be relayed to the next hop via the channel
     pub htlc_minimum_value: u128,
     /// The maximum value which may be relayed to the next hop via the channel.
@@ -402,7 +402,7 @@ where
             version: update.version,
             timestamp: std::time::UNIX_EPOCH.elapsed().unwrap().as_millis() as u64,
             enabled: !disabled,
-            cltv_expiry_delta: update.tlc_locktime_expiry_delta,
+            htlc_expiry_delta: update.tlc_locktime_expiry_delta,
             htlc_minimum_value: update.tlc_minimum_value,
             htlc_maximum_value: update.tlc_maximum_value,
             fee_rate: update.tlc_fee_proportional_millionths as u64,
@@ -548,7 +548,7 @@ where
                 .expect("channel_update is none");
                 let fee_rate = channel_update.fee_rate;
                 let fee = calculate_tlc_forward_fee(current_amount, fee_rate as u128);
-                let expiry = channel_update.cltv_expiry_delta;
+                let expiry = channel_update.htlc_expiry_delta;
                 (fee, expiry)
             };
 
@@ -634,7 +634,7 @@ where
             fee_charged: 0,
             probability: 1.0,
             next_hop: None,
-            incoming_cltv_height: 0,
+            incoming_htlc_expiry: 0,
         });
         let route_to_self = source == target;
         while let Some(cur_hop) = nodes_heap.pop() {
@@ -688,11 +688,11 @@ where
                     );
                     continue;
                 }
-                let incomming_cltv = cur_hop.incoming_cltv_height
+                let incoming_htlc_expiry = cur_hop.incoming_htlc_expiry
                     + if from == source {
                         0
                     } else {
-                        channel_update.cltv_expiry_delta
+                        channel_update.htlc_expiry_delta
                     };
 
                 let probability = cur_hop.probability
@@ -709,7 +709,7 @@ where
                 }
                 debug!("probability: {:?}", probability);
                 let agg_weight =
-                    self.edge_weight(amount_to_send, fee, channel_update.cltv_expiry_delta);
+                    self.edge_weight(amount_to_send, fee, channel_update.htlc_expiry_delta);
                 let weight = cur_hop.weight + agg_weight;
                 let distance = self.calculate_distance_based_probability(probability, weight);
 
@@ -723,7 +723,7 @@ where
                     weight,
                     distance,
                     amount_received: amount_to_send,
-                    incoming_cltv_height: incomming_cltv,
+                    incoming_htlc_expiry,
                     fee_charged: fee,
                     probability,
                     next_hop: Some((cur_hop.node_id, channel_info.out_point())),
@@ -762,9 +762,9 @@ where
         Ok(result)
     }
 
-    fn edge_weight(&self, amount: u128, fee: u128, cltv_expiry_delta: u64) -> u128 {
+    fn edge_weight(&self, amount: u128, fee: u128, htlc_expiry_delta: u64) -> u128 {
         let risk_factor: u128 = 15;
-        let time_lock_penalty = amount * cltv_expiry_delta as u128 * (risk_factor / 1000000000);
+        let time_lock_penalty = amount * htlc_expiry_delta as u128 * (risk_factor / 1000000000);
         fee + time_lock_penalty
     }
 
diff --git a/src/fiber/network.rs b/src/fiber/network.rs
index 1c4eea225..f6aceaddf 100644
--- a/src/fiber/network.rs
+++ b/src/fiber/network.rs
@@ -280,7 +280,7 @@ pub struct SendPaymentCommand {
     // the encoded invoice to send to the recipient
     pub invoice: Option<String>,
     // The CLTV delta from the current height that should be used to set the timelock for the final hop
-    pub final_cltv_delta: Option<u64>,
+    pub final_htlc_expiry_delta: Option<u64>,
     // the payment timeout in seconds, if the payment is not completed within this time, it will be cancelled
     pub timeout: Option<u64>,
     // the maximum fee amounts in shannons that the sender is willing to pay, default is 1000 shannons CKB.
@@ -303,7 +303,7 @@ pub struct SendPaymentData {
     pub amount: u128,
     pub payment_hash: Hash256,
     pub invoice: Option<String>,
-    pub final_cltv_delta: Option<u64>,
+    pub final_htlc_expiry_delta: Option<u64>,
     pub timeout: Option<u64>,
     pub max_fee_amount: Option<u128>,
     pub max_parts: Option<u64>,
@@ -404,7 +404,7 @@ impl SendPaymentData {
             amount,
             payment_hash,
             invoice: command.invoice,
-            final_cltv_delta: command.final_cltv_delta,
+            final_htlc_expiry_delta: command.final_htlc_expiry_delta,
             timeout: command.timeout,
             max_fee_amount: command.max_fee_amount,
             max_parts: command.max_parts,
diff --git a/src/fiber/path.rs b/src/fiber/path.rs
index 1a6536ed0..9a241aca0 100644
--- a/src/fiber/path.rs
+++ b/src/fiber/path.rs
@@ -25,8 +25,8 @@ pub(crate) struct NodeHeapElement {
     // The probability of this node.
     pub probability: f64,
 
-    // The expected aboslute expiry height for the incoming HTLC of this Node
-    pub incoming_cltv_height: u64,
+    // The expected aboslute expiry timestamp (in milliseconds) for the incoming HTLC of this Node
+    pub incoming_htlc_expiry: u64,
 
     // next_hop is the edge this route comes from
     pub next_hop: Option<(Pubkey, OutPoint)>,
@@ -60,7 +60,7 @@ impl PartialEq for NodeHeapElement {
             && self.amount_received == other.amount_received
             && self.fee_charged == other.fee_charged
             && self.probability == other.probability
-            && self.incoming_cltv_height == other.incoming_cltv_height
+            && self.incoming_htlc_expiry == other.incoming_htlc_expiry
             && self.next_hop == other.next_hop
     }
 }
diff --git a/src/fiber/tests/graph.rs b/src/fiber/tests/graph.rs
index 6696c4237..30bbaa9f7 100644
--- a/src/fiber/tests/graph.rs
+++ b/src/fiber/tests/graph.rs
@@ -513,7 +513,7 @@ fn test_graph_build_route_three_nodes() {
         amount: 100,
         payment_hash: Hash256::default(),
         invoice: None,
-        final_cltv_delta: Some(100),
+        final_htlc_expiry_delta: Some(100),
         timeout: Some(10),
         max_fee_amount: Some(1000),
         max_parts: None,
@@ -552,7 +552,7 @@ fn test_graph_build_route_exceed_max_htlc_value() {
         amount: 100, // Exceeds max_htlc_value of 50
         payment_hash: Hash256::default(),
         invoice: None,
-        final_cltv_delta: Some(100),
+        final_htlc_expiry_delta: Some(100),
         timeout: Some(10),
         max_fee_amount: Some(1000),
         max_parts: None,
@@ -578,7 +578,7 @@ fn test_graph_build_route_below_min_htlc_value() {
         amount: 10, // Below min_htlc_value of 50
         payment_hash: Hash256::default(),
         invoice: None,
-        final_cltv_delta: Some(100),
+        final_htlc_expiry_delta: Some(100),
         timeout: Some(10),
         max_fee_amount: Some(1000),
         max_parts: None,
@@ -623,7 +623,7 @@ fn test_graph_mark_failed_channel() {
         amount: 100,
         payment_hash: Hash256::default(),
         invoice: None,
-        final_cltv_delta: Some(100),
+        final_htlc_expiry_delta: Some(100),
         timeout: Some(10),
         max_fee_amount: Some(1000),
         max_parts: None,
@@ -644,7 +644,7 @@ fn test_graph_mark_failed_channel() {
         amount: 100,
         payment_hash: Hash256::default(),
         invoice: None,
-        final_cltv_delta: Some(100),
+        final_htlc_expiry_delta: Some(100),
         timeout: Some(10),
         max_fee_amount: Some(1000),
         max_parts: None,
@@ -673,7 +673,7 @@ fn test_graph_mark_failed_node() {
         amount: 100,
         payment_hash: Hash256::default(),
         invoice: None,
-        final_cltv_delta: Some(100),
+        final_htlc_expiry_delta: Some(100),
         timeout: Some(10),
         max_fee_amount: Some(1000),
         max_parts: None,
@@ -691,7 +691,7 @@ fn test_graph_mark_failed_node() {
         amount: 100,
         payment_hash: Hash256::default(),
         invoice: None,
-        final_cltv_delta: Some(100),
+        final_htlc_expiry_delta: Some(100),
         timeout: Some(10),
         max_fee_amount: Some(1000),
         max_parts: None,
@@ -711,7 +711,7 @@ fn test_graph_mark_failed_node() {
         amount: 100,
         payment_hash: Hash256::default(),
         invoice: None,
-        final_cltv_delta: Some(100),
+        final_htlc_expiry_delta: Some(100),
         timeout: Some(10),
         max_fee_amount: Some(1000),
         max_parts: None,
@@ -729,7 +729,7 @@ fn test_graph_mark_failed_node() {
         amount: 100,
         payment_hash: Hash256::default(),
         invoice: None,
-        final_cltv_delta: Some(100),
+        final_htlc_expiry_delta: Some(100),
         timeout: Some(10),
         max_fee_amount: Some(1000),
         max_parts: None,
@@ -756,7 +756,7 @@ fn test_graph_payment_self_default_is_false() {
         target_pubkey: Some(node0.into()),
         amount: Some(100),
         payment_hash: Some(Hash256::default()),
-        final_cltv_delta: Some(100),
+        final_htlc_expiry_delta: Some(100),
         invoice: None,
         timeout: Some(10),
         max_fee_amount: Some(1000),
@@ -774,7 +774,7 @@ fn test_graph_payment_self_default_is_false() {
         amount: 100,
         payment_hash: Hash256::default(),
         invoice: None,
-        final_cltv_delta: Some(100),
+        final_htlc_expiry_delta: Some(100),
         timeout: Some(10),
         max_fee_amount: Some(1000),
         max_parts: None,
@@ -801,7 +801,7 @@ fn test_graph_payment_pay_single_path() {
         target_pubkey: Some(network.keys[6].into()),
         amount: Some(100),
         payment_hash: Some(Hash256::default()),
-        final_cltv_delta: Some(100),
+        final_htlc_expiry_delta: Some(100),
         invoice: None,
         timeout: Some(10),
         max_fee_amount: Some(1000),
@@ -834,7 +834,7 @@ fn test_graph_payment_pay_self_will_ok() {
         target_pubkey: Some(network.keys[0].into()),
         amount: Some(100),
         payment_hash: Some(Hash256::default()),
-        final_cltv_delta: Some(100),
+        final_htlc_expiry_delta: Some(100),
         invoice: None,
         timeout: Some(10),
         max_fee_amount: Some(1000),
diff --git a/src/fiber/tests/path.rs b/src/fiber/tests/path.rs
index 653e73725..8177ceee1 100644
--- a/src/fiber/tests/path.rs
+++ b/src/fiber/tests/path.rs
@@ -20,7 +20,7 @@ fn test_node_heap() {
         fee_charged: 0,
         probability: 0.0,
         next_hop: None,
-        incoming_cltv_height: 0,
+        incoming_htlc_expiry: 0,
     };
     let node2 = NodeHeapElement {
         node_id: public_key2.into(),
@@ -30,7 +30,7 @@ fn test_node_heap() {
         fee_charged: 0,
         probability: 0.0,
         next_hop: None,
-        incoming_cltv_height: 0,
+        incoming_htlc_expiry: 0,
     };
     assert!(heap.is_empty());
     heap.push(node1.clone());
@@ -60,7 +60,7 @@ fn test_node_heap_probability() {
         fee_charged: 0,
         probability: 0.0,
         next_hop: None,
-        incoming_cltv_height: 0,
+        incoming_htlc_expiry: 0,
     };
     let node2 = NodeHeapElement {
         node_id: public_key2.into(),
@@ -70,7 +70,7 @@ fn test_node_heap_probability() {
         fee_charged: 0,
         probability: 0.5,
         next_hop: None,
-        incoming_cltv_height: 0,
+        incoming_htlc_expiry: 0,
     };
     heap.push(node1.clone());
     heap.push(node2.clone());
@@ -97,7 +97,7 @@ fn test_node_heap_distance() {
         fee_charged: 0,
         probability: 0.0,
         next_hop: None,
-        incoming_cltv_height: 0,
+        incoming_htlc_expiry: 0,
     };
     let node2 = NodeHeapElement {
         node_id: public_key2.into(),
@@ -107,7 +107,7 @@ fn test_node_heap_distance() {
         fee_charged: 0,
         probability: 0.0,
         next_hop: None,
-        incoming_cltv_height: 0,
+        incoming_htlc_expiry: 0,
     };
     heap.push(node1.clone());
     heap.push(node2.clone());
@@ -134,7 +134,7 @@ fn test_node_heap_push_or_fix() {
         fee_charged: 0,
         probability: 0.0,
         next_hop: None,
-        incoming_cltv_height: 0,
+        incoming_htlc_expiry: 0,
     };
     let node2 = NodeHeapElement {
         node_id: public_key2.into(),
@@ -144,7 +144,7 @@ fn test_node_heap_push_or_fix() {
         fee_charged: 0,
         probability: 0.0,
         next_hop: None,
-        incoming_cltv_height: 0,
+        incoming_htlc_expiry: 0,
     };
 
     heap.push(node1.clone());
@@ -159,7 +159,7 @@ fn test_node_heap_push_or_fix() {
         fee_charged: 0,
         probability: 0.0,
         next_hop: None,
-        incoming_cltv_height: 0,
+        incoming_htlc_expiry: 0,
     };
 
     heap.push_or_fix(node1_update.clone());
diff --git a/src/rpc/channel.rs b/src/rpc/channel.rs
index cc369e818..b854df98d 100644
--- a/src/rpc/channel.rs
+++ b/src/rpc/channel.rs
@@ -203,9 +203,9 @@ pub(crate) struct SendPaymentCommandParams {
     // FIXME: this should be optional when AMP is enabled
     payment_hash: Option<Hash256>,
 
-    // The CLTV delta from the current height that should be used to set the timelock for the final hop
+    // The htlc expiry delta should be used to set the timelock for the final hop
     #[serde_as(as = "Option<U64Hex>")]
-    final_cltv_delta: Option<u64>,
+    final_htlc_expiry_delta: Option<u64>,
 
     // the encoded invoice to send to the recipient
     invoice: Option<String>,
@@ -523,7 +523,7 @@ where
                     target_pubkey: params.target_pubkey,
                     amount: params.amount,
                     payment_hash: params.payment_hash,
-                    final_cltv_delta: params.final_cltv_delta,
+                    final_htlc_expiry_delta: params.final_htlc_expiry_delta,
                     invoice: params.invoice.clone(),
                     timeout: params.timeout,
                     max_fee_amount: params.max_fee_amount,

From 1abac18ce4667822a3181870581e5bfeeef7af72 Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Wed, 30 Oct 2024 14:31:13 +0900
Subject: [PATCH 05/31] chore: remove LockTime

---
 src/cch/actor.rs           |   7 ++-
 src/cch/config.rs          |  16 +++---
 src/cch/mod.rs             |   2 +-
 src/fiber/channel.rs       |  26 ++-------
 src/fiber/tests/channel.rs |  14 +++--
 src/fiber/tests/types.rs   |   2 +-
 src/fiber/types.rs         | 109 ++-----------------------------------
 src/lib.rs                 |   7 +++
 src/rpc/channel.rs         |   5 +-
 9 files changed, 42 insertions(+), 146 deletions(-)

diff --git a/src/cch/actor.rs b/src/cch/actor.rs
index 00296aa31..3cd1115be 100644
--- a/src/cch/actor.rs
+++ b/src/cch/actor.rs
@@ -19,9 +19,10 @@ use crate::fiber::channel::{
     AddTlcCommand, ChannelCommand, ChannelCommandWithId, RemoveTlcCommand, TlcNotification,
 };
 use crate::fiber::hash_algorithm::HashAlgorithm;
-use crate::fiber::types::{Hash256, LockTime, RemoveTlcFulfill, RemoveTlcReason};
+use crate::fiber::types::{Hash256, RemoveTlcFulfill, RemoveTlcReason};
 use crate::fiber::{NetworkActorCommand, NetworkActorMessage};
 use crate::invoice::Currency;
+use crate::now_timestamp;
 
 use super::error::CchDbError;
 use super::{CchConfig, CchError, CchOrderStatus, CchOrdersDb, ReceiveBTCOrder, SendBTCOrder};
@@ -311,7 +312,7 @@ impl CchActor {
             fee_sats,
             currency: send_btc.currency,
             created_at: duration_since_epoch.as_secs(),
-            ckb_final_tlc_expiry: self.config.ckb_final_tlc_expiry_blocks,
+            ckb_final_tlc_expiry: self.config.ckb_final_tlc_expiry_delta,
             btc_pay_req: send_btc.btc_pay_req,
             ckb_pay_req: Default::default(),
             payment_hash: format!("0x{}", invoice.payment_hash().encode_hex::<String>()),
@@ -591,7 +592,7 @@ impl CchActor {
                                 payment_hash: Some(
                                     Hash256::from_str(&order.payment_hash).expect("parse Hash256"),
                                 ),
-                                expiry: LockTime::new(self.config.ckb_final_tlc_expiry_blocks),
+                                expiry: now_timestamp() + self.config.ckb_final_tlc_expiry_delta,
                                 hash_algorithm: HashAlgorithm::Sha256,
                                 onion_packet: vec![],
                                 previous_tlc: None,
diff --git a/src/cch/config.rs b/src/cch/config.rs
index 29a74f030..8cfd4d24d 100644
--- a/src/cch/config.rs
+++ b/src/cch/config.rs
@@ -6,8 +6,8 @@ use clap_serde_derive::ClapSerde;
 pub const DEFAULT_ORDER_EXPIRY_TIME: u64 = 3600;
 /// Default BTC final-hop HTLC expiry time in seconds.
 pub const DEFAULT_BTC_FINAL_TLC_EXPIRY_TIME: u64 = 36;
-/// Default CKB final-hop HTLC expiry time in blocks.
-pub const DEFAULT_CKB_FINAL_TLC_EXPIRY_BLOCKS: u64 = 10;
+/// Default CKB final-hop HTLC expiry delta in timestamp (in milliseconds), 24 hours.
+pub const DEFAULT_CKB_FINAL_TLC_EXPIRY_DELTA: u64 = 24 * 60 * 60 * 1000;
 
 // Use prefix `cch-`/`CCH_`
 #[derive(ClapSerde, Debug, Clone)]
@@ -93,15 +93,15 @@ pub struct CchConfig {
     )]
     pub btc_final_tlc_expiry: u64,
 
-    /// Final tlc expiry time for CKB network in blocks.
-    #[default(DEFAULT_CKB_FINAL_TLC_EXPIRY_BLOCKS)]
+    ///  Tlc expiry time for CKB network in blocks.
+    #[default(DEFAULT_CKB_FINAL_TLC_EXPIRY_DELTA)]
     #[arg(
-        name = "CCH_CKB_FINAL_TLC_EXPIRY_BLOCKS",
-        long = "cch-ckb-final-tlc-expiry-blocks",
+        name = "CCH_CKB_FINAL_TLC_EXPIRY_DELTA",
+        long = "cch-ckb-final-tlc-expiry-delta",
         env,
-        help = format!("final tlc expiry time in blocks for CKB network, default is {}", DEFAULT_CKB_FINAL_TLC_EXPIRY_BLOCKS),
+        help = format!("final tlc expiry delta in timestamp for CKB network, default is {}", DEFAULT_CKB_FINAL_TLC_EXPIRY_DELTA),
     )]
-    pub ckb_final_tlc_expiry_blocks: u64,
+    pub ckb_final_tlc_expiry_delta: u64,
 
     /// Ignore the failure when starting the cch service.
     #[default(false)]
diff --git a/src/cch/mod.rs b/src/cch/mod.rs
index 2466611e3..4f0733dd9 100644
--- a/src/cch/mod.rs
+++ b/src/cch/mod.rs
@@ -6,7 +6,7 @@ pub use error::{CchError, CchResult};
 
 mod config;
 pub use config::{
-    CchConfig, DEFAULT_BTC_FINAL_TLC_EXPIRY_TIME, DEFAULT_CKB_FINAL_TLC_EXPIRY_BLOCKS,
+    CchConfig, DEFAULT_BTC_FINAL_TLC_EXPIRY_TIME, DEFAULT_CKB_FINAL_TLC_EXPIRY_DELTA,
     DEFAULT_ORDER_EXPIRY_TIME,
 };
 
diff --git a/src/fiber/channel.rs b/src/fiber/channel.rs
index 64a1475d8..465e33f1f 100644
--- a/src/fiber/channel.rs
+++ b/src/fiber/channel.rs
@@ -69,8 +69,8 @@ use super::{
     serde_utils::EntityHex,
     types::{
         AcceptChannel, AddTlc, ChannelAnnouncement, ChannelReady, ClosingSigned, CommitmentSigned,
-        EcdsaSignature, FiberChannelMessage, FiberMessage, Hash256, LockTime, OpenChannel, Privkey,
-        Pubkey, ReestablishChannel, RemoveTlc, RemoveTlcFulfill, RemoveTlcReason, RevokeAndAck,
+        EcdsaSignature, FiberChannelMessage, FiberMessage, Hash256, OpenChannel, Privkey, Pubkey,
+        ReestablishChannel, RemoveTlc, RemoveTlcFulfill, RemoveTlcReason, RevokeAndAck,
         TxCollaborationMsg, TxComplete, TxUpdate,
     },
     NetworkActorCommand, NetworkActorEvent, NetworkActorMessage, ASSUME_NETWORK_ACTOR_ALIVE,
@@ -138,7 +138,7 @@ pub struct AddTlcCommand {
     pub amount: u128,
     pub preimage: Option<Hash256>,
     pub payment_hash: Option<Hash256>,
-    pub expiry: LockTime,
+    pub expiry: u64,
     pub hash_algorithm: HashAlgorithm,
     pub onion_packet: Vec<u8>,
     pub previous_tlc: Option<(Hash256, u64)>,
@@ -3930,7 +3930,7 @@ impl ChannelActorState {
                 result.extend_from_slice(&tlc.tlc.get_hash());
                 result.extend_from_slice(&local.serialize());
                 result.extend_from_slice(&remote.serialize());
-                result.extend_from_slice(&Since::from(tlc.tlc.lock_time).value().to_le_bytes());
+                result.extend_from_slice(&Since::new(SinceType::Timestamp, tlc.tlc.lock_time, false).value().to_le_bytes());
             }
             result
         }
@@ -5591,22 +5591,6 @@ pub fn aggregate_partial_signatures_for_msg(
     Ok(signature)
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct ChannelParametersOneParty {
-    pub pubkeys: ChannelBasePublicKeys,
-    pub selected_contest_delay: LockTime,
-}
-
-impl ChannelParametersOneParty {
-    pub fn funding_pubkey(&self) -> &Pubkey {
-        &self.pubkeys.funding_pubkey
-    }
-
-    pub fn tlc_base_key(&self) -> &Pubkey {
-        &self.pubkeys.tlc_base_key
-    }
-}
-
 /// One counterparty's public keys which do not change over the life of a channel.
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct ChannelBasePublicKeys {
@@ -5646,7 +5630,7 @@ pub struct TLC {
     /// The value as it appears in the commitment transaction
     pub amount: u128,
     /// The CLTV lock-time at which this HTLC expires.
-    pub lock_time: LockTime,
+    pub lock_time: u64,
     /// The hash of the preimage which unlocks this HTLC.
     pub payment_hash: Hash256,
     /// The preimage of the hash to be sent to the counterparty.
diff --git a/src/fiber/tests/channel.rs b/src/fiber/tests/channel.rs
index e8f2ada8b..fb16df90b 100644
--- a/src/fiber/tests/channel.rs
+++ b/src/fiber/tests/channel.rs
@@ -9,10 +9,10 @@ use crate::{
         config::DEFAULT_CHANNEL_MINIMAL_CKB_AMOUNT,
         hash_algorithm::HashAlgorithm,
         network::{AcceptChannelCommand, OpenChannelCommand},
-        types::{Hash256, LockTime, Privkey, RemoveTlcFulfill, RemoveTlcReason},
+        types::{Hash256, Privkey, RemoveTlcFulfill, RemoveTlcReason},
         NetworkActorCommand, NetworkActorMessage,
     },
-    NetworkServiceEvent,
+    now_timestamp, NetworkServiceEvent,
 };
 use ckb_jsonrpc_types::Status;
 use ckb_types::{
@@ -24,6 +24,8 @@ use ractor::call;
 
 use super::test_utils::{init_tracing, NetworkNode};
 
+const DEFAULT_EXPIRY_DELTA: u64 = 24 * 60 * 60 * 1000; // 24 hours
+
 #[test]
 fn test_per_commitment_point_and_secret_consistency() {
     init_tracing();
@@ -281,7 +283,7 @@ async fn do_test_channel_commitment_tx_after_add_tlc(algorithm: HashAlgorithm) {
                         amount: tlc_amount,
                         hash_algorithm: algorithm,
                         payment_hash: Some(digest.into()),
-                        expiry: LockTime::new(100),
+                        expiry: now_timestamp() + DEFAULT_EXPIRY_DELTA,
                         preimage: None,
                         onion_packet: vec![],
                         previous_tlc: None,
@@ -485,7 +487,7 @@ async fn do_test_remove_tlc_with_wrong_hash_algorithm(
                         amount: tlc_amount,
                         hash_algorithm: correct_algorithm,
                         payment_hash: Some(digest.into()),
-                        expiry: LockTime::new(100),
+                        expiry: now_timestamp() + DEFAULT_EXPIRY_DELTA,
                         preimage: None,
                         onion_packet: vec![],
                         previous_tlc: None,
@@ -534,7 +536,7 @@ async fn do_test_remove_tlc_with_wrong_hash_algorithm(
                         amount: tlc_amount,
                         hash_algorithm: wrong_algorithm,
                         payment_hash: Some(digest.into()),
-                        expiry: LockTime::new(100),
+                        expiry: now_timestamp() + DEFAULT_EXPIRY_DELTA,
                         preimage: None,
                         onion_packet: vec![],
                         previous_tlc: None,
@@ -608,7 +610,7 @@ async fn do_test_channel_with_simple_update_operation(algorithm: HashAlgorithm)
                         amount: tlc_amount,
                         hash_algorithm: algorithm,
                         payment_hash: Some(digest.into()),
-                        expiry: LockTime::new(100),
+                        expiry: now_timestamp() + DEFAULT_EXPIRY_DELTA,
                         preimage: None,
                         onion_packet: vec![],
                         previous_tlc: None,
diff --git a/src/fiber/tests/types.rs b/src/fiber/tests/types.rs
index 3af7429f1..85990c199 100644
--- a/src/fiber/tests/types.rs
+++ b/src/fiber/tests/types.rs
@@ -33,7 +33,7 @@ fn test_add_tlc_serialization() {
         tlc_id: 42,
         amount: 42,
         payment_hash: [42; 32].into(),
-        expiry: 42.into(),
+        expiry: 42,
         hash_algorithm: HashAlgorithm::Sha256,
         onion_packet: vec![],
     };
diff --git a/src/fiber/types.rs b/src/fiber/types.rs
index 2fd005712..1b198f293 100644
--- a/src/fiber/types.rs
+++ b/src/fiber/types.rs
@@ -11,11 +11,9 @@ use super::network::get_chain_hash;
 use super::r#gen::fiber::PubNonceOpt;
 use super::serde_utils::{EntityHex, SliceHex};
 use anyhow::anyhow;
-use ckb_sdk::{Since, SinceType};
-use ckb_types::core::FeeRate;
-use ckb_types::packed::{OutPoint, Uint64};
 use ckb_types::{
-    packed::{Byte32 as MByte32, BytesVec, Script, Transaction},
+    core::FeeRate,
+    packed::{Byte32 as MByte32, BytesVec, Script, Transaction, OutPoint},
     prelude::{Pack, Unpack},
 };
 use core::fmt::{self, Formatter};
@@ -45,103 +43,6 @@ pub fn secp256k1_instance() -> &'static Secp256k1<All> {
     INSTANCE.get_or_init(Secp256k1::new)
 }
 
-// TODO: We actually use both relative
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)]
-pub struct LockTime(u64);
-
-impl LockTime {
-    pub fn new(blocks: u64) -> Self {
-        LockTime(blocks)
-    }
-}
-
-impl From<LockTime> for Since {
-    fn from(lock_time: LockTime) -> Since {
-        Since::new(SinceType::BlockNumber, lock_time.0, true)
-    }
-}
-
-impl TryFrom<Since> for LockTime {
-    type Error = Error;
-
-    fn try_from(since: Since) -> Result<Self, Self::Error> {
-        if !since.is_relative() {
-            return Err(Error::from(anyhow!(
-                "Invalid lock time type: must be relative"
-            )));
-        }
-        since
-            .extract_metric()
-            .map(|(ty, value)| {
-                if ty == SinceType::BlockNumber {
-                    Ok(LockTime(value))
-                } else {
-                    Err(Error::from(anyhow!(
-                        "Invalid lock time type: must be blocknumber"
-                    )))
-                }
-            })
-            .unwrap_or_else(|| {
-                Err(Error::from(anyhow!(
-                    "Invalid lock time type: unable to extract metric"
-                )))
-            })
-    }
-}
-
-impl From<LockTime> for Uint64 {
-    fn from(lock_time: LockTime) -> Uint64 {
-        let b: [u8; 8] = lock_time.into();
-        Uint64::from_slice(&b).expect("valid locktime serialized to 8 bytes")
-    }
-}
-
-impl TryFrom<Uint64> for LockTime {
-    type Error = Error;
-
-    fn try_from(value: Uint64) -> Result<LockTime, Error> {
-        let b = value.as_slice();
-        LockTime::try_from(b)
-    }
-}
-
-impl From<u64> for LockTime {
-    fn from(value: u64) -> LockTime {
-        LockTime(value)
-    }
-}
-
-impl From<LockTime> for u64 {
-    fn from(lock_time: LockTime) -> u64 {
-        lock_time.0
-    }
-}
-
-impl From<[u8; 8]> for LockTime {
-    fn from(value: [u8; 8]) -> LockTime {
-        LockTime(u64::from_le_bytes(value))
-    }
-}
-
-impl From<LockTime> for [u8; 8] {
-    fn from(lock_time: LockTime) -> [u8; 8] {
-        lock_time.0.to_le_bytes()
-    }
-}
-
-impl TryFrom<&[u8]> for LockTime {
-    type Error = Error;
-
-    fn try_from(value: &[u8]) -> Result<LockTime, Error> {
-        if value.len() != 8 {
-            return Err(Error::from(anyhow!("Invalid lock time length")));
-        }
-        let mut bytes = [0u8; 8];
-        bytes.copy_from_slice(value);
-        Ok(LockTime::from(bytes))
-    }
-}
-
 impl From<&Byte66> for PubNonce {
     fn from(value: &Byte66) -> Self {
         PubNonce::from_bytes(value.as_slice()).unwrap()
@@ -1135,7 +1036,7 @@ pub struct AddTlc {
     pub tlc_id: u64,
     pub amount: u128,
     pub payment_hash: Hash256,
-    pub expiry: LockTime,
+    pub expiry: u64,
     pub hash_algorithm: HashAlgorithm,
     pub onion_packet: Vec<u8>,
 }
@@ -1147,7 +1048,7 @@ impl From<AddTlc> for molecule_fiber::AddTlc {
             .tlc_id(add_tlc.tlc_id.pack())
             .amount(add_tlc.amount.pack())
             .payment_hash(add_tlc.payment_hash.into())
-            .expiry(add_tlc.expiry.into())
+            .expiry(add_tlc.expiry.pack())
             .hash_algorithm(Byte::new(add_tlc.hash_algorithm as u8))
             .onion_packet(add_tlc.onion_packet.pack())
             .build()
@@ -1163,7 +1064,7 @@ impl TryFrom<molecule_fiber::AddTlc> for AddTlc {
             tlc_id: add_tlc.tlc_id().unpack(),
             amount: add_tlc.amount().unpack(),
             payment_hash: add_tlc.payment_hash().into(),
-            expiry: add_tlc.expiry().try_into()?,
+            expiry: add_tlc.expiry().unpack(),
             onion_packet: add_tlc.onion_packet().unpack(),
             hash_algorithm: add_tlc
                 .hash_algorithm()
diff --git a/src/lib.rs b/src/lib.rs
index 806826de5..972581998 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -36,6 +36,13 @@ pub fn get_node_prefix() -> &'static str {
     INSTANCE.get_or_init(|| std::env::var("LOG_PREFIX").unwrap_or_else(|_| "".to_string()))
 }
 
+pub fn now_timestamp() -> u64 {
+    std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .unwrap()
+        .as_millis() as u64
+}
+
 pub mod macros {
     #[macro_export]
     macro_rules! unwrap_or_return {
diff --git a/src/rpc/channel.rs b/src/rpc/channel.rs
index b854df98d..347f10d1a 100644
--- a/src/rpc/channel.rs
+++ b/src/rpc/channel.rs
@@ -7,7 +7,7 @@ use crate::fiber::{
     hash_algorithm::HashAlgorithm,
     network::{AcceptChannelCommand, OpenChannelCommand, SendPaymentCommand},
     serde_utils::{U128Hex, U64Hex},
-    types::{Hash256, LockTime, Pubkey, RemoveTlcFulfill, TlcErr, TlcErrPacket, TlcErrorCode},
+    types::{Hash256, Pubkey, RemoveTlcFulfill, TlcErr, TlcErrPacket, TlcErrorCode},
     NetworkActorCommand, NetworkActorMessage,
 };
 use crate::{handle_actor_call, handle_actor_cast, log_and_error};
@@ -118,7 +118,8 @@ pub(crate) struct AddTlcParams {
     #[serde_as(as = "U128Hex")]
     amount: u128,
     payment_hash: Hash256,
-    expiry: LockTime,
+    #[serde_as(as = "U64Hex")]
+    expiry: u64,
     hash_algorithm: Option<HashAlgorithm>,
 }
 

From 5b521d381535125a1a74159ce968ca2c9e0fa1b5 Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Wed, 30 Oct 2024 15:15:28 +0900
Subject: [PATCH 06/31] chore: rename locktime

---
 src/fiber/channel.rs        | 50 ++++++++++++++++++++-----------------
 src/fiber/config.rs         | 19 +++++++-------
 src/fiber/gen/fiber.rs      | 32 ++++++++----------------
 src/fiber/graph.rs          |  2 +-
 src/fiber/network.rs        | 20 +++++++--------
 src/fiber/schema/fiber.mol  |  2 +-
 src/fiber/tests/channel.rs  | 16 ++++++------
 src/fiber/tests/graph.rs    |  2 +-
 src/fiber/types.rs          | 14 +++++------
 src/invoice/command.rs      |  1 -
 src/invoice/invoice_impl.rs |  1 -
 src/rpc/README.md           |  4 +--
 src/rpc/channel.rs          |  8 +++---
 src/rpc/info.rs             |  4 +--
 src/rpc/invoice.rs          |  2 --
 15 files changed, 83 insertions(+), 94 deletions(-)

diff --git a/src/fiber/channel.rs b/src/fiber/channel.rs
index 465e33f1f..10852e7a6 100644
--- a/src/fiber/channel.rs
+++ b/src/fiber/channel.rs
@@ -160,7 +160,7 @@ pub struct ShutdownCommand {
 #[derive(Debug)]
 pub struct UpdateCommand {
     pub enabled: Option<bool>,
-    pub tlc_locktime_expiry_delta: Option<u64>,
+    pub tlc_expiry_delta: Option<u64>,
     pub tlc_minimum_value: Option<u128>,
     pub tlc_maximum_value: Option<u128>,
     pub tlc_fee_proportional_millionths: Option<u128>,
@@ -1105,7 +1105,7 @@ where
                 tlc_id: tlc.id.into(),
                 amount: tlc.amount,
                 payment_hash: tlc.payment_hash,
-                expiry: tlc.lock_time,
+                expiry: tlc.expiry,
                 hash_algorithm: tlc.hash_algorithm,
                 onion_packet: tlc.onion_packet,
             }),
@@ -1220,7 +1220,7 @@ where
 
         let UpdateCommand {
             enabled,
-            tlc_locktime_expiry_delta,
+            tlc_expiry_delta,
             tlc_minimum_value,
             tlc_maximum_value,
             tlc_fee_proportional_millionths,
@@ -1232,8 +1232,8 @@ where
             updated |= state.update_our_enabled(enabled);
         }
 
-        if let Some(delta) = tlc_locktime_expiry_delta {
-            updated |= state.update_our_locktime_expiry_delta(delta);
+        if let Some(delta) = tlc_expiry_delta {
+            updated |= state.update_our_tlc_expiry_delta(delta);
         }
 
         if let Some(value) = tlc_minimum_value {
@@ -2136,8 +2136,8 @@ pub struct PublicChannelInfo {
     // Max/min value of the tlc that we will accept.
     pub tlc_max_value: Option<u128>,
     pub tlc_min_value: Option<u128>,
-    // The locktime expiry delta. This is the number of blocks that the locktime.
-    pub tlc_locktime_expiry_delta: Option<u64>,
+    // The expiry delta timestamp, in milliseconds, for the tlc.
+    pub tlc_expiry_delta: Option<u64>,
 
     // Channel announcement signatures, may be empty for private channel.
     pub local_channel_announcement_signature: Option<(EcdsaSignature, PartialSignature)>,
@@ -2150,7 +2150,7 @@ pub struct PublicChannelInfo {
 
 impl PublicChannelInfo {
     pub fn new(
-        tlc_locktime_expiry_delta: u64,
+        tlc_expiry_delta: u64,
         tlc_min_value: u128,
         tlc_max_value: u128,
         tlc_fee_proportional_millionths: u128,
@@ -2159,7 +2159,7 @@ impl PublicChannelInfo {
             tlc_fee_proportional_millionths: Some(tlc_fee_proportional_millionths),
             tlc_max_value: Some(tlc_max_value),
             tlc_min_value: Some(tlc_min_value),
-            tlc_locktime_expiry_delta: Some(tlc_locktime_expiry_delta),
+            tlc_expiry_delta: Some(tlc_expiry_delta),
             enabled: true,
             ..Default::default()
         }
@@ -2660,13 +2660,13 @@ impl ChannelActorState {
 
         self.public_channel_info.as_ref().and_then(|info| {
             match (
-                info.tlc_locktime_expiry_delta,
+                info.tlc_expiry_delta,
                 info.tlc_min_value,
                 info.tlc_max_value,
                 info.tlc_fee_proportional_millionths,
             ) {
                 (
-                    Some(locktime_expiry_delta),
+                    Some(expiry_delta),
                     Some(min_value),
                     Some(max_value),
                     Some(fee_proportional_millionths),
@@ -2676,7 +2676,7 @@ impl ChannelActorState {
                     std::time::UNIX_EPOCH.elapsed().unwrap().as_secs(),
                     message_flags,
                     0,
-                    locktime_expiry_delta,
+                    expiry_delta,
                     min_value,
                     max_value,
                     fee_proportional_millionths,
@@ -3164,18 +3164,18 @@ impl ChannelActorState {
         }
     }
 
-    fn get_our_locktime_expiry_delta(&self) -> Option<u64> {
+    fn get_our_tlc_expiry_delta(&self) -> Option<u64> {
         self.public_channel_info
             .as_ref()
-            .and_then(|state| state.tlc_locktime_expiry_delta)
+            .and_then(|state| state.tlc_expiry_delta)
     }
 
-    fn update_our_locktime_expiry_delta(&mut self, value: u64) -> bool {
-        let old_value = self.get_our_locktime_expiry_delta();
+    fn update_our_tlc_expiry_delta(&mut self, value: u64) -> bool {
+        let old_value = self.get_our_tlc_expiry_delta();
         match old_value {
             Some(old_value) if old_value == value => false,
             _ => {
-                self.public_channel_state_mut().tlc_locktime_expiry_delta = Some(value);
+                self.public_channel_state_mut().tlc_expiry_delta = Some(value);
                 true
             }
         }
@@ -3930,7 +3930,11 @@ impl ChannelActorState {
                 result.extend_from_slice(&tlc.tlc.get_hash());
                 result.extend_from_slice(&local.serialize());
                 result.extend_from_slice(&remote.serialize());
-                result.extend_from_slice(&Since::new(SinceType::Timestamp, tlc.tlc.lock_time, false).value().to_le_bytes());
+                result.extend_from_slice(
+                    &Since::new(SinceType::Timestamp, tlc.tlc.expiry, false)
+                        .value()
+                        .to_le_bytes(),
+                );
             }
             result
         }
@@ -4035,7 +4039,7 @@ impl ChannelActorState {
             id: TLCId::Offered(id),
             amount: command.amount,
             payment_hash,
-            lock_time: command.expiry,
+            expiry: command.expiry,
             payment_preimage: Some(preimage),
             hash_algorithm: command.hash_algorithm,
             onion_packet: command.onion_packet,
@@ -4067,7 +4071,7 @@ impl ChannelActorState {
             id: TLCId::Received(message.tlc_id),
             amount: message.amount,
             payment_hash: message.payment_hash,
-            lock_time: message.expiry,
+            expiry: message.expiry,
             payment_preimage,
             hash_algorithm: message.hash_algorithm,
             onion_packet: message.onion_packet,
@@ -4822,7 +4826,7 @@ impl ChannelActorState {
                                                     tlc_id: info.tlc.get_id(),
                                                     amount: info.tlc.amount,
                                                     payment_hash: info.tlc.payment_hash,
-                                                    expiry: info.tlc.lock_time,
+                                                    expiry: info.tlc.expiry,
                                                     hash_algorithm: info.tlc.hash_algorithm,
                                                     onion_packet: info.tlc.onion_packet.clone(),
                                                 }),
@@ -5629,8 +5633,8 @@ pub struct TLC {
     pub id: TLCId,
     /// The value as it appears in the commitment transaction
     pub amount: u128,
-    /// The CLTV lock-time at which this HTLC expires.
-    pub lock_time: u64,
+    /// The expiry timestamp in millisecond.
+    pub expiry: u64,
     /// The hash of the preimage which unlocks this HTLC.
     pub payment_hash: Hash256,
     /// The preimage of the hash to be sent to the counterparty.
diff --git a/src/fiber/config.rs b/src/fiber/config.rs
index 8931128c0..9cecc9581 100644
--- a/src/fiber/config.rs
+++ b/src/fiber/config.rs
@@ -36,8 +36,8 @@ pub const DEFAULT_UDT_MINIMAL_CKB_AMOUNT: u64 =
 pub const DEFAULT_CHANNEL_MIN_AUTO_CKB_AMOUNT: u64 =
     DEFAULT_MIN_INBOUND_LIQUIDITY + MIN_OCCUPIED_CAPACITY + DEFAULT_MIN_SHUTDOWN_FEE;
 
-/// The locktime expiry delta to forward a tlc, in seconds. 86400 means 1 day.
-pub const DEFAULT_TLC_LOCKTIME_EXPIRY_DELTA: u64 = 86400;
+/// The expiry delta to forward a tlc, in milliseconds, default to 1 day.
+pub const DEFAULT_TLC_EXPIRY_DELTA: u64 = 24 * 60 * 60 * 1000;
 
 /// The minimal value of a tlc. 0 means no minimal value.
 pub const DEFAULT_TLC_MIN_VALUE: u128 = 0;
@@ -119,14 +119,14 @@ pub struct FiberConfig {
     )]
     pub auto_accept_channel_ckb_funding_amount: Option<u64>,
 
-    /// The locktime expiry delta to forward a tlc, in seconds. [default: 86400 (1 day)]
+    /// The expiry delta to forward a tlc, in milliseconds. [default: 86400000 (1 day)]
     #[arg(
-        name = "FIBER_TLC_LOCKTIME_EXPIRY_DELTA",
-        long = "fiber-tlc-locktime-expiry-delta",
+        name = "FIBER_TLC_EXPIRY_DELTA",
+        long = "fiber-tlc-expiry-delta",
         env,
-        help = "The locktime expiry delta to forward a tlc, in seconds. [default: 86400 (1 day)]"
+        help = "The expiry delta to forward a tlc, in milliseconds. [default: 86400000 (1 day)]"
     )]
-    pub tlc_locktime_expiry_delta: Option<u64>,
+    pub tlc_expiry_delta: Option<u64>,
 
     /// The minimal value of a tlc. [default: 0 (no minimal value)]
     #[arg(
@@ -315,9 +315,8 @@ impl FiberConfig {
             .unwrap_or(DEFAULT_CHANNEL_MINIMAL_CKB_AMOUNT)
     }
 
-    pub fn tlc_locktime_expiry_delta(&self) -> u64 {
-        self.tlc_locktime_expiry_delta
-            .unwrap_or(DEFAULT_TLC_LOCKTIME_EXPIRY_DELTA)
+    pub fn tlc_expiry_delta(&self) -> u64 {
+        self.tlc_expiry_delta.unwrap_or(DEFAULT_TLC_EXPIRY_DELTA)
     }
 
     pub fn tlc_min_value(&self) -> u128 {
diff --git a/src/fiber/gen/fiber.rs b/src/fiber/gen/fiber.rs
index 86daaeb17..fdd37535c 100644
--- a/src/fiber/gen/fiber.rs
+++ b/src/fiber/gen/fiber.rs
@@ -13510,12 +13510,7 @@ impl ::core::fmt::Display for ChannelUpdate {
         write!(f, ", {}: {}", "timestamp", self.timestamp())?;
         write!(f, ", {}: {}", "message_flags", self.message_flags())?;
         write!(f, ", {}: {}", "channel_flags", self.channel_flags())?;
-        write!(
-            f,
-            ", {}: {}",
-            "tlc_locktime_expiry_delta",
-            self.tlc_locktime_expiry_delta()
-        )?;
+        write!(f, ", {}: {}", "tlc_expiry_delta", self.tlc_expiry_delta())?;
         write!(f, ", {}: {}", "tlc_minimum_value", self.tlc_minimum_value())?;
         write!(f, ", {}: {}", "tlc_maximum_value", self.tlc_maximum_value())?;
         write!(
@@ -13600,7 +13595,7 @@ impl ChannelUpdate {
         let end = molecule::unpack_number(&slice[28..]) as usize;
         Uint32::new_unchecked(self.0.slice(start..end))
     }
-    pub fn tlc_locktime_expiry_delta(&self) -> Uint64 {
+    pub fn tlc_expiry_delta(&self) -> Uint64 {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[28..]) as usize;
         let end = molecule::unpack_number(&slice[32..]) as usize;
@@ -13661,7 +13656,7 @@ impl molecule::prelude::Entity for ChannelUpdate {
             .timestamp(self.timestamp())
             .message_flags(self.message_flags())
             .channel_flags(self.channel_flags())
-            .tlc_locktime_expiry_delta(self.tlc_locktime_expiry_delta())
+            .tlc_expiry_delta(self.tlc_expiry_delta())
             .tlc_minimum_value(self.tlc_minimum_value())
             .tlc_maximum_value(self.tlc_maximum_value())
             .tlc_fee_proportional_millionths(self.tlc_fee_proportional_millionths())
@@ -13692,12 +13687,7 @@ impl<'r> ::core::fmt::Display for ChannelUpdateReader<'r> {
         write!(f, ", {}: {}", "timestamp", self.timestamp())?;
         write!(f, ", {}: {}", "message_flags", self.message_flags())?;
         write!(f, ", {}: {}", "channel_flags", self.channel_flags())?;
-        write!(
-            f,
-            ", {}: {}",
-            "tlc_locktime_expiry_delta",
-            self.tlc_locktime_expiry_delta()
-        )?;
+        write!(f, ", {}: {}", "tlc_expiry_delta", self.tlc_expiry_delta())?;
         write!(f, ", {}: {}", "tlc_minimum_value", self.tlc_minimum_value())?;
         write!(f, ", {}: {}", "tlc_maximum_value", self.tlc_maximum_value())?;
         write!(
@@ -13767,7 +13757,7 @@ impl<'r> ChannelUpdateReader<'r> {
         let end = molecule::unpack_number(&slice[28..]) as usize;
         Uint32Reader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn tlc_locktime_expiry_delta(&self) -> Uint64Reader<'r> {
+    pub fn tlc_expiry_delta(&self) -> Uint64Reader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[28..]) as usize;
         let end = molecule::unpack_number(&slice[32..]) as usize;
@@ -13863,7 +13853,7 @@ pub struct ChannelUpdateBuilder {
     pub(crate) timestamp: Uint64,
     pub(crate) message_flags: Uint32,
     pub(crate) channel_flags: Uint32,
-    pub(crate) tlc_locktime_expiry_delta: Uint64,
+    pub(crate) tlc_expiry_delta: Uint64,
     pub(crate) tlc_minimum_value: Uint128,
     pub(crate) tlc_maximum_value: Uint128,
     pub(crate) tlc_fee_proportional_millionths: Uint128,
@@ -13894,8 +13884,8 @@ impl ChannelUpdateBuilder {
         self.channel_flags = v;
         self
     }
-    pub fn tlc_locktime_expiry_delta(mut self, v: Uint64) -> Self {
-        self.tlc_locktime_expiry_delta = v;
+    pub fn tlc_expiry_delta(mut self, v: Uint64) -> Self {
+        self.tlc_expiry_delta = v;
         self
     }
     pub fn tlc_minimum_value(mut self, v: Uint128) -> Self {
@@ -13922,7 +13912,7 @@ impl molecule::prelude::Builder for ChannelUpdateBuilder {
             + self.timestamp.as_slice().len()
             + self.message_flags.as_slice().len()
             + self.channel_flags.as_slice().len()
-            + self.tlc_locktime_expiry_delta.as_slice().len()
+            + self.tlc_expiry_delta.as_slice().len()
             + self.tlc_minimum_value.as_slice().len()
             + self.tlc_maximum_value.as_slice().len()
             + self.tlc_fee_proportional_millionths.as_slice().len()
@@ -13943,7 +13933,7 @@ impl molecule::prelude::Builder for ChannelUpdateBuilder {
         offsets.push(total_size);
         total_size += self.channel_flags.as_slice().len();
         offsets.push(total_size);
-        total_size += self.tlc_locktime_expiry_delta.as_slice().len();
+        total_size += self.tlc_expiry_delta.as_slice().len();
         offsets.push(total_size);
         total_size += self.tlc_minimum_value.as_slice().len();
         offsets.push(total_size);
@@ -13960,7 +13950,7 @@ impl molecule::prelude::Builder for ChannelUpdateBuilder {
         writer.write_all(self.timestamp.as_slice())?;
         writer.write_all(self.message_flags.as_slice())?;
         writer.write_all(self.channel_flags.as_slice())?;
-        writer.write_all(self.tlc_locktime_expiry_delta.as_slice())?;
+        writer.write_all(self.tlc_expiry_delta.as_slice())?;
         writer.write_all(self.tlc_minimum_value.as_slice())?;
         writer.write_all(self.tlc_maximum_value.as_slice())?;
         writer.write_all(self.tlc_fee_proportional_millionths.as_slice())?;
diff --git a/src/fiber/graph.rs b/src/fiber/graph.rs
index e22e9628e..ce6a93938 100644
--- a/src/fiber/graph.rs
+++ b/src/fiber/graph.rs
@@ -402,7 +402,7 @@ where
             version: update.version,
             timestamp: std::time::UNIX_EPOCH.elapsed().unwrap().as_millis() as u64,
             enabled: !disabled,
-            htlc_expiry_delta: update.tlc_locktime_expiry_delta,
+            htlc_expiry_delta: update.tlc_expiry_delta,
             htlc_minimum_value: update.tlc_minimum_value,
             htlc_maximum_value: update.tlc_maximum_value,
             fee_rate: update.tlc_fee_proportional_millionths as u64,
diff --git a/src/fiber/network.rs b/src/fiber/network.rs
index f6aceaddf..e43158945 100644
--- a/src/fiber/network.rs
+++ b/src/fiber/network.rs
@@ -146,7 +146,7 @@ pub struct NodeInfoResponse {
     pub chain_hash: Hash256,
     pub open_channel_auto_accept_min_ckb_funding_amount: u64,
     pub auto_accept_channel_ckb_funding_amount: u64,
-    pub tlc_locktime_expiry_delta: u64,
+    pub tlc_expiry_delta: u64,
     pub tlc_min_value: u128,
     pub tlc_max_value: u128,
     pub tlc_fee_proportional_millionths: u128,
@@ -259,7 +259,7 @@ pub struct OpenChannelCommand {
     pub commitment_fee_rate: Option<u64>,
     pub commitment_delay_epoch: Option<EpochNumberWithFraction>,
     pub funding_fee_rate: Option<u64>,
-    pub tlc_locktime_expiry_delta: Option<u64>,
+    pub tlc_expiry_delta: Option<u64>,
     pub tlc_min_value: Option<u128>,
     pub tlc_max_value: Option<u128>,
     pub tlc_fee_proportional_millionths: Option<u128>,
@@ -279,7 +279,7 @@ pub struct SendPaymentCommand {
     pub payment_hash: Option<Hash256>,
     // the encoded invoice to send to the recipient
     pub invoice: Option<String>,
-    // The CLTV delta from the current height that should be used to set the timelock for the final hop
+    // The htlc expiry delta that should be used to set the timelock for the final hop
     pub final_htlc_expiry_delta: Option<u64>,
     // the payment timeout in seconds, if the payment is not completed within this time, it will be cancelled
     pub timeout: Option<u64>,
@@ -1798,7 +1798,7 @@ where
                         .open_channel_auto_accept_min_ckb_funding_amount,
                     auto_accept_channel_ckb_funding_amount: state
                         .auto_accept_channel_ckb_funding_amount,
-                    tlc_locktime_expiry_delta: state.tlc_locktime_expiry_delta,
+                    tlc_expiry_delta: state.tlc_expiry_delta,
                     tlc_min_value: state.tlc_min_value,
                     tlc_max_value: state.tlc_max_value,
                     tlc_fee_proportional_millionths: state.tlc_fee_proportional_millionths,
@@ -2555,8 +2555,8 @@ pub struct NetworkActorState<S> {
     open_channel_auto_accept_min_ckb_funding_amount: u64,
     // Tha default amount of CKB to be funded when auto accepting a channel.
     auto_accept_channel_ckb_funding_amount: u64,
-    // The default locktime expiry delta to forward tlcs.
-    tlc_locktime_expiry_delta: u64,
+    // The default expiry delta to forward tlcs.
+    tlc_expiry_delta: u64,
     // The default tlc min and max value of tlcs to be accepted.
     tlc_min_value: u128,
     tlc_max_value: u128,
@@ -2861,7 +2861,7 @@ where
             commitment_fee_rate,
             commitment_delay_epoch,
             funding_fee_rate,
-            tlc_locktime_expiry_delta,
+            tlc_expiry_delta,
             tlc_min_value,
             tlc_max_value,
             tlc_fee_proportional_millionths,
@@ -2900,7 +2900,7 @@ where
                 funding_amount,
                 seed,
                 public_channel_info: public.then_some(PublicChannelInfo::new(
-                    tlc_locktime_expiry_delta.unwrap_or(self.tlc_locktime_expiry_delta),
+                    tlc_expiry_delta.unwrap_or(self.tlc_expiry_delta),
                     tlc_min_value.unwrap_or(self.tlc_min_value),
                     tlc_max_value.unwrap_or(self.tlc_max_value),
                     tlc_fee_proportional_millionths.unwrap_or(self.tlc_fee_proportional_millionths),
@@ -2977,7 +2977,7 @@ where
                 funding_amount,
                 reserved_ckb_amount,
                 public_channel_info: open_channel.is_public().then_some(PublicChannelInfo::new(
-                    self.tlc_locktime_expiry_delta,
+                    self.tlc_expiry_delta,
                     self.tlc_min_value,
                     self.tlc_max_value,
                     self.tlc_fee_proportional_millionths,
@@ -3950,7 +3950,7 @@ where
             open_channel_auto_accept_min_ckb_funding_amount: config
                 .open_channel_auto_accept_min_ckb_funding_amount(),
             auto_accept_channel_ckb_funding_amount: config.auto_accept_channel_ckb_funding_amount(),
-            tlc_locktime_expiry_delta: config.tlc_locktime_expiry_delta(),
+            tlc_expiry_delta: config.tlc_expiry_delta(),
             tlc_min_value: config.tlc_min_value(),
             tlc_max_value: config.tlc_max_value(),
             tlc_fee_proportional_millionths: config.tlc_fee_proportional_millionths(),
diff --git a/src/fiber/schema/fiber.mol b/src/fiber/schema/fiber.mol
index d1a6f3292..8517d7396 100644
--- a/src/fiber/schema/fiber.mol
+++ b/src/fiber/schema/fiber.mol
@@ -234,7 +234,7 @@ table ChannelUpdate {
     timestamp: Uint64,
     message_flags: Uint32,
     channel_flags: Uint32,
-    tlc_locktime_expiry_delta: Uint64,
+    tlc_expiry_delta: Uint64,
     tlc_minimum_value: Uint128,
     tlc_maximum_value: Uint128,
     tlc_fee_proportional_millionths: Uint128,
diff --git a/src/fiber/tests/channel.rs b/src/fiber/tests/channel.rs
index fb16df90b..060a02736 100644
--- a/src/fiber/tests/channel.rs
+++ b/src/fiber/tests/channel.rs
@@ -61,7 +61,7 @@ async fn test_open_channel_to_peer() {
                 commitment_fee_rate: None,
                 commitment_delay_epoch: None,
                 funding_fee_rate: None,
-                tlc_locktime_expiry_delta: None,
+                tlc_expiry_delta: None,
                 tlc_min_value: None,
                 tlc_max_value: None,
                 tlc_fee_proportional_millionths: None,
@@ -102,7 +102,7 @@ async fn test_open_and_accept_channel() {
                 commitment_fee_rate: None,
                 commitment_delay_epoch: None,
                 funding_fee_rate: None,
-                tlc_locktime_expiry_delta: None,
+                tlc_expiry_delta: None,
                 tlc_min_value: None,
                 tlc_max_value: None,
                 tlc_fee_proportional_millionths: None,
@@ -201,7 +201,7 @@ async fn do_test_channel_commitment_tx_after_add_tlc(algorithm: HashAlgorithm) {
                 commitment_fee_rate: None,
                 commitment_delay_epoch: None,
                 funding_fee_rate: None,
-                tlc_locktime_expiry_delta: None,
+                tlc_expiry_delta: None,
                 tlc_min_value: None,
                 tlc_max_value: None,
                 tlc_fee_proportional_millionths: None,
@@ -392,7 +392,7 @@ async fn create_nodes_with_established_channel(
                 commitment_fee_rate: None,
                 commitment_delay_epoch: None,
                 funding_fee_rate: None,
-                tlc_locktime_expiry_delta: None,
+                tlc_expiry_delta: None,
                 tlc_min_value: None,
                 tlc_max_value: None,
                 tlc_fee_proportional_millionths: None,
@@ -730,7 +730,7 @@ async fn test_open_channel_with_invalid_ckb_amount_range() {
                 commitment_fee_rate: None,
                 commitment_delay_epoch: None,
                 funding_fee_rate: None,
-                tlc_locktime_expiry_delta: None,
+                tlc_expiry_delta: None,
                 tlc_min_value: None,
                 tlc_max_value: None,
                 tlc_fee_proportional_millionths: None,
@@ -765,7 +765,7 @@ async fn test_revoke_old_commitment_transaction() {
                 commitment_fee_rate: None,
                 commitment_delay_epoch: None,
                 funding_fee_rate: None,
-                tlc_locktime_expiry_delta: None,
+                tlc_expiry_delta: None,
                 tlc_min_value: None,
                 tlc_max_value: None,
                 tlc_fee_proportional_millionths: None,
@@ -943,7 +943,7 @@ async fn test_create_channel() {
                 commitment_fee_rate: None,
                 commitment_delay_epoch: None,
                 funding_fee_rate: None,
-                tlc_locktime_expiry_delta: None,
+                tlc_expiry_delta: None,
                 tlc_min_value: None,
                 tlc_max_value: None,
                 tlc_fee_proportional_millionths: None,
@@ -1068,7 +1068,7 @@ async fn test_reestablish_channel() {
                 commitment_fee_rate: None,
                 commitment_delay_epoch: None,
                 funding_fee_rate: None,
-                tlc_locktime_expiry_delta: None,
+                tlc_expiry_delta: None,
                 tlc_min_value: None,
                 tlc_max_value: None,
                 tlc_fee_proportional_millionths: None,
diff --git a/src/fiber/tests/graph.rs b/src/fiber/tests/graph.rs
index 30bbaa9f7..b0cc65342 100644
--- a/src/fiber/tests/graph.rs
+++ b/src/fiber/tests/graph.rs
@@ -125,7 +125,7 @@ impl MockNetworkGraph {
             version: 0,
             message_flags: 1,
             channel_flags: 0,
-            tlc_locktime_expiry_delta: 144,
+            tlc_expiry_delta: 144,
             tlc_fee_proportional_millionths: fee_rate.unwrap_or(0),
             tlc_maximum_value: max_htlc_value.unwrap_or(10000),
             tlc_minimum_value: min_htlc_value.unwrap_or(0),
diff --git a/src/fiber/types.rs b/src/fiber/types.rs
index 1b198f293..6daa701c5 100644
--- a/src/fiber/types.rs
+++ b/src/fiber/types.rs
@@ -13,7 +13,7 @@ use super::serde_utils::{EntityHex, SliceHex};
 use anyhow::anyhow;
 use ckb_types::{
     core::FeeRate,
-    packed::{Byte32 as MByte32, BytesVec, Script, Transaction, OutPoint},
+    packed::{Byte32 as MByte32, BytesVec, OutPoint, Script, Transaction},
     prelude::{Pack, Unpack},
 };
 use core::fmt::{self, Formatter};
@@ -1881,7 +1881,7 @@ pub struct ChannelUpdate {
     // Currently only the first bit is used to indicate if the channel is disabled.
     // If the first bit is set, the channel is disabled.
     pub channel_flags: u32,
-    pub tlc_locktime_expiry_delta: u64,
+    pub tlc_expiry_delta: u64,
     pub tlc_minimum_value: u128,
     pub tlc_maximum_value: u128,
     pub tlc_fee_proportional_millionths: u128,
@@ -1894,7 +1894,7 @@ impl ChannelUpdate {
         timestamp: u64,
         message_flags: u32,
         channel_flags: u32,
-        tlc_locktime_expiry_delta: u64,
+        tlc_expiry_delta: u64,
         tlc_minimum_value: u128,
         tlc_maximum_value: u128,
         tlc_fee_proportional_millionths: u128,
@@ -1906,7 +1906,7 @@ impl ChannelUpdate {
             version: timestamp,
             message_flags,
             channel_flags,
-            tlc_locktime_expiry_delta,
+            tlc_expiry_delta,
             tlc_minimum_value,
             tlc_maximum_value,
             tlc_fee_proportional_millionths,
@@ -1921,7 +1921,7 @@ impl ChannelUpdate {
             version: self.version,
             message_flags: self.message_flags,
             channel_flags: self.channel_flags,
-            tlc_locktime_expiry_delta: self.tlc_locktime_expiry_delta,
+            tlc_expiry_delta: self.tlc_expiry_delta,
             tlc_minimum_value: self.tlc_minimum_value,
             tlc_maximum_value: self.tlc_maximum_value,
             tlc_fee_proportional_millionths: self.tlc_fee_proportional_millionths,
@@ -1944,7 +1944,7 @@ impl From<ChannelUpdate> for molecule_fiber::ChannelUpdate {
             .timestamp(channel_update.version.pack())
             .message_flags(channel_update.message_flags.pack())
             .channel_flags(channel_update.channel_flags.pack())
-            .tlc_locktime_expiry_delta(channel_update.tlc_locktime_expiry_delta.pack())
+            .tlc_expiry_delta(channel_update.tlc_expiry_delta.pack())
             .tlc_minimum_value(channel_update.tlc_minimum_value.pack())
             .tlc_maximum_value(channel_update.tlc_maximum_value.pack())
             .tlc_fee_proportional_millionths(channel_update.tlc_fee_proportional_millionths.pack())
@@ -1963,7 +1963,7 @@ impl TryFrom<molecule_fiber::ChannelUpdate> for ChannelUpdate {
             version: channel_update.timestamp().unpack(),
             message_flags: channel_update.message_flags().unpack(),
             channel_flags: channel_update.channel_flags().unpack(),
-            tlc_locktime_expiry_delta: channel_update.tlc_locktime_expiry_delta().unpack(),
+            tlc_expiry_delta: channel_update.tlc_expiry_delta().unpack(),
             tlc_minimum_value: channel_update.tlc_minimum_value().unpack(),
             tlc_maximum_value: channel_update.tlc_maximum_value().unpack(),
             tlc_fee_proportional_millionths: channel_update
diff --git a/src/invoice/command.rs b/src/invoice/command.rs
index fc79fcb81..c52673e5d 100644
--- a/src/invoice/command.rs
+++ b/src/invoice/command.rs
@@ -27,5 +27,4 @@ pub struct NewInvoiceParams {
     pub expiry: Option<u64>,
     pub fallback_address: Option<String>,
     pub final_cltv: Option<u64>,
-    pub final_htlc_timeout: Option<u64>,
 }
diff --git a/src/invoice/invoice_impl.rs b/src/invoice/invoice_impl.rs
index 535df5a83..4c84f953b 100644
--- a/src/invoice/invoice_impl.rs
+++ b/src/invoice/invoice_impl.rs
@@ -291,7 +291,6 @@ impl CkbInvoice {
     attr_getter!(payee_pub_key, PayeePublicKey, PublicKey);
     attr_getter!(expiry_time, ExpiryTime, Duration);
     attr_getter!(description, Description, String);
-    attr_getter!(final_htlc_timeout, FinalHtlcTimeout, u64);
     attr_getter!(
         final_htlc_minimum_cltv_expiry,
         FinalHtlcMinimumCltvExpiry,
diff --git a/src/rpc/README.md b/src/rpc/README.md
index 2c958b423..a5688af1f 100644
--- a/src/rpc/README.md
+++ b/src/rpc/README.md
@@ -74,7 +74,7 @@ Attempts to open a channel with a peer.
 * `commitment_fee_rate` - The fee rate for the commitment transaction, an optional parameter
 * `commitment_delay_epoch` - The delay time for the commitment transaction, must be an [EpochNumberWithFraction](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0017-tx-valid-since/e-i-l-encoding.png) in u64 format, an optional parameter, default value is 24 hours
 * `funding_fee_rate` - The fee rate for the funding transaction, an optional parameter
-* `tlc_locktime_expiry_delta` - The expiry delta for the TLC locktime, an optional parameter
+* `tlc_expiry_delta` - The expiry delta for the TLC, timestamp in milliseconds, an optional parameter, default value is 24 hours
 * `tlc_min_value` - The minimum value for a TLC, an optional parameter
 * `tlc_max_value` - The maximum value for a TLC, an optional parameter
 * `tlc_fee_proportional_millionths` - The fee proportional millionths for a TLC, an optional parameter
@@ -364,7 +364,7 @@ Returns a struct with these fields:
 * `chain_hash`: The hash of the blockchain that the node is connected to.
 * `open_channel_auto_accept_min_ckb_funding_amount`: The minimum CKB funding amount for automatically accepting open channel requests, serialized as a hexadecimal string.
 * `auto_accept_channel_ckb_funding_amount`: The CKB funding amount for automatically accepting channel requests, serialized as a hexadecimal string.
-* `tlc_locktime_expiry_delta`: The locktime expiry delta for Time-Locked Contracts (TLC), serialized as a hexadecimal string.
+* `tlc_expiry_delta`: The expiry delta for Time-Locked Contracts (TLC), serialized as a hexadecimal string.
 * `tlc_min_value`: The minimum value for Time-Locked Contracts (TLC), serialized as a hexadecimal string, `0` means no minimum value limit.
 * `tlc_max_value`: The maximum value for Time-Locked Contracts (TLC), serialized as a hexadecimal string, `0` means no maximum value limit.
 * `tlc_fee_proportional_millionths`: The fee proportional to the value of Time-Locked Contracts (TLC), expressed in millionths and serialized as a hexadecimal string.
diff --git a/src/rpc/channel.rs b/src/rpc/channel.rs
index 347f10d1a..3955b10cd 100644
--- a/src/rpc/channel.rs
+++ b/src/rpc/channel.rs
@@ -41,7 +41,7 @@ pub(crate) struct OpenChannelParams {
     #[serde_as(as = "Option<U64Hex>")]
     funding_fee_rate: Option<u64>,
     #[serde_as(as = "Option<U64Hex>")]
-    tlc_locktime_expiry_delta: Option<u64>,
+    tlc_expiry_delta: Option<u64>,
     #[serde_as(as = "Option<U128Hex>")]
     tlc_min_value: Option<u128>,
     #[serde_as(as = "Option<U128Hex>")]
@@ -163,7 +163,7 @@ pub struct UpdateChannelParams {
     channel_id: Hash256,
     enabled: Option<bool>,
     #[serde_as(as = "Option<U64Hex>")]
-    tlc_locktime_expiry_delta: Option<u64>,
+    tlc_expiry_delta: Option<u64>,
     #[serde_as(as = "Option<U128Hex>")]
     tlc_minimum_value: Option<u128>,
     #[serde_as(as = "Option<U128Hex>")]
@@ -322,7 +322,7 @@ where
                         .map(|s| s.into()),
                     commitment_fee_rate: params.commitment_fee_rate,
                     funding_fee_rate: params.funding_fee_rate,
-                    tlc_locktime_expiry_delta: params.tlc_locktime_expiry_delta,
+                    tlc_expiry_delta: params.tlc_expiry_delta,
                     tlc_min_value: params.tlc_min_value,
                     tlc_max_value: params.tlc_max_value,
                     tlc_fee_proportional_millionths: params.tlc_fee_proportional_millionths,
@@ -501,7 +501,7 @@ where
                     command: ChannelCommand::Update(
                         UpdateCommand {
                             enabled: params.enabled,
-                            tlc_locktime_expiry_delta: params.tlc_locktime_expiry_delta,
+                            tlc_expiry_delta: params.tlc_expiry_delta,
                             tlc_minimum_value: params.tlc_minimum_value,
                             tlc_maximum_value: params.tlc_maximum_value,
                             tlc_fee_proportional_millionths: params.tlc_fee_proportional_millionths,
diff --git a/src/rpc/info.rs b/src/rpc/info.rs
index d0959cc03..42fcce63a 100644
--- a/src/rpc/info.rs
+++ b/src/rpc/info.rs
@@ -34,7 +34,7 @@ pub(crate) struct NodeInfoResult {
     #[serde_as(as = "U64Hex")]
     auto_accept_channel_ckb_funding_amount: u64,
     #[serde_as(as = "U64Hex")]
-    tlc_locktime_expiry_delta: u64,
+    tlc_expiry_delta: u64,
     #[serde_as(as = "U128Hex")]
     tlc_min_value: u128,
     #[serde_as(as = "U128Hex")]
@@ -91,7 +91,7 @@ where
             open_channel_auto_accept_min_ckb_funding_amount: response
                 .open_channel_auto_accept_min_ckb_funding_amount,
             auto_accept_channel_ckb_funding_amount: response.auto_accept_channel_ckb_funding_amount,
-            tlc_locktime_expiry_delta: response.tlc_locktime_expiry_delta,
+            tlc_expiry_delta: response.tlc_expiry_delta,
             tlc_min_value: response.tlc_min_value,
             tlc_max_value: response.tlc_max_value,
             tlc_fee_proportional_millionths: response.tlc_fee_proportional_millionths,
diff --git a/src/rpc/invoice.rs b/src/rpc/invoice.rs
index b20b0c530..86cb47d98 100644
--- a/src/rpc/invoice.rs
+++ b/src/rpc/invoice.rs
@@ -25,8 +25,6 @@ pub(crate) struct NewInvoiceParams {
     fallback_address: Option<String>,
     #[serde_as(as = "Option<U64Hex>")]
     final_cltv: Option<u64>,
-    #[serde_as(as = "Option<U64Hex>")]
-    final_htlc_timeout: Option<u64>,
     udt_type_script: Option<Script>,
     hash_algorithm: Option<HashAlgorithm>,
 }

From 90e49f2bb8eda637bacf6ac67b8cefde3bda3254 Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Wed, 30 Oct 2024 15:26:56 +0900
Subject: [PATCH 07/31] chore: rename cltv

---
 src/cch/actor.rs                              |   4 +-
 src/cch/order.rs                              |   8 +-
 src/fiber/gen/invoice.rs                      | 114 +++++++++---------
 src/fiber/schema/invoice.mol                  |   4 +-
 src/fiber/types.rs                            |   8 +-
 src/invoice/command.rs                        |   2 +-
 src/invoice/invoice_impl.rs                   |  18 +--
 src/invoice/tests/invoice_impl.rs             |  12 +-
 src/rpc/README.md                             |   2 +-
 src/rpc/cch.rs                                |   8 +-
 src/rpc/invoice.rs                            |   6 +-
 .../3-nodes-transfer/11-node3-gen-invoice.bru |   2 +-
 .../3-nodes-transfer/16-node3-gen-invoice.bru |   2 +-
 tests/bruno/e2e/invoice-ops/1-gen-invoice.bru |   2 +-
 .../invoice-ops/2-gen-invoice-duplicate.bru   |   2 +-
 .../e2e/router-pay/11-node3-gen-invoice.bru   |   2 +-
 .../router-pay/14-node3-gen-invoice-later.bru |   2 +-
 .../22-node3-gen-expiring-invoice.bru         |   2 +-
 .../udt-router-pay/11-node3-gen-invoice.bru   |   2 +-
 .../13-node3-gen-invoice-later.bru            |   2 +-
 tests/bruno/e2e/udt/07-node2-gen-invoice.bru  |   2 +-
 21 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/src/cch/actor.rs b/src/cch/actor.rs
index 3cd1115be..46e892218 100644
--- a/src/cch/actor.rs
+++ b/src/cch/actor.rs
@@ -312,7 +312,7 @@ impl CchActor {
             fee_sats,
             currency: send_btc.currency,
             created_at: duration_since_epoch.as_secs(),
-            ckb_final_tlc_expiry: self.config.ckb_final_tlc_expiry_delta,
+            ckb_final_tlc_expiry_delta: self.config.ckb_final_tlc_expiry_delta,
             btc_pay_req: send_btc.btc_pay_req,
             ckb_pay_req: Default::default(),
             payment_hash: format!("0x{}", invoice.payment_hash().encode_hex::<String>()),
@@ -534,7 +534,7 @@ impl CchActor {
         let order = ReceiveBTCOrder {
             created_at: duration_since_epoch.as_secs(),
             expires_after: DEFAULT_ORDER_EXPIRY_SECONDS,
-            ckb_final_tlc_expiry: receive_btc.final_tlc_expiry,
+            ckb_final_tlc_expiry_delta: receive_btc.final_tlc_expiry,
             btc_pay_req,
             payment_hash: receive_btc.payment_hash.clone(),
             payment_preimage: None,
diff --git a/src/cch/order.rs b/src/cch/order.rs
index 3ddd39395..c2c45b207 100644
--- a/src/cch/order.rs
+++ b/src/cch/order.rs
@@ -62,9 +62,9 @@ pub struct SendBTCOrder {
     // Seconds after timestamp that the order expires
     #[serde_as(as = "U64Hex")]
     pub expires_after: u64,
-    // The minimal expiry in seconds of the final TLC in the CKB network
+    // The minimal expiry delta in milliseconds of the final TLC hop in the CKB network
     #[serde_as(as = "U64Hex")]
-    pub ckb_final_tlc_expiry: u64,
+    pub ckb_final_tlc_expiry_delta: u64,
 
     pub currency: Currency,
     pub wrapped_btc_type_script: ckb_jsonrpc_types::Script,
@@ -95,7 +95,7 @@ impl SendBTCOrder {
                     .map_err(|_| CchError::HexDecodingError(self.payment_hash.clone()))?,
             )
             .expiry_time(Duration::from_secs(self.expires_after))
-            .final_cltv(self.ckb_final_tlc_expiry)
+            .final_expiry_delta(self.ckb_final_tlc_expiry_delta)
             .udt_type_script(self.wrapped_btc_type_script.clone().into());
 
         let invoice = invoice_builder.build()?;
@@ -116,7 +116,7 @@ pub struct ReceiveBTCOrder {
     pub expires_after: u64,
     // The minimal expiry in seconds of the final TLC in the CKB network
     #[serde_as(as = "U64Hex")]
-    pub ckb_final_tlc_expiry: u64,
+    pub ckb_final_tlc_expiry_delta: u64,
 
     pub wrapped_btc_type_script: ckb_jsonrpc_types::Script,
 
diff --git a/src/fiber/gen/invoice.rs b/src/fiber/gen/invoice.rs
index 7995faffb..727e4f9ee 100644
--- a/src/fiber/gen/invoice.rs
+++ b/src/fiber/gen/invoice.rs
@@ -3315,8 +3315,8 @@ impl molecule::prelude::Builder for FinalHtlcTimeoutBuilder {
     }
 }
 #[derive(Clone)]
-pub struct FinalHtlcMinimumCltvExpiry(molecule::bytes::Bytes);
-impl ::core::fmt::LowerHex for FinalHtlcMinimumCltvExpiry {
+pub struct FinalHtlcMinimumExpiryDelta(molecule::bytes::Bytes);
+impl ::core::fmt::LowerHex for FinalHtlcMinimumExpiryDelta {
     fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
         use molecule::hex_string;
         if f.alternate() {
@@ -3325,25 +3325,25 @@ impl ::core::fmt::LowerHex for FinalHtlcMinimumCltvExpiry {
         write!(f, "{}", hex_string(self.as_slice()))
     }
 }
-impl ::core::fmt::Debug for FinalHtlcMinimumCltvExpiry {
+impl ::core::fmt::Debug for FinalHtlcMinimumExpiryDelta {
     fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
         write!(f, "{}({:#x})", Self::NAME, self)
     }
 }
-impl ::core::fmt::Display for FinalHtlcMinimumCltvExpiry {
+impl ::core::fmt::Display for FinalHtlcMinimumExpiryDelta {
     fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
         write!(f, "{} {{ ", Self::NAME)?;
         write!(f, "{}: {}", "value", self.value())?;
         write!(f, " }}")
     }
 }
-impl ::core::default::Default for FinalHtlcMinimumCltvExpiry {
+impl ::core::default::Default for FinalHtlcMinimumExpiryDelta {
     fn default() -> Self {
         let v = molecule::bytes::Bytes::from_static(&Self::DEFAULT_VALUE);
-        FinalHtlcMinimumCltvExpiry::new_unchecked(v)
+        FinalHtlcMinimumExpiryDelta::new_unchecked(v)
     }
 }
-impl FinalHtlcMinimumCltvExpiry {
+impl FinalHtlcMinimumExpiryDelta {
     const DEFAULT_VALUE: [u8; 8] = [0, 0, 0, 0, 0, 0, 0, 0];
     pub const TOTAL_SIZE: usize = 8;
     pub const FIELD_SIZES: [usize; 1] = [8];
@@ -3351,15 +3351,15 @@ impl FinalHtlcMinimumCltvExpiry {
     pub fn value(&self) -> Uint64 {
         Uint64::new_unchecked(self.0.slice(0..8))
     }
-    pub fn as_reader<'r>(&'r self) -> FinalHtlcMinimumCltvExpiryReader<'r> {
-        FinalHtlcMinimumCltvExpiryReader::new_unchecked(self.as_slice())
+    pub fn as_reader<'r>(&'r self) -> FinalHtlcMinimumExpiryDeltaReader<'r> {
+        FinalHtlcMinimumExpiryDeltaReader::new_unchecked(self.as_slice())
     }
 }
-impl molecule::prelude::Entity for FinalHtlcMinimumCltvExpiry {
-    type Builder = FinalHtlcMinimumCltvExpiryBuilder;
-    const NAME: &'static str = "FinalHtlcMinimumCltvExpiry";
+impl molecule::prelude::Entity for FinalHtlcMinimumExpiryDelta {
+    type Builder = FinalHtlcMinimumExpiryDeltaBuilder;
+    const NAME: &'static str = "FinalHtlcMinimumExpiryDelta";
     fn new_unchecked(data: molecule::bytes::Bytes) -> Self {
-        FinalHtlcMinimumCltvExpiry(data)
+        FinalHtlcMinimumExpiryDelta(data)
     }
     fn as_bytes(&self) -> molecule::bytes::Bytes {
         self.0.clone()
@@ -3368,10 +3368,10 @@ impl molecule::prelude::Entity for FinalHtlcMinimumCltvExpiry {
         &self.0[..]
     }
     fn from_slice(slice: &[u8]) -> molecule::error::VerificationResult<Self> {
-        FinalHtlcMinimumCltvExpiryReader::from_slice(slice).map(|reader| reader.to_entity())
+        FinalHtlcMinimumExpiryDeltaReader::from_slice(slice).map(|reader| reader.to_entity())
     }
     fn from_compatible_slice(slice: &[u8]) -> molecule::error::VerificationResult<Self> {
-        FinalHtlcMinimumCltvExpiryReader::from_compatible_slice(slice)
+        FinalHtlcMinimumExpiryDeltaReader::from_compatible_slice(slice)
             .map(|reader| reader.to_entity())
     }
     fn new_builder() -> Self::Builder {
@@ -3382,8 +3382,8 @@ impl molecule::prelude::Entity for FinalHtlcMinimumCltvExpiry {
     }
 }
 #[derive(Clone, Copy)]
-pub struct FinalHtlcMinimumCltvExpiryReader<'r>(&'r [u8]);
-impl<'r> ::core::fmt::LowerHex for FinalHtlcMinimumCltvExpiryReader<'r> {
+pub struct FinalHtlcMinimumExpiryDeltaReader<'r>(&'r [u8]);
+impl<'r> ::core::fmt::LowerHex for FinalHtlcMinimumExpiryDeltaReader<'r> {
     fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
         use molecule::hex_string;
         if f.alternate() {
@@ -3392,19 +3392,19 @@ impl<'r> ::core::fmt::LowerHex for FinalHtlcMinimumCltvExpiryReader<'r> {
         write!(f, "{}", hex_string(self.as_slice()))
     }
 }
-impl<'r> ::core::fmt::Debug for FinalHtlcMinimumCltvExpiryReader<'r> {
+impl<'r> ::core::fmt::Debug for FinalHtlcMinimumExpiryDeltaReader<'r> {
     fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
         write!(f, "{}({:#x})", Self::NAME, self)
     }
 }
-impl<'r> ::core::fmt::Display for FinalHtlcMinimumCltvExpiryReader<'r> {
+impl<'r> ::core::fmt::Display for FinalHtlcMinimumExpiryDeltaReader<'r> {
     fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
         write!(f, "{} {{ ", Self::NAME)?;
         write!(f, "{}: {}", "value", self.value())?;
         write!(f, " }}")
     }
 }
-impl<'r> FinalHtlcMinimumCltvExpiryReader<'r> {
+impl<'r> FinalHtlcMinimumExpiryDeltaReader<'r> {
     pub const TOTAL_SIZE: usize = 8;
     pub const FIELD_SIZES: [usize; 1] = [8];
     pub const FIELD_COUNT: usize = 1;
@@ -3412,14 +3412,14 @@ impl<'r> FinalHtlcMinimumCltvExpiryReader<'r> {
         Uint64Reader::new_unchecked(&self.as_slice()[0..8])
     }
 }
-impl<'r> molecule::prelude::Reader<'r> for FinalHtlcMinimumCltvExpiryReader<'r> {
-    type Entity = FinalHtlcMinimumCltvExpiry;
-    const NAME: &'static str = "FinalHtlcMinimumCltvExpiryReader";
+impl<'r> molecule::prelude::Reader<'r> for FinalHtlcMinimumExpiryDeltaReader<'r> {
+    type Entity = FinalHtlcMinimumExpiryDelta;
+    const NAME: &'static str = "FinalHtlcMinimumExpiryDeltaReader";
     fn to_entity(&self) -> Self::Entity {
         Self::Entity::new_unchecked(self.as_slice().to_owned().into())
     }
     fn new_unchecked(slice: &'r [u8]) -> Self {
-        FinalHtlcMinimumCltvExpiryReader(slice)
+        FinalHtlcMinimumExpiryDeltaReader(slice)
     }
     fn as_slice(&self) -> &'r [u8] {
         self.0
@@ -3434,10 +3434,10 @@ impl<'r> molecule::prelude::Reader<'r> for FinalHtlcMinimumCltvExpiryReader<'r>
     }
 }
 #[derive(Clone, Debug, Default)]
-pub struct FinalHtlcMinimumCltvExpiryBuilder {
+pub struct FinalHtlcMinimumExpiryDeltaBuilder {
     pub(crate) value: Uint64,
 }
-impl FinalHtlcMinimumCltvExpiryBuilder {
+impl FinalHtlcMinimumExpiryDeltaBuilder {
     pub const TOTAL_SIZE: usize = 8;
     pub const FIELD_SIZES: [usize; 1] = [8];
     pub const FIELD_COUNT: usize = 1;
@@ -3446,9 +3446,9 @@ impl FinalHtlcMinimumCltvExpiryBuilder {
         self
     }
 }
-impl molecule::prelude::Builder for FinalHtlcMinimumCltvExpiryBuilder {
-    type Entity = FinalHtlcMinimumCltvExpiry;
-    const NAME: &'static str = "FinalHtlcMinimumCltvExpiryBuilder";
+impl molecule::prelude::Builder for FinalHtlcMinimumExpiryDeltaBuilder {
+    type Entity = FinalHtlcMinimumExpiryDelta;
+    const NAME: &'static str = "FinalHtlcMinimumExpiryDeltaBuilder";
     fn expected_length(&self) -> usize {
         Self::TOTAL_SIZE
     }
@@ -3460,7 +3460,7 @@ impl molecule::prelude::Builder for FinalHtlcMinimumCltvExpiryBuilder {
         let mut inner = Vec::with_capacity(self.expected_length());
         self.write(&mut inner)
             .unwrap_or_else(|_| panic!("{} build should be ok", Self::NAME));
-        FinalHtlcMinimumCltvExpiry::new_unchecked(inner.into())
+        FinalHtlcMinimumExpiryDelta::new_unchecked(inner.into())
     }
 }
 #[derive(Clone)]
@@ -4884,7 +4884,7 @@ impl InvoiceAttr {
             0 => ExpiryTime::new_unchecked(inner).into(),
             1 => Description::new_unchecked(inner).into(),
             2 => FinalHtlcTimeout::new_unchecked(inner).into(),
-            3 => FinalHtlcMinimumCltvExpiry::new_unchecked(inner).into(),
+            3 => FinalHtlcMinimumExpiryDelta::new_unchecked(inner).into(),
             4 => FallbackAddr::new_unchecked(inner).into(),
             5 => Feature::new_unchecked(inner).into(),
             6 => UdtScript::new_unchecked(inner).into(),
@@ -4956,7 +4956,7 @@ impl<'r> InvoiceAttrReader<'r> {
             0 => ExpiryTimeReader::new_unchecked(inner).into(),
             1 => DescriptionReader::new_unchecked(inner).into(),
             2 => FinalHtlcTimeoutReader::new_unchecked(inner).into(),
-            3 => FinalHtlcMinimumCltvExpiryReader::new_unchecked(inner).into(),
+            3 => FinalHtlcMinimumExpiryDeltaReader::new_unchecked(inner).into(),
             4 => FallbackAddrReader::new_unchecked(inner).into(),
             5 => FeatureReader::new_unchecked(inner).into(),
             6 => UdtScriptReader::new_unchecked(inner).into(),
@@ -4990,7 +4990,7 @@ impl<'r> molecule::prelude::Reader<'r> for InvoiceAttrReader<'r> {
             0 => ExpiryTimeReader::verify(inner_slice, compatible),
             1 => DescriptionReader::verify(inner_slice, compatible),
             2 => FinalHtlcTimeoutReader::verify(inner_slice, compatible),
-            3 => FinalHtlcMinimumCltvExpiryReader::verify(inner_slice, compatible),
+            3 => FinalHtlcMinimumExpiryDeltaReader::verify(inner_slice, compatible),
             4 => FallbackAddrReader::verify(inner_slice, compatible),
             5 => FeatureReader::verify(inner_slice, compatible),
             6 => UdtScriptReader::verify(inner_slice, compatible),
@@ -5035,7 +5035,7 @@ pub enum InvoiceAttrUnion {
     ExpiryTime(ExpiryTime),
     Description(Description),
     FinalHtlcTimeout(FinalHtlcTimeout),
-    FinalHtlcMinimumCltvExpiry(FinalHtlcMinimumCltvExpiry),
+    FinalHtlcMinimumExpiryDelta(FinalHtlcMinimumExpiryDelta),
     FallbackAddr(FallbackAddr),
     Feature(Feature),
     UdtScript(UdtScript),
@@ -5047,7 +5047,7 @@ pub enum InvoiceAttrUnionReader<'r> {
     ExpiryTime(ExpiryTimeReader<'r>),
     Description(DescriptionReader<'r>),
     FinalHtlcTimeout(FinalHtlcTimeoutReader<'r>),
-    FinalHtlcMinimumCltvExpiry(FinalHtlcMinimumCltvExpiryReader<'r>),
+    FinalHtlcMinimumExpiryDelta(FinalHtlcMinimumExpiryDeltaReader<'r>),
     FallbackAddr(FallbackAddrReader<'r>),
     Feature(FeatureReader<'r>),
     UdtScript(UdtScriptReader<'r>),
@@ -5071,12 +5071,12 @@ impl ::core::fmt::Display for InvoiceAttrUnion {
             InvoiceAttrUnion::FinalHtlcTimeout(ref item) => {
                 write!(f, "{}::{}({})", Self::NAME, FinalHtlcTimeout::NAME, item)
             }
-            InvoiceAttrUnion::FinalHtlcMinimumCltvExpiry(ref item) => {
+            InvoiceAttrUnion::FinalHtlcMinimumExpiryDelta(ref item) => {
                 write!(
                     f,
                     "{}::{}({})",
                     Self::NAME,
-                    FinalHtlcMinimumCltvExpiry::NAME,
+                    FinalHtlcMinimumExpiryDelta::NAME,
                     item
                 )
             }
@@ -5110,12 +5110,12 @@ impl<'r> ::core::fmt::Display for InvoiceAttrUnionReader<'r> {
             InvoiceAttrUnionReader::FinalHtlcTimeout(ref item) => {
                 write!(f, "{}::{}({})", Self::NAME, FinalHtlcTimeout::NAME, item)
             }
-            InvoiceAttrUnionReader::FinalHtlcMinimumCltvExpiry(ref item) => {
+            InvoiceAttrUnionReader::FinalHtlcMinimumExpiryDelta(ref item) => {
                 write!(
                     f,
                     "{}::{}({})",
                     Self::NAME,
-                    FinalHtlcMinimumCltvExpiry::NAME,
+                    FinalHtlcMinimumExpiryDelta::NAME,
                     item
                 )
             }
@@ -5143,7 +5143,7 @@ impl InvoiceAttrUnion {
             InvoiceAttrUnion::ExpiryTime(ref item) => write!(f, "{}", item),
             InvoiceAttrUnion::Description(ref item) => write!(f, "{}", item),
             InvoiceAttrUnion::FinalHtlcTimeout(ref item) => write!(f, "{}", item),
-            InvoiceAttrUnion::FinalHtlcMinimumCltvExpiry(ref item) => write!(f, "{}", item),
+            InvoiceAttrUnion::FinalHtlcMinimumExpiryDelta(ref item) => write!(f, "{}", item),
             InvoiceAttrUnion::FallbackAddr(ref item) => write!(f, "{}", item),
             InvoiceAttrUnion::Feature(ref item) => write!(f, "{}", item),
             InvoiceAttrUnion::UdtScript(ref item) => write!(f, "{}", item),
@@ -5158,7 +5158,7 @@ impl<'r> InvoiceAttrUnionReader<'r> {
             InvoiceAttrUnionReader::ExpiryTime(ref item) => write!(f, "{}", item),
             InvoiceAttrUnionReader::Description(ref item) => write!(f, "{}", item),
             InvoiceAttrUnionReader::FinalHtlcTimeout(ref item) => write!(f, "{}", item),
-            InvoiceAttrUnionReader::FinalHtlcMinimumCltvExpiry(ref item) => write!(f, "{}", item),
+            InvoiceAttrUnionReader::FinalHtlcMinimumExpiryDelta(ref item) => write!(f, "{}", item),
             InvoiceAttrUnionReader::FallbackAddr(ref item) => write!(f, "{}", item),
             InvoiceAttrUnionReader::Feature(ref item) => write!(f, "{}", item),
             InvoiceAttrUnionReader::UdtScript(ref item) => write!(f, "{}", item),
@@ -5182,9 +5182,9 @@ impl ::core::convert::From<FinalHtlcTimeout> for InvoiceAttrUnion {
         InvoiceAttrUnion::FinalHtlcTimeout(item)
     }
 }
-impl ::core::convert::From<FinalHtlcMinimumCltvExpiry> for InvoiceAttrUnion {
-    fn from(item: FinalHtlcMinimumCltvExpiry) -> Self {
-        InvoiceAttrUnion::FinalHtlcMinimumCltvExpiry(item)
+impl ::core::convert::From<FinalHtlcMinimumExpiryDelta> for InvoiceAttrUnion {
+    fn from(item: FinalHtlcMinimumExpiryDelta) -> Self {
+        InvoiceAttrUnion::FinalHtlcMinimumExpiryDelta(item)
     }
 }
 impl ::core::convert::From<FallbackAddr> for InvoiceAttrUnion {
@@ -5227,11 +5227,11 @@ impl<'r> ::core::convert::From<FinalHtlcTimeoutReader<'r>> for InvoiceAttrUnionR
         InvoiceAttrUnionReader::FinalHtlcTimeout(item)
     }
 }
-impl<'r> ::core::convert::From<FinalHtlcMinimumCltvExpiryReader<'r>>
+impl<'r> ::core::convert::From<FinalHtlcMinimumExpiryDeltaReader<'r>>
     for InvoiceAttrUnionReader<'r>
 {
-    fn from(item: FinalHtlcMinimumCltvExpiryReader<'r>) -> Self {
-        InvoiceAttrUnionReader::FinalHtlcMinimumCltvExpiry(item)
+    fn from(item: FinalHtlcMinimumExpiryDeltaReader<'r>) -> Self {
+        InvoiceAttrUnionReader::FinalHtlcMinimumExpiryDelta(item)
     }
 }
 impl<'r> ::core::convert::From<FallbackAddrReader<'r>> for InvoiceAttrUnionReader<'r> {
@@ -5266,7 +5266,7 @@ impl InvoiceAttrUnion {
             InvoiceAttrUnion::ExpiryTime(item) => item.as_bytes(),
             InvoiceAttrUnion::Description(item) => item.as_bytes(),
             InvoiceAttrUnion::FinalHtlcTimeout(item) => item.as_bytes(),
-            InvoiceAttrUnion::FinalHtlcMinimumCltvExpiry(item) => item.as_bytes(),
+            InvoiceAttrUnion::FinalHtlcMinimumExpiryDelta(item) => item.as_bytes(),
             InvoiceAttrUnion::FallbackAddr(item) => item.as_bytes(),
             InvoiceAttrUnion::Feature(item) => item.as_bytes(),
             InvoiceAttrUnion::UdtScript(item) => item.as_bytes(),
@@ -5279,7 +5279,7 @@ impl InvoiceAttrUnion {
             InvoiceAttrUnion::ExpiryTime(item) => item.as_slice(),
             InvoiceAttrUnion::Description(item) => item.as_slice(),
             InvoiceAttrUnion::FinalHtlcTimeout(item) => item.as_slice(),
-            InvoiceAttrUnion::FinalHtlcMinimumCltvExpiry(item) => item.as_slice(),
+            InvoiceAttrUnion::FinalHtlcMinimumExpiryDelta(item) => item.as_slice(),
             InvoiceAttrUnion::FallbackAddr(item) => item.as_slice(),
             InvoiceAttrUnion::Feature(item) => item.as_slice(),
             InvoiceAttrUnion::UdtScript(item) => item.as_slice(),
@@ -5292,7 +5292,7 @@ impl InvoiceAttrUnion {
             InvoiceAttrUnion::ExpiryTime(_) => 0,
             InvoiceAttrUnion::Description(_) => 1,
             InvoiceAttrUnion::FinalHtlcTimeout(_) => 2,
-            InvoiceAttrUnion::FinalHtlcMinimumCltvExpiry(_) => 3,
+            InvoiceAttrUnion::FinalHtlcMinimumExpiryDelta(_) => 3,
             InvoiceAttrUnion::FallbackAddr(_) => 4,
             InvoiceAttrUnion::Feature(_) => 5,
             InvoiceAttrUnion::UdtScript(_) => 6,
@@ -5305,7 +5305,7 @@ impl InvoiceAttrUnion {
             InvoiceAttrUnion::ExpiryTime(_) => "ExpiryTime",
             InvoiceAttrUnion::Description(_) => "Description",
             InvoiceAttrUnion::FinalHtlcTimeout(_) => "FinalHtlcTimeout",
-            InvoiceAttrUnion::FinalHtlcMinimumCltvExpiry(_) => "FinalHtlcMinimumCltvExpiry",
+            InvoiceAttrUnion::FinalHtlcMinimumExpiryDelta(_) => "FinalHtlcMinimumExpiryDelta",
             InvoiceAttrUnion::FallbackAddr(_) => "FallbackAddr",
             InvoiceAttrUnion::Feature(_) => "Feature",
             InvoiceAttrUnion::UdtScript(_) => "UdtScript",
@@ -5318,7 +5318,7 @@ impl InvoiceAttrUnion {
             InvoiceAttrUnion::ExpiryTime(item) => item.as_reader().into(),
             InvoiceAttrUnion::Description(item) => item.as_reader().into(),
             InvoiceAttrUnion::FinalHtlcTimeout(item) => item.as_reader().into(),
-            InvoiceAttrUnion::FinalHtlcMinimumCltvExpiry(item) => item.as_reader().into(),
+            InvoiceAttrUnion::FinalHtlcMinimumExpiryDelta(item) => item.as_reader().into(),
             InvoiceAttrUnion::FallbackAddr(item) => item.as_reader().into(),
             InvoiceAttrUnion::Feature(item) => item.as_reader().into(),
             InvoiceAttrUnion::UdtScript(item) => item.as_reader().into(),
@@ -5334,7 +5334,7 @@ impl<'r> InvoiceAttrUnionReader<'r> {
             InvoiceAttrUnionReader::ExpiryTime(item) => item.as_slice(),
             InvoiceAttrUnionReader::Description(item) => item.as_slice(),
             InvoiceAttrUnionReader::FinalHtlcTimeout(item) => item.as_slice(),
-            InvoiceAttrUnionReader::FinalHtlcMinimumCltvExpiry(item) => item.as_slice(),
+            InvoiceAttrUnionReader::FinalHtlcMinimumExpiryDelta(item) => item.as_slice(),
             InvoiceAttrUnionReader::FallbackAddr(item) => item.as_slice(),
             InvoiceAttrUnionReader::Feature(item) => item.as_slice(),
             InvoiceAttrUnionReader::UdtScript(item) => item.as_slice(),
@@ -5347,7 +5347,7 @@ impl<'r> InvoiceAttrUnionReader<'r> {
             InvoiceAttrUnionReader::ExpiryTime(_) => 0,
             InvoiceAttrUnionReader::Description(_) => 1,
             InvoiceAttrUnionReader::FinalHtlcTimeout(_) => 2,
-            InvoiceAttrUnionReader::FinalHtlcMinimumCltvExpiry(_) => 3,
+            InvoiceAttrUnionReader::FinalHtlcMinimumExpiryDelta(_) => 3,
             InvoiceAttrUnionReader::FallbackAddr(_) => 4,
             InvoiceAttrUnionReader::Feature(_) => 5,
             InvoiceAttrUnionReader::UdtScript(_) => 6,
@@ -5360,7 +5360,7 @@ impl<'r> InvoiceAttrUnionReader<'r> {
             InvoiceAttrUnionReader::ExpiryTime(_) => "ExpiryTime",
             InvoiceAttrUnionReader::Description(_) => "Description",
             InvoiceAttrUnionReader::FinalHtlcTimeout(_) => "FinalHtlcTimeout",
-            InvoiceAttrUnionReader::FinalHtlcMinimumCltvExpiry(_) => "FinalHtlcMinimumCltvExpiry",
+            InvoiceAttrUnionReader::FinalHtlcMinimumExpiryDelta(_) => "FinalHtlcMinimumExpiryDelta",
             InvoiceAttrUnionReader::FallbackAddr(_) => "FallbackAddr",
             InvoiceAttrUnionReader::Feature(_) => "Feature",
             InvoiceAttrUnionReader::UdtScript(_) => "UdtScript",
@@ -5384,8 +5384,8 @@ impl From<FinalHtlcTimeout> for InvoiceAttr {
         Self::new_builder().set(value).build()
     }
 }
-impl From<FinalHtlcMinimumCltvExpiry> for InvoiceAttr {
-    fn from(value: FinalHtlcMinimumCltvExpiry) -> Self {
+impl From<FinalHtlcMinimumExpiryDelta> for InvoiceAttr {
+    fn from(value: FinalHtlcMinimumExpiryDelta) -> Self {
         Self::new_builder().set(value).build()
     }
 }
diff --git a/src/fiber/schema/invoice.mol b/src/fiber/schema/invoice.mol
index 9edcb43fe..d29dd1be9 100644
--- a/src/fiber/schema/invoice.mol
+++ b/src/fiber/schema/invoice.mol
@@ -18,7 +18,7 @@ struct FinalHtlcTimeout {
     value: Uint64,
 }
 
-struct FinalHtlcMinimumCltvExpiry {
+struct FinalHtlcMinimumExpiryDelta {
     value: Uint64,
 }
 
@@ -56,7 +56,7 @@ union InvoiceAttr {
     ExpiryTime,
     Description,
     FinalHtlcTimeout,
-    FinalHtlcMinimumCltvExpiry,
+    FinalHtlcMinimumExpiryDelta,
     FallbackAddr,
     Feature,
     UdtScript,
diff --git a/src/fiber/types.rs b/src/fiber/types.rs
index 6daa701c5..74ae3b1c7 100644
--- a/src/fiber/types.rs
+++ b/src/fiber/types.rs
@@ -1292,13 +1292,13 @@ pub enum TlcErrorCode {
     UnknownNextPeer = PERM | 10,
     AmountBelowMinimum = UPDATE | 11,
     FeeInsufficient = UPDATE | 12,
-    // TODO: cltv expiry check
-    IncorrectCltvExpiry = UPDATE | 13,
+    // TODO: htlc expiry check
+    IncorrectHtlcExpiry = UPDATE | 13,
     ExpiryTooSoon = UPDATE | 14,
     IncorrectOrUnknownPaymentDetails = PERM | 15,
     InvoiceExpired = PERM | 16,
     InvoiceCancelled = PERM | 17,
-    FinalIncorrectCltvExpiry = 18,
+    FinalIncorrectExpiryDelta = 18,
     FinalIncorrectHtlcAmount = 19,
     ChannelDisabled = UPDATE | 20,
     ExpiryTooFar = 21,
@@ -1327,7 +1327,7 @@ impl TlcErrorCode {
     pub fn payment_failed(&self) -> bool {
         match self {
             TlcErrorCode::IncorrectOrUnknownPaymentDetails
-            | TlcErrorCode::FinalIncorrectCltvExpiry
+            | TlcErrorCode::FinalIncorrectExpiryDelta
             | TlcErrorCode::FinalIncorrectHtlcAmount
             | TlcErrorCode::InvoiceExpired
             | TlcErrorCode::InvoiceCancelled
diff --git a/src/invoice/command.rs b/src/invoice/command.rs
index c52673e5d..da968086c 100644
--- a/src/invoice/command.rs
+++ b/src/invoice/command.rs
@@ -26,5 +26,5 @@ pub struct NewInvoiceParams {
     pub payment_preimage: Option<Hash256>,
     pub expiry: Option<u64>,
     pub fallback_address: Option<String>,
-    pub final_cltv: Option<u64>,
+    pub final_expiry_delta: Option<u64>,
 }
diff --git a/src/invoice/invoice_impl.rs b/src/invoice/invoice_impl.rs
index 4c84f953b..2d327c7a9 100644
--- a/src/invoice/invoice_impl.rs
+++ b/src/invoice/invoice_impl.rs
@@ -101,7 +101,7 @@ pub struct CkbScript(#[serde_as(as = "EntityHex")] pub Script);
 #[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
 pub enum Attribute {
     FinalHtlcTimeout(u64),
-    FinalHtlcMinimumCltvExpiry(u64),
+    FinalHtlcMinimumExpiryDelta(u64),
     ExpiryTime(Duration),
     Description(String),
     FallbackAddr(String),
@@ -292,8 +292,8 @@ impl CkbInvoice {
     attr_getter!(expiry_time, ExpiryTime, Duration);
     attr_getter!(description, Description, String);
     attr_getter!(
-        final_htlc_minimum_cltv_expiry,
-        FinalHtlcMinimumCltvExpiry,
+        final_htlc_minimum_expiry_delta,
+        FinalHtlcMinimumExpiryDelta,
         u64
     );
     attr_getter!(fallback_address, FallbackAddr, String);
@@ -459,9 +459,9 @@ impl From<Attribute> for InvoiceAttr {
             Attribute::FinalHtlcTimeout(value) => InvoiceAttrUnion::FinalHtlcTimeout(
                 FinalHtlcTimeout::new_builder().value(value.pack()).build(),
             ),
-            Attribute::FinalHtlcMinimumCltvExpiry(value) => {
-                InvoiceAttrUnion::FinalHtlcMinimumCltvExpiry(
-                    FinalHtlcMinimumCltvExpiry::new_builder()
+            Attribute::FinalHtlcMinimumExpiryDelta(value) => {
+                InvoiceAttrUnion::FinalHtlcMinimumExpiryDelta(
+                    FinalHtlcMinimumExpiryDelta::new_builder()
                         .value(value.pack())
                         .build(),
                 )
@@ -507,8 +507,8 @@ impl From<InvoiceAttr> for Attribute {
             InvoiceAttrUnion::FinalHtlcTimeout(x) => {
                 Attribute::FinalHtlcTimeout(x.value().unpack())
             }
-            InvoiceAttrUnion::FinalHtlcMinimumCltvExpiry(x) => {
-                Attribute::FinalHtlcMinimumCltvExpiry(x.value().unpack())
+            InvoiceAttrUnion::FinalHtlcMinimumExpiryDelta(x) => {
+                Attribute::FinalHtlcMinimumExpiryDelta(x.value().unpack())
             }
             InvoiceAttrUnion::FallbackAddr(x) => {
                 let value: Vec<u8> = x.value().unpack();
@@ -600,7 +600,7 @@ impl InvoiceBuilder {
     attr_setter!(payee_pub_key, PayeePublicKey, PublicKey);
     attr_setter!(expiry_time, ExpiryTime, Duration);
     attr_setter!(fallback_address, FallbackAddr, String);
-    attr_setter!(final_cltv, FinalHtlcMinimumCltvExpiry, u64);
+    attr_setter!(final_expiry_delta, FinalHtlcMinimumExpiryDelta, u64);
 
     pub fn build(self) -> Result<CkbInvoice, InvoiceError> {
         let preimage = self.payment_preimage;
diff --git a/src/invoice/tests/invoice_impl.rs b/src/invoice/tests/invoice_impl.rs
index 2e4fac1cf..3f5db0570 100644
--- a/src/invoice/tests/invoice_impl.rs
+++ b/src/invoice/tests/invoice_impl.rs
@@ -48,7 +48,7 @@ fn mock_invoice() -> CkbInvoice {
                 .as_millis(),
             attrs: vec![
                 Attribute::FinalHtlcTimeout(5),
-                Attribute::FinalHtlcMinimumCltvExpiry(12),
+                Attribute::FinalHtlcMinimumExpiryDelta(12),
                 Attribute::Description("description".to_string()),
                 Attribute::ExpiryTime(Duration::from_secs(1024)),
                 Attribute::FallbackAddr("address".to_string()),
@@ -161,7 +161,7 @@ fn test_invoice_bc32m_not_same() {
             timestamp: 0,
             attrs: vec![
                 Attribute::FinalHtlcTimeout(5),
-                Attribute::FinalHtlcMinimumCltvExpiry(12),
+                Attribute::FinalHtlcMinimumExpiryDelta(12),
                 Attribute::Description("description hello".to_string()),
                 Attribute::ExpiryTime(Duration::from_secs(1024)),
                 Attribute::FallbackAddr("address".to_string()),
@@ -202,7 +202,7 @@ fn test_invoice_builder() {
         .expiry_time(Duration::from_secs(1024))
         .payee_pub_key(public_key)
         .add_attr(Attribute::FinalHtlcTimeout(5))
-        .add_attr(Attribute::FinalHtlcMinimumCltvExpiry(12))
+        .add_attr(Attribute::FinalHtlcMinimumExpiryDelta(12))
         .add_attr(Attribute::Description("description".to_string()))
         .add_attr(Attribute::UdtScript(CkbScript(Script::default())))
         .build_with_sign(|hash| Secp256k1::new().sign_ecdsa_recoverable(hash, &private_key))
@@ -231,7 +231,7 @@ fn test_invoice_check_signature() {
         .expiry_time(Duration::from_secs(1024))
         .payee_pub_key(public_key)
         .add_attr(Attribute::FinalHtlcTimeout(5))
-        .add_attr(Attribute::FinalHtlcMinimumCltvExpiry(12))
+        .add_attr(Attribute::FinalHtlcMinimumExpiryDelta(12))
         .add_attr(Attribute::Description("description".to_string()))
         .add_attr(Attribute::UdtScript(CkbScript(Script::default())))
         .build_with_sign(|hash| Secp256k1::new().sign_ecdsa_recoverable(hash, &private_key))
@@ -264,7 +264,7 @@ fn test_invoice_check_signature() {
         .expiry_time(Duration::from_secs(1024))
         .payee_pub_key(public_key)
         .add_attr(Attribute::FinalHtlcTimeout(5))
-        .add_attr(Attribute::FinalHtlcMinimumCltvExpiry(12))
+        .add_attr(Attribute::FinalHtlcMinimumExpiryDelta(12))
         .build()
         .unwrap();
 
@@ -288,7 +288,7 @@ fn test_invoice_signature_check() {
         .expiry_time(Duration::from_secs(1024))
         .payee_pub_key(public_key)
         .add_attr(Attribute::FinalHtlcTimeout(5))
-        .add_attr(Attribute::FinalHtlcMinimumCltvExpiry(12))
+        .add_attr(Attribute::FinalHtlcMinimumExpiryDelta(12))
         .add_attr(Attribute::Description("description".to_string()))
         .add_attr(Attribute::UdtScript(CkbScript(Script::default())))
         .build_with_sign(|hash| Secp256k1::new().sign_ecdsa_recoverable(hash, &private_key));
diff --git a/src/rpc/README.md b/src/rpc/README.md
index a5688af1f..13d2f634c 100644
--- a/src/rpc/README.md
+++ b/src/rpc/README.md
@@ -178,7 +178,7 @@ Sends a payment to a peer.
 - `target_pubkey` (type: `Pubkey`): The identifier of the payment target.
 - `amount` (type: `u128`): The amount of the payment.
 - `payment_hash` (type: `Hash256`): The hash to use within the payment's HTLC.
-- `final_cltv_delta` (type: `Option<u64>`): The CLTV delta from the current height that should be used to set the timelock for the final hop.
+- `final_expiry_delta` (type: `Option<u64>`): The htlc expiry delta that should be used to set the timelock for the final hop, timestamp in milliseconds, default is 24 hours.
 - `invoice` (type: `Option<String>`): The encoded invoice to send to the recipient.
 - `timeout` (type: `Option<u64>`): The payment timeout in seconds. If the payment is not completed within this time, it will be cancelled.
 - `max_fee_amount` (type: `Option<u128>`): The maximum fee amounts in shannons that the sender is willing to pay.
diff --git a/src/rpc/cch.rs b/src/rpc/cch.rs
index 6139a1296..cda2d70e5 100644
--- a/src/rpc/cch.rs
+++ b/src/rpc/cch.rs
@@ -32,7 +32,7 @@ pub(crate) struct SendBTCResponse {
     expiry: u64,
     // The minimal expiry in seconds of the final TLC in the CKB network
     #[serde_as(as = "U64Hex")]
-    ckb_final_tlc_expiry: u64,
+    ckb_final_tlc_expiry_delta: u64,
 
     currency: Currency,
     wrapped_btc_type_script: ckb_jsonrpc_types::Script,
@@ -81,7 +81,7 @@ pub(crate) struct ReceiveBTCResponse {
     expiry: u64,
     // The minimal expiry in seconds of the final TLC in the CKB network
     #[serde_as(as = "U64Hex")]
-    ckb_final_tlc_expiry: u64,
+    ckb_final_tlc_expiry_delta: u64,
 
     wrapped_btc_type_script: ckb_jsonrpc_types::Script,
 
@@ -154,7 +154,7 @@ impl CchRpcServer for CchRpcServerImpl {
             .map(|order| SendBTCResponse {
                 timestamp: order.created_at,
                 expiry: order.expires_after,
-                ckb_final_tlc_expiry: order.ckb_final_tlc_expiry,
+                ckb_final_tlc_expiry_delta: order.ckb_final_tlc_expiry_delta,
                 currency: order.currency,
                 wrapped_btc_type_script: order.wrapped_btc_type_script,
                 btc_pay_req: order.btc_pay_req,
@@ -220,7 +220,7 @@ impl From<ReceiveBTCOrder> for ReceiveBTCResponse {
         Self {
             timestamp: value.created_at,
             expiry: value.expires_after,
-            ckb_final_tlc_expiry: value.ckb_final_tlc_expiry,
+            ckb_final_tlc_expiry_delta: value.ckb_final_tlc_expiry_delta,
             wrapped_btc_type_script: value.wrapped_btc_type_script,
             btc_pay_req: value.btc_pay_req,
             payment_hash: value.payment_hash,
diff --git a/src/rpc/invoice.rs b/src/rpc/invoice.rs
index 86cb47d98..520112b72 100644
--- a/src/rpc/invoice.rs
+++ b/src/rpc/invoice.rs
@@ -24,7 +24,7 @@ pub(crate) struct NewInvoiceParams {
     expiry: Option<u64>,
     fallback_address: Option<String>,
     #[serde_as(as = "Option<U64Hex>")]
-    final_cltv: Option<u64>,
+    final_expiry_delta: Option<u64>,
     udt_type_script: Option<Script>,
     hash_algorithm: Option<HashAlgorithm>,
 }
@@ -131,8 +131,8 @@ where
         if let Some(fallback_address) = params.fallback_address.clone() {
             invoice_builder = invoice_builder.fallback_address(fallback_address);
         };
-        if let Some(final_cltv) = params.final_cltv {
-            invoice_builder = invoice_builder.final_cltv(final_cltv);
+        if let Some(final_expiry_delta) = params.final_expiry_delta {
+            invoice_builder = invoice_builder.final_expiry_delta(final_expiry_delta);
         };
         if let Some(udt_type_script) = &params.udt_type_script {
             invoice_builder = invoice_builder.udt_type_script(udt_type_script.clone().into());
diff --git a/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru b/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru
index 8631bf207..fe9f6de62 100644
--- a/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru
+++ b/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru
@@ -26,7 +26,7 @@ body:json {
         "currency": "Fibb",
         "description": "test invoice generated by node3",
         "expiry": "0xe10",
-        "final_cltv": "0x28",
+        "final_expiry_delta": "0x28",
         "payment_preimage": "{{payment_preimage}}"
       }
     ]
diff --git a/tests/bruno/e2e/3-nodes-transfer/16-node3-gen-invoice.bru b/tests/bruno/e2e/3-nodes-transfer/16-node3-gen-invoice.bru
index 7c48515a8..9da0999d5 100644
--- a/tests/bruno/e2e/3-nodes-transfer/16-node3-gen-invoice.bru
+++ b/tests/bruno/e2e/3-nodes-transfer/16-node3-gen-invoice.bru
@@ -26,7 +26,7 @@ body:json {
         "currency": "Fibb",
         "description": "test invoice generated by node3",
         "expiry": "0xe10",
-        "final_cltv": "0x28",
+        "final_expiry_delta": "0x28",
         "payment_preimage": "{{payment_preimage}}"
       }
     ]
diff --git a/tests/bruno/e2e/invoice-ops/1-gen-invoice.bru b/tests/bruno/e2e/invoice-ops/1-gen-invoice.bru
index 3a3ca6f8e..65665c0f9 100644
--- a/tests/bruno/e2e/invoice-ops/1-gen-invoice.bru
+++ b/tests/bruno/e2e/invoice-ops/1-gen-invoice.bru
@@ -39,7 +39,7 @@ body:json {
         "currency": "Fibb",
         "description": "test invoice",
         "expiry": "0xe10",
-        "final_cltv": "0x28",
+        "final_expiry_delta": "0x28",
         "payment_preimage": "{{payment_preimage}}"
       }
     ]
diff --git a/tests/bruno/e2e/invoice-ops/2-gen-invoice-duplicate.bru b/tests/bruno/e2e/invoice-ops/2-gen-invoice-duplicate.bru
index 837f436cd..f43629a74 100644
--- a/tests/bruno/e2e/invoice-ops/2-gen-invoice-duplicate.bru
+++ b/tests/bruno/e2e/invoice-ops/2-gen-invoice-duplicate.bru
@@ -30,7 +30,7 @@ body:json {
         "currency": "Fibb",
         "description": "test invoice",
         "expiry": "0xe10",
-        "final_cltv": "0x28",
+        "final_expiry_delta": "0x28",
         "payment_preimage": "{{payment_preimage}}"
       }
     ]
diff --git a/tests/bruno/e2e/router-pay/11-node3-gen-invoice.bru b/tests/bruno/e2e/router-pay/11-node3-gen-invoice.bru
index 8631bf207..fe9f6de62 100644
--- a/tests/bruno/e2e/router-pay/11-node3-gen-invoice.bru
+++ b/tests/bruno/e2e/router-pay/11-node3-gen-invoice.bru
@@ -26,7 +26,7 @@ body:json {
         "currency": "Fibb",
         "description": "test invoice generated by node3",
         "expiry": "0xe10",
-        "final_cltv": "0x28",
+        "final_expiry_delta": "0x28",
         "payment_preimage": "{{payment_preimage}}"
       }
     ]
diff --git a/tests/bruno/e2e/router-pay/14-node3-gen-invoice-later.bru b/tests/bruno/e2e/router-pay/14-node3-gen-invoice-later.bru
index 4eb25c18c..334e1a9c7 100644
--- a/tests/bruno/e2e/router-pay/14-node3-gen-invoice-later.bru
+++ b/tests/bruno/e2e/router-pay/14-node3-gen-invoice-later.bru
@@ -26,7 +26,7 @@ body:json {
         "currency": "Fibb",
         "description": "test invoice generated by node3",
         "expiry": "0xe10",
-        "final_cltv": "0x28",
+        "final_expiry_delta": "0x28",
         "payment_preimage": "{{payment_preimage}}"
       }
     ]
diff --git a/tests/bruno/e2e/router-pay/22-node3-gen-expiring-invoice.bru b/tests/bruno/e2e/router-pay/22-node3-gen-expiring-invoice.bru
index c33c0e1e9..453517542 100644
--- a/tests/bruno/e2e/router-pay/22-node3-gen-expiring-invoice.bru
+++ b/tests/bruno/e2e/router-pay/22-node3-gen-expiring-invoice.bru
@@ -26,7 +26,7 @@ body:json {
         "currency": "Fibb",
         "description": "test invoice generated by node3",
         "expiry": "0x2",
-        "final_cltv": "0x28",
+        "final_expiry_delta": "0x28",
         "payment_preimage": "{{payment_preimage}}"
       }
     ]
diff --git a/tests/bruno/e2e/udt-router-pay/11-node3-gen-invoice.bru b/tests/bruno/e2e/udt-router-pay/11-node3-gen-invoice.bru
index b243e2a11..64db3dc8d 100644
--- a/tests/bruno/e2e/udt-router-pay/11-node3-gen-invoice.bru
+++ b/tests/bruno/e2e/udt-router-pay/11-node3-gen-invoice.bru
@@ -26,7 +26,7 @@ body:json {
         "currency": "Fibb",
         "description": "test invoice generated by node3",
         "expiry": "0xe10",
-        "final_cltv": "0x28",
+        "final_expiry_delta": "0x28",
         "payment_preimage": "{{payment_preimage}}",
         "udt_type_script": {
             "code_hash": "{{UDT_CODE_HASH}}",
diff --git a/tests/bruno/e2e/udt-router-pay/13-node3-gen-invoice-later.bru b/tests/bruno/e2e/udt-router-pay/13-node3-gen-invoice-later.bru
index cc67e0154..554de4ec7 100644
--- a/tests/bruno/e2e/udt-router-pay/13-node3-gen-invoice-later.bru
+++ b/tests/bruno/e2e/udt-router-pay/13-node3-gen-invoice-later.bru
@@ -26,7 +26,7 @@ body:json {
         "currency": "Fibb",
         "description": "test invoice generated by node3",
         "expiry": "0xe10",
-        "final_cltv": "0x28",
+        "final_expiry_delta": "0x28",
         "payment_preimage": "{{payment_preimage}}",
         "udt_type_script": {
             "code_hash": "{{UDT_CODE_HASH}}",
diff --git a/tests/bruno/e2e/udt/07-node2-gen-invoice.bru b/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
index a0edcc529..3c034164f 100644
--- a/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
+++ b/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
@@ -39,7 +39,7 @@ body:json {
         "currency": "Fibb",
         "description": "test invoice generated by node2",
         "expiry": "0xe10",
-        "final_cltv": "0x28",
+        "final_expiry_delta": "0x28",
         "payment_preimage": "{{payment_preimage}}",
         "udt_type_script": {
             "code_hash": "{{UDT_CODE_HASH}}",

From 12d1a0092e8b2752ff46cf75470aa2401b9c94ee Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Wed, 30 Oct 2024 17:53:16 +0900
Subject: [PATCH 08/31] chore: fix e2e test

---
 tests/bruno/e2e/3-nodes-transfer/12-node1-add-tlc.bru           | 2 +-
 tests/bruno/e2e/3-nodes-transfer/13-node2-add-tlc.bru           | 2 +-
 tests/bruno/e2e/3-nodes-transfer/17-node1-add-tlc.bru           | 2 +-
 tests/bruno/e2e/3-nodes-transfer/18-node2-add-tlc.bru           | 2 +-
 tests/bruno/e2e/cross-chain-hub/07-node1-add-tlc.bru            | 2 +-
 .../e2e/open-use-close-a-channel/07-add-tlc-from-NODE3.bru      | 2 +-
 .../e2e/open-use-close-a-channel/08-add-tlc-from-NODE1.bru      | 2 +-
 .../e2e/open-use-close-a-channel/09-add-tlc-from-NODE3.bru      | 2 +-
 .../10-add-tlc-from-NODE1-amount-err.bru                        | 2 +-
 .../10-add-tlc-from-NODE1-balance-err.bru                       | 2 +-
 .../e2e/open-use-close-a-channel/11-add-tlc-from-NODE3.bru      | 2 +-
 .../e2e/open-use-close-a-channel/12-add-tlc-from-NODE3.bru      | 2 +-
 tests/bruno/e2e/reestablish/07-add-tlc-from-NODE3.bru           | 2 +-
 tests/bruno/e2e/udt/08-node1-add-tlc.bru                        | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/bruno/e2e/3-nodes-transfer/12-node1-add-tlc.bru b/tests/bruno/e2e/3-nodes-transfer/12-node1-add-tlc.bru
index 1c3b242e7..1edd4d1f4 100644
--- a/tests/bruno/e2e/3-nodes-transfer/12-node1-add-tlc.bru
+++ b/tests/bruno/e2e/3-nodes-transfer/12-node1-add-tlc.bru
@@ -25,7 +25,7 @@ body:json {
         "channel_id": "{{N1N2_CHANNEL_ID}}",
         "amount": "{{payment_amount}}",
         "payment_hash": "{{payment_hash}}",
-        "expiry": 40
+        "expiry": "0x20000000000"
       }
     ]
   }
diff --git a/tests/bruno/e2e/3-nodes-transfer/13-node2-add-tlc.bru b/tests/bruno/e2e/3-nodes-transfer/13-node2-add-tlc.bru
index 7e07df818..851e9902f 100644
--- a/tests/bruno/e2e/3-nodes-transfer/13-node2-add-tlc.bru
+++ b/tests/bruno/e2e/3-nodes-transfer/13-node2-add-tlc.bru
@@ -25,7 +25,7 @@ body:json {
         "channel_id": "{{N2N3_CHANNEL_ID}}",
         "amount": "{{payment_amount}}",
         "payment_hash": "{{payment_hash}}",
-        "expiry": 40
+        "expiry": "0x20000000000"
       }
     ]
   }
diff --git a/tests/bruno/e2e/3-nodes-transfer/17-node1-add-tlc.bru b/tests/bruno/e2e/3-nodes-transfer/17-node1-add-tlc.bru
index 4c0e8b943..47cc87ed9 100644
--- a/tests/bruno/e2e/3-nodes-transfer/17-node1-add-tlc.bru
+++ b/tests/bruno/e2e/3-nodes-transfer/17-node1-add-tlc.bru
@@ -25,7 +25,7 @@ body:json {
         "channel_id": "{{N1N2_CHANNEL_ID}}",
         "amount": "{{payment_amount}}",
         "payment_hash": "{{payment_hash}}",
-        "expiry": 40
+        "expiry": "0x20000000000"
       }
     ]
   }
diff --git a/tests/bruno/e2e/3-nodes-transfer/18-node2-add-tlc.bru b/tests/bruno/e2e/3-nodes-transfer/18-node2-add-tlc.bru
index 10ffdd8b3..46d772215 100644
--- a/tests/bruno/e2e/3-nodes-transfer/18-node2-add-tlc.bru
+++ b/tests/bruno/e2e/3-nodes-transfer/18-node2-add-tlc.bru
@@ -25,7 +25,7 @@ body:json {
         "channel_id": "{{N2N3_CHANNEL_ID}}",
         "amount": "{{payment_amount}}",
         "payment_hash": "{{payment_hash}}",
-        "expiry": 40
+        "expiry": "0x20000000000"
       }
     ]
   }
diff --git a/tests/bruno/e2e/cross-chain-hub/07-node1-add-tlc.bru b/tests/bruno/e2e/cross-chain-hub/07-node1-add-tlc.bru
index fba4e5851..ade936c6b 100644
--- a/tests/bruno/e2e/cross-chain-hub/07-node1-add-tlc.bru
+++ b/tests/bruno/e2e/cross-chain-hub/07-node1-add-tlc.bru
@@ -25,7 +25,7 @@ body:json {
         "channel_id": "{{N1N3_CHANNEL_ID}}",
         "amount": "0x4e20",
         "payment_hash": "{{PAYMENT_HASH}}",
-        "expiry": 40,
+        "expiry": "0x20000000000",
         "hash_algorithm": "sha256"
       }
     ]
diff --git a/tests/bruno/e2e/open-use-close-a-channel/07-add-tlc-from-NODE3.bru b/tests/bruno/e2e/open-use-close-a-channel/07-add-tlc-from-NODE3.bru
index e75262dfd..8c5234fca 100644
--- a/tests/bruno/e2e/open-use-close-a-channel/07-add-tlc-from-NODE3.bru
+++ b/tests/bruno/e2e/open-use-close-a-channel/07-add-tlc-from-NODE3.bru
@@ -25,7 +25,7 @@ body:json {
         "channel_id": "{{CHANNEL_ID}}",
         "amount": "0x5f5e100",
         "payment_hash": "0x266cec97cbede2cfbce73666f08deed9560bdf7841a7a5a51b3a3f09da249e21",
-        "expiry": 40
+        "expiry": "0x20000000000"
       }
     ]
   }
diff --git a/tests/bruno/e2e/open-use-close-a-channel/08-add-tlc-from-NODE1.bru b/tests/bruno/e2e/open-use-close-a-channel/08-add-tlc-from-NODE1.bru
index cdb4e6634..78df27591 100644
--- a/tests/bruno/e2e/open-use-close-a-channel/08-add-tlc-from-NODE1.bru
+++ b/tests/bruno/e2e/open-use-close-a-channel/08-add-tlc-from-NODE1.bru
@@ -25,7 +25,7 @@ body:json {
         "channel_id": "{{CHANNEL_ID}}",
         "amount": "0xbebc200",
         "payment_hash": "0xcb7bce98a778f130d34da522623d7e56705bddfe0dc4781bd2331211134a19a8",
-        "expiry": 40
+        "expiry": "0x20000000000"
       }
     ]
   }
diff --git a/tests/bruno/e2e/open-use-close-a-channel/09-add-tlc-from-NODE3.bru b/tests/bruno/e2e/open-use-close-a-channel/09-add-tlc-from-NODE3.bru
index 0b5323e6f..3fbc333a6 100644
--- a/tests/bruno/e2e/open-use-close-a-channel/09-add-tlc-from-NODE3.bru
+++ b/tests/bruno/e2e/open-use-close-a-channel/09-add-tlc-from-NODE3.bru
@@ -25,7 +25,7 @@ body:json {
         "channel_id": "{{CHANNEL_ID}}",
         "amount": "0x11e1a300",
         "payment_hash": "0x29449e2cc6f56a691253fe88e3a378171c81573b09247010b4f1cb8c806e1e09",
-        "expiry": 40
+        "expiry": "0x20000000000"
       }
     ]
   }
diff --git a/tests/bruno/e2e/open-use-close-a-channel/10-add-tlc-from-NODE1-amount-err.bru b/tests/bruno/e2e/open-use-close-a-channel/10-add-tlc-from-NODE1-amount-err.bru
index 1dc88d010..61d1222b8 100644
--- a/tests/bruno/e2e/open-use-close-a-channel/10-add-tlc-from-NODE1-amount-err.bru
+++ b/tests/bruno/e2e/open-use-close-a-channel/10-add-tlc-from-NODE1-amount-err.bru
@@ -25,7 +25,7 @@ body:json {
         "channel_id": "{{CHANNEL_ID}}",
         "amount": "0x0",
         "payment_hash": "0xcb7bce98a778f130d34da522623d7e56705bddfe0dc4781bd2331211134a19a5",
-        "expiry": 40
+        "expiry": "0x20000000000"
       }
     ]
   }
diff --git a/tests/bruno/e2e/open-use-close-a-channel/10-add-tlc-from-NODE1-balance-err.bru b/tests/bruno/e2e/open-use-close-a-channel/10-add-tlc-from-NODE1-balance-err.bru
index 0fde456aa..7317fbe84 100644
--- a/tests/bruno/e2e/open-use-close-a-channel/10-add-tlc-from-NODE1-balance-err.bru
+++ b/tests/bruno/e2e/open-use-close-a-channel/10-add-tlc-from-NODE1-balance-err.bru
@@ -25,7 +25,7 @@ body:json {
         "channel_id": "{{CHANNEL_ID}}",
         "amount": "0xbebc200",
         "payment_hash": "0xcb7bce98a778f130d34da522623d7e56705bddfe0dc4781bd2331211134a19a6",
-        "expiry": 40
+        "expiry": "0x20000000000"
       }
     ]
   }
diff --git a/tests/bruno/e2e/open-use-close-a-channel/11-add-tlc-from-NODE3.bru b/tests/bruno/e2e/open-use-close-a-channel/11-add-tlc-from-NODE3.bru
index 9316ffb9f..1b07cdbe2 100644
--- a/tests/bruno/e2e/open-use-close-a-channel/11-add-tlc-from-NODE3.bru
+++ b/tests/bruno/e2e/open-use-close-a-channel/11-add-tlc-from-NODE3.bru
@@ -25,7 +25,7 @@ body:json {
         "channel_id": "{{CHANNEL_ID}}",
         "amount": "0x11e1a300",
         "payment_hash": "0x29449e2cc6f56a691253fe88e3a378171c81573b09247010b4f1cb8c806e1e38",
-        "expiry": 40
+        "expiry": "0x20000000000"
       }
     ]
   }
diff --git a/tests/bruno/e2e/open-use-close-a-channel/12-add-tlc-from-NODE3.bru b/tests/bruno/e2e/open-use-close-a-channel/12-add-tlc-from-NODE3.bru
index 66a31cd04..a243a17de 100644
--- a/tests/bruno/e2e/open-use-close-a-channel/12-add-tlc-from-NODE3.bru
+++ b/tests/bruno/e2e/open-use-close-a-channel/12-add-tlc-from-NODE3.bru
@@ -25,7 +25,7 @@ body:json {
         "channel_id": "{{CHANNEL_ID}}",
         "amount": "0x11e1a300",
         "payment_hash": "0x29449e2cc6f56a691253fe88e3a378171c81573b09247010b4f1cb8c806e1e12",
-        "expiry": 40
+        "expiry": "0x20000000000"
       }
     ]
   }
diff --git a/tests/bruno/e2e/reestablish/07-add-tlc-from-NODE3.bru b/tests/bruno/e2e/reestablish/07-add-tlc-from-NODE3.bru
index e0784b12a..c8efda0f6 100644
--- a/tests/bruno/e2e/reestablish/07-add-tlc-from-NODE3.bru
+++ b/tests/bruno/e2e/reestablish/07-add-tlc-from-NODE3.bru
@@ -25,7 +25,7 @@ body:json {
         "channel_id": "{{CHANNEL_ID}}",
         "amount": "0x5f5e100",
         "payment_hash": "0x266cec97cbede2cfbce73666f08deed9560bdf7841a7a5a51b3a3f09da249e21",
-        "expiry": 40
+        "expiry": "0x20000000000"
       }
     ]
   }
diff --git a/tests/bruno/e2e/udt/08-node1-add-tlc.bru b/tests/bruno/e2e/udt/08-node1-add-tlc.bru
index 79e391c40..48c2b6ada 100644
--- a/tests/bruno/e2e/udt/08-node1-add-tlc.bru
+++ b/tests/bruno/e2e/udt/08-node1-add-tlc.bru
@@ -25,7 +25,7 @@ body:json {
         "channel_id": "{{N1N2_CHANNEL_ID}}",
         "amount": "{{payment_amount}}",
         "payment_hash": "{{payment_hash}}",
-        "expiry": 40
+        "expiry": "0x20000000000"
       }
     ]
   }

From a8b7ddc7bc5703e40461bd17a5fcd3ff660923bc Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Tue, 29 Oct 2024 21:11:54 +0900
Subject: [PATCH 09/31] chore: refactor ContractsContext

---
 Cargo.lock                  |   2 +
 Cargo.toml                  |   2 +
 config/testnet/config.yml   |  34 +-
 src/ckb/contracts.rs        | 605 +++++++++++-------------------------
 src/ckb/tests/contracts.rs  |  33 --
 src/ckb/tests/mod.rs        |   1 -
 src/ckb/tests/test_utils.rs | 100 +++++-
 src/fiber/config.rs         |  47 ++-
 src/main.rs                 |  16 +-
 9 files changed, 344 insertions(+), 496 deletions(-)
 delete mode 100644 src/ckb/tests/contracts.rs

diff --git a/Cargo.lock b/Cargo.lock
index f05c203c3..2c2795f83 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1518,9 +1518,11 @@ dependencies = [
  "bech32 0.8.1",
  "bitcoin",
  "bitflags 2.6.0",
+ "ckb-chain-spec",
  "ckb-gen-types",
  "ckb-hash 0.115.0",
  "ckb-jsonrpc-types",
+ "ckb-resource",
  "ckb-rocksdb",
  "ckb-sdk",
  "ckb-testtool",
diff --git a/Cargo.toml b/Cargo.toml
index 2fb336e43..eacc5cbc7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,6 +27,8 @@ molecule = { version = "0.8.0", default-features = false }
 ckb-types = "0.118.0"
 ckb-gen-types = "0.118.0"
 ckb-jsonrpc-types = "0.118.0"
+ckb-chain-spec    = "0.118.0"
+ckb-resource      = "0.118.0"
 rocksdb = { package = "ckb-rocksdb", version = "=0.21.1", features = [
     "snappy",
 ], default-features = false }
diff --git a/config/testnet/config.yml b/config/testnet/config.yml
index 5007308ba..04834de94 100644
--- a/config/testnet/config.yml
+++ b/config/testnet/config.yml
@@ -1,10 +1,42 @@
 fiber:
   listening_addr: "/ip4/127.0.0.1/tcp/8228"
-  network: "Testnet"
   bootnode_addrs:
     - "/ip4/54.179.226.154/tcp/8228/p2p/Qmes1EBD4yNo9Ywkfe6eRw9tG1nVNGLDmMud1xJMsoYFKy"
     - "/ip4/54.179.226.154/tcp/18228/p2p/QmdyQWjPtbK4NWWsvy8s69NGJaQULwgeQDT5ZpNDrTNaeV"
   announce_listening_addr: true
+  # chain spec, can be mainnet | testnet | "path to chain spec file"
+  chain: testnet
+  # lock script configurations related to fiber network
+  # https://github.com/nervosnetwork/fiber-scripts/blob/main/deployment/testnet/migrations/2024-09-14-084742.json
+  scripts:
+    - name: FundingLock
+      script:
+        code_hash: 0x6c67887fe201ee0c7853f1682c0b77c0e6214044c156c7558269390a8afa6d7c
+        hash_type: type
+        args: 0x
+      cell_deps:
+        - out_point:
+            tx_hash: 0x89af398edc7ed0054506b33349b031097d94378e11e77bf0690ee69d82623a43
+            index: 0x0
+          dep_type: code
+        - out_point:
+            tx_hash: 0xbfd6d68b328a02606f1f65ee0f79f8ed5f76dfe86998c7aaa9ee4720d53f4c49 # ckb_auth
+            index: 0x0
+          dep_type: code
+    - name: CommitmentLock
+      script:
+        code_hash: 0x740dee83f87c6f309824d8fd3fbdd3c8380ee6fc9acc90b1a748438afcdf81d8
+        hash_type: type
+        args: 0x
+      cell_deps:
+        - out_point:
+            tx_hash: 0x89af398edc7ed0054506b33349b031097d94378e11e77bf0690ee69d82623a43
+            index: 0x1
+          dep_type: code
+        - out_point:
+            tx_hash: 0xbfd6d68b328a02606f1f65ee0f79f8ed5f76dfe86998c7aaa9ee4720d53f4c49 #ckb_auth
+            index: 0x0
+          dep_type: code
 
 rpc:
   listening_addr: "127.0.0.1:8227"
diff --git a/src/ckb/contracts.rs b/src/ckb/contracts.rs
index 32bd41038..618bac98a 100644
--- a/src/ckb/contracts.rs
+++ b/src/ckb/contracts.rs
@@ -1,456 +1,208 @@
 use ckb_types::{
-    core::{DepType, ScriptHashType},
-    packed::{CellDep, CellDepVec, CellDepVecBuilder, OutPoint, Script},
+    core::{BlockView, DepType, ScriptHashType},
+    packed::{CellDep, CellDepVec, CellDepVecBuilder, CellOutput, OutPoint, Script},
     prelude::{Builder, Entity, Pack, PackVec},
 };
+use once_cell::sync::OnceCell;
 use regex::Regex;
-use std::{collections::HashMap, env, str::FromStr, sync::Arc};
-use tracing::debug;
+use serde::{Deserialize, Serialize};
+use std::{collections::HashMap, vec};
+use tracing::info;
 
-use crate::fiber::{config::CkbNetwork, types::Hash256};
+use crate::fiber::config::FiberScript;
 
-use ckb_types::bytes::Bytes;
+use super::config::{UdtArgInfo, UdtCfgInfos};
 
-#[cfg(test)]
-use ckb_testtool::context::Context;
-#[cfg(test)]
-use std::sync::{RwLock, RwLockWriteGuard};
-
-use super::{
-    config::{UdtArgInfo, UdtCfgInfos},
-    CkbConfig,
-};
-
-#[cfg(test)]
-#[derive(Clone)]
-pub struct MockContext {
-    context: Arc<RwLock<Context>>,
-    contracts_context: Arc<ContractsInfo>,
-}
-
-#[cfg(test)]
-impl Default for MockContext {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-#[cfg(test)]
-impl MockContext {
-    fn get_contract_binaries() -> Vec<(Contract, Bytes)> {
-        [
-            (
-                Contract::FundingLock,
-                Bytes::from_static(include_bytes!("../../tests/deploy/contracts/funding-lock")),
-            ),
-            (
-                Contract::CommitmentLock,
-                Bytes::from_static(include_bytes!(
-                    "../../tests/deploy/contracts/commitment-lock"
-                )),
-            ),
-            // mock secp256k1 lock script
-            (
-                Contract::Secp256k1Lock,
-                Bytes::from_static(include_bytes!(
-                    "../../tests/deploy/contracts/always_success"
-                )),
-            ),
-            (
-                Contract::CkbAuth,
-                Bytes::from_static(include_bytes!("../../tests/deploy/contracts/auth")),
-            ),
-            (
-                Contract::SimpleUDT,
-                Bytes::from_static(include_bytes!("../../tests/deploy/contracts/simple_udt")),
-            ),
-        ]
-        .into()
-    }
-
-    pub fn new() -> Self {
-        let mut context = Context::new_with_deterministic_rng();
-
-        let (map, script_cell_deps) = Self::get_contract_binaries().into_iter().fold(
-            (HashMap::new(), HashMap::new()),
-            |(mut map, mut script_cell_deps), (contract, binary)| {
-                // Use a deterministic RNG to ensure that the outpoints are the same for all nodes.
-                // Otherwise, cell deps may differ for different nodes, which would make
-                // different nodes sign different messages (as transaction hashes differ).
-                let out_point = context.deploy_cell(binary);
-                let script = context
-                    .build_script(&out_point, Default::default())
-                    .expect("valid script");
-                map.insert(contract, script);
-                let cell_dep = CellDep::new_builder()
-                    .out_point(out_point)
-                    .dep_type(DepType::Code.into())
-                    .build();
-
-                script_cell_deps.insert(contract, CellDepVec::new_builder().push(cell_dep).build());
-                (map, script_cell_deps)
-            },
-        );
-        debug!("Loaded contracts into the mock environement: {:?}", &map);
-
-        let context = MockContext {
-            context: Arc::new(RwLock::new(context)),
-            contracts_context: Arc::new(ContractsInfo {
-                contract_default_scripts: map,
-                script_cell_deps,
-                udt_whitelist: UdtCfgInfos::default(),
-            }),
-        };
-        debug!("Created mock context to test transactions.");
-        context
-    }
-
-    pub fn write(&self) -> RwLockWriteGuard<Context> {
-        self.context.write().unwrap()
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone, Copy, Hash)]
 pub enum Contract {
+    CkbAuth,
     FundingLock,
     CommitmentLock,
     Secp256k1Lock,
-    CkbAuth,
     SimpleUDT,
 }
 
 #[derive(Clone, Debug)]
-struct ContractsInfo {
-    contract_default_scripts: HashMap<Contract, Script>,
-    script_cell_deps: HashMap<Contract, CellDepVec>,
-    udt_whitelist: UdtCfgInfos,
-}
-
-#[derive(Clone)]
-pub enum ContractsContext {
-    #[cfg(test)]
-    Mock(MockContext),
-    #[allow(private_interfaces)]
-    Real(Arc<ContractsInfo>),
-}
-
-impl std::fmt::Debug for ContractsContext {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            #[cfg(test)]
-            Self::Mock(_mock) => write!(f, "Mock"),
-            Self::Real(_real) => write!(f, "Real"),
-        }
-    }
+pub struct ContractsInfo {
+    pub contract_default_scripts: HashMap<Contract, Script>,
+    pub script_cell_deps: HashMap<Contract, Vec<CellDep>>,
+    pub udt_whitelist: UdtCfgInfos,
 }
 
-enum EnvironmentVariableType {
-    CodeHash,
-    #[allow(dead_code)]
-    TypeHash,
-    TxIndex,
-    TxHash,
-}
-
-fn get_hash_from_environment_variable(
-    contract: Contract,
-    env_type: EnvironmentVariableType,
-    dep_type: DepType,
-) -> Hash256 {
-    let string = get_environment_variable(contract, env_type, dep_type);
-    if string.len() < 2 || &string[..2].to_lowercase() != "0x" {
-        panic!("hex string should start with 0x");
-    };
-    <[u8; 32]>::try_from(hex::decode(&string[2..]).expect("valid hex").as_slice())
-        .expect("valid hash")
-        .into()
+#[derive(Clone, Debug)]
+pub struct ContractsContext {
+    pub contracts: ContractsInfo,
 }
 
-const ENV_PREFIX: &str = "NEXT_PUBLIC";
-const DEFUALT_SECP256K1_TYPE_HASH: &str =
-    "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8";
-
-fn get_environment_variable(
-    contract: Contract,
-    env_type: EnvironmentVariableType,
-    dep_type: DepType,
-) -> String {
-    let contract_name = match contract {
-        Contract::FundingLock => "FUNDING_LOCK",
-        Contract::CommitmentLock => "COMMITMENT_LOCK",
-        Contract::SimpleUDT => "SIMPLE_UDT",
-        _ => panic!("Unsupported contract type {:?}", contract),
-    };
-    let type_desc = match env_type {
-        EnvironmentVariableType::CodeHash => "CODE_HASH",
-        EnvironmentVariableType::TypeHash => "TYPE_HASH",
-        EnvironmentVariableType::TxIndex => "TX_INDEX",
-        EnvironmentVariableType::TxHash => "TX_HASH",
-    };
-    let maybe_dep_group = if dep_type == DepType::Code {
-        ""
-    } else {
-        "_DEP_GROUP"
-    };
-    let env = format!("{ENV_PREFIX}_{contract_name}{maybe_dep_group}_{type_desc}");
-    std::env::var(&env).unwrap_or_else(|_| {
-        panic!(
-            "Environment variable {} for contract {:?}",
-            env.as_str(),
-            contract
-        )
-    })
-}
+impl ContractsContext {
+    pub fn new(
+        genesis_block: BlockView,
+        fiber_scripts: Vec<FiberScript>,
+        udt_whitelist: UdtCfgInfos,
+    ) -> Self {
+        let mut contract_default_scripts: HashMap<Contract, Script> = HashMap::new();
+        let mut script_cell_deps: HashMap<Contract, Vec<CellDep>> = HashMap::new();
+
+        let genesis_tx = genesis_block
+            .transaction(0)
+            .expect("genesis block transaction #0 should exist");
+
+        // setup secp256k1
+        let secp256k1_binary_cell = genesis_tx
+            .output(1)
+            .expect("genesis block transaction #0 output #1 should exist");
+        let secp256k1_binary_cell_type_script = secp256k1_binary_cell
+            .type_()
+            .to_opt()
+            .expect("secp256k1 binary type script should exist");
+        contract_default_scripts.insert(
+            Contract::Secp256k1Lock,
+            Script::new_builder()
+                .code_hash(secp256k1_binary_cell_type_script.calc_script_hash())
+                .hash_type(ScriptHashType::Type.into())
+                .build(),
+        );
 
-#[cfg(test)]
-impl From<MockContext> for ContractsContext {
-    fn from(mock: MockContext) -> Self {
-        Self::Mock(mock)
-    }
-}
+        let secp256k1_dep_group_tx_hash = genesis_block
+            .transaction(1)
+            .expect("genesis block transaction #1 should exist")
+            .hash();
+        let secp256k1_dep_group_out_point = OutPoint::new_builder()
+            .tx_hash(secp256k1_dep_group_tx_hash)
+            .index(0u32.pack())
+            .build();
+        script_cell_deps.insert(
+            Contract::Secp256k1Lock,
+            vec![CellDep::new_builder()
+                .out_point(secp256k1_dep_group_out_point)
+                .dep_type(DepType::DepGroup.into())
+                .build()],
+        );
 
-impl ContractsContext {
-    pub fn new(network: CkbNetwork, udt_whitelist: UdtCfgInfos) -> Self {
-        match network {
-            #[cfg(test)]
-            CkbNetwork::Mocknet => {
-                tracing::warn!("Initializing mock context for testing.");
-                MockContext::new().into()
+        let genesis_hash = genesis_block.hash();
+        match format!("{genesis_hash:#x}").as_str() {
+            "0x92b197aa1fba0f63633922c61c92375c9c074a93e85963554f5499fe1450d0e5" => {
+                info!("Creating ContractsContext for mainnet");
             }
-            CkbNetwork::Dev => {
-                let mut map = HashMap::new();
-                let mut script_cell_deps = HashMap::new();
-                for (program_dep_type, group_dep_type, contracts) in [
-                    (
-                        DepType::Code,
-                        DepType::DepGroup,
-                        vec![Contract::FundingLock, Contract::CommitmentLock],
-                    ),
-                    (DepType::Code, DepType::Code, vec![Contract::SimpleUDT]),
-                ] {
-                    for contract in contracts {
-                        let program_code_hash = get_hash_from_environment_variable(
-                            contract,
-                            EnvironmentVariableType::CodeHash,
-                            program_dep_type,
-                        );
-                        let group_tx = get_hash_from_environment_variable(
-                            contract,
-                            EnvironmentVariableType::TxHash,
-                            group_dep_type,
-                        );
-                        let group_index: usize = get_environment_variable(
-                            contract,
-                            EnvironmentVariableType::TxIndex,
-                            group_dep_type,
-                        )
-                        .parse()
-                        .expect("Valid index");
-                        let dep_group_out_point = OutPoint::new_builder()
-                            .tx_hash(group_tx.into())
-                            .index(group_index.pack())
-                            .build();
-                        let script = Script::new_builder()
-                            .code_hash(program_code_hash.into())
-                            .hash_type(ScriptHashType::Data1.into())
-                            .args(Bytes::new().pack())
-                            .build();
-                        let cell_dep = CellDep::new_builder()
-                            .out_point(dep_group_out_point.clone())
-                            .dep_type(group_dep_type.into())
-                            .build();
-                        map.insert(contract, script);
-                        script_cell_deps.insert(
-                            contract,
-                            CellDepVec::new_builder().push(cell_dep).build().pack(),
-                        );
-                    }
-                }
-                let tx1_env_name = format!("{ENV_PREFIX}_CKB_GENESIS_TX_1");
-                let tx1 = Hash256::from_str(
-                    &env::var(&tx1_env_name)
-                        .unwrap_or_else(|_| panic!("environment variable {tx1_env_name}")),
-                )
-                .expect("valid hash");
+            "0x10639e0895502b5688a6be8cf69460d76541bfa4821629d86d62ba0aae3f9606" => {
+                info!("Creating ContractsContext for testnet");
+            }
+            _ => {
+                info!("Creating ContractsContext for devnet");
+                let len = genesis_tx.outputs().len();
+                // the last 4 cells are the default contracts: CkbAuth, FundingLock, CommitmentLock, SimpleUDT
+                let ckb_auth_cell_dep = CellDep::new_builder()
+                    .out_point(
+                        OutPoint::new_builder()
+                            .tx_hash(genesis_tx.hash())
+                            .index((len - 4).pack())
+                            .build(),
+                    )
+                    .dep_type(DepType::Code.into())
+                    .build();
+                script_cell_deps.insert(Contract::CkbAuth, vec![ckb_auth_cell_dep.clone()]);
 
-                let secp256k1_script = Script::new_builder()
-                    .code_hash(
-                        Hash256::from_str(DEFUALT_SECP256K1_TYPE_HASH)
-                            .expect("valid hash")
-                            .into(),
+                let funding_lock_cell_dep = CellDep::new_builder()
+                    .out_point(
+                        OutPoint::new_builder()
+                            .tx_hash(genesis_tx.hash())
+                            .index((len - 3).pack())
+                            .build(),
                     )
-                    .hash_type(ScriptHashType::Type.into())
-                    .args(Bytes::new().pack())
+                    .dep_type(DepType::Code.into())
                     .build();
-                map.insert(Contract::Secp256k1Lock, secp256k1_script);
-                let cell_dep = CellDep::new_builder()
+                let output_data = genesis_tx.outputs_data().get(len - 3).unwrap().raw_data();
+                script_cell_deps.insert(
+                    Contract::FundingLock,
+                    vec![funding_lock_cell_dep, ckb_auth_cell_dep.clone()],
+                );
+                contract_default_scripts.insert(
+                    Contract::FundingLock,
+                    Script::new_builder()
+                        .code_hash(CellOutput::calc_data_hash(&output_data))
+                        .hash_type(ScriptHashType::Data1.into())
+                        .build(),
+                );
+
+                let commitment_lock_cell_dep = CellDep::new_builder()
                     .out_point(
                         OutPoint::new_builder()
-                            .tx_hash(tx1.into())
-                            .index(0u32.pack())
+                            .tx_hash(genesis_tx.hash())
+                            .index((len - 2).pack())
                             .build(),
                     )
-                    .dep_type(DepType::DepGroup.into())
+                    .dep_type(DepType::Code.into())
                     .build();
+                let output_data = genesis_tx.outputs_data().get(len - 2).unwrap().raw_data();
                 script_cell_deps.insert(
-                    Contract::Secp256k1Lock,
-                    CellDepVec::new_builder().push(cell_dep).build().pack(),
+                    Contract::CommitmentLock,
+                    vec![commitment_lock_cell_dep, ckb_auth_cell_dep],
+                );
+                contract_default_scripts.insert(
+                    Contract::CommitmentLock,
+                    Script::new_builder()
+                        .code_hash(CellOutput::calc_data_hash(&output_data))
+                        .hash_type(ScriptHashType::Data1.into())
+                        .build(),
                 );
 
-                debug!("Loaded contracts into the real environement: {:?}", &map);
-                Self::Real(Arc::new(ContractsInfo {
-                    contract_default_scripts: map,
-                    script_cell_deps,
-                    udt_whitelist,
-                }))
-            }
-            CkbNetwork::Testnet => {
-                let map = [
-                    (
-                        Contract::FundingLock,
-                        "0x6c67887fe201ee0c7853f1682c0b77c0e6214044c156c7558269390a8afa6d7c",
-                    ),
-                    (
-                        Contract::CommitmentLock,
-                        "0x740dee83f87c6f309824d8fd3fbdd3c8380ee6fc9acc90b1a748438afcdf81d8",
-                    ),
-                    (Contract::Secp256k1Lock, DEFUALT_SECP256K1_TYPE_HASH),
-                ]
-                .into_iter()
-                .map(|(contract, type_hash)| {
-                    (
-                        contract,
-                        Script::new_builder()
-                            .code_hash(Hash256::from_str(type_hash).expect("valid hash").into())
-                            .hash_type(ScriptHashType::Type.into())
-                            .args(Bytes::new().pack())
+                let simple_udt_cell_dep = CellDep::new_builder()
+                    .out_point(
+                        OutPoint::new_builder()
+                            .tx_hash(genesis_tx.hash())
+                            .index((len - 1).pack())
                             .build(),
                     )
-                })
-                .collect();
-                let script_cell_info: HashMap<_, _> = [
-                    (
-                        Contract::Secp256k1Lock,
-                        (
-                            "0xf8de3bb47d055cdf460d93a2a6e1b05f7432f9777c8c474abf4eec1d4aee5d37",
-                            0u32,
-                            DepType::DepGroup,
-                        ),
-                    ),
-                    (
-                        Contract::CkbAuth,
-                        (
-                            "0xbfd6d68b328a02606f1f65ee0f79f8ed5f76dfe86998c7aaa9ee4720d53f4c49",
-                            0,
-                            DepType::Code,
-                        ),
-                    ),
-                    (
-                        Contract::FundingLock,
-                        (
-                            "0x89af398edc7ed0054506b33349b031097d94378e11e77bf0690ee69d82623a43",
-                            0,
-                            DepType::Code,
-                        ),
-                    ),
-                    (
-                        Contract::CommitmentLock,
-                        (
-                            "0x89af398edc7ed0054506b33349b031097d94378e11e77bf0690ee69d82623a43",
-                            1,
-                            DepType::Code,
-                        ),
-                    ),
-                ]
-                .into_iter()
-                .collect();
-                let script_deps: HashMap<_, _> = [
-                    (Contract::FundingLock, vec![Contract::CkbAuth]),
-                    (Contract::CommitmentLock, vec![Contract::CkbAuth]),
-                ]
-                .into_iter()
-                .collect();
+                    .dep_type(DepType::Code.into())
+                    .build();
+                let output_data = genesis_tx.outputs_data().get(len - 1).unwrap().raw_data();
+                script_cell_deps.insert(Contract::SimpleUDT, vec![simple_udt_cell_dep]);
+                contract_default_scripts.insert(
+                    Contract::SimpleUDT,
+                    Script::new_builder()
+                        .code_hash(CellOutput::calc_data_hash(&output_data))
+                        .hash_type(ScriptHashType::Data1.into())
+                        .build(),
+                );
+            }
+        }
 
-                let script_cell_deps = script_cell_info
-                    .keys()
-                    .map(|contract| {
-                        let cell_deps = vec![contract]
-                            .into_iter()
-                            .chain(script_deps.get(contract).unwrap_or(&vec![]))
-                            .map(|dep| {
-                                let (tx, index, dep_type) = script_cell_info.get(dep).unwrap();
-                                CellDep::new_builder()
-                                    .out_point(
-                                        OutPoint::new_builder()
-                                            .tx_hash(Hash256::from_str(tx).unwrap().into())
-                                            .index((*index).pack())
-                                            .build(),
-                                    )
-                                    .dep_type((*dep_type).into())
-                                    .build()
-                            })
-                            .collect();
-                        (
-                            *contract,
-                            CellDepVec::new_builder().set(cell_deps).build().pack(),
-                        )
-                    })
-                    .collect();
+        // allow for overriding the default scripts and cell deps
+        for fiber_script in fiber_scripts {
+            let FiberScript {
+                name,
+                script,
+                cell_deps,
+            } = fiber_script;
+            contract_default_scripts.insert(name, script.into());
+            script_cell_deps.insert(name, cell_deps.into_iter().map(CellDep::from).collect());
+        }
 
-                Self::Real(Arc::new(ContractsInfo {
-                    contract_default_scripts: map,
-                    script_cell_deps,
-                    udt_whitelist,
-                }))
-            }
-            _ => panic!("Unsupported network type {:?}", network),
+        Self {
+            contracts: ContractsInfo {
+                contract_default_scripts,
+                script_cell_deps,
+                udt_whitelist,
+            },
         }
     }
 
     fn get_contracts_map(&self) -> &HashMap<Contract, Script> {
-        match self {
-            #[cfg(test)]
-            Self::Mock(mock) => &mock.contracts_context.contract_default_scripts,
-            Self::Real(real) => &real.contract_default_scripts,
-        }
+        &self.contracts.contract_default_scripts
     }
 
     pub(crate) fn get_cell_deps(&self, contracts: Vec<Contract>) -> CellDepVec {
-        let (script_cell_deps, contracts) = match self {
-            #[cfg(test)]
-            Self::Mock(mock) => {
-                // ckb-testtool need to include CkbAuth
-                let mut contracts = contracts;
-                contracts.push(Contract::CkbAuth);
-                (&mock.contracts_context.script_cell_deps, contracts)
+        let mut builder: CellDepVecBuilder = CellDepVec::new_builder();
+        for contract in contracts {
+            if let Some(cell_deps) = self.contracts.script_cell_deps.get(&contract) {
+                builder = builder.extend(cell_deps.clone());
             }
-            Self::Real(real) => (&real.script_cell_deps, contracts),
-        };
-
-        let cell_deps_vec = contracts
-            .into_iter()
-            .map(|contract| {
-                script_cell_deps
-                    .get(&contract)
-                    .unwrap_or_else(|| {
-                        panic!("Cell dep for contract {:?} does not exists", contract)
-                    })
-                    .clone()
-            })
-            .collect::<Vec<CellDepVec>>();
-        let mut res: CellDepVecBuilder = CellDepVec::new_builder();
-        for cell_dep in cell_deps_vec.into_iter().flatten() {
-            res = res.push(cell_dep);
         }
-        res.build()
+        builder.build()
     }
 
     pub fn get_udt_whitelist(&self) -> &UdtCfgInfos {
-        match self {
-            #[cfg(test)]
-            Self::Mock(mock) => &mock.contracts_context.udt_whitelist,
-            Self::Real(real) => &real.udt_whitelist,
-        }
+        &self.contracts.udt_whitelist
     }
 
     pub(crate) fn get_script(&self, contract: Contract, args: &[u8]) -> Script {
@@ -480,37 +232,38 @@ impl ContractsContext {
     }
 }
 
+pub static CONTRACTS_CONTEXT_INSTANCE: OnceCell<ContractsContext> = OnceCell::new();
+
 pub fn init_contracts_context(
-    network: Option<CkbNetwork>,
-    ckb_config: Option<&CkbConfig>,
-) -> &'static ContractsContext {
-    static INSTANCE: once_cell::sync::OnceCell<ContractsContext> = once_cell::sync::OnceCell::new();
-    let udt_whitelist = ckb_config
-        .map(|config| config.udt_whitelist.clone())
-        .unwrap_or_default();
-    INSTANCE.get_or_init(|| {
-        ContractsContext::new(
-            network.unwrap_or(DEFAULT_CONTRACT_NETWORK),
-            udt_whitelist.unwrap_or_default(),
-        )
-    })
+    genesis_block: BlockView,
+    fiber_scripts: Vec<FiberScript>,
+    udt_whitelist: UdtCfgInfos,
+) {
+    CONTRACTS_CONTEXT_INSTANCE
+        .set(ContractsContext::new(
+            genesis_block,
+            fiber_scripts,
+            udt_whitelist,
+        ))
+        .expect("init_contracts_context should only be called once");
 }
 
-#[cfg(test)]
-const DEFAULT_CONTRACT_NETWORK: CkbNetwork = CkbNetwork::Mocknet;
-#[cfg(not(test))]
-const DEFAULT_CONTRACT_NETWORK: CkbNetwork = CkbNetwork::Dev;
+fn get_contracts_context() -> &'static ContractsContext {
+    CONTRACTS_CONTEXT_INSTANCE
+        .get()
+        .expect("init_contracts_context should be called first")
+}
 
 pub fn get_script_by_contract(contract: Contract, args: &[u8]) -> Script {
-    init_contracts_context(None, None).get_script(contract, args)
+    get_contracts_context().get_script(contract, args)
 }
 
 pub fn get_cell_deps_by_contracts(contracts: Vec<Contract>) -> CellDepVec {
-    init_contracts_context(None, None).get_cell_deps(contracts)
+    get_contracts_context().get_cell_deps(contracts)
 }
 
 fn get_udt_info(script: &Script) -> Option<&UdtArgInfo> {
-    init_contracts_context(None, None).get_udt_info(script)
+    get_contracts_context().get_udt_info(script)
 }
 
 pub fn check_udt_script(script: &Script) -> bool {
@@ -528,9 +281,7 @@ pub fn get_udt_cell_deps(script: &Script) -> Option<CellDepVec> {
 }
 
 pub fn get_udt_whitelist() -> UdtCfgInfos {
-    init_contracts_context(None, None)
-        .get_udt_whitelist()
-        .clone()
+    get_contracts_context().get_udt_whitelist().clone()
 }
 
 pub fn is_udt_type_auto_accept(script: &Script, amount: u128) -> bool {
diff --git a/src/ckb/tests/contracts.rs b/src/ckb/tests/contracts.rs
deleted file mode 100644
index 1707e501f..000000000
--- a/src/ckb/tests/contracts.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use ckb_types::{core::TransactionView, packed::CellOutput, prelude::Pack};
-use molecule::prelude::{Builder, Entity};
-
-use crate::ckb::contracts::{get_script_by_contract, Contract, ContractsContext, MockContext};
-
-// This test is to ensure that the same transaction is generated for different mock contexts.
-// If different transactions are generated, then the mock context is not deterministic.
-// We can't use the mock context to verify the validity of the transactions.
-#[test]
-fn test_same_tx_for_different_mock_context() {
-    let mock_ctx1 = MockContext::new();
-    let mock_ctx2 = MockContext::new();
-    let capacity = 100u64;
-    let output = CellOutput::new_builder()
-        .capacity(capacity.pack())
-        .lock(get_script_by_contract(
-            Contract::FundingLock,
-            &b"whatever"[..],
-        ))
-        .build();
-    assert_eq!(
-        TransactionView::new_advanced_builder()
-            .cell_deps(ContractsContext::from(mock_ctx1).get_cell_deps(vec![Contract::FundingLock]))
-            .output(output.clone())
-            .output_data(Default::default())
-            .build(),
-        TransactionView::new_advanced_builder()
-            .cell_deps(ContractsContext::from(mock_ctx2).get_cell_deps(vec![Contract::FundingLock]))
-            .output(output)
-            .output_data(Default::default())
-            .build()
-    );
-}
diff --git a/src/ckb/tests/mod.rs b/src/ckb/tests/mod.rs
index 7096078c8..1c0ebf32a 100644
--- a/src/ckb/tests/mod.rs
+++ b/src/ckb/tests/mod.rs
@@ -1,5 +1,4 @@
 mod actor;
 mod config;
-mod contracts;
 
 pub mod test_utils;
diff --git a/src/ckb/tests/test_utils.rs b/src/ckb/tests/test_utils.rs
index f9eeb7241..196fe7c2d 100644
--- a/src/ckb/tests/test_utils.rs
+++ b/src/ckb/tests/test_utils.rs
@@ -1,16 +1,20 @@
-use std::collections::HashMap;
-
 use anyhow::anyhow;
 use ckb_jsonrpc_types::TxStatus;
+use ckb_testtool::context::Context;
 use ckb_types::{
-    core::TransactionView,
-    packed::{CellOutput, OutPoint},
+    bytes::Bytes,
+    core::{DepType, TransactionView},
+    packed::{CellDep, CellOutput, OutPoint, Script},
     prelude::{Builder, Entity, Pack, PackVec, Unpack},
 };
+use std::collections::HashMap;
 
-use crate::ckb::{TraceTxRequest, TraceTxResponse};
+use crate::ckb::{
+    config::UdtCfgInfos,
+    contracts::{Contract, ContractsContext, ContractsInfo, CONTRACTS_CONTEXT_INSTANCE},
+    TraceTxRequest, TraceTxResponse,
+};
 
-use crate::ckb::contracts::MockContext;
 use crate::ckb::CkbChainMessage;
 
 use ckb_types::packed::Byte32;
@@ -24,6 +28,88 @@ pub enum CellStatus {
     Consumed,
 }
 
+pub struct MockContext {
+    pub context: Context,
+}
+
+impl MockContext {
+    pub fn new() -> Self {
+        let binaries = [
+            (
+                Contract::CkbAuth,
+                Bytes::from_static(include_bytes!("../../../tests/deploy/contracts/auth")),
+            ),
+            (
+                Contract::FundingLock,
+                Bytes::from_static(include_bytes!(
+                    "../../../tests/deploy/contracts/funding-lock"
+                )),
+            ),
+            (
+                Contract::CommitmentLock,
+                Bytes::from_static(include_bytes!(
+                    "../../../tests/deploy/contracts/commitment-lock"
+                )),
+            ),
+            // mock secp256k1 lock script
+            (
+                Contract::Secp256k1Lock,
+                Bytes::from_static(include_bytes!(
+                    "../../../tests/deploy/contracts/always_success"
+                )),
+            ),
+            (
+                Contract::SimpleUDT,
+                Bytes::from_static(include_bytes!("../../../tests/deploy/contracts/simple_udt")),
+            ),
+        ];
+        let mut context = Context::new_with_deterministic_rng();
+        let mut contract_default_scripts: HashMap<Contract, Script> = HashMap::new();
+        let mut script_cell_deps: HashMap<Contract, Vec<CellDep>> = HashMap::new();
+
+        for (contract, binary) in binaries.into_iter() {
+            let out_point = context.deploy_cell(binary);
+            let script = context
+                .build_script(&out_point, Default::default())
+                .expect("valid script");
+            contract_default_scripts.insert(contract, script);
+            let cell_dep = CellDep::new_builder()
+                .out_point(out_point)
+                .dep_type(DepType::Code.into())
+                .build();
+
+            let cell_deps = if matches!(contract, Contract::FundingLock)
+                || matches!(contract, Contract::CommitmentLock)
+            {
+                // FundingLock and CommitmentLock depend on CkbAuth
+                vec![
+                    cell_dep,
+                    script_cell_deps
+                        .get(&Contract::CkbAuth)
+                        .unwrap()
+                        .clone()
+                        .get(0)
+                        .unwrap()
+                        .clone(),
+                ]
+            } else {
+                vec![cell_dep]
+            };
+            script_cell_deps.insert(contract, cell_deps);
+        }
+
+        let contracts = ContractsInfo {
+            contract_default_scripts,
+            script_cell_deps,
+            udt_whitelist: UdtCfgInfos::default(),
+        };
+        let contracts_context = ContractsContext { contracts };
+        let _ = CONTRACTS_CONTEXT_INSTANCE.set(contracts_context);
+
+        MockContext { context }
+    }
+}
+
 pub struct MockChainActorState {
     ctx: MockContext,
     tx_status: HashMap<
@@ -179,7 +265,6 @@ impl Actor for MockChainActor {
             }
             SendTx(tx, reply_port) => {
                 const MAX_CYCLES: u64 = 100_000_000;
-                let mut context = state.ctx.write();
                 let mut f = || {
                     // Mark the inputs as consumed
                     for input in tx.input_pts_iter() {
@@ -202,6 +287,7 @@ impl Actor for MockChainActor {
                             }
                         }
                     }
+                    let context = &mut state.ctx.context;
                     match context.verify_tx(&tx, MAX_CYCLES) {
                         Ok(c) => {
                             debug!("Verified transaction: {:?} with {} CPU cycles", tx, c);
diff --git a/src/fiber/config.rs b/src/fiber/config.rs
index 8931128c0..3113e0662 100644
--- a/src/fiber/config.rs
+++ b/src/fiber/config.rs
@@ -1,14 +1,13 @@
-use crate::Result;
-use ckb_sdk::NetworkType;
-use clap::ValueEnum;
+use crate::{ckb::contracts::Contract, Result};
+use ckb_jsonrpc_types::{CellDep, Script};
 use clap_serde_derive::{
     clap::{self},
     ClapSerde,
 };
 #[cfg(not(test))]
 use once_cell::sync::OnceCell;
-use serde::{Deserialize, Deserializer, Serializer};
-use std::{fs, path::PathBuf};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use std::{fs, path::PathBuf, str::FromStr};
 use tentacle::secio::{PublicKey, SecioKeyPair};
 
 pub const CKB_SHANNONS: u64 = 100_000_000; // 1 CKB = 10 ^ 8 shannons
@@ -98,9 +97,13 @@ pub struct FiberConfig {
     )]
     pub(crate) announced_node_name: Option<AnnouncedNodeName>,
 
-    /// name of the network to use (can be any of `mocknet`/`mainnet`/`testnet`/`staging`/`dev`)
-    #[arg(name = "FIBER_NETWORK", long = "fiber-network", env)]
-    pub network: Option<CkbNetwork>,
+    /// chain spec file path, can be "mainnet", "testnet", or a file path to a custom chain spec
+    #[arg(name = "FIBER_CHAIN", long = "fiber-chain", env)]
+    pub chain: String,
+
+    /// lock script configurations related to fiber network
+    #[arg(name = "FIBER_SCRIPTS", long = "fiber-scripts", env, value_parser, num_args = 0.., value_delimiter = ',')]
+    pub scripts: Vec<FiberScript>,
 
     /// minimum ckb funding amount for auto accepting an open channel requests, aunit: shannons [default: 16200000000 shannons]
     #[arg(
@@ -357,25 +360,17 @@ impl FiberConfig {
     }
 }
 
-// Basically ckb_sdk::types::NetworkType. But we added a `Mocknet` variant.
-// And we can't use `ckb_sdk::types::NetworkType` directly because it is not `ValueEnum`.
-#[derive(Debug, Clone, Copy, ValueEnum, Deserialize, PartialEq, Eq)]
-pub enum CkbNetwork {
-    Mocknet,
-    Mainnet,
-    Testnet,
-    Staging,
-    Dev,
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct FiberScript {
+    pub name: Contract,
+    pub script: Script,
+    pub cell_deps: Vec<CellDep>,
 }
 
-impl From<CkbNetwork> for Option<NetworkType> {
-    fn from(network: CkbNetwork) -> Self {
-        match network {
-            CkbNetwork::Mocknet => None,
-            CkbNetwork::Mainnet => Some(NetworkType::Mainnet),
-            CkbNetwork::Testnet => Some(NetworkType::Testnet),
-            CkbNetwork::Staging => Some(NetworkType::Staging),
-            CkbNetwork::Dev => Some(NetworkType::Dev),
-        }
+impl FromStr for FiberScript {
+    type Err = serde_json::Error;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        serde_json::from_str(s)
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 1d17c837a..46243e484 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,5 @@
+use ckb_chain_spec::ChainSpec;
+use ckb_resource::Resource;
 use fnn::actors::RootActor;
 use fnn::cch::CchMessage;
 use fnn::ckb::{
@@ -71,7 +73,19 @@ pub async fn main() {
             Add ckb service to the services list in the config file and relevant configuration to the ckb section of the config file.");
             let node_public_key = fiber_config.public_key();
 
-            let _ = init_contracts_context(fiber_config.network, Some(&ckb_config));
+            let chain = fiber_config.chain.as_str();
+            let chain_spec = ChainSpec::load_from(&match chain {
+                "mainnet" => Resource::bundled("specs/mainnet.toml".to_string()),
+                "testnet" => Resource::bundled("specs/testnet.toml".to_string()),
+                path => Resource::file_system(path.into()),
+            })
+            .expect("load chain spec");
+            let genesis_block = chain_spec.build_genesis().expect("build genesis block");
+            init_contracts_context(
+                genesis_block,
+                fiber_config.scripts.clone(),
+                ckb_config.udt_whitelist.clone().unwrap_or_default(),
+            );
 
             let ckb_actor = Actor::spawn_linked(
                 Some("ckb".to_string()),

From dc986f2aa232c0744c223b5b4687eb50389e0c9c Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Tue, 29 Oct 2024 21:34:11 +0900
Subject: [PATCH 10/31] chore: add dev chain spec for e2e

---
 src/ckb/contracts.rs            |   2 +-
 tests/nodes/deployer/config.yml |   3 +-
 tests/nodes/deployer/dev.toml   | 118 ++++++++++++++++++++++++++++++++
 3 files changed, 120 insertions(+), 3 deletions(-)
 create mode 100644 tests/nodes/deployer/dev.toml

diff --git a/src/ckb/contracts.rs b/src/ckb/contracts.rs
index 618bac98a..c6850fc64 100644
--- a/src/ckb/contracts.rs
+++ b/src/ckb/contracts.rs
@@ -88,7 +88,7 @@ impl ContractsContext {
                 info!("Creating ContractsContext for testnet");
             }
             _ => {
-                info!("Creating ContractsContext for devnet");
+                info!("Creating ContractsContext for dev");
                 let len = genesis_tx.outputs().len();
                 // the last 4 cells are the default contracts: CkbAuth, FundingLock, CommitmentLock, SimpleUDT
                 let ckb_auth_cell_dep = CellDep::new_builder()
diff --git a/tests/nodes/deployer/config.yml b/tests/nodes/deployer/config.yml
index 11c7bd9f8..963ceef6f 100644
--- a/tests/nodes/deployer/config.yml
+++ b/tests/nodes/deployer/config.yml
@@ -2,8 +2,7 @@
 ## Instead the initialize program `udt-init` will use it as a config template to generate `config.yml` for nodes
 
 fiber:
-  listening_port: 8346
-  #announce_node_interval_seconds: 36000
+  chain: dev.toml
   auto_announce_node: true
 
 rpc:
diff --git a/tests/nodes/deployer/dev.toml b/tests/nodes/deployer/dev.toml
new file mode 100644
index 000000000..2b45ac78c
--- /dev/null
+++ b/tests/nodes/deployer/dev.toml
@@ -0,0 +1,118 @@
+name = "ckb_dev"
+
+[genesis]
+version = 0
+parent_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
+timestamp = 0
+compact_target = 0x20010000
+uncles_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
+nonce = "0x0"
+
+[genesis.genesis_cell]
+message = "ckb_dev"
+
+[genesis.genesis_cell.lock]
+code_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
+args = "0x"
+hash_type = "data"
+
+# An array list paths to system cell files, which is absolute or relative to
+# the directory containing this config file.
+[[genesis.system_cells]]
+file = { bundled = "specs/cells/secp256k1_blake160_sighash_all" }
+create_type_id = true
+capacity = 100_000_0000_0000
+[[genesis.system_cells]]
+file = { bundled = "specs/cells/dao" }
+create_type_id = true
+capacity = 16_000_0000_0000
+[[genesis.system_cells]]
+file = { bundled = "specs/cells/secp256k1_data" }
+create_type_id = false
+capacity = 1_048_617_0000_0000
+[[genesis.system_cells]]
+file = { bundled = "specs/cells/secp256k1_blake160_multisig_all" }
+create_type_id = true
+capacity = 100_000_0000_0000
+[[genesis.system_cells]]
+file = { file_system = "../../deploy/contracts/auth" }
+create_type_id = false
+capacity = 100_000_0000_0000
+[[genesis.system_cells]]
+file = { file_system = "../../deploy/contracts/funding-lock" }
+create_type_id = false
+capacity = 100_000_0000_0000
+[[genesis.system_cells]]
+file = { file_system = "../../deploy/contracts/commitment-lock" }
+create_type_id = false
+capacity = 100_000_0000_0000
+[[genesis.system_cells]]
+file = { file_system = "../../deploy/contracts/simple_udt" }
+create_type_id = false
+capacity = 100_000_0000_0000
+
+[genesis.system_cells_lock]
+code_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
+args = "0x"
+hash_type = "data"
+
+# Dep group cells
+[[genesis.dep_groups]]
+name = "secp256k1_blake160_sighash_all"
+files = [
+  { bundled = "specs/cells/secp256k1_data" },
+  { bundled = "specs/cells/secp256k1_blake160_sighash_all" },
+]
+[[genesis.dep_groups]]
+name = "secp256k1_blake160_multisig_all"
+files = [
+  { bundled = "specs/cells/secp256k1_data" },
+  { bundled = "specs/cells/secp256k1_blake160_multisig_all" },
+]
+
+# For first 11 block
+[genesis.bootstrap_lock]
+code_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
+args = "0x"
+hash_type = "type"
+
+# Burn
+[[genesis.issued_cells]]
+capacity = 8_400_000_000_00000000
+lock.code_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
+lock.args = "0x62e907b15cbf27d5425399ebf6f0fb50ebb88f18"
+lock.hash_type = "data"
+
+# issue for random generated private key: d00c06bfd800d27397002dca6fb0993d5ba6399b4238b2f29ee9deb97593d2bc
+[[genesis.issued_cells]]
+capacity = 20_000_000_000_00000000
+lock.code_hash = "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"
+lock.args = "0xc8328aabcd9b9e8e64fbc566c4385c3bdeb219d7"
+lock.hash_type = "type"
+
+# issue for random generated private key: 63d86723e08f0f813a36ce6aa123bb2289d90680ae1e99d4de8cdb334553f24d
+[[genesis.issued_cells]]
+capacity = 5_198_735_037_00000000
+lock.code_hash = "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"
+lock.args = "0x470dcdc5e44064909650113a274b3b36aecb6dc7"
+lock.hash_type = "type"
+
+[params]
+initial_primary_epoch_reward = 1_917_808_21917808
+secondary_epoch_reward = 613_698_63013698
+max_block_cycles = 10_000_000_000
+cellbase_maturity = 0
+primary_epoch_reward_halving_interval = 8760
+epoch_duration_target = 80
+genesis_epoch_length = 10
+# For development and testing purposes only.
+# Keep difficulty be permanent if the pow is Dummy. (default: false)
+permanent_difficulty_in_dummy = true
+starting_block_limiting_dao_withdrawing_lock = 0
+
+[params.hardfork]
+ckb2023 = 0
+
+
+[pow]
+func = "Dummy"

From 4b587db255df77538e3cb0406c095d29a7291d54 Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Tue, 29 Oct 2024 21:49:57 +0900
Subject: [PATCH 11/31] fix: chain hash should be setup

---
 src/fiber/network.rs | 14 +++++++++++++-
 src/main.rs          |  3 ++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/fiber/network.rs b/src/fiber/network.rs
index 1c4eea225..619b7469c 100644
--- a/src/fiber/network.rs
+++ b/src/fiber/network.rs
@@ -4,6 +4,7 @@ use ckb_types::core::{EpochNumberWithFraction, TransactionView};
 use ckb_types::packed::{self, Byte32, CellOutput, OutPoint, Script, Transaction};
 use ckb_types::prelude::{IntoTransactionView, Pack, Unpack};
 use musig2::CompactSignature;
+use once_cell::sync::OnceCell;
 use ractor::concurrency::Duration;
 use ractor::{
     async_trait as rasync_trait, call, call_t, Actor, ActorCell, ActorProcessingErr, ActorRef,
@@ -107,8 +108,19 @@ const NUM_PEER_CONNECTIONS: usize = 40;
 // The duration for which we will try to maintain the number of peers in connection.
 const MAINTAINING_CONNECTIONS_INTERVAL: Duration = Duration::from_secs(3600);
 
+static CHAIN_HASH_INSTANCE: OnceCell<Hash256> = OnceCell::new();
+
+pub fn init_chain_hash(chain_hash: Hash256) {
+    CHAIN_HASH_INSTANCE
+        .set(chain_hash)
+        .expect("init_chain_hash should only be called once");
+}
+
 pub(crate) fn get_chain_hash() -> Hash256 {
-    Default::default()
+    CHAIN_HASH_INSTANCE
+        .get()
+        .cloned()
+        .unwrap_or_default()
 }
 
 #[derive(Debug)]
diff --git a/src/main.rs b/src/main.rs
index 46243e484..796964d5b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,7 +6,7 @@ use fnn::ckb::{
     contracts::{get_script_by_contract, init_contracts_context, Contract},
     CkbChainActor,
 };
-use fnn::fiber::{channel::ChannelSubscribers, graph::NetworkGraph};
+use fnn::fiber::{channel::ChannelSubscribers, graph::NetworkGraph, network::init_chain_hash};
 use fnn::store::Store;
 use fnn::tasks::{
     cancel_tasks_and_wait_for_completion, new_tokio_cancellation_token, new_tokio_task_tracker,
@@ -81,6 +81,7 @@ pub async fn main() {
             })
             .expect("load chain spec");
             let genesis_block = chain_spec.build_genesis().expect("build genesis block");
+            init_chain_hash(genesis_block.hash().into());
             init_contracts_context(
                 genesis_block,
                 fiber_config.scripts.clone(),

From e1174ddad2c3b6f50bafc19d8f9a4247c57ea16f Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Wed, 30 Oct 2024 15:23:17 +0800
Subject: [PATCH 12/31] fix udt init and dev.toml

---
 .gitignore                        |  1 +
 src/config.rs                     |  2 ++
 src/main.rs                       |  3 ++-
 tests/deploy/udt-init/src/main.rs | 20 ++++++++++++--------
 tests/nodes/deployer/dev.toml     | 16 ++++++++--------
 5 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1eb08f847..acc79fb43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 
 /tests/nodes/*/fiber/store
 /tests/nodes/*/config.yml
+/tests/nodes/*/dev.toml
 /tests/deploy/udt-init/target
 tests/nodes/.ports
 /coverage-report
diff --git a/src/config.rs b/src/config.rs
index b9cd9fce4..a1340aeaf 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -106,6 +106,7 @@ pub struct Config {
     pub rpc: Option<RpcConfig>,
     // ckb actor config, None represents that we should not run ckb actor
     pub ckb: Option<CkbConfig>,
+    pub base_dir: PathBuf,
 }
 
 pub(crate) fn print_help_and_exit(code: i32) {
@@ -197,6 +198,7 @@ impl Config {
             cch,
             rpc,
             ckb,
+            base_dir,
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 796964d5b..ff2f4e414 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,6 +15,7 @@ use fnn::watchtower::{WatchtowerActor, WatchtowerMessage};
 use fnn::{start_cch, start_network, start_rpc, Config};
 
 use core::default::Default;
+use std::path::Path;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -77,7 +78,7 @@ pub async fn main() {
             let chain_spec = ChainSpec::load_from(&match chain {
                 "mainnet" => Resource::bundled("specs/mainnet.toml".to_string()),
                 "testnet" => Resource::bundled("specs/testnet.toml".to_string()),
-                path => Resource::file_system(path.into()),
+                path => Resource::file_system(Path::new(&config.base_dir).join(path)),
             })
             .expect("load chain spec");
             let genesis_block = chain_spec.build_genesis().expect("build genesis block");
diff --git a/tests/deploy/udt-init/src/main.rs b/tests/deploy/udt-init/src/main.rs
index 30299f35e..56e4f3ccc 100644
--- a/tests/deploy/udt-init/src/main.rs
+++ b/tests/deploy/udt-init/src/main.rs
@@ -18,8 +18,8 @@ use ckb_types::{
 use ckb_types::{packed::CellDep, prelude::Builder};
 use rand::Rng;
 use serde::{Deserialize, Serialize};
-use std::collections::HashSet;
-use std::net::TcpListener;
+use std::{collections::HashSet, path::Path};
+use std::{fs, net::TcpListener};
 
 use std::{error::Error as StdErr, str::FromStr};
 
@@ -225,8 +225,9 @@ fn generate_ports(num_ports: usize) -> Vec<u16> {
 }
 
 fn genrate_nodes_config() {
-    let nodes_dir = std::env::var("NODES_DIR").expect("env var");
-    let yaml_file_path = format!("{}/deployer/config.yml", nodes_dir);
+    let node_dir_env = std::env::var("NODES_DIR").expect("env var");
+    let nodes_dir = Path::new(&node_dir_env);
+    let yaml_file_path = nodes_dir.join("deployer/config.yml");
     let content = std::fs::read_to_string(yaml_file_path).expect("read failed");
     let data: serde_yaml::Value = serde_yaml::from_str(&content).expect("Unable to parse YAML");
     let mut udt_infos = vec![];
@@ -257,6 +258,7 @@ fn genrate_nodes_config() {
     let on_github_action = std::env::var("ON_GITHUB_ACTION").is_ok();
     let gen_ports = generate_ports(6);
     let mut ports_iter = gen_ports.iter();
+    let dev_config = nodes_dir.join("deployer/dev.toml");
     for (i, config_dir) in config_dirs.iter().enumerate() {
         let use_gen_port = on_github_action && i != 0;
         let default_fiber_port = (8343 + i) as u16;
@@ -290,13 +292,14 @@ fn genrate_nodes_config() {
         }
 
         let new_yaml = header.to_string() + &serde_yaml::to_string(&data).unwrap();
-        let config_path = format!("{}/{}/config.yml", nodes_dir, config_dir);
-
+        let config_path = nodes_dir.join(config_dir).join("config.yml");
         std::fs::write(config_path, new_yaml).expect("write failed");
+        let node_dev_config = nodes_dir.join(config_dir).join("dev.toml");
+        fs::copy(dev_config.clone(), node_dev_config).expect("copy dev.toml failed");
     }
 
     if on_github_action {
-        let bruno_dir = format!("{}/../bruno/environments/", nodes_dir);
+        let bruno_dir = nodes_dir.join("../bruno/environments/");
         for config in std::fs::read_dir(bruno_dir).expect("read dir") {
             let config = config.expect("read config");
             for (default_port, port) in ports_map.iter() {
@@ -319,7 +322,8 @@ fn genrate_nodes_config() {
         .collect::<Vec<_>>()
         .join("\n");
 
-    let port_file_path = format!("{}/.ports", nodes_dir);
+    let port_file_path = nodes_dir.join(".ports");
+
     std::fs::write(port_file_path, content).expect("write ports list");
 }
 
diff --git a/tests/nodes/deployer/dev.toml b/tests/nodes/deployer/dev.toml
index 2b45ac78c..781ec9052 100644
--- a/tests/nodes/deployer/dev.toml
+++ b/tests/nodes/deployer/dev.toml
@@ -35,21 +35,21 @@ file = { bundled = "specs/cells/secp256k1_blake160_multisig_all" }
 create_type_id = true
 capacity = 100_000_0000_0000
 [[genesis.system_cells]]
-file = { file_system = "../../deploy/contracts/auth" }
+file = { file = "../../deploy/contracts/auth" }
 create_type_id = false
-capacity = 100_000_0000_0000
+capacity = 200_000_0000_0000
 [[genesis.system_cells]]
-file = { file_system = "../../deploy/contracts/funding-lock" }
+file = { file = "../../deploy/contracts/funding-lock" }
 create_type_id = false
-capacity = 100_000_0000_0000
+capacity = 200_000_0000_0000
 [[genesis.system_cells]]
-file = { file_system = "../../deploy/contracts/commitment-lock" }
+file = { file = "../../deploy/contracts/commitment-lock" }
 create_type_id = false
-capacity = 100_000_0000_0000
+capacity = 200_000_0000_0000
 [[genesis.system_cells]]
-file = { file_system = "../../deploy/contracts/simple_udt" }
+file = { file = "../../deploy/contracts/simple_udt" }
 create_type_id = false
-capacity = 100_000_0000_0000
+capacity = 200_000_0000_0000
 
 [genesis.system_cells_lock]
 code_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"

From 0939aea4fc2548168cf38f936ef1d6f3a5a9b36d Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Wed, 30 Oct 2024 16:58:27 +0800
Subject: [PATCH 13/31] fix udt init

---
 src/main.rs                       |   1 +
 tests/deploy/deploy.sh            |   3 -
 tests/deploy/udt-init/Cargo.lock  | 140 +++++++++++++++++-------------
 tests/deploy/udt-init/Cargo.toml  |  10 ++-
 tests/deploy/udt-init/src/main.rs |  96 +++++++++++++++-----
 5 files changed, 161 insertions(+), 89 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index ff2f4e414..56b40b84d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -82,6 +82,7 @@ pub async fn main() {
             })
             .expect("load chain spec");
             let genesis_block = chain_spec.build_genesis().expect("build genesis block");
+            eprintln!("genesis block hash: {}", genesis_block.hash());
             init_chain_hash(genesis_block.hash().into());
             init_contracts_context(
                 genesis_block,
diff --git a/tests/deploy/deploy.sh b/tests/deploy/deploy.sh
index 752447ade..643bcc2f9 100755
--- a/tests/deploy/deploy.sh
+++ b/tests/deploy/deploy.sh
@@ -66,9 +66,6 @@ run_udt_init() {
     )
 }
 
-deploy_and_generate_blocks funding-lock
-deploy_and_generate_blocks commitment-lock
-deploy_and_generate_blocks simple-udt
 deploy_and_generate_blocks xudt
 
 ./create-dotenv-file.sh >.env
diff --git a/tests/deploy/udt-init/Cargo.lock b/tests/deploy/udt-init/Cargo.lock
index 637d0c64f..551473175 100644
--- a/tests/deploy/udt-init/Cargo.lock
+++ b/tests/deploy/udt-init/Cargo.lock
@@ -178,9 +178,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "ckb-chain-spec"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e955d55380bbd2ca883b4426fb1483e61f06fe65c8b377d5d4bceeb03ecf07bb"
+checksum = "38fa470ac81179a066b3dd3e0d56e8fb9988aaddf5c2ae921cbc2ee6c60bbc56"
 dependencies = [
  "cacache",
  "ckb-constant",
@@ -201,38 +201,38 @@ dependencies = [
 
 [[package]]
 name = "ckb-channel"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "853f561e90ff59d858dc87c1ac385fae948984859c874fd8d3bd1bbab335889d"
+checksum = "081350579a7d6cee3c7d3b82b3667860517e785269f8cd72b27ae472775d9c04"
 dependencies = [
  "crossbeam-channel",
 ]
 
 [[package]]
 name = "ckb-constant"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5baf91b16a3b8360c85211dfdff3d2adc0a1f3ae571ea6b1637d55d6b227e312"
+checksum = "fce0d46bfe7d555b60e7e1b589643bcd2d6a40e4cc0a04c5e9412dbb30c1f206"
 
 [[package]]
 name = "ckb-crypto"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e2094270f5632808cbff1c37a37ffb9b3e79f7a99e78927fb228d8c343793eb"
+checksum = "d2b268e177104ec7089656562adac06dd8209298873cb806fff76c1d3df16566"
 dependencies = [
  "ckb-fixed-hash",
  "faster-hex",
  "lazy_static",
- "rand 0.7.3",
+ "rand 0.8.5",
  "secp256k1",
  "thiserror",
 ]
 
 [[package]]
 name = "ckb-dao-utils"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eb3606c602a424098317bfde4b7d6427d4fe5dfe1a6d4ebc831ce0308508085"
+checksum = "1df36dfa384153423e777f3f40beeb5fbb42d5ba223d411d7850bf72e190428e"
 dependencies = [
  "byteorder",
  "ckb-error",
@@ -241,9 +241,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-error"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01041f8a1d7eeaf85caca3547bb78d929d6a4d62774509d7eb438b6bc310ba30"
+checksum = "e6726194aed3b38485270e64d3823b3fb5e9d7ce6ea2ea117106f97619272de5"
 dependencies = [
  "anyhow",
  "ckb-occupied-capacity",
@@ -253,9 +253,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-fixed-hash"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a7491f18717b84827923935cc5adb1bcdf9c924e377b478d089f4694e7c779b"
+checksum = "e497f03441f4622bc6d1d44db95ff47c37bec03ef2c8132ca19ac8005c70995f"
 dependencies = [
  "ckb-fixed-hash-core",
  "ckb-fixed-hash-macros",
@@ -263,9 +263,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-fixed-hash-core"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9509f63fedb9b6e42cfd0db47d3dc5acb6b029da546d5d4451d08afc44c70cf8"
+checksum = "bb5f80c82b9b0498272f085b86824cfe0b76a2c04ee653a91f9ff362fd9b6f6c"
 dependencies = [
  "ckb_schemars",
  "faster-hex",
@@ -275,9 +275,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-fixed-hash-macros"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd89533a5da746f50798752a46f5f084f110c849335be94baf506790ebee931"
+checksum = "00ede2291016d17450e9d117fac6fb515629779e31ea452d5146a117cd12bf0f"
 dependencies = [
  "ckb-fixed-hash-core",
  "proc-macro2",
@@ -287,9 +287,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-gen-types"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a0f2d0f4224507a027d25d64824dd0dc8d367c8b5bead30289eaffe1381a7fb"
+checksum = "e0a7891f62f4ae4f018bfde91a46178c78491a1dfee740a20b994003a23f10af"
 dependencies = [
  "cfg-if 1.0.0",
  "ckb-error",
@@ -302,9 +302,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-hash"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5754bc49cf76a7e8829fe6a7cf1eea1284cbca9777b521f072c76d6ae28d303"
+checksum = "d96b7aec74956ae5e79d0fc68e5903dc2b133c2c64644514485bbc9feb5367eb"
 dependencies = [
  "blake2b-ref",
  "blake2b-rs",
@@ -312,9 +312,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-jsonrpc-types"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef7e123043ca3701cf05ba4c3699b34f3b179609109a4c8c3afa68922f722be7"
+checksum = "44e622a66404770b52da9dfbc9b994f2b711ea2368ef23cc9b1c96ca38491ecf"
 dependencies = [
  "ckb-types",
  "ckb_schemars",
@@ -325,9 +325,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-logger"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ebecd56c9acb453bdcb5c39e66b6b7f980bdf72b35515750bc295fa635287d"
+checksum = "c76af0252cd14e57fafac7c67282eedb9c7bbf40a529ed4eb1bb85067b767e7a"
 dependencies = [
  "log",
 ]
@@ -343,9 +343,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-mock-tx-types"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1ddfee88ad65ff6fd828695a78ec49be60888c58e631feb66d130008ce130d0"
+checksum = "fd785084e7c3903cb49f0d2abb12c56880827cae14723cd4fed1bf3fa26a74db"
 dependencies = [
  "ckb-jsonrpc-types",
  "ckb-traits",
@@ -355,9 +355,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-occupied-capacity"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4aa07af7cec38d15cfe4c1ce150514fba5a4e78996bbbd098982106bee7d8d"
+checksum = "5e01910f17fcdb1850df67a5b340bbb98d18948eacb476fc85d9a7699294d7ab"
 dependencies = [
  "ckb-occupied-capacity-core",
  "ckb-occupied-capacity-macros",
@@ -365,18 +365,18 @@ dependencies = [
 
 [[package]]
 name = "ckb-occupied-capacity-core"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a63ed90996ba24ab26d5ac8ae22fd002a293f4a4e4526042e1adf84b1889e176"
+checksum = "21ead5905cedba4acf082f88723c8f42a508bd28fd9c00e1dbf170049ef778b4"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "ckb-occupied-capacity-macros"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a6aae3f1f8d194cd5bd4328c9c7281f0d7acc73976b2771576cdc06a9ed608f"
+checksum = "893198354933ba8fa0a1d99c013c819a295f6ae30b1af89fc14e0b62d7afa024"
 dependencies = [
  "ckb-occupied-capacity-core",
  "quote",
@@ -385,9 +385,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-pow"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb981de6e56107cd3e1660a9105bb07891277b21604946f70bf5097dd03690f7"
+checksum = "069c3db99adb9d350d186de8e02a43e77dff7be2a8b9b7cf61ba80a280e2dd00"
 dependencies = [
  "byteorder",
  "ckb-hash",
@@ -399,9 +399,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-rational"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570e816c80fffdfafb58c7c895df8c08c64ba56ce79d824e5ff976dd1a7381"
+checksum = "7be813511d1c17a6bab8a7dcfbee6e086aa2bae3bb77cfd4a570abfb67af2c16"
 dependencies = [
  "numext-fixed-uint",
  "serde",
@@ -409,9 +409,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-resource"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d482493fabf4ce3670277d7dbaa5811872379535031431dc6b19699722c7b846"
+checksum = "d1e74f9bc4039a4cf6d579dc8b444b3d76780e51aab94daccdd5e6e58d01cc32"
 dependencies = [
  "ckb-system-scripts",
  "ckb-types",
@@ -424,9 +424,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-script"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2d6528e95a0f93d4a39e569b1ffffd60cbb0a9ae8f1c96dd465e2576ad510a9"
+checksum = "f6b92a1f4f059f4680b08817dfb739a40356dcf4798b3cb8ae1f1d67218eb0fb"
 dependencies = [
  "byteorder",
  "ckb-chain-spec",
@@ -438,12 +438,14 @@ dependencies = [
  "ckb-vm",
  "faster-hex",
  "serde",
+ "tokio",
 ]
 
 [[package]]
 name = "ckb-sdk"
-version = "3.2.0"
-source = "git+https://github.com/chenyukang/ckb-sdk-rust.git?branch=pcn-udt#e205f61b0df4ae73c4688d6505079cdce6445527"
+version = "3.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75d816b57b37c49a99c715f07e120928d8139993523efec0b9e2faa94db7edce"
 dependencies = [
  "anyhow",
  "bech32",
@@ -496,18 +498,18 @@ dependencies = [
 
 [[package]]
 name = "ckb-traits"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c528f704f3088ec2dd467d374920b64b2bbb9ed9c4e8e12931c069a99150d8bc"
+checksum = "b6500281355bbf7a235fb386b2883e8ffb8cb5bab8447bd86dd229148ec52704"
 dependencies = [
  "ckb-types",
 ]
 
 [[package]]
 name = "ckb-types"
-version = "0.116.1"
+version = "0.118.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b05cc1c6aab0c40b323b233617b67860f9d679fac431a34d1f1b0853d700e9d"
+checksum = "88f4ef54b7665440d1984489c580e8d540888496d7b9ff8d57262ac583ff97a4"
 dependencies = [
  "bit-vec",
  "bytes",
@@ -531,9 +533,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-vm"
-version = "0.24.9"
+version = "0.24.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2c3d68dc7f891e5555c7ebc054722b28ab005e51c5076f54c20d36002dc8e83"
+checksum = "ddff96029d3298cb630e95f29d4b9a93384e938a0b75758684aa8794b53bdd1a"
 dependencies = [
  "byteorder",
  "bytes",
@@ -549,9 +551,9 @@ dependencies = [
 
 [[package]]
 name = "ckb-vm-definitions"
-version = "0.24.9"
+version = "0.24.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2fdf9c8ee14409b2208d23b9ad88828242d7881153ddc04872b66d2e018a52f"
+checksum = "c280bf1d589d23ab0358f58601c2187fc6be86a131644583ef72ea96a0a13ddd"
 dependencies = [
  "paste",
 ]
@@ -1006,6 +1008,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -1287,9 +1295,9 @@ dependencies = [
 
 [[package]]
 name = "molecule"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd9767ab5e5f2ea40f71ff4c8bdb633c50509052e093c2fdd0e390a749dfa3"
+checksum = "6efe1c7efcd0bdf4ca590e104bcb13087d9968956ae4ae98e92fb8c1da0f3730"
 dependencies = [
  "bytes",
  "cfg-if 1.0.0",
@@ -1313,6 +1321,16 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
 [[package]]
 name = "numext-constructor"
 version = "0.1.6"
@@ -1793,18 +1811,18 @@ dependencies = [
 
 [[package]]
 name = "secp256k1"
-version = "0.24.3"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62"
+checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
 dependencies = [
  "secp256k1-sys",
 ]
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.6.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
+checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
 dependencies = [
  "cc",
 ]
@@ -2113,6 +2131,7 @@ dependencies = [
  "bytes",
  "libc",
  "mio",
+ "num_cpus",
  "pin-project-lite",
  "socket2",
  "tokio-macros",
@@ -2214,7 +2233,10 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 name = "udt-init"
 version = "0.1.0"
 dependencies = [
+ "ckb-chain-spec",
+ "ckb-gen-types",
  "ckb-jsonrpc-types",
+ "ckb-resource",
  "ckb-sdk",
  "ckb-types",
  "hex",
diff --git a/tests/deploy/udt-init/Cargo.toml b/tests/deploy/udt-init/Cargo.toml
index 0b5b21467..032ed363f 100644
--- a/tests/deploy/udt-init/Cargo.toml
+++ b/tests/deploy/udt-init/Cargo.toml
@@ -6,9 +6,10 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-sdk = { version = "3.2.0", git = "https://github.com/chenyukang/ckb-sdk-rust.git", branch = "pcn-udt"}
-ckb-types = "0.116.1"
-ckb-jsonrpc-types = "0.116.1"
+#ckb-sdk = { version = "3.2.0", git = "https://github.com/chenyukang/ckb-sdk-rust.git", branch = "pcn-udt"}
+ckb-sdk = { version = "3.4"}
+ckb-types = "0.118"
+ckb-jsonrpc-types = "0.118"
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"
 serde_json = "1.0"
@@ -16,3 +17,6 @@ thiserror = "1.0.30"
 hex = "0.4.3"
 serde_yaml = "0.9.34"
 rand = "0.8.5"
+ckb-chain-spec    = "0.118.0"
+ckb-resource      = "0.118.0"
+ckb-gen-types = "0.118.0"
diff --git a/tests/deploy/udt-init/src/main.rs b/tests/deploy/udt-init/src/main.rs
index 56e4f3ccc..4baebd095 100644
--- a/tests/deploy/udt-init/src/main.rs
+++ b/tests/deploy/udt-init/src/main.rs
@@ -1,3 +1,5 @@
+use ckb_chain_spec::ChainSpec;
+use ckb_resource::Resource;
 use ckb_sdk::{
     transaction::{
         builder::{sudt::SudtTransactionBuilder, CkbTransactionBuilder},
@@ -8,11 +10,16 @@ use ckb_sdk::{
     },
     Address, CkbRpcClient, NetworkInfo, ScriptId,
 };
+use ckb_types::{
+    core::BlockView,
+    packed::CellOutput,
+    prelude::{Entity, Unpack},
+};
 use ckb_types::{
     core::{DepType, ScriptHashType},
     h256,
     packed::{OutPoint, Script},
-    prelude::{Entity, Pack},
+    prelude::Pack,
     H256,
 };
 use ckb_types::{packed::CellDep, prelude::Builder};
@@ -46,34 +53,64 @@ fn get_env_hex(name: &str) -> H256 {
 }
 
 fn gen_dev_udt_handler(udt_kind: &str) -> SudtHandler {
-    let udt_tx = get_env_hex(format!("NEXT_PUBLIC_{}_TX_HASH", udt_kind).as_str());
-    let code_hash = get_code_hash(udt_kind);
-    let (out_point, script_id) = (
-        OutPoint::new_builder()
-            .tx_hash(udt_tx.pack())
-            .index(0u32.pack())
-            .build(),
-        ScriptId::new_data1(code_hash),
-    );
-
-    let cell_dep = CellDep::new_builder()
-        .out_point(out_point)
-        .dep_type(DepType::Code.into())
-        .build();
-
-    ckb_sdk::transaction::handler::sudt::SudtHandler::new_with_customize(vec![cell_dep], script_id)
+    if udt_kind == "SIMPLE_UDT" {
+        let genesis_block = build_gensis_block();
+        let genesis_tx = genesis_block
+            .transaction(0)
+            .expect("genesis block transaction #0 should exist");
+
+        let output_data = genesis_tx.outputs_data().get(3).unwrap().raw_data();
+        let script_id = ScriptId::new_data1(CellOutput::calc_data_hash(&output_data).unpack());
+
+        let simple_udt_cell_dep = CellDep::new_builder()
+            .out_point(
+                OutPoint::new_builder()
+                    .tx_hash(genesis_tx.hash())
+                    .index(3u32.pack())
+                    .build(),
+            )
+            .dep_type(DepType::Code.into())
+            .build();
+
+        ckb_sdk::transaction::handler::sudt::SudtHandler::new_with_customize(
+            vec![simple_udt_cell_dep],
+            script_id,
+        )
+    } else {
+        let udt_tx = get_env_hex(format!("NEXT_PUBLIC_{}_TX_HASH", udt_kind).as_str());
+        let code_hash = get_code_hash(udt_kind);
+        let (out_point, script_id) = (
+            OutPoint::new_builder()
+                .tx_hash(udt_tx.pack())
+                .index(0u32.pack())
+                .build(),
+            ScriptId::new_data1(code_hash),
+        );
+
+        let cell_dep = CellDep::new_builder()
+            .out_point(out_point)
+            .dep_type(DepType::Code.into())
+            .build();
+
+        ckb_sdk::transaction::handler::sudt::SudtHandler::new_with_customize(
+            vec![cell_dep],
+            script_id,
+        )
+    }
 }
 
 fn gen_dev_sighash_handler() -> Secp256k1Blake160SighashAllScriptHandler {
-    let sighash_tx = get_env_hex("NEXT_PUBLIC_CKB_GENESIS_TX_1");
-
-    let out_point = OutPoint::new_builder()
-        .tx_hash(sighash_tx.pack())
+    let genesis_block = build_gensis_block();
+    let secp256k1_dep_group_tx_hash = genesis_block
+        .transaction(1)
+        .expect("genesis block transaction #1 should exist")
+        .hash();
+    let secp256k1_dep_group_out_point = OutPoint::new_builder()
+        .tx_hash(secp256k1_dep_group_tx_hash)
         .index(0u32.pack())
         .build();
-
     let cell_dep = CellDep::new_builder()
-        .out_point(out_point)
+        .out_point(secp256k1_dep_group_out_point)
         .dep_type(DepType::DepGroup.into())
         .build();
 
@@ -355,8 +392,19 @@ fn init_udt_accounts() -> Result<(), Box<dyn StdErr>> {
     Ok(())
 }
 
+fn build_gensis_block() -> BlockView {
+    let node_dir_env = std::env::var("NODES_DIR").expect("env var");
+    let nodes_dir = Path::new(&node_dir_env);
+    let dev_toml = nodes_dir.join("deployer/dev.toml");
+    let chain_spec =
+        ChainSpec::load_from(&Resource::file_system(dev_toml)).expect("load chain spec");
+    let genesis_block = chain_spec.build_genesis().expect("build genesis block");
+    eprintln!("genesis block hash: {}", genesis_block.hash());
+    genesis_block
+}
+
 fn main() -> Result<(), Box<dyn StdErr>> {
-    init_udt_accounts()?;
     genrate_nodes_config();
+    init_udt_accounts()?;
     Ok(())
 }

From 4cad2c3c0f7682968ef224c5fdb7032f27066443 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Wed, 30 Oct 2024 20:35:30 +0800
Subject: [PATCH 14/31] fix contract index issues and clean up script

---
 src/ckb/contracts.rs               | 17 +++---
 src/fiber/network.rs               |  5 +-
 tests/deploy/create-dotenv-file.sh | 50 ---------------
 tests/deploy/deploy.sh             | 34 -----------
 tests/deploy/init-dev-chain.sh     |  3 +
 tests/deploy/udt-init/Cargo.toml   |  7 +--
 tests/deploy/udt-init/src/main.rs  | 98 ++++++++++--------------------
 tests/nodes/deployer/dev.toml      |  4 ++
 8 files changed, 52 insertions(+), 166 deletions(-)

diff --git a/src/ckb/contracts.rs b/src/ckb/contracts.rs
index c6850fc64..8b9fa9e25 100644
--- a/src/ckb/contracts.rs
+++ b/src/ckb/contracts.rs
@@ -89,13 +89,12 @@ impl ContractsContext {
             }
             _ => {
                 info!("Creating ContractsContext for dev");
-                let len = genesis_tx.outputs().len();
-                // the last 4 cells are the default contracts: CkbAuth, FundingLock, CommitmentLock, SimpleUDT
+                // index from 5 ~ 8 are the default contracts: CkbAuth, FundingLock, CommitmentLock, SimpleUDT
                 let ckb_auth_cell_dep = CellDep::new_builder()
                     .out_point(
                         OutPoint::new_builder()
                             .tx_hash(genesis_tx.hash())
-                            .index((len - 4).pack())
+                            .index(5u32.pack())
                             .build(),
                     )
                     .dep_type(DepType::Code.into())
@@ -106,12 +105,12 @@ impl ContractsContext {
                     .out_point(
                         OutPoint::new_builder()
                             .tx_hash(genesis_tx.hash())
-                            .index((len - 3).pack())
+                            .index(6u32.pack())
                             .build(),
                     )
                     .dep_type(DepType::Code.into())
                     .build();
-                let output_data = genesis_tx.outputs_data().get(len - 3).unwrap().raw_data();
+                let output_data = genesis_tx.outputs_data().get(6).unwrap().raw_data();
                 script_cell_deps.insert(
                     Contract::FundingLock,
                     vec![funding_lock_cell_dep, ckb_auth_cell_dep.clone()],
@@ -128,12 +127,12 @@ impl ContractsContext {
                     .out_point(
                         OutPoint::new_builder()
                             .tx_hash(genesis_tx.hash())
-                            .index((len - 2).pack())
+                            .index(7u32.pack())
                             .build(),
                     )
                     .dep_type(DepType::Code.into())
                     .build();
-                let output_data = genesis_tx.outputs_data().get(len - 2).unwrap().raw_data();
+                let output_data = genesis_tx.outputs_data().get(7).unwrap().raw_data();
                 script_cell_deps.insert(
                     Contract::CommitmentLock,
                     vec![commitment_lock_cell_dep, ckb_auth_cell_dep],
@@ -150,12 +149,12 @@ impl ContractsContext {
                     .out_point(
                         OutPoint::new_builder()
                             .tx_hash(genesis_tx.hash())
-                            .index((len - 1).pack())
+                            .index(8u32.pack())
                             .build(),
                     )
                     .dep_type(DepType::Code.into())
                     .build();
-                let output_data = genesis_tx.outputs_data().get(len - 1).unwrap().raw_data();
+                let output_data = genesis_tx.outputs_data().get(8).unwrap().raw_data();
                 script_cell_deps.insert(Contract::SimpleUDT, vec![simple_udt_cell_dep]);
                 contract_default_scripts.insert(
                     Contract::SimpleUDT,
diff --git a/src/fiber/network.rs b/src/fiber/network.rs
index 619b7469c..1cd5b1130 100644
--- a/src/fiber/network.rs
+++ b/src/fiber/network.rs
@@ -117,10 +117,7 @@ pub fn init_chain_hash(chain_hash: Hash256) {
 }
 
 pub(crate) fn get_chain_hash() -> Hash256 {
-    CHAIN_HASH_INSTANCE
-        .get()
-        .cloned()
-        .unwrap_or_default()
+    CHAIN_HASH_INSTANCE.get().cloned().unwrap_or_default()
 }
 
 #[derive(Debug)]
diff --git a/tests/deploy/create-dotenv-file.sh b/tests/deploy/create-dotenv-file.sh
index d1ceeb23f..ec3b2ffa0 100755
--- a/tests/deploy/create-dotenv-file.sh
+++ b/tests/deploy/create-dotenv-file.sh
@@ -24,53 +24,3 @@ case "${1:-}" in
     ;;
 esac
 
-create_dotenv_for_contract() {
-    local CONTRACT_NAME="$1"
-    local CONTRACT_INFO_FILE="$(ls "migrations/$CONTRACT_NAME"/*.json | grep -v deployment | head -n 1)"
-    # Replace dash with underscore because envirornment variable names cannot contain dashes.
-    # Also use uppercase because environment variable names are usually uppercase.
-    CONTRACT_NAME="$(echo "$CONTRACT_NAME" | tr '-' '_' | tr '[:lower:]' '[:upper:]')"
-
-    sed -n \
-        -e 's/,$//' \
-        -e 's/^ *"data_hash": "/NEXT_PUBLIC_'"$CONTRACT_NAME"'_CODE_HASH="/p' \
-        "$CONTRACT_INFO_FILE" | head -1
-
-    sed -n \
-        -e 's/,$//' \
-        -e 's/^ *"type_id": "/NEXT_PUBLIC_'"$CONTRACT_NAME"'_TYPE_HASH="/p' \
-        "$CONTRACT_INFO_FILE" | head -1
-
-    sed -n \
-        -e 's/,$//' \
-        -e 's/^ *"tx_hash": /NEXT_PUBLIC_'"$CONTRACT_NAME"'_TX_HASH=/p' \
-        "$CONTRACT_INFO_FILE" | head -1
-
-    sed -n \
-        -e 's/,$//' \
-        -e 's/^ *"index": /NEXT_PUBLIC_'"$CONTRACT_NAME"'_TX_INDEX=/p' \
-        "$CONTRACT_INFO_FILE" | head -1
-
-    if ! grep -Eq '"dep_group_recipes": *\[ *\]$' "$CONTRACT_INFO_FILE"; then
-        sed -n \
-            -e 's/,$//' \
-            -e 's/^ *"data_hash": "/NEXT_PUBLIC_'"$CONTRACT_NAME"'_DEP_GROUP_CODE_HASH="/p' \
-            "$CONTRACT_INFO_FILE" | tail -1
-
-        sed -n \
-            -e 's/,$//' \
-            -e 's/^ *"tx_hash": "/NEXT_PUBLIC_'"$CONTRACT_NAME"'_DEP_GROUP_TX_HASH="/p' \
-            "$CONTRACT_INFO_FILE" | tail -1
-
-        sed -n \
-            -e 's/,$//' \
-            -e 's/^ *"index": /NEXT_PUBLIC_'"$CONTRACT_NAME"'_DEP_GROUP_TX_INDEX=/p' \
-            "$CONTRACT_INFO_FILE" | tail -1
-
-    fi
-}
-
-create_dotenv_for_contract funding-lock
-create_dotenv_for_contract commitment-lock
-create_dotenv_for_contract simple-udt
-create_dotenv_for_contract xudt
diff --git a/tests/deploy/deploy.sh b/tests/deploy/deploy.sh
index 643bcc2f9..a5dddcee0 100755
--- a/tests/deploy/deploy.sh
+++ b/tests/deploy/deploy.sh
@@ -25,38 +25,6 @@ if ! (echo | ckb-cli account import --local-only --privkey-path "$miner_key_file
     :
 fi
 
-function deploy() {
-    local DEPLOY_NAME="$1"
-    local MIGRATION_DIR="migrations/$DEPLOY_NAME"
-    local CONFIG_FILE="$MIGRATION_DIR/deployment.toml"
-    local INFO_FILE="$MIGRATION_DIR/deployment.json"
-    local TEMPLATE_FILE="migrations/templates/$DEPLOY_NAME.toml"
-
-    rm -rf "$MIGRATION_DIR" && mkdir -p "$MIGRATION_DIR"
-    GENESIS_TX0="$(ckb -C "$data_dir" list-hashes | sed -n 's/tx_hash = "\(.*\)"/\1/p' | head -1)"
-    sed "s/0x8f8c79eb6671709633fe6a46de93c0fedc9c1b8a6527a18d3983879542635c9f/$GENESIS_TX0/" "$TEMPLATE_FILE" >"$CONFIG_FILE"
-
-    ckb-cli deploy gen-txs --from-address $(cat "$nodes_dir/deployer/ckb/wallet") \
-        --fee-rate 100000 --deployment-config "$CONFIG_FILE" --info-file "$INFO_FILE" --migration-dir "$MIGRATION_DIR"
-
-    ckb-cli deploy sign-txs --add-signatures --info-file "$INFO_FILE" --privkey-path "$miner_key_file" --output-format json | sed -n 's/: \("[^"]*"\)/: [\1]/p'
-
-    if ckb-cli deploy apply-txs --info-file "$INFO_FILE" --migration-dir "$MIGRATION_DIR" | grep -q "already exists in transaction_pool"; then
-        :
-    fi
-}
-
-generate_blocks() {
-    ./generate-blocks.sh 8
-    sleep 1
-}
-
-# try twice in case the indexer has not updated yet
-deploy_and_generate_blocks() {
-    deploy "$1" || deploy "$1"
-    generate_blocks
-}
-
 run_udt_init() {
     export $(xargs <".env")
     export NODES_DIR="$nodes_dir"
@@ -66,7 +34,5 @@ run_udt_init() {
     )
 }
 
-deploy_and_generate_blocks xudt
-
 ./create-dotenv-file.sh >.env
 run_udt_init
diff --git a/tests/deploy/init-dev-chain.sh b/tests/deploy/init-dev-chain.sh
index d478233b1..8b19c36a4 100755
--- a/tests/deploy/init-dev-chain.sh
+++ b/tests/deploy/init-dev-chain.sh
@@ -33,6 +33,9 @@ done
 # Initialize the data directory if it does not exist.
 if ! [[ -d "$data_dir" ]]; then
     ckb init -C "$data_dir" -c dev --force --ba-arg 0xc8328aabcd9b9e8e64fbc566c4385c3bdeb219d7
+    cp "$nodes_dir/deployer/dev.toml" "$data_dir/specs/dev.toml"
+    sed -i.bak 's|\.\./\.\./deploy/contracts|\.\./\.\./\.\./deploy/contracts|g' "$data_dir/specs/dev.toml"
+
     # Enable the IntegrationTest module (required to generate blocks).
     if ! grep -E '^modules.*IntegrationTest' "$data_dir/ckb.toml"; then
         # -i.bak is required to sed work on both Linux and macOS.
diff --git a/tests/deploy/udt-init/Cargo.toml b/tests/deploy/udt-init/Cargo.toml
index 032ed363f..1ee2b7d5f 100644
--- a/tests/deploy/udt-init/Cargo.toml
+++ b/tests/deploy/udt-init/Cargo.toml
@@ -6,8 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-#ckb-sdk = { version = "3.2.0", git = "https://github.com/chenyukang/ckb-sdk-rust.git", branch = "pcn-udt"}
-ckb-sdk = { version = "3.4"}
+ckb-sdk = { version = "3.4" }
 ckb-types = "0.118"
 ckb-jsonrpc-types = "0.118"
 serde = { version = "1.0", features = ["derive"] }
@@ -17,6 +16,6 @@ thiserror = "1.0.30"
 hex = "0.4.3"
 serde_yaml = "0.9.34"
 rand = "0.8.5"
-ckb-chain-spec    = "0.118.0"
-ckb-resource      = "0.118.0"
+ckb-chain-spec = "0.118.0"
+ckb-resource = "0.118.0"
 ckb-gen-types = "0.118.0"
diff --git a/tests/deploy/udt-init/src/main.rs b/tests/deploy/udt-init/src/main.rs
index 4baebd095..2f58f0968 100644
--- a/tests/deploy/udt-init/src/main.rs
+++ b/tests/deploy/udt-init/src/main.rs
@@ -17,7 +17,6 @@ use ckb_types::{
 };
 use ckb_types::{
     core::{DepType, ScriptHashType},
-    h256,
     packed::{OutPoint, Script},
     prelude::Pack,
     H256,
@@ -30,73 +29,41 @@ use std::{fs, net::TcpListener};
 
 use std::{error::Error as StdErr, str::FromStr};
 
-const SIMPLE_CODE_HASH: H256 =
-    h256!("0xe1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df419");
-const XUDT_CODE_HASH: H256 =
-    h256!("0x50bd8d6680b8b9cf98b73f3c08faf8b2a21914311954118ad6609be6e78a1b95");
-
 const UDT_KINDS: [&str; 2] = ["SIMPLE_UDT", "XUDT"];
 
-fn get_code_hash(udt_kind: &str) -> H256 {
-    match udt_kind {
-        "SIMPLE_UDT" => SIMPLE_CODE_HASH.clone(),
-        "XUDT" => XUDT_CODE_HASH.clone(),
-        _ => panic!("unsupported udt kind"),
-    }
-}
-
-fn get_env_hex(name: &str) -> H256 {
-    let value = std::env::var(name).expect("env var");
-    // strip prefix 0x
-    let value = value.trim_start_matches("0x");
-    H256::from_str(value).expect("parse hex")
+fn get_udt_info(udt_kind: &str) -> (H256, H256, usize) {
+    let genesis_block = build_gensis_block();
+    let genesis_tx = genesis_block
+        .transaction(0)
+        .expect("genesis block transaction #0 should exist");
+
+    let index = if udt_kind == "SIMPLE_UDT" { 8 } else { 9 };
+    let output_data = genesis_tx.outputs_data().get(index).unwrap().raw_data();
+    (
+        CellOutput::calc_data_hash(&output_data).unpack(),
+        genesis_tx.hash().unpack(),
+        index,
+    )
 }
 
 fn gen_dev_udt_handler(udt_kind: &str) -> SudtHandler {
-    if udt_kind == "SIMPLE_UDT" {
-        let genesis_block = build_gensis_block();
-        let genesis_tx = genesis_block
-            .transaction(0)
-            .expect("genesis block transaction #0 should exist");
-
-        let output_data = genesis_tx.outputs_data().get(3).unwrap().raw_data();
-        let script_id = ScriptId::new_data1(CellOutput::calc_data_hash(&output_data).unpack());
-
-        let simple_udt_cell_dep = CellDep::new_builder()
-            .out_point(
-                OutPoint::new_builder()
-                    .tx_hash(genesis_tx.hash())
-                    .index(3u32.pack())
-                    .build(),
-            )
-            .dep_type(DepType::Code.into())
-            .build();
-
-        ckb_sdk::transaction::handler::sudt::SudtHandler::new_with_customize(
-            vec![simple_udt_cell_dep],
-            script_id,
-        )
-    } else {
-        let udt_tx = get_env_hex(format!("NEXT_PUBLIC_{}_TX_HASH", udt_kind).as_str());
-        let code_hash = get_code_hash(udt_kind);
-        let (out_point, script_id) = (
+    let (data_hash, genesis_tx, index) = get_udt_info(udt_kind);
+    let script_id = ScriptId::new_data1(data_hash);
+
+    let udt_cell_dep = CellDep::new_builder()
+        .out_point(
             OutPoint::new_builder()
-                .tx_hash(udt_tx.pack())
-                .index(0u32.pack())
+                .tx_hash(genesis_tx.pack())
+                .index(index.pack())
                 .build(),
-            ScriptId::new_data1(code_hash),
-        );
-
-        let cell_dep = CellDep::new_builder()
-            .out_point(out_point)
-            .dep_type(DepType::Code.into())
-            .build();
-
-        ckb_sdk::transaction::handler::sudt::SudtHandler::new_with_customize(
-            vec![cell_dep],
-            script_id,
         )
-    }
+        .dep_type(DepType::Code.into())
+        .build();
+
+    ckb_sdk::transaction::handler::sudt::SudtHandler::new_with_customize(
+        vec![udt_cell_dep],
+        script_id,
+    )
 }
 
 fn gen_dev_sighash_handler() -> Secp256k1Blake160SighashAllScriptHandler {
@@ -163,6 +130,7 @@ fn init_or_send_udt(
     )?;
 
     let json_tx = ckb_jsonrpc_types::TransactionView::from(tx_with_groups.get_tx_view().clone());
+    //eprintln!("transaction: {:#?}", json_tx);
     if apply {
         let tx_hash = CkbRpcClient::new(network_info.url.as_str())
             .send_transaction(json_tx.inner, None)
@@ -192,7 +160,7 @@ fn generate_blocks(num: u64) -> Result<(), Box<dyn StdErr>> {
 fn generate_udt_type_script(udt_kind: &str, address: &str) -> ckb_types::packed::Script {
     let address = Address::from_str(address).expect("parse address");
     let sudt_owner_lock_script: Script = (&address).into();
-    let code_hash = get_code_hash(udt_kind);
+    let (code_hash, _, _) = get_udt_info(udt_kind);
     Script::new_builder()
         .code_hash(code_hash.pack())
         .hash_type(ScriptHashType::Data1.into())
@@ -269,18 +237,19 @@ fn genrate_nodes_config() {
     let data: serde_yaml::Value = serde_yaml::from_str(&content).expect("Unable to parse YAML");
     let mut udt_infos = vec![];
     for udt in UDT_KINDS {
+        let (code_hash, genesis_tx, index) = get_udt_info(udt);
         let udt_info = UdtInfo {
             name: udt.to_string(),
             auto_accept_amount: Some(1000),
             script: UdtScript {
-                code_hash: get_code_hash(udt),
+                code_hash: code_hash,
                 hash_type: "Data1".to_string(),
                 args: "0x.*".to_string(),
             },
             cell_deps: vec![UdtCellDep {
                 dep_type: "code".to_string(),
-                tx_hash: get_env_hex(format!("NEXT_PUBLIC_{}_TX_HASH", udt).as_str()),
-                index: 0,
+                tx_hash: genesis_tx,
+                index: index as u32,
             }],
         };
         udt_infos.push(udt_info);
@@ -399,7 +368,6 @@ fn build_gensis_block() -> BlockView {
     let chain_spec =
         ChainSpec::load_from(&Resource::file_system(dev_toml)).expect("load chain spec");
     let genesis_block = chain_spec.build_genesis().expect("build genesis block");
-    eprintln!("genesis block hash: {}", genesis_block.hash());
     genesis_block
 }
 
diff --git a/tests/nodes/deployer/dev.toml b/tests/nodes/deployer/dev.toml
index 781ec9052..ee7f1dccb 100644
--- a/tests/nodes/deployer/dev.toml
+++ b/tests/nodes/deployer/dev.toml
@@ -50,6 +50,10 @@ capacity = 200_000_0000_0000
 file = { file = "../../deploy/contracts/simple_udt" }
 create_type_id = false
 capacity = 200_000_0000_0000
+[[genesis.system_cells]]
+file = { file = "../../deploy/contracts/xudt_rce" }
+create_type_id = false
+capacity = 200_000_0000_0000
 
 [genesis.system_cells_lock]
 code_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"

From 17a375b0ecef99d8b9f9eaa8efa82b2461635902 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Wed, 30 Oct 2024 21:41:00 +0800
Subject: [PATCH 15/31] fix chain hash bug

---
 src/fiber/channel.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fiber/channel.rs b/src/fiber/channel.rs
index 5525efd2d..cbc84e7d8 100644
--- a/src/fiber/channel.rs
+++ b/src/fiber/channel.rs
@@ -2503,7 +2503,7 @@ impl ChannelActorState {
                     &node1_id,
                     &node2_id,
                     channel_outpoint,
-                    Default::default(),
+                    get_chain_hash(),
                     &self.get_funding_lock_script_xonly_key(),
                     capacity,
                     self.funding_udt_type_script.clone(),

From e5c0f50d5910deea648eaeb9a2c9d8ddb6c9c5a2 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Wed, 30 Oct 2024 21:52:57 +0800
Subject: [PATCH 16/31] tweak generate blocks

---
 tests/deploy/init-dev-chain.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/deploy/init-dev-chain.sh b/tests/deploy/init-dev-chain.sh
index 8b19c36a4..250ebc52a 100755
--- a/tests/deploy/init-dev-chain.sh
+++ b/tests/deploy/init-dev-chain.sh
@@ -64,13 +64,13 @@ if ! [[ -d "$data_dir" ]]; then
     ckb-cli wallet transfer --to-address $(cat "$nodes_dir/1/ckb/wallet") --capacity 5000000000 --fee-rate 2000 --privkey-path "$nodes_dir/deployer/ckb/key"
 
     sleep 1
-    "$script_dir/generate-blocks.sh" 6
+    "$script_dir/generate-blocks.sh" 4
     sleep 1
 
     # Transfer some money to the node 2.
     ckb-cli wallet transfer --to-address $(cat "$nodes_dir/2/ckb/wallet") --capacity 5000000000 --fee-rate 2000 --privkey-path "$nodes_dir/deployer/ckb/key"
     sleep 1
-    "$script_dir/generate-blocks.sh" 6
+    "$script_dir/generate-blocks.sh" 4
     sleep 1
 
     # Transfer some money to the node 3.
@@ -78,7 +78,7 @@ if ! [[ -d "$data_dir" ]]; then
     sleep 1
     # Generate a few blocks so that above transaction is confirmed.
     echo "begin to generate blocks for wallet updating..."
-    "$script_dir/generate-blocks.sh" 6
+    "$script_dir/generate-blocks.sh" 4
 
     # Also deploy the contracts.
     echo "deploy.sh..."

From d886af61d21f39bf912c9b01d37ba981e3461f85 Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Thu, 31 Oct 2024 07:40:06 +0900
Subject: [PATCH 17/31] chore: rebase with main

---
 src/rpc/invoice.rs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/rpc/invoice.rs b/src/rpc/invoice.rs
index 05f16570b..ff26c3afa 100644
--- a/src/rpc/invoice.rs
+++ b/src/rpc/invoice.rs
@@ -1,4 +1,3 @@
-use crate::fiber::config::CkbNetwork;
 use crate::fiber::hash_algorithm::HashAlgorithm;
 use crate::fiber::serde_utils::{U128Hex, U64Hex};
 use crate::fiber::types::{Hash256, Privkey};
@@ -109,11 +108,10 @@ impl<S> InvoiceRpcServerImpl<S> {
             );
 
             // restrict currency to be the same as network
-            let currency = match config.network {
-                Some(CkbNetwork::Mainnet) => Some(Currency::Fibb),
-                Some(CkbNetwork::Testnet) => Some(Currency::Fibt),
-                Some(_) => Some(Currency::Fibd),
-                _ => None,
+            let currency = match config.chain.as_str() {
+                "mainnet" => Currency::Fibb,
+                "testnet" => Currency::Fibt,
+                _ => Currency::Fibd,
             };
 
             (keypair, currency)
@@ -121,10 +119,7 @@ impl<S> InvoiceRpcServerImpl<S> {
         Self {
             store,
             keypair: config.as_ref().map(|(kp, _)| kp.clone()),
-            currency: config
-                .as_ref()
-                .map(|(_, currency)| *currency)
-                .unwrap_or_default(),
+            currency: config.as_ref().map(|(_, currency)| *currency),
         }
     }
 }

From 785c3007baa6d3689af0320631868dd7003ce637 Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Thu, 31 Oct 2024 07:48:37 +0900
Subject: [PATCH 18/31] chore: remove eprintln

---
 src/fiber/tests/channel.rs        | 1 -
 src/fiber/tests/graph.rs          | 7 -------
 src/main.rs                       | 2 +-
 tests/deploy/udt-init/src/main.rs | 7 -------
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/fiber/tests/channel.rs b/src/fiber/tests/channel.rs
index e8f2ada8b..11fcb46e2 100644
--- a/src/fiber/tests/channel.rs
+++ b/src/fiber/tests/channel.rs
@@ -739,7 +739,6 @@ async fn test_open_channel_with_invalid_ckb_amount_range() {
         ))
     };
     let open_channel_result = call!(node_a.network_actor, message).expect("node_a alive");
-    eprintln!("{:?}", open_channel_result.as_ref().err().unwrap());
     assert!(open_channel_result
         .err()
         .unwrap()
diff --git a/src/fiber/tests/graph.rs b/src/fiber/tests/graph.rs
index 6696c4237..ce8c380c2 100644
--- a/src/fiber/tests/graph.rs
+++ b/src/fiber/tests/graph.rs
@@ -522,7 +522,6 @@ fn test_graph_build_route_three_nodes() {
         preimage: None,
         allow_self_payment: false,
     });
-    eprintln!("return {:?}", route);
     assert!(route.is_ok());
     let route = route.unwrap();
     assert_eq!(route.len(), 3);
@@ -632,7 +631,6 @@ fn test_graph_mark_failed_channel() {
         preimage: None,
         allow_self_payment: false,
     });
-    eprintln!("return {:?}", route);
     assert!(route.is_err());
 
     network.add_edge(0, 5, Some(500), Some(2));
@@ -653,7 +651,6 @@ fn test_graph_mark_failed_channel() {
         preimage: None,
         allow_self_payment: false,
     });
-    eprintln!("return {:?}", route);
     assert!(route.is_ok());
 }
 
@@ -682,7 +679,6 @@ fn test_graph_mark_failed_node() {
         preimage: None,
         allow_self_payment: false,
     });
-    eprintln!("return {:?}", route);
     assert!(route.is_ok());
 
     // Test build route from node1 to node4 should be Ok
@@ -700,7 +696,6 @@ fn test_graph_mark_failed_node() {
         preimage: None,
         allow_self_payment: false,
     });
-    eprintln!("return {:?}", route);
     assert!(route.is_ok());
 
     network.mark_node_failed(2);
@@ -720,7 +715,6 @@ fn test_graph_mark_failed_node() {
         preimage: None,
         allow_self_payment: false,
     });
-    eprintln!("return {:?}", route);
     assert!(route.is_err());
 
     // Test build route from node1 to node4
@@ -738,7 +732,6 @@ fn test_graph_mark_failed_node() {
         preimage: None,
         allow_self_payment: false,
     });
-    eprintln!("return {:?}", route);
     assert!(route.is_err());
 }
 
diff --git a/src/main.rs b/src/main.rs
index 56b40b84d..df455f436 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -82,7 +82,7 @@ pub async fn main() {
             })
             .expect("load chain spec");
             let genesis_block = chain_spec.build_genesis().expect("build genesis block");
-            eprintln!("genesis block hash: {}", genesis_block.hash());
+
             init_chain_hash(genesis_block.hash().into());
             init_contracts_context(
                 genesis_block,
diff --git a/tests/deploy/udt-init/src/main.rs b/tests/deploy/udt-init/src/main.rs
index 2f58f0968..a585d7301 100644
--- a/tests/deploy/udt-init/src/main.rs
+++ b/tests/deploy/udt-init/src/main.rs
@@ -130,7 +130,6 @@ fn init_or_send_udt(
     )?;
 
     let json_tx = ckb_jsonrpc_types::TransactionView::from(tx_with_groups.get_tx_view().clone());
-    //eprintln!("transaction: {:#?}", json_tx);
     if apply {
         let tx_hash = CkbRpcClient::new(network_info.url.as_str())
             .send_transaction(json_tx.inner, None)
@@ -309,10 +308,6 @@ fn genrate_nodes_config() {
         for config in std::fs::read_dir(bruno_dir).expect("read dir") {
             let config = config.expect("read config");
             for (default_port, port) in ports_map.iter() {
-                eprintln!(
-                    "update bruno config: {:?} {} -> {}",
-                    config, default_port, port
-                );
                 let content = std::fs::read_to_string(config.path()).expect("read config");
                 let new_content = content.replace(&default_port.to_string(), &port.to_string());
                 std::fs::write(config.path(), new_content).expect("write config");
@@ -336,14 +331,12 @@ fn genrate_nodes_config() {
 fn init_udt_accounts() -> Result<(), Box<dyn StdErr>> {
     let udt_owner = get_nodes_info("deployer");
     for udt in UDT_KINDS {
-        eprintln!("begin init udt: {} ...", udt);
         init_or_send_udt(udt, &udt_owner.0, &udt_owner, None, 1000000000000, true)
             .expect("init udt");
         generate_blocks(8).expect("ok");
         std::thread::sleep(std::time::Duration::from_millis(1000));
         for i in 0..3 {
             let wallet = get_nodes_info(&(i + 1).to_string());
-            eprintln!("begin send udt: {} to node {} ...", udt, i);
             init_or_send_udt(
                 udt,
                 &udt_owner.0,

From e61a1c7f9ecfc8ddfd6e2b04037219bc0d7cd687 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Thu, 31 Oct 2024 08:34:10 +0800
Subject: [PATCH 19/31] fix bruno currency issue

---
 src/rpc/utils.rs                                              | 4 ++--
 tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru     | 2 +-
 tests/bruno/e2e/3-nodes-transfer/16-node3-gen-invoice.bru     | 2 +-
 tests/bruno/e2e/invoice-ops/1-gen-invoice.bru                 | 2 +-
 tests/bruno/e2e/invoice-ops/2-gen-invoice-duplicate.bru       | 2 +-
 tests/bruno/e2e/router-pay/11-node3-gen-invoice.bru           | 2 +-
 tests/bruno/e2e/router-pay/14-node3-gen-invoice-later.bru     | 2 +-
 tests/bruno/e2e/router-pay/22-node3-gen-expiring-invoice.bru  | 2 +-
 tests/bruno/e2e/udt-router-pay/11-node3-gen-invoice.bru       | 2 +-
 tests/bruno/e2e/udt-router-pay/13-node3-gen-invoice-later.bru | 2 +-
 tests/bruno/e2e/udt/07-node2-gen-invoice.bru                  | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/rpc/utils.rs b/src/rpc/utils.rs
index 6db49d141..55e25e8ff 100644
--- a/src/rpc/utils.rs
+++ b/src/rpc/utils.rs
@@ -26,12 +26,12 @@ macro_rules! handle_actor_call {
             Ok(result) => match result {
                 Ok(res) => Ok(res),
                 Err(e) => {
-                    debug!("Error: {:?}", e);
+                    error!("Error: {:?}", e);
                     Err(e)
                 }
             },
             Err(e) => {
-                debug!("Error: {:?}", e);
+                error!("Error: {:?}", e);
                 Err(e)
             }
         }
diff --git a/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru b/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru
index 8631bf207..5a2f2a942 100644
--- a/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru
+++ b/tests/bruno/e2e/3-nodes-transfer/11-node3-gen-invoice.bru
@@ -23,7 +23,7 @@ body:json {
     "params": [
       {
         "amount": "0x613ae6500",
-        "currency": "Fibb",
+        "currency": "Fibd",
         "description": "test invoice generated by node3",
         "expiry": "0xe10",
         "final_cltv": "0x28",
diff --git a/tests/bruno/e2e/3-nodes-transfer/16-node3-gen-invoice.bru b/tests/bruno/e2e/3-nodes-transfer/16-node3-gen-invoice.bru
index 7c48515a8..a4999fa43 100644
--- a/tests/bruno/e2e/3-nodes-transfer/16-node3-gen-invoice.bru
+++ b/tests/bruno/e2e/3-nodes-transfer/16-node3-gen-invoice.bru
@@ -23,7 +23,7 @@ body:json {
     "params": [
       {
         "amount": "0x867ba4900",
-        "currency": "Fibb",
+        "currency": "Fibd",
         "description": "test invoice generated by node3",
         "expiry": "0xe10",
         "final_cltv": "0x28",
diff --git a/tests/bruno/e2e/invoice-ops/1-gen-invoice.bru b/tests/bruno/e2e/invoice-ops/1-gen-invoice.bru
index 3a3ca6f8e..cadf02cbc 100644
--- a/tests/bruno/e2e/invoice-ops/1-gen-invoice.bru
+++ b/tests/bruno/e2e/invoice-ops/1-gen-invoice.bru
@@ -36,7 +36,7 @@ body:json {
     "params": [
       {
         "amount": "0x64",
-        "currency": "Fibb",
+        "currency": "Fibd",
         "description": "test invoice",
         "expiry": "0xe10",
         "final_cltv": "0x28",
diff --git a/tests/bruno/e2e/invoice-ops/2-gen-invoice-duplicate.bru b/tests/bruno/e2e/invoice-ops/2-gen-invoice-duplicate.bru
index 837f436cd..561930684 100644
--- a/tests/bruno/e2e/invoice-ops/2-gen-invoice-duplicate.bru
+++ b/tests/bruno/e2e/invoice-ops/2-gen-invoice-duplicate.bru
@@ -27,7 +27,7 @@ body:json {
     "params": [
       {
         "amount": "0x64",
-        "currency": "Fibb",
+        "currency": "Fibd",
         "description": "test invoice",
         "expiry": "0xe10",
         "final_cltv": "0x28",
diff --git a/tests/bruno/e2e/router-pay/11-node3-gen-invoice.bru b/tests/bruno/e2e/router-pay/11-node3-gen-invoice.bru
index 8631bf207..5a2f2a942 100644
--- a/tests/bruno/e2e/router-pay/11-node3-gen-invoice.bru
+++ b/tests/bruno/e2e/router-pay/11-node3-gen-invoice.bru
@@ -23,7 +23,7 @@ body:json {
     "params": [
       {
         "amount": "0x613ae6500",
-        "currency": "Fibb",
+        "currency": "Fibd",
         "description": "test invoice generated by node3",
         "expiry": "0xe10",
         "final_cltv": "0x28",
diff --git a/tests/bruno/e2e/router-pay/14-node3-gen-invoice-later.bru b/tests/bruno/e2e/router-pay/14-node3-gen-invoice-later.bru
index 4eb25c18c..eb8bd2fda 100644
--- a/tests/bruno/e2e/router-pay/14-node3-gen-invoice-later.bru
+++ b/tests/bruno/e2e/router-pay/14-node3-gen-invoice-later.bru
@@ -23,7 +23,7 @@ body:json {
     "params": [
       {
         "amount": "0x613",
-        "currency": "Fibb",
+        "currency": "Fibd",
         "description": "test invoice generated by node3",
         "expiry": "0xe10",
         "final_cltv": "0x28",
diff --git a/tests/bruno/e2e/router-pay/22-node3-gen-expiring-invoice.bru b/tests/bruno/e2e/router-pay/22-node3-gen-expiring-invoice.bru
index c33c0e1e9..338e625e2 100644
--- a/tests/bruno/e2e/router-pay/22-node3-gen-expiring-invoice.bru
+++ b/tests/bruno/e2e/router-pay/22-node3-gen-expiring-invoice.bru
@@ -23,7 +23,7 @@ body:json {
     "params": [
       {
         "amount": "0x613",
-        "currency": "Fibb",
+        "currency": "Fibd",
         "description": "test invoice generated by node3",
         "expiry": "0x2",
         "final_cltv": "0x28",
diff --git a/tests/bruno/e2e/udt-router-pay/11-node3-gen-invoice.bru b/tests/bruno/e2e/udt-router-pay/11-node3-gen-invoice.bru
index b243e2a11..30045dfcc 100644
--- a/tests/bruno/e2e/udt-router-pay/11-node3-gen-invoice.bru
+++ b/tests/bruno/e2e/udt-router-pay/11-node3-gen-invoice.bru
@@ -23,7 +23,7 @@ body:json {
     "params": [
       {
         "amount": "0x5F5E100",
-        "currency": "Fibb",
+        "currency": "Fibd",
         "description": "test invoice generated by node3",
         "expiry": "0xe10",
         "final_cltv": "0x28",
diff --git a/tests/bruno/e2e/udt-router-pay/13-node3-gen-invoice-later.bru b/tests/bruno/e2e/udt-router-pay/13-node3-gen-invoice-later.bru
index cc67e0154..f9ae09118 100644
--- a/tests/bruno/e2e/udt-router-pay/13-node3-gen-invoice-later.bru
+++ b/tests/bruno/e2e/udt-router-pay/13-node3-gen-invoice-later.bru
@@ -23,7 +23,7 @@ body:json {
     "params": [
       {
         "amount": "0x20",
-        "currency": "Fibb",
+        "currency": "Fibd",
         "description": "test invoice generated by node3",
         "expiry": "0xe10",
         "final_cltv": "0x28",
diff --git a/tests/bruno/e2e/udt/07-node2-gen-invoice.bru b/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
index a0edcc529..3d12ff157 100644
--- a/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
+++ b/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
@@ -36,7 +36,7 @@ body:json {
     "params": [
       {
         "amount": "0xc8",
-        "currency": "Fibb",
+        "currency": "Fibd",
         "description": "test invoice generated by node2",
         "expiry": "0xe10",
         "final_cltv": "0x28",

From 86176c5f11c85784ebeea8e382f46daa43e74056 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Thu, 31 Oct 2024 08:50:51 +0800
Subject: [PATCH 20/31] shell script clean up

---
 tests/deploy/create-dotenv-file.sh | 26 --------------------------
 tests/deploy/deploy.sh             |  2 --
 tests/nodes/start.sh               | 29 ++++++-----------------------
 3 files changed, 6 insertions(+), 51 deletions(-)
 delete mode 100755 tests/deploy/create-dotenv-file.sh

diff --git a/tests/deploy/create-dotenv-file.sh b/tests/deploy/create-dotenv-file.sh
deleted file mode 100755
index ec3b2ffa0..000000000
--- a/tests/deploy/create-dotenv-file.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-set -xeuo pipefail
-
-script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-cd "$script_dir" || exit 1
-
-case "${1:-}" in
---testnet)
-    shift
-    cat env.example
-    ;;
---mainnet)
-    shift
-    echo 'NEXT_PUBLIC_CKB="LINA"'
-    echo 'NEXT_PUBLIC_CKB_RPC_URL="	https://mainnet.ckb.dev/"'
-    ;;
-*)
-    echo 'NEXT_PUBLIC_CKB="DEV"'
-    echo 'NEXT_PUBLIC_CKB_RPC_URL="http://127.0.0.1:8114/"'
-    GENESIS_TXS="$(ckb-cli rpc get_block_by_number --number 0 | sed -n 's/^    hash: //p')"
-    echo 'NEXT_PUBLIC_CKB_GENESIS_TX_0="'"$(echo "$GENESIS_TXS" | head -n 1)"'"'
-    echo 'NEXT_PUBLIC_CKB_GENESIS_TX_1="'"$(echo "$GENESIS_TXS" | tail -n 1)"'"'
-    ;;
-esac
-
diff --git a/tests/deploy/deploy.sh b/tests/deploy/deploy.sh
index a5dddcee0..a4fabb8f1 100755
--- a/tests/deploy/deploy.sh
+++ b/tests/deploy/deploy.sh
@@ -26,7 +26,6 @@ if ! (echo | ckb-cli account import --local-only --privkey-path "$miner_key_file
 fi
 
 run_udt_init() {
-    export $(xargs <".env")
     export NODES_DIR="$nodes_dir"
     (
         cd "$udt_init_dir" || exit 1
@@ -34,5 +33,4 @@ run_udt_init() {
     )
 }
 
-./create-dotenv-file.sh >.env
 run_udt_init
diff --git a/tests/nodes/start.sh b/tests/nodes/start.sh
index 410b50fb5..ac473cc70 100755
--- a/tests/nodes/start.sh
+++ b/tests/nodes/start.sh
@@ -19,30 +19,13 @@ export TESTING_CONTRACTS_DIR="$deploy_dir/contracts"
 # This script is nilpotent, so it is safe to run multiple times.
 "$deploy_dir/init-dev-chain.sh"
 
-# Load the environment variables from the .env file generated by create-dotenv-file.sh.
-# These are environment variables that specify the contract hashes and other information.
-if [[ ! -f "$deploy_dir/.env" ]]; then
+if [ -n "$should_clean_fiber_state" ]; then
+    echo "starting to clean fiber store ...."
+    rm -rf "$nodes_dir"/*/fiber/store
+elif [ -n "$should_remove_old_state" ]; then
+    echo "starting to reset ...."
+    rm -rf "$nodes_dir"/*/fiber/store
     "$deploy_dir/init-dev-chain.sh" -f
-    if [[ ! -f "$deploy_dir/.env" ]]; then
-        echo "The .env file does not exist. This should no happen" >&2
-        echo "In case of issue pesisting, run $deploy_dir/init-dev-chain.sh -f to reintialize the devchain"
-        exit 1
-    fi
-else
-    if [ -n "$should_clean_fiber_state" ]; then
-        echo "starting to clean fiber store ...."
-        rm -rf "$nodes_dir"/*/fiber/store
-    elif [ -n "$should_remove_old_state" ]; then
-        echo "starting to reset ...."
-        rm -rf "$nodes_dir"/*/fiber/store
-        "$deploy_dir/init-dev-chain.sh" -f
-    fi
-fi
-export $(xargs <"$deploy_dir/.env")
-
-if [[ -f "$deploy_dir/.env.local" ]]; then
-    # Local environment variables, may used to override the default ones.
-    export $(xargs <"$deploy_dir/.env.local")
 fi
 
 echo "Initializing finished, begin to start services ...."

From f46cde59d7cd77d6bbc67f977f5484a0767d209a Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Thu, 31 Oct 2024 11:32:51 +0800
Subject: [PATCH 21/31] refactor contract

---
 src/ckb/contracts.rs | 95 ++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 61 deletions(-)

diff --git a/src/ckb/contracts.rs b/src/ckb/contracts.rs
index 8b9fa9e25..d931a34ed 100644
--- a/src/ckb/contracts.rs
+++ b/src/ckb/contracts.rs
@@ -101,68 +101,41 @@ impl ContractsContext {
                     .build();
                 script_cell_deps.insert(Contract::CkbAuth, vec![ckb_auth_cell_dep.clone()]);
 
-                let funding_lock_cell_dep = CellDep::new_builder()
-                    .out_point(
-                        OutPoint::new_builder()
-                            .tx_hash(genesis_tx.hash())
-                            .index(6u32.pack())
-                            .build(),
-                    )
-                    .dep_type(DepType::Code.into())
-                    .build();
-                let output_data = genesis_tx.outputs_data().get(6).unwrap().raw_data();
-                script_cell_deps.insert(
-                    Contract::FundingLock,
-                    vec![funding_lock_cell_dep, ckb_auth_cell_dep.clone()],
-                );
-                contract_default_scripts.insert(
-                    Contract::FundingLock,
-                    Script::new_builder()
-                        .code_hash(CellOutput::calc_data_hash(&output_data))
-                        .hash_type(ScriptHashType::Data1.into())
-                        .build(),
-                );
-
-                let commitment_lock_cell_dep = CellDep::new_builder()
-                    .out_point(
-                        OutPoint::new_builder()
-                            .tx_hash(genesis_tx.hash())
-                            .index(7u32.pack())
+                let contract_map = [
+                    (Contract::FundingLock, 6u32),
+                    (Contract::CommitmentLock, 7u32),
+                    (Contract::SimpleUDT, 8u32),
+                ];
+                for (contract, index) in contract_map.into_iter() {
+                    let cell_dep = CellDep::new_builder()
+                        .out_point(
+                            OutPoint::new_builder()
+                                .tx_hash(genesis_tx.hash())
+                                .index(index.pack())
+                                .build(),
+                        )
+                        .dep_type(DepType::Code.into())
+                        .build();
+                    let output_data = genesis_tx
+                        .outputs_data()
+                        .get(index as usize)
+                        .unwrap()
+                        .raw_data();
+                    let cell_deps =
+                        if matches!(contract, Contract::FundingLock | Contract::CommitmentLock) {
+                            vec![cell_dep, ckb_auth_cell_dep.clone()]
+                        } else {
+                            vec![cell_dep]
+                        };
+                    script_cell_deps.insert(contract, cell_deps);
+                    contract_default_scripts.insert(
+                        contract,
+                        Script::new_builder()
+                            .code_hash(CellOutput::calc_data_hash(&output_data))
+                            .hash_type(ScriptHashType::Data1.into())
                             .build(),
-                    )
-                    .dep_type(DepType::Code.into())
-                    .build();
-                let output_data = genesis_tx.outputs_data().get(7).unwrap().raw_data();
-                script_cell_deps.insert(
-                    Contract::CommitmentLock,
-                    vec![commitment_lock_cell_dep, ckb_auth_cell_dep],
-                );
-                contract_default_scripts.insert(
-                    Contract::CommitmentLock,
-                    Script::new_builder()
-                        .code_hash(CellOutput::calc_data_hash(&output_data))
-                        .hash_type(ScriptHashType::Data1.into())
-                        .build(),
-                );
-
-                let simple_udt_cell_dep = CellDep::new_builder()
-                    .out_point(
-                        OutPoint::new_builder()
-                            .tx_hash(genesis_tx.hash())
-                            .index(8u32.pack())
-                            .build(),
-                    )
-                    .dep_type(DepType::Code.into())
-                    .build();
-                let output_data = genesis_tx.outputs_data().get(8).unwrap().raw_data();
-                script_cell_deps.insert(Contract::SimpleUDT, vec![simple_udt_cell_dep]);
-                contract_default_scripts.insert(
-                    Contract::SimpleUDT,
-                    Script::new_builder()
-                        .code_hash(CellOutput::calc_data_hash(&output_data))
-                        .hash_type(ScriptHashType::Data1.into())
-                        .build(),
-                );
+                    );
+                }
             }
         }
 

From 817d8617fba3379526fcc27f193c1309deb4b98d Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Thu, 31 Oct 2024 14:10:43 +0900
Subject: [PATCH 22/31] chore: resolve unit test error

---
 src/ckb/contracts.rs        | 14 ++++++++++++--
 src/ckb/tests/test_utils.rs | 19 +++++++++++--------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/ckb/contracts.rs b/src/ckb/contracts.rs
index 8b9fa9e25..859396a65 100644
--- a/src/ckb/contracts.rs
+++ b/src/ckb/contracts.rs
@@ -247,12 +247,22 @@ pub fn init_contracts_context(
         .expect("init_contracts_context should only be called once");
 }
 
+#[cfg(not(test))]
 fn get_contracts_context() -> &'static ContractsContext {
     CONTRACTS_CONTEXT_INSTANCE
         .get()
         .expect("init_contracts_context should be called first")
 }
 
+#[cfg(test)]
+fn get_contracts_context<'a>() -> ContractsContext {
+    super::tests::test_utils::MOCK_CONTEXT
+        .read()
+        .unwrap()
+        .contracts_context
+        .clone()
+}
+
 pub fn get_script_by_contract(contract: Contract, args: &[u8]) -> Script {
     get_contracts_context().get_script(contract, args)
 }
@@ -261,8 +271,8 @@ pub fn get_cell_deps_by_contracts(contracts: Vec<Contract>) -> CellDepVec {
     get_contracts_context().get_cell_deps(contracts)
 }
 
-fn get_udt_info(script: &Script) -> Option<&UdtArgInfo> {
-    get_contracts_context().get_udt_info(script)
+fn get_udt_info(script: &Script) -> Option<UdtArgInfo> {
+    get_contracts_context().get_udt_info(script).cloned()
 }
 
 pub fn check_udt_script(script: &Script) -> bool {
diff --git a/src/ckb/tests/test_utils.rs b/src/ckb/tests/test_utils.rs
index 196fe7c2d..a3c24168d 100644
--- a/src/ckb/tests/test_utils.rs
+++ b/src/ckb/tests/test_utils.rs
@@ -7,11 +7,12 @@ use ckb_types::{
     packed::{CellDep, CellOutput, OutPoint, Script},
     prelude::{Builder, Entity, Pack, PackVec, Unpack},
 };
-use std::collections::HashMap;
+use once_cell::sync::Lazy;
+use std::{collections::HashMap, sync::RwLock};
 
 use crate::ckb::{
     config::UdtCfgInfos,
-    contracts::{Contract, ContractsContext, ContractsInfo, CONTRACTS_CONTEXT_INSTANCE},
+    contracts::{Contract, ContractsContext, ContractsInfo},
     TraceTxRequest, TraceTxResponse,
 };
 
@@ -28,8 +29,11 @@ pub enum CellStatus {
     Consumed,
 }
 
+pub static MOCK_CONTEXT: Lazy<RwLock<MockContext>> = Lazy::new(|| RwLock::new(MockContext::new()));
+
 pub struct MockContext {
     pub context: Context,
+    pub contracts_context: ContractsContext,
 }
 
 impl MockContext {
@@ -104,14 +108,14 @@ impl MockContext {
             udt_whitelist: UdtCfgInfos::default(),
         };
         let contracts_context = ContractsContext { contracts };
-        let _ = CONTRACTS_CONTEXT_INSTANCE.set(contracts_context);
-
-        MockContext { context }
+        MockContext {
+            context,
+            contracts_context,
+        }
     }
 }
 
 pub struct MockChainActorState {
-    ctx: MockContext,
     tx_status: HashMap<
         Byte32,
         (
@@ -131,7 +135,6 @@ impl Default for MockChainActorState {
 impl MockChainActorState {
     pub fn new() -> Self {
         Self {
-            ctx: MockContext::new(),
             tx_status: HashMap::new(),
             cell_status: HashMap::new(),
         }
@@ -287,7 +290,7 @@ impl Actor for MockChainActor {
                             }
                         }
                     }
-                    let context = &mut state.ctx.context;
+                    let context = &mut MOCK_CONTEXT.write().unwrap().context;
                     match context.verify_tx(&tx, MAX_CYCLES) {
                         Ok(c) => {
                             debug!("Verified transaction: {:?} with {} CPU cycles", tx, c);

From 89a3f735477e69b187769f285e2432f5595ded41 Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Fri, 18 Oct 2024 10:24:48 +0800
Subject: [PATCH 23/31] Add more tests for public channels

---
 src/fiber/graph.rs         |   8 +++
 src/fiber/tests/channel.rs | 123 +++++++++++++++++++++++++++++++++++--
 2 files changed, 126 insertions(+), 5 deletions(-)

diff --git a/src/fiber/graph.rs b/src/fiber/graph.rs
index ce6a93938..10ea9b34e 100644
--- a/src/fiber/graph.rs
+++ b/src/fiber/graph.rs
@@ -56,6 +56,14 @@ impl ChannelInfo {
         self.announcement_msg.node2_id
     }
 
+    pub fn node1_peerid(&self) -> PeerId {
+        self.announcement_msg.node1_id.tentacle_peer_id()
+    }
+
+    pub fn node2_peerid(&self) -> PeerId {
+        self.announcement_msg.node2_id.tentacle_peer_id()
+    }
+
     pub fn channel_annoucement_timestamp(&self) -> u64 {
         self.timestamp
     }
diff --git a/src/fiber/tests/channel.rs b/src/fiber/tests/channel.rs
index cc6552f13..1550c7bac 100644
--- a/src/fiber/tests/channel.rs
+++ b/src/fiber/tests/channel.rs
@@ -1,3 +1,5 @@
+use std::collections::HashSet;
+
 use crate::{
     ckb::contracts::{get_cell_deps, Contract},
     fiber::{
@@ -7,6 +9,7 @@ use crate::{
             ShutdownCommand, DEFAULT_COMMITMENT_FEE_RATE,
         },
         config::DEFAULT_CHANNEL_MINIMAL_CKB_AMOUNT,
+        graph::NetworkGraphStateStore,
         hash_algorithm::HashAlgorithm,
         network::{AcceptChannelCommand, OpenChannelCommand},
         types::{Hash256, Privkey, RemoveTlcFulfill, RemoveTlcReason},
@@ -160,6 +163,96 @@ async fn test_create_public_channel() {
     // FIXME: add assertion
 }
 
+#[tokio::test]
+async fn test_public_channel_saved_to_the_owner_graph() {
+    init_tracing();
+
+    let _span = tracing::info_span!("node", node = "test").entered();
+
+    let node1_funding_amount = 100000000000;
+    let node2_funding_amount = 6200000000;
+
+    let (mut node1, mut node2, _new_channel_id) =
+        create_nodes_with_established_channel(node1_funding_amount, node2_funding_amount, true)
+            .await;
+
+    // Wait for the channel announcement to be broadcasted
+    tokio::time::sleep(tokio::time::Duration::from_millis(5000)).await;
+
+    let node1_store = node1.store.clone();
+    let node1_id = node1.peer_id.clone();
+    node1.stop().await;
+    let node2_store = node2.store.clone();
+    let node2_id = node2.peer_id.clone();
+    node2.stop().await;
+
+    let node1_channels = node1_store.get_channels(None);
+    assert_eq!(node1_channels.len(), 1);
+    let node1_channel = &node1_channels[0];
+    assert_eq!(
+        HashSet::from([node1_channel.node1_peerid(), node1_channel.node2_peerid()]),
+        HashSet::from([node1_id.clone(), node2_id.clone()])
+    );
+    let node1_nodes = node1_store.get_nodes(None);
+    assert_eq!(node1_nodes.len(), 2);
+    for node in node1_nodes {
+        assert!(node.node_id == node1_channel.node1() || node.node_id == node1_channel.node2());
+    }
+
+    let node2_channels = node2_store.get_channels(None);
+    assert_eq!(node2_channels.len(), 1);
+    let node2_channel = &node2_channels[0];
+    assert_eq!(
+        HashSet::from([node2_channel.node1_peerid(), node2_channel.node2_peerid()]),
+        HashSet::from([node1_id, node2_id])
+    );
+    let node2_nodes = node2_store.get_nodes(None);
+    assert_eq!(node2_nodes.len(), 2);
+    for node in node2_nodes {
+        assert!(node.node_id == node2_channel.node1() || node.node_id == node2_channel.node2());
+    }
+}
+
+#[tokio::test]
+async fn test_public_channel_saved_to_the_other_nodes_graph() {
+    init_tracing();
+
+    let _span = tracing::info_span!("node", node = "test").entered();
+
+    let node1_funding_amount = 100000000000;
+    let node2_funding_amount = 6200000000;
+
+    let [mut node1, mut node2, mut node3] = NetworkNode::new_n_interconnected_nodes().await;
+    let _channel_id = establish_channel_between_nodes(
+        &mut node1,
+        &mut node2,
+        node1_funding_amount,
+        node2_funding_amount,
+        true,
+    )
+    .await;
+
+    // Wait for the channel announcement to be broadcasted
+    tokio::time::sleep(tokio::time::Duration::from_millis(5000)).await;
+
+    let node3_store = node3.store.clone();
+    node3.stop().await;
+    let channels = node3_store.get_channels(None);
+    assert_eq!(channels.len(), 1);
+    let channel = &channels[0];
+    assert_eq!(
+        HashSet::from([channel.node1_peerid(), channel.node2_peerid()]),
+        HashSet::from([node1.peer_id.clone(), node2.peer_id.clone()])
+    );
+    let nodes = node3_store.get_nodes(None);
+    let node_pubkeys = nodes
+        .iter()
+        .map(|node| node.node_id)
+        .collect::<HashSet<_>>();
+    assert!(node_pubkeys.contains(&channel.node1()));
+    assert!(node_pubkeys.contains(&channel.node2()));
+}
+
 #[tokio::test]
 async fn test_stash_broadcast_messages() {
     init_tracing();
@@ -374,13 +467,13 @@ async fn test_channel_commitment_tx_after_add_tlc_sha256() {
     do_test_channel_commitment_tx_after_add_tlc(HashAlgorithm::Sha256).await
 }
 
-async fn create_nodes_with_established_channel(
+async fn establish_channel_between_nodes(
+    node_a: &mut NetworkNode,
+    node_b: &mut NetworkNode,
     node_a_funding_amount: u128,
     node_b_funding_amount: u128,
     public: bool,
-) -> (NetworkNode, NetworkNode, Hash256) {
-    let [mut node_a, mut node_b] = NetworkNode::new_n_interconnected_nodes().await;
-
+) -> Hash256 {
     let message = |rpc_reply| {
         NetworkActorMessage::Command(NetworkActorCommand::OpenChannel(
             OpenChannelCommand {
@@ -460,7 +553,27 @@ async fn create_nodes_with_established_channel(
             _ => false,
         })
         .await;
-    (node_a, node_b, new_channel_id)
+
+    new_channel_id
+}
+
+async fn create_nodes_with_established_channel(
+    node_a_funding_amount: u128,
+    node_b_funding_amount: u128,
+    public: bool,
+) -> (NetworkNode, NetworkNode, Hash256) {
+    let [mut node_a, mut node_b] = NetworkNode::new_n_interconnected_nodes().await;
+
+    let channel_id = establish_channel_between_nodes(
+        &mut node_a,
+        &mut node_b,
+        node_a_funding_amount,
+        node_b_funding_amount,
+        public,
+    )
+    .await;
+
+    (node_a, node_b, channel_id)
 }
 
 async fn do_test_remove_tlc_with_wrong_hash_algorithm(

From 3ee022251c663d0b5de4393d8d5f18a6bfc2fe1a Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Fri, 18 Oct 2024 16:00:43 +0800
Subject: [PATCH 24/31] Prettify a few outputs

---
 src/fiber/network.rs          |  5 ++++-
 src/fiber/tests/test_utils.rs | 18 ++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/fiber/network.rs b/src/fiber/network.rs
index 846fbf82f..a5a53386a 100644
--- a/src/fiber/network.rs
+++ b/src/fiber/network.rs
@@ -1553,7 +1553,10 @@ where
                 // TODO: It is possible that the remote peer of the channel may repeatedly
                 // receive the same message.
                 let peer_ids = state.get_n_peer_peer_ids(MAX_BROADCAST_SESSIONS, HashSet::new());
-                debug!("Broadcasting message random selected peers {:?}", &peer_ids);
+                debug!(
+                    "Broadcasting message to randomly selected peers {:?} (from {:?})",
+                    &peer_ids, &state.peer_id
+                );
                 // The order matters here because should_message_be_broadcasted
                 // will change the state, and we don't want to change the state
                 // if there is not peer to broadcast the message.
diff --git a/src/fiber/tests/test_utils.rs b/src/fiber/tests/test_utils.rs
index e6b6a2750..9c779c0ca 100644
--- a/src/fiber/tests/test_utils.rs
+++ b/src/fiber/tests/test_utils.rs
@@ -51,6 +51,10 @@ impl TempDir {
             OldTempDir::with_prefix(prefix).expect("create temp directory"),
         ))
     }
+
+    pub fn to_str(&self) -> &str {
+        self.0.path().to_str().expect("path to str")
+    }
 }
 
 impl AsRef<Path> for TempDir {
@@ -199,6 +203,10 @@ impl NetworkNodeConfigBuilder {
         self
     }
 
+    pub fn base_dir_prefix(self, prefix: &str) -> Self {
+        self.base_dir(Arc::new(TempDir::new(prefix)))
+    }
+
     pub fn node_name(mut self, node_name: Option<String>) -> Self {
         self.node_name = node_name;
         self
@@ -278,7 +286,7 @@ impl NetworkNode {
             public_key.into(),
         )));
         let network_actor = Actor::spawn_linked(
-            Some(format!("network actor at {:?}", base_dir.as_ref())),
+            Some(format!("network actor at {}", base_dir.to_str())),
             NetworkActor::new(
                 event_sender,
                 chain_actor.clone(),
@@ -361,7 +369,13 @@ impl NetworkNode {
     pub async fn new_n_interconnected_nodes<const N: usize>() -> [Self; N] {
         let mut nodes: Vec<NetworkNode> = Vec::with_capacity(N);
         for i in 0..N {
-            let new = Self::new_with_node_name_opt(Some(format!("Node {i}"))).await;
+            let new = Self::new_with_config(
+                NetworkNodeConfigBuilder::new()
+                    .node_name(Some(format!("node-{}", i)))
+                    .base_dir_prefix(&format!("fnn-test-node-{}-", i))
+                    .build(),
+            )
+            .await;
             for node in nodes.iter_mut() {
                 node.connect_to(&new).await;
             }

From dcb43785e554d90639348be23c57ba73ffd7c6cf Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Fri, 18 Oct 2024 16:29:48 +0800
Subject: [PATCH 25/31] Fix public channel announcement test

---
 src/ckb/tests/test_utils.rs   | 24 ++++++++++++++++++++++--
 src/fiber/graph.rs            |  1 +
 src/fiber/tests/channel.rs    | 26 ++++++++++++++++----------
 src/fiber/tests/test_utils.rs | 21 +++++++++++++++------
 4 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/ckb/tests/test_utils.rs b/src/ckb/tests/test_utils.rs
index a3c24168d..78fdfde12 100644
--- a/src/ckb/tests/test_utils.rs
+++ b/src/ckb/tests/test_utils.rs
@@ -4,8 +4,8 @@ use ckb_testtool::context::Context;
 use ckb_types::{
     bytes::Bytes,
     core::{DepType, TransactionView},
-    packed::{CellDep, CellOutput, OutPoint, Script},
-    prelude::{Builder, Entity, Pack, PackVec, Unpack},
+    packed::{CellDep, CellOutput, OutPoint, Script, Transaction},
+    prelude::{Builder, Entity, IntoTransactionView, Pack, PackVec, Unpack},
 };
 use once_cell::sync::Lazy;
 use std::{collections::HashMap, sync::RwLock};
@@ -411,3 +411,23 @@ pub async fn trace_tx_hash(
     .status
     .status
 }
+
+pub async fn get_tx_from_hash(
+    mock_actor: ActorRef<CkbChainMessage>,
+    tx_hash: Byte32,
+) -> Result<TransactionView, anyhow::Error> {
+    pub const TIMEOUT: u64 = 1000;
+    let request = TraceTxRequest {
+        tx_hash,
+        confirmations: 1,
+    };
+    call_t!(
+        mock_actor,
+        CkbChainMessage::TraceTx,
+        TIMEOUT,
+        request.clone()
+    )?
+    .tx
+    .map(|tx| Transaction::from(tx.inner).into_view())
+    .ok_or(anyhow!("tx not found in trace tx response"))
+}
diff --git a/src/fiber/graph.rs b/src/fiber/graph.rs
index 10ea9b34e..4347364ec 100644
--- a/src/fiber/graph.rs
+++ b/src/fiber/graph.rs
@@ -13,6 +13,7 @@ use ckb_types::packed::{OutPoint, Script};
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
 use std::collections::HashMap;
+use tentacle::secio::PeerId;
 use thiserror::Error;
 use tracing::log::error;
 use tracing::{debug, info, warn};
diff --git a/src/fiber/tests/channel.rs b/src/fiber/tests/channel.rs
index 1550c7bac..6c49b54ae 100644
--- a/src/fiber/tests/channel.rs
+++ b/src/fiber/tests/channel.rs
@@ -19,7 +19,7 @@ use crate::{
 };
 use ckb_jsonrpc_types::Status;
 use ckb_types::{
-    core::FeeRate,
+    core::{FeeRate, TransactionView},
     packed::{CellInput, Script, Transaction},
     prelude::{AsTransactionBuilder, Builder, Entity, IntoTransactionView, Pack, Unpack},
 };
@@ -223,7 +223,7 @@ async fn test_public_channel_saved_to_the_other_nodes_graph() {
     let node2_funding_amount = 6200000000;
 
     let [mut node1, mut node2, mut node3] = NetworkNode::new_n_interconnected_nodes().await;
-    let _channel_id = establish_channel_between_nodes(
+    let (_channel_id, funding_tx) = establish_channel_between_nodes(
         &mut node1,
         &mut node2,
         node1_funding_amount,
@@ -231,6 +231,8 @@ async fn test_public_channel_saved_to_the_other_nodes_graph() {
         true,
     )
     .await;
+    let status = node3.submit_tx(funding_tx).await;
+    assert_eq!(status, Status::Committed);
 
     // Wait for the channel announcement to be broadcasted
     tokio::time::sleep(tokio::time::Duration::from_millis(5000)).await;
@@ -473,7 +475,7 @@ async fn establish_channel_between_nodes(
     node_a_funding_amount: u128,
     node_b_funding_amount: u128,
     public: bool,
-) -> Hash256 {
+) -> (Hash256, TransactionView) {
     let message = |rpc_reply| {
         NetworkActorMessage::Command(NetworkActorCommand::OpenChannel(
             OpenChannelCommand {
@@ -524,18 +526,18 @@ async fn establish_channel_between_nodes(
         .expect("accept channel success");
     let new_channel_id = accept_channel_result.new_channel_id;
 
-    node_a
-        .expect_event(|event| match event {
-            NetworkServiceEvent::ChannelReady(peer_id, channel_id, _funding_tx_hash) => {
+    let funding_tx_outpoint = node_a
+        .expect_to_process_event(|event| match event {
+            NetworkServiceEvent::ChannelReady(peer_id, channel_id, funding_tx_outpoint) => {
                 println!(
                     "A channel ({:?}) to {:?} is now ready",
                     &channel_id, &peer_id
                 );
                 assert_eq!(peer_id, &node_b.peer_id);
                 assert_eq!(channel_id, &new_channel_id);
-                true
+                Some(funding_tx_outpoint.clone())
             }
-            _ => false,
+            _ => None,
         })
         .await;
 
@@ -554,7 +556,11 @@ async fn establish_channel_between_nodes(
         })
         .await;
 
-    new_channel_id
+    let funding_tx = node_a
+        .get_tx_from_hash(funding_tx_outpoint.tx_hash())
+        .await
+        .expect("tx found");
+    (new_channel_id, funding_tx)
 }
 
 async fn create_nodes_with_established_channel(
@@ -564,7 +570,7 @@ async fn create_nodes_with_established_channel(
 ) -> (NetworkNode, NetworkNode, Hash256) {
     let [mut node_a, mut node_b] = NetworkNode::new_n_interconnected_nodes().await;
 
-    let channel_id = establish_channel_between_nodes(
+    let (channel_id, _funding_tx) = establish_channel_between_nodes(
         &mut node_a,
         &mut node_b,
         node_a_funding_amount,
diff --git a/src/fiber/tests/test_utils.rs b/src/fiber/tests/test_utils.rs
index 9c779c0ca..5f5775509 100644
--- a/src/fiber/tests/test_utils.rs
+++ b/src/fiber/tests/test_utils.rs
@@ -24,17 +24,19 @@ use tokio::{
 
 use crate::{
     actors::{RootActor, RootActorMessage},
-    ckb::tests::test_utils::{submit_tx, trace_tx, trace_tx_hash, MockChainActor},
+    ckb::tests::test_utils::{
+        get_tx_from_hash, submit_tx, trace_tx, trace_tx_hash, MockChainActor,
+    },
     ckb::CkbChainMessage,
     fiber::channel::{ChannelActorState, ChannelActorStateStore, ChannelState},
     fiber::graph::NetworkGraphStateStore,
     fiber::graph::PaymentSession,
     fiber::graph::{ChannelInfo, NetworkGraph, NodeInfo},
-    fiber::network::NetworkActorStartArguments,
-    fiber::network::{NetworkActor, NetworkActorCommand, NetworkActorMessage},
-    fiber::network::{NetworkActorStateStore, PersistentNetworkActorState},
-    fiber::types::Hash256,
-    fiber::types::Pubkey,
+    fiber::network::{
+        NetworkActor, NetworkActorCommand, NetworkActorMessage, NetworkActorStartArguments,
+        NetworkActorStateStore, PersistentNetworkActorState,
+    },
+    fiber::types::{Hash256, Pubkey},
     invoice::{CkbInvoice, InvoiceError, InvoiceStore},
     tasks::{new_tokio_cancellation_token, new_tokio_task_tracker},
     FiberConfig, NetworkServiceEvent,
@@ -472,6 +474,13 @@ impl NetworkNode {
     pub async fn trace_tx_hash(&mut self, tx_hash: Byte32) -> ckb_jsonrpc_types::Status {
         trace_tx_hash(self.chain_actor.clone(), tx_hash).await
     }
+
+    pub async fn get_tx_from_hash(
+        &mut self,
+        tx_hash: Byte32,
+    ) -> Result<TransactionView, anyhow::Error> {
+        get_tx_from_hash(self.chain_actor.clone(), tx_hash).await
+    }
 }
 
 #[derive(Clone, Default)]

From 4a7a4dd9278568409001f0d5de6e66091846d16f Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Fri, 18 Oct 2024 16:40:35 +0800
Subject: [PATCH 26/31] Test not saving channel to graph if funding tx
 unconfirmed

---
 src/fiber/tests/channel.rs | 52 +++++++++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/fiber/tests/channel.rs b/src/fiber/tests/channel.rs
index 6c49b54ae..0afd58d98 100644
--- a/src/fiber/tests/channel.rs
+++ b/src/fiber/tests/channel.rs
@@ -147,10 +147,20 @@ async fn test_open_and_accept_channel() {
 }
 
 #[tokio::test]
-async fn test_create_public_channel() {
+async fn test_create_private_channel() {
     init_tracing();
 
-    let _span = tracing::info_span!("node", node = "test").entered();
+    let node_a_funding_amount = 100000000000;
+    let node_b_funding_amount = 6200000000;
+
+    let (_node_a, _node_b, _new_channel_id) =
+        create_nodes_with_established_channel(node_a_funding_amount, node_b_funding_amount, false)
+            .await;
+}
+
+#[tokio::test]
+async fn test_create_public_channel() {
+    init_tracing();
 
     let node_a_funding_amount = 100000000000;
     let node_b_funding_amount = 6200000000;
@@ -158,17 +168,12 @@ async fn test_create_public_channel() {
     let (_node_a, _node_b, _new_channel_id) =
         create_nodes_with_established_channel(node_a_funding_amount, node_b_funding_amount, true)
             .await;
-    // Wait for the channel announcement to be broadcasted
-    tokio::time::sleep(tokio::time::Duration::from_millis(5000)).await;
-    // FIXME: add assertion
 }
 
 #[tokio::test]
 async fn test_public_channel_saved_to_the_owner_graph() {
     init_tracing();
 
-    let _span = tracing::info_span!("node", node = "test").entered();
-
     let node1_funding_amount = 100000000000;
     let node2_funding_amount = 6200000000;
 
@@ -217,8 +222,6 @@ async fn test_public_channel_saved_to_the_owner_graph() {
 async fn test_public_channel_saved_to_the_other_nodes_graph() {
     init_tracing();
 
-    let _span = tracing::info_span!("node", node = "test").entered();
-
     let node1_funding_amount = 100000000000;
     let node2_funding_amount = 6200000000;
 
@@ -255,6 +258,37 @@ async fn test_public_channel_saved_to_the_other_nodes_graph() {
     assert!(node_pubkeys.contains(&channel.node2()));
 }
 
+#[tokio::test]
+async fn test_public_channel_with_unconfirmed_funding_tx() {
+    init_tracing();
+
+    let node1_funding_amount = 100000000000;
+    let node2_funding_amount = 6200000000;
+
+    let [mut node1, mut node2, mut node3] = NetworkNode::new_n_interconnected_nodes().await;
+    let (_channel_id, _funding_tx) = establish_channel_between_nodes(
+        &mut node1,
+        &mut node2,
+        node1_funding_amount,
+        node2_funding_amount,
+        true,
+    )
+    .await;
+
+    // We should submit the transaction to node 3's chain actor here.
+    // If we don't do that node 3 will deem the funding transaction unconfirmed,
+    // thus refusing to save the channel to the graph.
+
+    // Wait for the channel announcement to be broadcasted
+    tokio::time::sleep(tokio::time::Duration::from_millis(5000)).await;
+
+    let node3_store = node3.store.clone();
+    node3.stop().await;
+    let channels = node3_store.get_channels(None);
+    // No channels here as node 3 didn't think the funding transaction is confirmed.
+    assert_eq!(channels.len(), 0);
+}
+
 #[tokio::test]
 async fn test_stash_broadcast_messages() {
     init_tracing();

From de5007adc6b952cb3aa51e432269166dcb3c2008 Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Fri, 18 Oct 2024 18:09:40 +0800
Subject: [PATCH 27/31] Add more debug messages

---
 src/ckb/tests/test_utils.rs   |  5 +++++
 src/fiber/network.rs          | 13 +++++++++++--
 src/fiber/tests/test_utils.rs |  3 +++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/ckb/tests/test_utils.rs b/src/ckb/tests/test_utils.rs
index 78fdfde12..7b3e0fc09 100644
--- a/src/ckb/tests/test_utils.rs
+++ b/src/ckb/tests/test_utils.rs
@@ -175,6 +175,7 @@ impl Actor for MockChainActor {
         message: Self::Msg,
         state: &mut Self::State,
     ) -> Result<(), ActorProcessingErr> {
+        debug!("MockChainActor received message: {:?}", message);
         use CkbChainMessage::*;
         match message {
             GetCurrentBlockNumber(_, reply) => {
@@ -324,6 +325,10 @@ impl Actor for MockChainActor {
                     }
                 };
                 let (status, result) = f();
+                debug!(
+                    "Transaction verfication result: tx {:?}, status: {:?}",
+                    &tx, &status
+                );
                 state.tx_status.insert(tx.hash(), (tx.into(), status));
                 if let Err(e) = reply_port.send(result) {
                     error!(
diff --git a/src/fiber/network.rs b/src/fiber/network.rs
index a5a53386a..eb1686a77 100644
--- a/src/fiber/network.rs
+++ b/src/fiber/network.rs
@@ -1732,10 +1732,10 @@ where
                 channel_announcement,
             ) => {
                 debug!(
-                    "Received channel announcement message for channel (confirmed at #{} block #{} tx) to peer {:?}: {:?}",
-                    &peer_id,
+                    "Processing our channel announcement message (confirmed at #{} block #{} tx) to peer {:?}: {:?}",
                     &block_number,
                     &tx_index,
+                    &peer_id,
                     &channel_announcement
                 );
                 // Adding this owned channel to the network graph.
@@ -1774,6 +1774,10 @@ where
             }
 
             NetworkActorCommand::ProccessChannelUpdate(peer_id, channel_update) => {
+                debug!(
+                    "Processing our channel update message to peer {:?}: {:?}",
+                    &peer_id, &channel_update
+                );
                 let mut graph = self.network_graph.write().await;
                 graph
                     .process_channel_update(channel_update.clone())
@@ -1959,6 +1963,11 @@ where
                     )));
                 }
 
+                debug!(
+                    "Node signatures in channel announcement message verified: {:?}",
+                    &channel_announcement
+                );
+
                 let (tx, block_number, tx_index): (_, u64, _) = match call_t!(
                     self.chain_actor,
                     CkbChainMessage::TraceTx,
diff --git a/src/fiber/tests/test_utils.rs b/src/fiber/tests/test_utils.rs
index 5f5775509..78390b6af 100644
--- a/src/fiber/tests/test_utils.rs
+++ b/src/fiber/tests/test_utils.rs
@@ -272,6 +272,9 @@ impl NetworkNode {
             store,
             fiber_config,
         } = config;
+
+        let _span = tracing::info_span!("NetworkNode", node_name = &node_name).entered();
+
         let root = ROOT_ACTOR.get_or_init(get_test_root_actor).await.clone();
         let (event_sender, mut event_receiver) = mpsc::channel(10000);
 

From 363a9d7280fa51c4b9657e5c55ce47b8922752dc Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Mon, 21 Oct 2024 17:19:53 +0800
Subject: [PATCH 28/31] Wait for SendTx in mock actor of TraceTx

---
 src/actors.rs               |  15 ++-
 src/ckb/tests/test_utils.rs | 198 +++++++++++++++++++++++++++++-------
 2 files changed, 173 insertions(+), 40 deletions(-)

diff --git a/src/actors.rs b/src/actors.rs
index 350a8a11e..2f2db43a2 100644
--- a/src/actors.rs
+++ b/src/actors.rs
@@ -60,11 +60,16 @@ impl Actor for RootActor {
         _state: &mut Self::State,
     ) -> Result<(), ActorProcessingErr> {
         match message {
-            SupervisionEvent::ActorTerminated(who, _, _) => {
-                debug!("Actor {:?} terminated", who);
-            }
-            SupervisionEvent::ActorPanicked(who, _) => {
-                error!("Actor {:?} panicked", who);
+            SupervisionEvent::ActorTerminated(who, _state, reason) => match reason {
+                Some(reason) => {
+                    debug!("Actor terminated for {:?} (id: {:?})", reason, who,);
+                }
+                None => {
+                    debug!("Actor terminated for unknown reason (id: {:?})", who);
+                }
+            },
+            SupervisionEvent::ActorPanicked(who, err) => {
+                error!("Actor unexpectedly panicked (id: {:?}): {:?}", who, err);
             }
             _ => {}
         }
diff --git a/src/ckb/tests/test_utils.rs b/src/ckb/tests/test_utils.rs
index 7b3e0fc09..014b12e64 100644
--- a/src/ckb/tests/test_utils.rs
+++ b/src/ckb/tests/test_utils.rs
@@ -8,7 +8,7 @@ use ckb_types::{
     prelude::{Builder, Entity, IntoTransactionView, Pack, PackVec, Unpack},
 };
 use once_cell::sync::Lazy;
-use std::{collections::HashMap, sync::RwLock};
+use std::{collections::HashMap, sync::Arc, sync::RwLock};
 
 use crate::ckb::{
     config::UdtCfgInfos,
@@ -19,9 +19,21 @@ use crate::ckb::{
 use crate::ckb::CkbChainMessage;
 
 use ckb_types::packed::Byte32;
-use ractor::{call_t, Actor, ActorProcessingErr, ActorRef};
+use ractor::{
+    call_t, concurrency::Duration, Actor, ActorProcessingErr, ActorRef, OutputPort, RpcReplyPort,
+    SupervisionEvent,
+};
 use tracing::{debug, error};
 
+pub const TRACE_TX_WAITING_FOR_NOTIFICATION_MS: u64 = 2 * 1000;
+pub const TRACE_TX_TIMEOUT_MS: u64 = 3 * 1000;
+
+type TxNotification = (
+    Byte32,
+    ckb_jsonrpc_types::TransactionView,
+    ckb_jsonrpc_types::Status,
+);
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum CellStatus {
     // This cell has been consumed. If any transaction
@@ -115,6 +127,104 @@ impl MockContext {
     }
 }
 
+enum TraceTxResult {
+    Found(TxNotification),
+    Timeout(),
+}
+
+// A simple actor to wait for the tx notifications from mock chain actor,
+// Sometimes we are sending SendTx to the mock chain actor after a TraceTx request.
+// In this case, we don't want to prematurely tell the caller that the transaction
+// does not exists. So we use this actor to wait for the tx notifications from the
+// mock chain actor.
+struct TraceTxReplier {
+    tx_hash: Byte32,
+}
+
+impl TraceTxReplier {
+    pub fn new(tx_hash: Byte32) -> Self {
+        Self { tx_hash }
+    }
+}
+
+#[ractor::async_trait]
+impl Actor for TraceTxReplier {
+    type Msg = TraceTxResult;
+    type Arguments = (
+        Arc<OutputPort<TxNotification>>,
+        Duration,
+        RpcReplyPort<TraceTxResponse>,
+    );
+    type State = Option<RpcReplyPort<TraceTxResponse>>;
+
+    async fn pre_start(
+        &self,
+        myself: ActorRef<Self::Msg>,
+        (notifier, timeout, reply_port): Self::Arguments,
+    ) -> Result<Self::State, ActorProcessingErr> {
+        let _ = myself.send_after(timeout, || TraceTxResult::Timeout());
+        let hash = self.tx_hash.clone();
+        notifier.subscribe(myself, move |notification| {
+            if notification.0 == hash {
+                Some(TraceTxResult::Found(notification))
+            } else {
+                None
+            }
+        });
+        Ok(Some(reply_port))
+    }
+
+    async fn handle(
+        &self,
+        myself: ActorRef<Self::Msg>,
+        message: Self::Msg,
+        reply_port: &mut Self::State,
+    ) -> Result<(), ActorProcessingErr> {
+        let (tx, status) = match message {
+            TraceTxResult::Found((_hash, tx, status)) => (Some(tx), status),
+            TraceTxResult::Timeout() => {
+                debug!("Timeout waiting for tx notification: {:?}", self.tx_hash);
+                (None, ckb_jsonrpc_types::Status::Unknown)
+            }
+        };
+
+        reply_trace_tx(
+            tx,
+            status,
+            reply_port
+                .take()
+                .expect("state is initialized, and handle function will only be called once"),
+        );
+
+        myself.stop(Some("handled trace tx result".to_string()));
+        Ok(())
+    }
+}
+
+fn reply_trace_tx(
+    tx: Option<ckb_jsonrpc_types::TransactionView>,
+    status: ckb_jsonrpc_types::Status,
+    reply_port: RpcReplyPort<TraceTxResponse>,
+) {
+    let block_hash = tx.as_ref().map(|tx| tx.hash.clone());
+    let status = TxStatus {
+        status,
+        // Some tests may require the block hash and block number to be set.
+        block_number: Some(Default::default()),
+        block_hash: block_hash.clone(),
+        tx_index: None,
+        reason: None,
+    };
+    let response = TraceTxResponse { tx, status };
+
+    if let Err(e) = reply_port.send(response) {
+        error!(
+            "Sending trace tx result of {:?} failed: {:?}",
+            block_hash, e
+        );
+    };
+}
+
 pub struct MockChainActorState {
     tx_status: HashMap<
         Byte32,
@@ -123,6 +233,7 @@ pub struct MockChainActorState {
             ckb_jsonrpc_types::Status,
         ),
     >,
+    tx_notifications: Arc<OutputPort<TxNotification>>,
     cell_status: HashMap<OutPoint, CellStatus>,
 }
 
@@ -136,6 +247,7 @@ impl MockChainActorState {
     pub fn new() -> Self {
         Self {
             tx_status: HashMap::new(),
+            tx_notifications: Arc::new(OutputPort::default()),
             cell_status: HashMap::new(),
         }
     }
@@ -153,6 +265,24 @@ impl MockChainActor {
     pub fn new() -> Self {
         Self {}
     }
+
+    pub async fn start_trace_tx_replier(
+        &self,
+        myself: ActorRef<CkbChainMessage>,
+        tx_hash: Byte32,
+        notifier: Arc<OutputPort<TxNotification>>,
+        timeout: Duration,
+        reply_port: RpcReplyPort<TraceTxResponse>,
+    ) {
+        let _ = Actor::spawn_linked(
+            None,
+            TraceTxReplier::new(tx_hash),
+            (notifier, timeout, reply_port),
+            myself.get_cell(),
+        )
+        .await
+        .expect("start trace tx replier");
+    }
 }
 
 #[ractor::async_trait]
@@ -329,6 +459,9 @@ impl Actor for MockChainActor {
                     "Transaction verfication result: tx {:?}, status: {:?}",
                     &tx, &status
                 );
+                state
+                    .tx_notifications
+                    .send((tx.hash(), tx.clone().into(), status.clone()));
                 state.tx_status.insert(tx.hash(), (tx.into(), status));
                 if let Err(e) = reply_port.send(result) {
                     error!(
@@ -339,41 +472,36 @@ impl Actor for MockChainActor {
                 }
             }
             TraceTx(tx, reply_port) => {
-                let (tx_view, status) = match state.tx_status.get(&tx.tx_hash).cloned() {
-                    Some((tx_view, status)) => (Some(tx_view), status),
-                    None => (None, ckb_jsonrpc_types::Status::Unknown),
-                };
-
-                debug!(
-                    "Tracing transaction: {:?}, status: {:?}",
-                    &tx.tx_hash, &status
-                );
-                let status = TxStatus {
-                    status,
-                    // Some tests may require the block hash and block number to be set.
-                    block_number: Some(Default::default()),
-                    block_hash: Some(ckb_types::H256(
-                        tx.tx_hash.clone().as_slice().try_into().unwrap(),
-                    )),
-                    tx_index: None,
-                    reason: None,
-                };
-                let response = TraceTxResponse {
-                    tx: tx_view,
-                    status,
+                match state.tx_status.get(&tx.tx_hash).cloned() {
+                    Some((tx_view, status)) => {
+                        reply_trace_tx(Some(tx_view), status, reply_port);
+                    }
+                    // The transaction is not found in the tx_status, we need to wait for the
+                    // tx notification from the mock chain actor.
+                    None => {
+                        self.start_trace_tx_replier(
+                            myself,
+                            tx.tx_hash,
+                            state.tx_notifications.clone(),
+                            Duration::from_millis(TRACE_TX_WAITING_FOR_NOTIFICATION_MS),
+                            reply_port,
+                        )
+                        .await;
+                    }
                 };
-
-                if let Err(e) = reply_port.send(response) {
-                    error!(
-                        "[{}] send reply failed: {:?}",
-                        myself.get_name().unwrap_or_default(),
-                        e
-                    );
-                }
             }
         }
         Ok(())
     }
+
+    async fn handle_supervisor_evt(
+        &self,
+        _myself: ActorRef<Self::Msg>,
+        _message: SupervisionEvent,
+        _state: &mut Self::State,
+    ) -> Result<(), ActorProcessingErr> {
+        Ok(())
+    }
 }
 
 pub async fn submit_tx(
@@ -381,6 +509,7 @@ pub async fn submit_tx(
     tx: TransactionView,
 ) -> ckb_jsonrpc_types::Status {
     pub const TIMEOUT: u64 = 1000;
+    debug!("Calling chain actor to submit tx: {:?}", &tx);
     if let Err(error) = call_t!(mock_actor, CkbChainMessage::SendTx, TIMEOUT, tx.clone())
         .expect("chain actor alive")
     {
@@ -401,7 +530,6 @@ pub async fn trace_tx_hash(
     mock_actor: ActorRef<CkbChainMessage>,
     tx_hash: Byte32,
 ) -> ckb_jsonrpc_types::Status {
-    pub const TIMEOUT: u64 = 1000;
     let request = TraceTxRequest {
         tx_hash,
         confirmations: 1,
@@ -409,8 +537,8 @@ pub async fn trace_tx_hash(
     call_t!(
         mock_actor,
         CkbChainMessage::TraceTx,
-        TIMEOUT,
-        request.clone()
+        TRACE_TX_TIMEOUT_MS,
+        request
     )
     .expect("chain actor alive")
     .status

From 3180987aab45775c4b61ae8793bf28bf5674f458 Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Tue, 29 Oct 2024 15:27:03 +0800
Subject: [PATCH 29/31] Demonstrate the race condition of disconnecting
 reconnecting in tentacle

---
 src/fiber/network.rs          |  8 ++++----
 src/fiber/tests/channel.rs    | 28 ++++++++++++++++++++++++++++
 src/fiber/tests/test_utils.rs |  1 +
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/fiber/network.rs b/src/fiber/network.rs
index eb1686a77..d6f950309 100644
--- a/src/fiber/network.rs
+++ b/src/fiber/network.rs
@@ -3383,7 +3383,7 @@ where
     }
 
     fn on_peer_disconnected(&mut self, id: &PeerId) {
-        info!("Peer {:?} disconnected", id);
+        info!("Peer {:?} disconnected from us ({:?})", id, &self.peer_id);
         if let Some(session) = self.peer_session_map.remove(id) {
             if let Some(channel_ids) = self.session_channels_map.remove(&session) {
                 for channel_id in channel_ids {
@@ -3916,7 +3916,7 @@ where
 
         tracker.spawn(async move {
             service.run().await;
-            debug!("Tentacle service shutdown");
+            debug!("Tentacle service stopped");
         });
 
         let mut graph = self.network_graph.write().await;
@@ -4160,8 +4160,8 @@ impl ServiceProtocol for Handle {
 
     async fn disconnected(&mut self, context: ProtocolContextMutRef<'_>) {
         info!(
-            "proto id [{}] close on session [{}]",
-            context.proto_id, context.session.id
+            "proto id [{}] close on session [{}], address: [{}], type: [{:?}]",
+            context.proto_id, context.session.id, &context.session.address, &context.session.ty
         );
 
         match context.session.remote_pubkey.as_ref() {
diff --git a/src/fiber/tests/channel.rs b/src/fiber/tests/channel.rs
index 0afd58d98..224f79322 100644
--- a/src/fiber/tests/channel.rs
+++ b/src/fiber/tests/channel.rs
@@ -1387,6 +1387,8 @@ async fn test_commitment_tx_capacity() {
 
 #[tokio::test]
 async fn test_connect_to_peers_with_mutual_channel_on_restart() {
+    init_tracing();
+
     let node_a_funding_amount = 100000000000;
     let node_b_funding_amount = 6200000000;
 
@@ -1401,3 +1403,29 @@ async fn test_connect_to_peers_with_mutual_channel_on_restart() {
     )
     .await;
 }
+
+#[tokio::test]
+async fn test_connect_to_peers_with_mutual_channel_on_restart_version_2() {
+    init_tracing();
+
+    let node_a_funding_amount = 100000000000;
+    let node_b_funding_amount = 6200000000;
+
+    let (mut node_a, mut node_b, _new_channel_id) =
+        create_nodes_with_established_channel(node_a_funding_amount, node_b_funding_amount, true)
+            .await;
+
+    node_a.stop().await;
+
+    node_b.expect_event(
+        |event| matches!(event, NetworkServiceEvent::PeerDisConnected(id, _addr) if id == &node_a.peer_id),
+    )
+    .await;
+
+    node_a.start().await;
+
+    node_a.expect_event(
+        |event| matches!(event, NetworkServiceEvent::PeerConnected(id, _addr) if id == &node_b.peer_id),
+    )
+    .await;
+}
diff --git a/src/fiber/tests/test_utils.rs b/src/fiber/tests/test_utils.rs
index 78390b6af..4627a62ca 100644
--- a/src/fiber/tests/test_utils.rs
+++ b/src/fiber/tests/test_utils.rs
@@ -368,6 +368,7 @@ impl NetworkNode {
 
     pub async fn restart(&mut self) {
         self.stop().await;
+        tracing::debug!("Node stopped, restarting");
         self.start().await;
     }
 

From f8ac3acb975ebff6da2d23ee9aebd7eb1e1fdd35 Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Tue, 29 Oct 2024 15:49:52 +0800
Subject: [PATCH 30/31] Use cargo nextest for better outputs

---
 .github/workflows/ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2317dc84e..397286891 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,11 @@ jobs:
       - uses: actions/checkout@v2
       - uses: Swatinem/rust-cache@v2
       - uses: dsherret/rust-toolchain-file@v1
-      - run: cargo test
+      - uses: taiki-e/install-action@v2
+        with:
+          tool: nextest
+      - run: |
+          RUST_BACKTRACE=full RUST_LOG=trace cargo nextest run
 
   fmt:
     name: Rustfmt

From 2fb8cf02514739f79097b404c46d9780fc835010 Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Tue, 29 Oct 2024 16:35:53 +0800
Subject: [PATCH 31/31] Sleep sometime before restarting the node

---
 src/fiber/tests/test_utils.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/fiber/tests/test_utils.rs b/src/fiber/tests/test_utils.rs
index 4627a62ca..1b0cfda8a 100644
--- a/src/fiber/tests/test_utils.rs
+++ b/src/fiber/tests/test_utils.rs
@@ -368,6 +368,11 @@ impl NetworkNode {
 
     pub async fn restart(&mut self) {
         self.stop().await;
+        // Tentacle shutdown may require some time to propagate to other nodes.
+        // If we start the node immediately, other nodes may deem our new connection
+        // as a duplicate connection and report RepeatedConnection error.
+        // And we will receive `ProtocolSelectError` error from tentacle.
+        tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
         tracing::debug!("Node stopped, restarting");
         self.start().await;
     }