From dc66aa6b72895a5d3edc28979335a5e360738046 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Thu, 23 May 2024 08:52:17 +0800
Subject: [PATCH 01/28] use local dev rust-sdk

---
 Cargo.lock | 25 ++++++++++++-------------
 Cargo.toml |  3 ++-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c4b6693b..37ad5536 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -908,8 +908,7 @@ dependencies = [
 [[package]]
 name = "ckb-sdk"
 version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8487deb2c0a77bbc4d33c812aa8f3f93c8786730c37a516eebfc4246602413ca"
+source = "git+https://github.com/chenyukang/ckb-sdk-rust.git?branch=v3.1.0-with-pcn-udt#548bae29c205afcf238a5806806ddb106855f95a"
 dependencies = [
  "anyhow",
  "bech32 0.8.1",
@@ -1414,9 +1413,9 @@ checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.33"
+version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -2625,9 +2624,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -2983,9 +2982,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
-version = "0.11.26"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "base64 0.21.7",
  "bytes",
@@ -3243,11 +3242,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.9.2"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -3256,9 +3255,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.1"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
 dependencies = [
  "core-foundation-sys",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index f3cf1b3c..6eb353b5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,7 +38,8 @@ tokio = { version = "1", features = [
     "signal",
 ] }
 home = "0.5.9"
-ckb-sdk = "3.1.0"
+#ckb-sdk = "3.1.0"
+ckb-sdk = { git = "https://github.com/chenyukang/ckb-sdk-rust.git", branch = "v3.1.0-with-pcn-udt" }
 thiserror = "1.0.58"
 anyhow = "1.0.81"
 env_logger = "0.11.3"

From 715071a4c2bfa9467fc5b49061deb1a924d51234 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Thu, 23 May 2024 16:33:42 +0800
Subject: [PATCH 02/28] add udt support for funding tx

---
 src/ckb_chain/funding/funding_tx.rs | 49 ++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/ckb_chain/funding/funding_tx.rs b/src/ckb_chain/funding/funding_tx.rs
index 3cb491e4..da18f808 100644
--- a/src/ckb_chain/funding/funding_tx.rs
+++ b/src/ckb_chain/funding/funding_tx.rs
@@ -1,14 +1,15 @@
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 
 use super::super::FundingError;
 use crate::ckb::serde_utils::EntityHex;
 
+use anyhow::anyhow;
 use ckb_sdk::{
     constants::SIGHASH_TYPE_HASH,
     traits::{
-        CellCollector, CellDepResolver, DefaultCellCollector, DefaultCellDepResolver,
-        DefaultHeaderDepResolver, DefaultTransactionDependencyProvider, HeaderDepResolver,
-        SecpCkbRawKeySigner, TransactionDependencyProvider,
+        CellCollector, CellDepResolver, CellQueryOptions, DefaultCellCollector,
+        DefaultCellDepResolver, DefaultHeaderDepResolver, DefaultTransactionDependencyProvider,
+        HeaderDepResolver, SecpCkbRawKeySigner, TransactionDependencyProvider, ValueRangeOption,
     },
     tx_builder::{unlock_tx, CapacityBalancer, TxBuilder, TxBuilderError},
     unlock::{ScriptUnlocker, SecpSighashUnlocker},
@@ -16,9 +17,10 @@ use ckb_sdk::{
 };
 use ckb_types::{
     core::{BlockView, Capacity, TransactionView},
-    packed::{self, Script, Transaction},
+    packed::{self, CellInput, Script, Transaction},
     prelude::*,
 };
+use log::warn;
 use molecule::{
     bytes::{BufMut as _, BytesMut},
     prelude::*,
@@ -96,11 +98,41 @@ struct FundingTxBuilder {
 impl TxBuilder for FundingTxBuilder {
     fn build_base(
         &self,
-        _cell_collector: &mut dyn CellCollector,
-        _cell_dep_resolver: &dyn CellDepResolver,
+        cell_collector: &mut dyn CellCollector,
+        cell_dep_resolver: &dyn CellDepResolver,
         _header_dep_resolver: &dyn HeaderDepResolver,
         _tx_dep_provider: &dyn TransactionDependencyProvider,
     ) -> Result<TransactionView, TxBuilderError> {
+        // Build inputs
+        let mut inputs = vec![];
+        let mut cell_deps = HashSet::new();
+        if let Some(ref udt_info) = self.request.udt_info {
+            let udt_type_script = udt_info.type_script.clone();
+            let owner = self.context.funding_source_lock_script.clone();
+            let owner_query = {
+                let mut query = CellQueryOptions::new_lock(udt_type_script.clone());
+                query.secondary_script_len_range = Some(ValueRangeOption::new_exact(0));
+                query.data_len_range = Some(ValueRangeOption::new_exact(0));
+                query
+            };
+
+            let (owner_cells, _) = cell_collector.collect_live_cells(&owner_query, true)?;
+            if owner_cells.is_empty() {
+                return Err(TxBuilderError::Other(anyhow!("owner cell not found")));
+            }
+            inputs = vec![CellInput::new(owner_cells[0].out_point.clone(), 0)];
+
+            let owner_cell_dep = cell_dep_resolver
+                .resolve(&owner)
+                .ok_or_else(|| TxBuilderError::ResolveCellDepFailed(owner.clone()))?;
+            let udt_cell_dep = cell_dep_resolver
+                .resolve(&udt_type_script)
+                .ok_or_else(|| TxBuilderError::ResolveCellDepFailed(udt_type_script.clone()))?;
+            #[allow(clippy::mutable_key_type)]
+            cell_deps.insert(owner_cell_dep);
+            cell_deps.insert(udt_cell_dep);
+        }
+
         let funding_cell = self
             .build_funding_cell()
             .map_err(|err| TxBuilderError::Other(err.into()))?;
@@ -121,8 +153,10 @@ impl TxBuilder for FundingTxBuilder {
             None => packed::Transaction::default().as_advanced_builder(),
         };
         let tx = builder
+            .set_inputs(inputs)
             .set_outputs(outputs)
             .set_outputs_data(outputs_data)
+            .set_cell_deps(cell_deps.into_iter().collect())
             .build();
 
         Ok(tx)
@@ -175,6 +209,7 @@ impl FundingTxBuilder {
                     .capacity(Capacity::shannons(ckb_amount).pack())
                     .lock(self.context.funding_cell_lock_script.clone())
                     .build();
+                warn!("yukang debug ckb_output: {:?}", ckb_output);
                 Ok((ckb_output, packed::Bytes::default()))
             }
         }

From d09775e41e2a4d0d17bb0c495a9bbf4166bc5b9f Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Sat, 25 May 2024 09:52:50 +0800
Subject: [PATCH 03/28] fix funding_tx

---
 Cargo.lock                                    |  24 +--
 src/ckb/channel.rs                            | 203 +++++++++++++-----
 src/ckb/network.rs                            |  36 +++-
 src/ckb_chain/funding/funding_tx.rs           | 122 ++++++++---
 .../bruno/e2e/udt/01-node1-connect-node2.bru  |  35 +++
 .../bruno/e2e/udt/02-node2-connect-node3.bru  |  35 +++
 .../udt/03-node1-node2-open-channel-wrong.bru |  41 ++++
 .../e2e/udt/04-node2-accept-channel-wrong.bru |  40 ++++
 ...ode1-node2-open-channel-script-invalid.bru |  41 ++++
 ...06-node2-accept-channel-script-invalid.bru |  46 ++++
 .../07-node1-node2-open-channel-normal.bru    |  41 ++++
 .../udt/08-node2-accept-channel-normal.bru    |  41 ++++
 12 files changed, 608 insertions(+), 97 deletions(-)
 create mode 100644 tests/bruno/e2e/udt/01-node1-connect-node2.bru
 create mode 100644 tests/bruno/e2e/udt/02-node2-connect-node3.bru
 create mode 100644 tests/bruno/e2e/udt/03-node1-node2-open-channel-wrong.bru
 create mode 100644 tests/bruno/e2e/udt/04-node2-accept-channel-wrong.bru
 create mode 100644 tests/bruno/e2e/udt/05-node1-node2-open-channel-script-invalid.bru
 create mode 100644 tests/bruno/e2e/udt/06-node2-accept-channel-script-invalid.bru
 create mode 100644 tests/bruno/e2e/udt/07-node1-node2-open-channel-normal.bru
 create mode 100644 tests/bruno/e2e/udt/08-node2-accept-channel-normal.bru

diff --git a/Cargo.lock b/Cargo.lock
index 37ad5536..9446c522 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -908,7 +908,7 @@ dependencies = [
 [[package]]
 name = "ckb-sdk"
 version = "3.1.0"
-source = "git+https://github.com/chenyukang/ckb-sdk-rust.git?branch=v3.1.0-with-pcn-udt#548bae29c205afcf238a5806806ddb106855f95a"
+source = "git+https://github.com/chenyukang/ckb-sdk-rust.git?branch=v3.1.0-with-pcn-udt#4b712fa35652bcd8b1f9e832cf0ad85681d0c6f5"
 dependencies = [
  "anyhow",
  "bech32 0.8.1",
@@ -1413,9 +1413,9 @@ checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -2624,9 +2624,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -2982,9 +2982,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
-version = "0.11.27"
+version = "0.11.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
+checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2"
 dependencies = [
  "base64 0.21.7",
  "bytes",
@@ -3242,11 +3242,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.11.0"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -3255,9 +3255,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
 dependencies = [
  "core-foundation-sys",
  "libc",
diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index 8e9dc553..28feb513 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -2,8 +2,8 @@ use bitflags::bitflags;
 use ckb_hash::{blake2b_256, new_blake2b};
 use ckb_sdk::Since;
 use ckb_types::{
-    core::{TransactionBuilder, TransactionView},
-    packed::{Bytes, CellInput, CellOutput, OutPoint, Script, Transaction},
+    core::{Capacity, TransactionBuilder, TransactionView},
+    packed::{self, Bytes, CellInput, CellOutput, OutPoint, Script, Transaction},
     prelude::{AsTransactionBuilder, IntoTransactionView, Pack, Unpack},
 };
 
@@ -35,7 +35,7 @@ use crate::{
     ckb::types::Shutdown,
     ckb_chain::{
         contracts::{get_cell_deps_by_contracts, get_script_by_contract, Contract},
-        FundingRequest,
+        FundingRequest, FundingUdtInfo,
     },
     NetworkServiceEvent,
 };
@@ -146,7 +146,7 @@ pub enum ChannelInitializationParameter {
     /// To open a new channel to another peer, the funding amount,
     /// the temporary channel id a unique channel seed to generate
     /// channel secrets must be given.
-    OpenChannel(u128, [u8; 32], oneshot::Sender<Hash256>),
+    OpenChannel(u128, [u8; 32], Option<Script>, oneshot::Sender<Hash256>),
     /// To accept a new channel from another peer, the funding amount,
     /// a unique channel seed to generate unique channel id,
     /// original OpenChannel message and an oneshot
@@ -155,6 +155,7 @@ pub enum ChannelInitializationParameter {
         u128,
         [u8; 32],
         OpenChannel,
+        Option<Script>,
         Option<oneshot::Sender<Hash256>>,
     ),
     /// Reestablish a channel with given channel id.
@@ -868,6 +869,7 @@ where
                 my_funding_amount,
                 seed,
                 open_channel,
+                my_funding_type_script,
                 oneshot_channel,
             ) => {
                 let peer_id = self.peer_id.clone();
@@ -896,17 +898,15 @@ where
                     ))));
                 }
 
-                if funding_type_script.is_some() {
-                    // We have not implemented funding type script yet.
-                    // But don't panic, otherwise adversary can easily take us down.
-                    return Err(Box::new(ProcessingChannelError::InvalidParameter(
-                        "Funding type script is not none, but we are currently unable to process this".to_string(),
-                    )));
-                }
+                warn!(
+                    "anan accept_channel funding_type_script: {:?} my_funding_type_script: {:?}",
+                    funding_type_script, my_funding_type_script
+                );
 
                 let mut state = ChannelActorState::new_inbound_channel(
                     *channel_id,
                     my_funding_amount,
+                    my_funding_type_script.clone(),
                     &seed,
                     peer_id.clone(),
                     *funding_amount,
@@ -968,7 +968,12 @@ where
                 }
                 Ok(state)
             }
-            ChannelInitializationParameter::OpenChannel(funding_amount, seed, tx) => {
+            ChannelInitializationParameter::OpenChannel(
+                funding_amount,
+                seed,
+                funding_type_script,
+                tx,
+            ) => {
                 let peer_id = self.peer_id.clone();
                 info!("Trying to open a channel to {:?}", &peer_id);
 
@@ -983,7 +988,7 @@ where
                 let message = PCNMessage::OpenChannel(OpenChannel {
                     chain_hash: Hash256::default(),
                     channel_id: channel.get_id(),
-                    funding_type_script: None,
+                    funding_type_script,
                     funding_amount: channel.to_local_amount,
                     funding_fee_rate: DEFAULT_FEE_RATE,
                     commitment_fee_rate: DEFAULT_COMMITMENT_FEE_RATE,
@@ -1182,6 +1187,9 @@ pub struct ChannelActorState {
     #[serde_as(as = "Option<EntityHex>")]
     pub funding_tx: Option<Transaction>,
 
+    #[serde_as(as = "Option<EntityHex>")]
+    pub funding_type_script: Option<Script>,
+
     // Is this channel initially inbound?
     // An inbound channel is one where the counterparty is the funder of the channel.
     pub is_acceptor: bool,
@@ -1410,6 +1418,7 @@ impl ChannelActorState {
     pub fn new_inbound_channel<'a>(
         temp_channel_id: Hash256,
         local_value: u128,
+        funding_type_script: Option<Script>,
         seed: &[u8],
         peer_id: PeerId,
         remote_value: u128,
@@ -1432,11 +1441,17 @@ impl ChannelActorState {
             &channel_id, &temp_channel_id,
         );
 
+        warn!(
+            "anan new_inbound_channel funding_type_script: {:?}",
+            funding_type_script
+        );
+
         Self {
             state: ChannelState::NegotiatingFunding(NegotiatingFundingFlags::THEIR_INIT_SENT),
             peer_id,
             funding_tx: None,
             is_acceptor: true,
+            funding_type_script,
             to_local_amount: local_value,
             id: channel_id,
             next_offering_tlc_id: 0,
@@ -1480,6 +1495,7 @@ impl ChannelActorState {
             state: ChannelState::NegotiatingFunding(NegotiatingFundingFlags::empty()),
             peer_id,
             funding_tx: None,
+            funding_type_script: None,
             is_acceptor: false,
             to_local_amount: value,
             id: temp_channel_id,
@@ -1649,9 +1665,20 @@ impl ChannelActorState {
     }
 
     pub fn get_funding_request(&self, fee_rate: u64) -> FundingRequest {
-        debug!("Generating funding request");
+        debug!("anan Generating funding request");
+        let udt_info = if let Some(type_script) = &self.funding_type_script {
+            Some(FundingUdtInfo {
+                type_script: type_script.clone(),
+                // FIXME(yukang): this is hardcoded to 61 * 10^8 * 4 shannons
+                local_ckb_amount: 24400000000,
+                remote_ckb_amount: 24400000000,
+            })
+        } else {
+            None
+        };
+        warn!("anan udt_info: {:?}", udt_info);
         FundingRequest {
-            udt_info: None,
+            udt_info,
             script: self.get_funding_lock_script(),
             local_amount: self.to_local_amount as u64,
             local_fee_rate: fee_rate,
@@ -2520,35 +2547,71 @@ impl ChannelActorState {
                     .build(),
             );
 
-        // TODO: Check UDT type, if it is ckb then convert it into u64.
-        let local_value = (self.to_local_amount - local_shutdown_fee) as u64;
-        let remote_value = (self.to_remote_amount - remote_shutdown_fee) as u64;
-        debug!(
-            "Building shutdown transaction with values: {} {}",
-            local_value, remote_value
-        );
-        let local_output = CellOutput::new_builder()
-            .capacity(local_value.pack())
-            .lock(local_shutdown_script)
-            .build();
-        let remote_output = CellOutput::new_builder()
-            .capacity(remote_value.pack())
-            .lock(remote_shutdown_script)
-            .build();
-        let outputs = self.order_things_for_musig2(local_output, remote_output);
-        let tx_builder = tx_builder.set_outputs(outputs.to_vec());
-        let tx_builder = tx_builder.set_outputs_data(vec![Default::default(), Default::default()]);
-        let tx = tx_builder.build();
-        let message = get_funding_cell_message_to_sign(
-            u64::MAX,
-            self.get_funding_transaction_outpoint(),
-            &tx,
-        );
-        debug!(
-            "Building message to sign for shutdown transaction {:?}",
-            hex::encode(message.as_slice())
-        );
-        Ok((tx, message))
+        if let Some(type_script) = &self.funding_type_script {
+            // FIXME(yukang): how to handle the CKB amount here,
+            // after substracting tx fee, we should return the lefted CKB to the holder
+            let minimal_capacity = 61_0000_0000 as u64;
+            let holder_output = CellOutput::new_builder()
+                .capacity(minimal_capacity.pack())
+                .type_(Some(type_script.clone()).pack())
+                .lock(local_shutdown_script)
+                .build();
+            let holder_output_data = self.to_local_amount.to_le_bytes().pack();
+
+            let counterparty_output = CellOutput::new_builder()
+                .capacity(minimal_capacity.pack())
+                .type_(Some(type_script.clone()).pack())
+                .lock(remote_shutdown_script)
+                .build();
+            let counterparty_output_data = self.to_remote_amount.to_le_bytes().pack();
+
+            let outputs = self.order_things_for_musig2(holder_output, counterparty_output);
+            let tx_builder = tx_builder.set_outputs(outputs.to_vec());
+            let tx_builder =
+                tx_builder.set_outputs_data(vec![holder_output_data, counterparty_output_data]);
+            let tx = tx_builder.build();
+            let message = get_funding_cell_message_to_sign(
+                u64::MAX,
+                self.get_funding_transaction_outpoint(),
+                &tx,
+            );
+            debug!(
+                "Building message to sign for shutdown transaction {:?}",
+                hex::encode(message.as_slice())
+            );
+            Ok((tx, message))
+        } else {
+            // TODO: Check UDT type, if it is ckb then convert it into u64.
+            let local_value = (self.to_local_amount - local_shutdown_fee) as u64;
+            let remote_value = (self.to_remote_amount - remote_shutdown_fee) as u64;
+            debug!(
+                "Building shutdown transaction with values: {} {}",
+                local_value, remote_value
+            );
+            let local_output = CellOutput::new_builder()
+                .capacity(local_value.pack())
+                .lock(local_shutdown_script)
+                .build();
+            let remote_output = CellOutput::new_builder()
+                .capacity(remote_value.pack())
+                .lock(remote_shutdown_script)
+                .build();
+            let outputs = self.order_things_for_musig2(local_output, remote_output);
+            let tx_builder = tx_builder.set_outputs(outputs.to_vec());
+            let tx_builder =
+                tx_builder.set_outputs_data(vec![Default::default(), Default::default()]);
+            let tx = tx_builder.build();
+            let message = get_funding_cell_message_to_sign(
+                u64::MAX,
+                self.get_funding_transaction_outpoint(),
+                &tx,
+            );
+            debug!(
+                "Building message to sign for shutdown transaction {:?}",
+                hex::encode(message.as_slice())
+            );
+            Ok((tx, message))
+        }
     }
 
     // The parameter `local` here specifies whether we are building the commitment transaction
@@ -2752,19 +2815,38 @@ impl ChannelActorState {
         let commitment_lock_script =
             get_script_by_contract(Contract::CommitmentLock, &blake2b_256(witnesses)[0..20]);
 
-        let outputs = vec![
-            CellOutput::new_builder()
-                .capacity((immediately_spendable_value as u64).pack())
-                .lock(immediate_secp256k1_lock_script)
-                .build(),
-            CellOutput::new_builder()
-                .capacity((time_locked_value as u64).pack())
-                .lock(commitment_lock_script)
-                .build(),
-        ];
-        let outputs_data = vec![Bytes::default(); outputs.len()];
-
-        (outputs, outputs_data)
+        if let Some(type_script) = &self.funding_type_script {
+            let immediate_output = packed::CellOutput::new_builder()
+                .capacity(Capacity::shannons(6100000000).pack())
+                .lock(immediate_secp256k1_lock_script.clone())
+                .type_(Some(type_script.clone()).pack())
+                .build();
+            let immediate_output_data: Bytes = immediately_spendable_value.to_le_bytes().pack();
+
+            let commitment_lock_output = packed::CellOutput::new_builder()
+                .capacity(Capacity::shannons(6100000000).pack())
+                .lock(commitment_lock_script.clone())
+                .type_(Some(type_script.clone()).pack())
+                .build();
+            let commitment_lock_output_data: Bytes = time_locked_value.to_le_bytes().pack();
+
+            let outputs = vec![immediate_output, commitment_lock_output];
+            let outputs_data = vec![immediate_output_data, commitment_lock_output_data];
+            (outputs, outputs_data)
+        } else {
+            let outputs = vec![
+                CellOutput::new_builder()
+                    .capacity((immediately_spendable_value as u64).pack())
+                    .lock(immediate_secp256k1_lock_script)
+                    .build(),
+                CellOutput::new_builder()
+                    .capacity((time_locked_value as u64).pack())
+                    .lock(commitment_lock_script)
+                    .build(),
+            ];
+            let outputs_data = vec![Bytes::default(); outputs.len()];
+            (outputs, outputs_data)
+        }
     }
 
     pub fn build_and_verify_commitment_tx(
@@ -3360,6 +3442,7 @@ mod tests {
                 OpenChannelCommand {
                     peer_id: node_b.peer_id.clone(),
                     funding_amount: 100000000000,
+                    funding_type_script: None,
                 },
                 rpc_reply,
             ))
@@ -3392,6 +3475,7 @@ mod tests {
                 OpenChannelCommand {
                     peer_id: node_b.peer_id.clone(),
                     funding_amount: 100000000000,
+                    funding_type_script: None,
                 },
                 rpc_reply,
             ))
@@ -3416,6 +3500,7 @@ mod tests {
                 AcceptChannelCommand {
                     temp_channel_id: open_channel_result.channel_id,
                     funding_amount: 6100000000,
+                    funding_type_script: None,
                 },
                 rpc_reply,
             ))
@@ -3440,6 +3525,7 @@ mod tests {
                 OpenChannelCommand {
                     peer_id: node_b.peer_id.clone(),
                     funding_amount: 100000000000,
+                    funding_type_script: None,
                 },
                 rpc_reply,
             ))
@@ -3463,6 +3549,7 @@ mod tests {
                 AcceptChannelCommand {
                     temp_channel_id: open_channel_result.channel_id,
                     funding_amount: 1000,
+                    funding_type_script: None,
                 },
                 rpc_reply,
             ))
@@ -3555,6 +3642,7 @@ mod tests {
                 OpenChannelCommand {
                     peer_id: node_b.peer_id.clone(),
                     funding_amount: 100000000000,
+                    funding_type_script: None,
                 },
                 rpc_reply,
             ))
@@ -3579,6 +3667,7 @@ mod tests {
                 AcceptChannelCommand {
                     temp_channel_id: open_channel_result.channel_id,
                     funding_amount: 6100000000,
+                    funding_type_script: None,
                 },
                 rpc_reply,
             ))
diff --git a/src/ckb/network.rs b/src/ckb/network.rs
index cf1d5a36..68a3e979 100644
--- a/src/ckb/network.rs
+++ b/src/ckb/network.rs
@@ -97,12 +97,16 @@ pub enum NetworkActorCommand {
 pub struct OpenChannelCommand {
     pub peer_id: PeerId,
     pub funding_amount: u128,
+    #[serde_as(as = "Option<EntityHex>")]
+    pub funding_type_script: Option<Script>,
 }
 
 #[derive(Debug)]
 pub struct AcceptChannelCommand {
     pub temp_channel_id: Hash256,
     pub funding_amount: u128,
+    #[serde_as(as = "Option<EntityHex>")]
+    pub funding_type_script: Option<Script>,
 }
 
 impl NetworkActorMessage {
@@ -365,6 +369,7 @@ where
                     "Updating channel funding for channel {:?}, current tx: {:?}",
                     &channel_id, old_tx
                 );
+                warn!("anan fundingrequest: {:?}", request);
                 let mut tx = FundingTx::new();
                 tx.update_for_self(old_tx)?;
                 let tx = match call_t!(
@@ -382,6 +387,7 @@ where
                         }
                     },
                     Ok(Err(err)) => {
+                        // FIXME(yukang): we need to handle this error properly
                         error!("Failed to fund channel: {}", err);
                         return Ok(());
                     }
@@ -554,13 +560,19 @@ impl NetworkActorState {
         let OpenChannelCommand {
             peer_id,
             funding_amount,
+            funding_type_script,
         } = open_channel;
         let seed = self.generate_channel_seed();
         let (tx, rx) = oneshot::channel::<Hash256>();
         let channel = Actor::spawn_linked(
             None,
             ChannelActor::new(peer_id.clone(), network.clone(), store),
-            ChannelInitializationParameter::OpenChannel(funding_amount, seed, tx),
+            ChannelInitializationParameter::OpenChannel(
+                funding_amount,
+                seed,
+                funding_type_script,
+                tx,
+            ),
             network.clone().get_cell(),
         )
         .await?
@@ -577,6 +589,7 @@ impl NetworkActorState {
         let AcceptChannelCommand {
             temp_channel_id,
             funding_amount,
+            funding_type_script,
         } = accept_channel;
         let (peer_id, open_channel) = self
             .to_be_accepted_channels
@@ -592,6 +605,26 @@ impl NetworkActorState {
             return Ok((channel.clone(), temp_channel_id, id));
         }
 
+        warn!(
+            "anan create_inbound_channel: our_funding_type: {:?}, remote_funding_type: {:?}",
+            funding_type_script, open_channel.funding_type_script
+        );
+
+        match (
+            open_channel.funding_type_script.as_ref(),
+            funding_type_script.as_ref(),
+        ) {
+            (Some(_open_script), Some(_script)) => {
+                // TODO: may need to check the same UDT type script
+            }
+            (None, None) => {}
+            _ => {
+                return Err(ProcessingChannelError::InvalidParameter(
+                    "Funding type script must both provided, or both not provided".to_string(),
+                ));
+            }
+        }
+
         let seed = self.generate_channel_seed();
         let (tx, rx) = oneshot::channel::<Hash256>();
         let channel = Actor::spawn_linked(
@@ -601,6 +634,7 @@ impl NetworkActorState {
                 funding_amount,
                 seed,
                 open_channel,
+                funding_type_script,
                 Some(tx),
             ),
             network.clone().get_cell(),
diff --git a/src/ckb_chain/funding/funding_tx.rs b/src/ckb_chain/funding/funding_tx.rs
index da18f808..88cc7482 100644
--- a/src/ckb_chain/funding/funding_tx.rs
+++ b/src/ckb_chain/funding/funding_tx.rs
@@ -16,8 +16,9 @@ use ckb_sdk::{
     CkbRpcClient, ScriptId,
 };
 use ckb_types::{
-    core::{BlockView, Capacity, TransactionView},
-    packed::{self, CellInput, Script, Transaction},
+    core::{BlockView, Capacity, DepType, TransactionView},
+    h256,
+    packed::{self, Bytes, CellDep, CellInput, OutPoint, Script, Transaction},
     prelude::*,
 };
 use log::warn;
@@ -56,11 +57,11 @@ impl From<Transaction> for FundingTx {
 pub struct FundingUdtInfo {
     /// The UDT type script
     #[serde_as(as = "EntityHex")]
-    type_script: packed::Script,
+    pub type_script: packed::Script,
     /// CKB amount to be provided by the local party.
-    local_ckb_amount: u64,
+    pub local_ckb_amount: u64,
     /// CKB amount to be provided by the remote party.
-    remote_ckb_amount: u64,
+    pub remote_ckb_amount: u64,
 }
 
 #[serde_as]
@@ -103,62 +104,106 @@ impl TxBuilder for FundingTxBuilder {
         _header_dep_resolver: &dyn HeaderDepResolver,
         _tx_dep_provider: &dyn TransactionDependencyProvider,
     ) -> Result<TransactionView, TxBuilderError> {
-        // Build inputs
+        let (funding_cell_output, funding_cell_output_data) = self
+            .build_funding_cell()
+            .map_err(|err| TxBuilderError::Other(err.into()))?;
+
+        // Funding cell does not need new cell deps and header deps. The type script deps will be added with inputs.
+        let mut outputs: Vec<packed::CellOutput> = vec![funding_cell_output];
+        let mut outputs_data: Vec<packed::Bytes> = vec![funding_cell_output_data];
+
+        // Try to find a proper UDT input cell.
         let mut inputs = vec![];
         let mut cell_deps = HashSet::new();
         if let Some(ref udt_info) = self.request.udt_info {
             let udt_type_script = udt_info.type_script.clone();
             let owner = self.context.funding_source_lock_script.clone();
+            warn!("anan owner now: {:?}", owner);
             let owner_query = {
-                let mut query = CellQueryOptions::new_lock(udt_type_script.clone());
-                query.secondary_script_len_range = Some(ValueRangeOption::new_exact(0));
-                query.data_len_range = Some(ValueRangeOption::new_exact(0));
+                let mut query = CellQueryOptions::new_lock(owner.clone());
+                //query.secondary_script = Some(udt_type_script.clone());
+                query.data_len_range = Some(ValueRangeOption::new_min(16));
+                query.min_total_capacity = u64::MAX;
                 query
             };
 
+            let local_ckb_amount = udt_info.local_ckb_amount;
+            let udt_amount = self.request.local_amount as u128;
+
             let (owner_cells, _) = cell_collector.collect_live_cells(&owner_query, true)?;
-            if owner_cells.is_empty() {
-                return Err(TxBuilderError::Other(anyhow!("owner cell not found")));
+            warn!("anan owner_cells: {:?}", owner_cells.len());
+            for cell in owner_cells.iter() {
+                let cell_capacity: u64 = cell.output.capacity().unpack();
+                let mut amount_bytes = [0u8; 16];
+                amount_bytes.copy_from_slice(&cell.output_data.as_ref()[0..16]);
+                let cell_udt_amount = u128::from_le_bytes(amount_bytes);
+                //FIXME(yukang): we may need to revise the check here
+                warn!("anan cell_capacity: {}, local_ckb_amount: {}, cell_udt_amount: {}, udt_amount: {}", cell_capacity, local_ckb_amount, cell_udt_amount, udt_amount);
+                if cell_capacity >= local_ckb_amount && cell_udt_amount >= udt_amount {
+                    inputs.push(CellInput::new(cell.out_point.clone(), 0));
+                    if cell_udt_amount > udt_amount {
+                        let change_output = packed::CellOutput::new_builder()
+                            .capacity(Capacity::shannons(cell_capacity - local_ckb_amount).pack())
+                            .lock(owner.clone())
+                            .build();
+                        let change_output_data: Bytes =
+                            (cell_udt_amount - udt_amount).to_le_bytes().pack();
+
+                        outputs.push(change_output);
+                        outputs_data.push(change_output_data);
+                    }
+                    warn!("anan find proper UDT owner cell: {:?}", cell);
+                    break;
+                }
+            }
+            if inputs.is_empty() {
+                return Err(TxBuilderError::Other(anyhow!(
+                    "proper UDT owner cell not found"
+                )));
             }
-            inputs = vec![CellInput::new(owner_cells[0].out_point.clone(), 0)];
-
             let owner_cell_dep = cell_dep_resolver
                 .resolve(&owner)
                 .ok_or_else(|| TxBuilderError::ResolveCellDepFailed(owner.clone()))?;
+            warn!("anan begin to resolve udt cell dep: {:?}", udt_type_script);
             let udt_cell_dep = cell_dep_resolver
                 .resolve(&udt_type_script)
                 .ok_or_else(|| TxBuilderError::ResolveCellDepFailed(udt_type_script.clone()))?;
+            warn!("anan udt_cell_dep: {:?}", udt_cell_dep);
             #[allow(clippy::mutable_key_type)]
             cell_deps.insert(owner_cell_dep);
             cell_deps.insert(udt_cell_dep);
         }
 
-        let funding_cell = self
-            .build_funding_cell()
-            .map_err(|err| TxBuilderError::Other(err.into()))?;
-
-        // Funding cell does not need new cell deps and header deps. The type script deps will be added with inputs.
-        let mut outputs: Vec<packed::CellOutput> = vec![funding_cell.0];
-        let mut outputs_data: Vec<packed::Bytes> = vec![funding_cell.1];
+        let mut tx_inputs: Vec<packed::CellInput> =
+            inputs.into_iter().map(|input| input.into()).collect();
 
         if let Some(ref tx) = self.funding_tx.tx {
             for (i, output) in tx.outputs().into_iter().enumerate().skip(1) {
                 outputs.push(output.clone());
                 outputs_data.push(tx.outputs_data().get(i).unwrap_or_default().clone());
             }
+            for input in tx.inputs().into_iter() {
+                tx_inputs.push(input.clone());
+            }
+            for cell_dep in tx.cell_deps().into_iter() {
+                cell_deps.insert(cell_dep);
+            }
         }
 
         let builder = match self.funding_tx.tx {
             Some(ref tx) => tx.as_advanced_builder(),
             None => packed::Transaction::default().as_advanced_builder(),
         };
-        let tx = builder
-            .set_inputs(inputs)
+
+        warn!("anan now here : {:?}", cell_deps);
+        let tx_builder = builder
+            .set_inputs(tx_inputs)
             .set_outputs(outputs)
             .set_outputs_data(outputs_data)
-            .set_cell_deps(cell_deps.into_iter().collect())
-            .build();
-
+            .set_cell_deps(cell_deps.into_iter().collect());
+        warn!("anan tx_builder: {:?}", tx_builder);
+        let tx = tx_builder.build();
+        warn!("anan tx_builder finished: {:?}", tx);
         Ok(tx)
     }
 }
@@ -209,7 +254,7 @@ impl FundingTxBuilder {
                     .capacity(Capacity::shannons(ckb_amount).pack())
                     .lock(self.context.funding_cell_lock_script.clone())
                     .build();
-                warn!("yukang debug ckb_output: {:?}", ckb_output);
+                warn!("build_funding_cell debug ckb_output: {:?}", ckb_output);
                 Ok((ckb_output, packed::Bytes::default()))
             }
         }
@@ -235,10 +280,33 @@ impl FundingTxBuilder {
             CapacityBalancer::new_simple(sender, placeholder_witness, self.request.local_fee_rate);
 
         let ckb_client = CkbRpcClient::new(&self.context.rpc_url);
-        let cell_dep_resolver = {
+        let mut cell_dep_resolver = {
             let genesis_block = ckb_client.get_block_by_number(0.into()).unwrap().unwrap();
             DefaultCellDepResolver::from_genesis(&BlockView::from(genesis_block)).unwrap()
         };
+
+        if let Some(ref udt_info) = self.request.udt_info {
+            // FIXME(yukang): how to add cell deps for udt?
+            let udt_type_script = udt_info.type_script.clone();
+            let tx_hash =
+                h256!("0x371c4d9727fa47c0d77d04bdbb9951a7c63860f50c26108372cd28a336a31058");
+            let out_point = OutPoint::new(tx_hash.pack(), 0);
+            let cell_dep = CellDep::new_builder()
+                .out_point(out_point)
+                .dep_type(DepType::Code.into())
+                .build();
+            warn!(
+                "anan adding cell_dep: code_hash {:?} => {:?}",
+                ScriptId::from(&udt_type_script),
+                cell_dep
+            );
+            cell_dep_resolver.insert(
+                ScriptId::from(&udt_type_script),
+                cell_dep,
+                "Simple UDT".to_string(),
+            );
+        }
+
         let header_dep_resolver = DefaultHeaderDepResolver::new(&self.context.rpc_url);
         let mut cell_collector = DefaultCellCollector::new(&self.context.rpc_url);
         let tx_dep_provider = DefaultTransactionDependencyProvider::new(&self.context.rpc_url, 10);
diff --git a/tests/bruno/e2e/udt/01-node1-connect-node2.bru b/tests/bruno/e2e/udt/01-node1-connect-node2.bru
new file mode 100644
index 00000000..7b3f8c39
--- /dev/null
+++ b/tests/bruno/e2e/udt/01-node1-connect-node2.bru
@@ -0,0 +1,35 @@
+meta {
+  name: connect peer
+  type: http
+  seq: 1
+}
+
+post {
+  url: {{NODE2_RPC_URL}}/ckb
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "request": {
+      "ConnectPeer": "{{NODE1_ADDR}}"
+    }
+  }
+
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  // Dialing a peer is async in tentacle. Sleep for some time to make sure
+  // we're connected to the peer.
+  await new Promise(r => setTimeout(r, 1000));
+}
diff --git a/tests/bruno/e2e/udt/02-node2-connect-node3.bru b/tests/bruno/e2e/udt/02-node2-connect-node3.bru
new file mode 100644
index 00000000..03cf125d
--- /dev/null
+++ b/tests/bruno/e2e/udt/02-node2-connect-node3.bru
@@ -0,0 +1,35 @@
+meta {
+  name: connect peer
+  type: http
+  seq: 2
+}
+
+post {
+  url: {{NODE3_RPC_URL}}/ckb
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "request": {
+      "ConnectPeer": "{{NODE2_ADDR}}"
+    }
+  }
+
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  // Dialing a peer is async in tentacle. Sleep for some time to make sure
+  // we're connected to the peer.
+  await new Promise(r => setTimeout(r, 1000));
+}
diff --git a/tests/bruno/e2e/udt/03-node1-node2-open-channel-wrong.bru b/tests/bruno/e2e/udt/03-node1-node2-open-channel-wrong.bru
new file mode 100644
index 00000000..53bf2b5d
--- /dev/null
+++ b/tests/bruno/e2e/udt/03-node1-node2-open-channel-wrong.bru
@@ -0,0 +1,41 @@
+meta {
+  name: Node1 open a channel to Node2
+  type: http
+  seq: 3
+}
+
+post {
+  url: {{NODE1_RPC_URL}}/ckb
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "request": {
+      "OpenChannel":
+      [
+        {
+          "peer_id": "{{NODE2_PEERID}}",
+          "funding_amount": 61000000000000,
+          "funding_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df41902200000004e58a837b1ac0a72adc56aa876dad176227a9c17c464ecd8e49451d72c79bc29"
+        }
+      ]
+    }
+  }
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  await new Promise(r => setTimeout(r, 1000));
+  console.log("N1N2 response: ", res.body.channel_id);
+  bru.setVar("N1N2_TEMP_CHANNEL_ID", res.body.channel_id);
+}
diff --git a/tests/bruno/e2e/udt/04-node2-accept-channel-wrong.bru b/tests/bruno/e2e/udt/04-node2-accept-channel-wrong.bru
new file mode 100644
index 00000000..dbc7f6ed
--- /dev/null
+++ b/tests/bruno/e2e/udt/04-node2-accept-channel-wrong.bru
@@ -0,0 +1,40 @@
+meta {
+  name: accept a channel from a peer, UDT does not match with the requested one
+  type: http
+  seq: 4
+}
+
+post {
+  url: {{NODE2_RPC_URL}}/ckb
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "request": {
+      "AcceptChannel": [
+        {
+          "temp_channel_id": "{{N1N2_TEMP_CHANNEL_ID}}",
+          "funding_amount": 71000000000000
+        }
+      ]
+    }
+  }
+}
+
+assert {
+  res.status: eq 500
+}
+
+script:post-response {
+  // Sleep for sometime to make sure current operation finishes before next request starts.
+  await new Promise(r => setTimeout(r, 2000));
+  console.log("accept channel result: ", res.body);
+  bru.setVar("N1N2_CHANNEL_ID", res.body.new_channel_id);
+}
diff --git a/tests/bruno/e2e/udt/05-node1-node2-open-channel-script-invalid.bru b/tests/bruno/e2e/udt/05-node1-node2-open-channel-script-invalid.bru
new file mode 100644
index 00000000..07f2c409
--- /dev/null
+++ b/tests/bruno/e2e/udt/05-node1-node2-open-channel-script-invalid.bru
@@ -0,0 +1,41 @@
+meta {
+  name: Node1 open a channel to Node2
+  type: http
+  seq: 5
+}
+
+post {
+  url: {{NODE1_RPC_URL}}/ckb
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "request": {
+      "OpenChannel":
+      [
+        {
+          "peer_id": "{{NODE2_PEERID}}",
+          "funding_amount": 61000000000000,
+          "funding_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df41902200000004e58a837b1ac0a72adc56aa876dad176227a9c17c464ecd8e49451d72c79bc29"
+        }
+      ]
+    }
+  }
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  await new Promise(r => setTimeout(r, 1000));
+  console.log("N1N2 response: ", res.body.channel_id);
+  bru.setVar("N1N2_TEMP_CHANNEL_ID", res.body.channel_id);
+}
diff --git a/tests/bruno/e2e/udt/06-node2-accept-channel-script-invalid.bru b/tests/bruno/e2e/udt/06-node2-accept-channel-script-invalid.bru
new file mode 100644
index 00000000..e04e805b
--- /dev/null
+++ b/tests/bruno/e2e/udt/06-node2-accept-channel-script-invalid.bru
@@ -0,0 +1,46 @@
+meta {
+  name: accept a channel from a peer, UDT does not match with the requested one
+  type: http
+  seq: 6
+}
+
+post {
+  url: {{NODE2_RPC_URL}}/ckb
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "request": {
+      "AcceptChannel": [
+        {
+          "temp_channel_id": "{{N1N2_TEMP_CHANNEL_ID}}",
+          "funding_amount": 81000000000000,
+          "funding_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df41902200000004e58a837b1ac0a72adc56aa876dad176227a9c17c464ecd8e49451d72c79bc29"
+        }
+      ]
+    }
+  }
+}
+
+docs {
+  // FIXME: the `funding_type_script` is not correct for NODE2, so this request should fail.
+  // we should return proper error code and message.
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  // Sleep for sometime to make sure current operation finishes before next request starts.
+  await new Promise(r => setTimeout(r, 2000));
+  console.log("accept channel result: ", res.body);
+  bru.setVar("N1N2_CHANNEL_ID", res.body.new_channel_id);
+}
diff --git a/tests/bruno/e2e/udt/07-node1-node2-open-channel-normal.bru b/tests/bruno/e2e/udt/07-node1-node2-open-channel-normal.bru
new file mode 100644
index 00000000..42752552
--- /dev/null
+++ b/tests/bruno/e2e/udt/07-node1-node2-open-channel-normal.bru
@@ -0,0 +1,41 @@
+meta {
+  name: Node1 open a channel to Node2
+  type: http
+  seq: 7
+}
+
+post {
+  url: {{NODE1_RPC_URL}}/ckb
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "request": {
+      "OpenChannel":
+      [
+        {
+          "peer_id": "{{NODE2_PEERID}}",
+          "funding_amount": 61000000000000,
+          "funding_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df41902200000004e58a837b1ac0a72adc56aa876dad176227a9c17c464ecd8e49451d72c79bc29"
+        }
+      ]
+    }
+  }
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  await new Promise(r => setTimeout(r, 1000));
+  console.log("N1N2 response: ", res.body.channel_id);
+  bru.setVar("N1N2_TEMP_CHANNEL_ID", res.body.channel_id);
+}
diff --git a/tests/bruno/e2e/udt/08-node2-accept-channel-normal.bru b/tests/bruno/e2e/udt/08-node2-accept-channel-normal.bru
new file mode 100644
index 00000000..a72eadd3
--- /dev/null
+++ b/tests/bruno/e2e/udt/08-node2-accept-channel-normal.bru
@@ -0,0 +1,41 @@
+meta {
+  name: accept a channel from a peer, a normal accept channel request
+  type: http
+  seq: 8
+}
+
+post {
+  url: {{NODE2_RPC_URL}}/ckb
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "request": {
+      "AcceptChannel": [
+        {
+          "temp_channel_id": "{{N1N2_TEMP_CHANNEL_ID}}",
+          "funding_amount": 91000000000000,
+          "funding_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df4190220000000e9218fa964cc80be12eb6eb750b43a94a649cfc6a71ba5c6ba37e88621fc3de3"
+        }
+      ]
+    }
+  }
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  // Sleep for sometime to make sure current operation finishes before next request starts.
+  await new Promise(r => setTimeout(r, 2000));
+  console.log("accept channel result: ", res.body);
+  bru.setVar("N1N2_CHANNEL_ID", res.body.new_channel_id);
+}

From 3dd74279c171427f08cac054f85fe045777909df Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Wed, 5 Jun 2024 01:11:36 +0800
Subject: [PATCH 04/28] udt send sign commitment tx

---
 src/ckb/channel.rs                            | 111 +++++++++-----
 src/ckb/gen/pcn.rs                            | 135 +++++++++++-------
 src/ckb/schema/pcn.mol                        |   1 +
 src/ckb/types.rs                              |   4 +
 src/ckb_chain/funding/funding_tx.rs           |   5 -
 .../udt/09-node1-send-commitment-signed.bru   |  38 +++++
 .../udt/10-node2-send-commitment-signed.bru   |  38 +++++
 7 files changed, 243 insertions(+), 89 deletions(-)
 create mode 100644 tests/bruno/e2e/udt/09-node1-send-commitment-signed.bru
 create mode 100644 tests/bruno/e2e/udt/10-node2-send-commitment-signed.bru

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index 28feb513..daa22ba5 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -907,6 +907,7 @@ where
                     *channel_id,
                     my_funding_amount,
                     my_funding_type_script.clone(),
+                    funding_type_script.clone(),
                     &seed,
                     peer_id.clone(),
                     *funding_amount,
@@ -922,6 +923,7 @@ where
                 let accept_channel = AcceptChannel {
                     channel_id: *channel_id,
                     funding_amount: my_funding_amount,
+                    funding_type_script: my_funding_type_script.clone(),
                     max_tlc_value_in_flight: DEFAULT_MAX_TLC_VALUE_IN_FLIGHT,
                     max_accept_tlcs: DEFAULT_MAX_ACCEPT_TLCS,
                     to_local_delay: *to_local_delay,
@@ -981,6 +983,7 @@ where
                     &seed,
                     self.peer_id.clone(),
                     funding_amount,
+                    funding_type_script.clone(),
                     LockTime::new(DEFAULT_TO_LOCAL_DELAY_BLOCKS),
                 );
 
@@ -1189,6 +1192,8 @@ pub struct ChannelActorState {
 
     #[serde_as(as = "Option<EntityHex>")]
     pub funding_type_script: Option<Script>,
+    #[serde_as(as = "Option<EntityHex>")]
+    pub remote_funding_type_script: Option<Script>,
 
     // Is this channel initially inbound?
     // An inbound channel is one where the counterparty is the funder of the channel.
@@ -1419,6 +1424,7 @@ impl ChannelActorState {
         temp_channel_id: Hash256,
         local_value: u128,
         funding_type_script: Option<Script>,
+        remote_funding_type_script: Option<Script>,
         seed: &[u8],
         peer_id: PeerId,
         remote_value: u128,
@@ -1452,6 +1458,7 @@ impl ChannelActorState {
             funding_tx: None,
             is_acceptor: true,
             funding_type_script,
+            remote_funding_type_script,
             to_local_amount: local_value,
             id: channel_id,
             next_offering_tlc_id: 0,
@@ -1485,6 +1492,7 @@ impl ChannelActorState {
         seed: &[u8],
         peer_id: PeerId,
         value: u128,
+        my_funding_type_script: Option<Script>,
         to_local_delay: LockTime,
     ) -> Self {
         let signer = InMemorySigner::generate_from_seed(seed);
@@ -1495,7 +1503,8 @@ impl ChannelActorState {
             state: ChannelState::NegotiatingFunding(NegotiatingFundingFlags::empty()),
             peer_id,
             funding_tx: None,
-            funding_type_script: None,
+            funding_type_script: my_funding_type_script,
+            remote_funding_type_script: None,
             is_acceptor: false,
             to_local_amount: value,
             id: temp_channel_id,
@@ -1665,7 +1674,6 @@ impl ChannelActorState {
     }
 
     pub fn get_funding_request(&self, fee_rate: u64) -> FundingRequest {
-        debug!("anan Generating funding request");
         let udt_info = if let Some(type_script) = &self.funding_type_script {
             Some(FundingUdtInfo {
                 type_script: type_script.clone(),
@@ -1676,7 +1684,6 @@ impl ChannelActorState {
         } else {
             None
         };
-        warn!("anan udt_info: {:?}", udt_info);
         FundingRequest {
             udt_info,
             script: self.get_funding_lock_script(),
@@ -1997,6 +2004,11 @@ impl ChannelActorState {
         ));
         self.to_remote_amount = accept_channel.funding_amount;
         self.remote_nonce = Some(accept_channel.next_local_nonce.clone());
+        self.remote_funding_type_script = accept_channel.funding_type_script.clone();
+        warn!(
+            "anan Remote funding type script: {:?}",
+            &self.remote_funding_type_script
+        );
 
         let remote_pubkeys = (&accept_channel).into();
         self.remote_channel_parameters = Some(ChannelParametersOneParty {
@@ -2370,6 +2382,27 @@ impl ChannelActorState {
             panic!("Invalid funding transation")
         }
 
+        if self.funding_type_script.is_some() {
+            let (_output, data) =
+                tx.output_with_data(0)
+                    .ok_or(ProcessingChannelError::InvalidParameter(
+                        "Funding transaction should have at least one output".to_string(),
+                    ))?;
+            if data.as_ref().len() >= 16 {
+                let mut amount_bytes = [0u8; 16];
+                amount_bytes.copy_from_slice(&data.as_ref()[0..16]);
+                let udt_amount = u128::from_le_bytes(amount_bytes);
+                warn!(
+                    "udt_amount: {}, to_remote_amount: {}, to_local_amount: {}",
+                    udt_amount, self.to_remote_amount, self.to_local_amount
+                );
+                if udt_amount == self.to_remote_amount + self.to_local_amount {
+                    return Ok(true);
+                }
+            } else {
+                return Ok(false);
+            }
+        }
         let current_capacity: u64 = first_output.capacity().unpack();
         let is_complete = current_capacity == (self.to_local_amount + self.to_remote_amount) as u64;
         Ok(is_complete)
@@ -2815,37 +2848,47 @@ impl ChannelActorState {
         let commitment_lock_script =
             get_script_by_contract(Contract::CommitmentLock, &blake2b_256(witnesses)[0..20]);
 
-        if let Some(type_script) = &self.funding_type_script {
-            let immediate_output = packed::CellOutput::new_builder()
-                .capacity(Capacity::shannons(6100000000).pack())
-                .lock(immediate_secp256k1_lock_script.clone())
-                .type_(Some(type_script.clone()).pack())
-                .build();
-            let immediate_output_data: Bytes = immediately_spendable_value.to_le_bytes().pack();
-
-            let commitment_lock_output = packed::CellOutput::new_builder()
-                .capacity(Capacity::shannons(6100000000).pack())
-                .lock(commitment_lock_script.clone())
-                .type_(Some(type_script.clone()).pack())
-                .build();
-            let commitment_lock_output_data: Bytes = time_locked_value.to_le_bytes().pack();
-
-            let outputs = vec![immediate_output, commitment_lock_output];
-            let outputs_data = vec![immediate_output_data, commitment_lock_output_data];
-            (outputs, outputs_data)
-        } else {
-            let outputs = vec![
-                CellOutput::new_builder()
-                    .capacity((immediately_spendable_value as u64).pack())
-                    .lock(immediate_secp256k1_lock_script)
-                    .build(),
-                CellOutput::new_builder()
-                    .capacity((time_locked_value as u64).pack())
-                    .lock(commitment_lock_script)
-                    .build(),
-            ];
-            let outputs_data = vec![Bytes::default(); outputs.len()];
-            (outputs, outputs_data)
+        match (&self.funding_type_script, &self.remote_funding_type_script) {
+            (Some(type_script), Some(remote_type_script)) => {
+                let immediate_output = packed::CellOutput::new_builder()
+                    .capacity(Capacity::shannons(6100000000).pack())
+                    .lock(immediate_secp256k1_lock_script.clone())
+                    .type_(Some(remote_type_script.clone()).pack())
+                    .build();
+                let immediate_output_data: Bytes = immediately_spendable_value.to_le_bytes().pack();
+
+                let commitment_lock_output = packed::CellOutput::new_builder()
+                    .capacity(Capacity::shannons(6100000000).pack())
+                    .lock(commitment_lock_script.clone())
+                    .type_(Some(type_script.clone()).pack())
+                    .build();
+                let commitment_lock_output_data: Bytes = time_locked_value.to_le_bytes().pack();
+
+                let outputs = vec![immediate_output, commitment_lock_output];
+                let outputs_data = vec![immediate_output_data, commitment_lock_output_data];
+                (outputs, outputs_data)
+            }
+            (None, None) => {
+                let outputs = vec![
+                    CellOutput::new_builder()
+                        .capacity((immediately_spendable_value as u64).pack())
+                        .lock(immediate_secp256k1_lock_script)
+                        .build(),
+                    CellOutput::new_builder()
+                        .capacity((time_locked_value as u64).pack())
+                        .lock(commitment_lock_script)
+                        .build(),
+                ];
+                let outputs_data = vec![Bytes::default(); outputs.len()];
+                (outputs, outputs_data)
+            }
+            _ => {
+                warn!(
+                    "self_type_script: {:?}, remote_type_script: {:?}",
+                    &self.funding_type_script, &self.remote_funding_type_script
+                );
+                panic!("Funding type script is not present");
+            }
         }
     }
 
diff --git a/src/ckb/gen/pcn.rs b/src/ckb/gen/pcn.rs
index 793cae2c..f87fddd3 100644
--- a/src/ckb/gen/pcn.rs
+++ b/src/ckb/gen/pcn.rs
@@ -3667,6 +3667,12 @@ impl ::core::fmt::Display for AcceptChannel {
         write!(f, "{} {{ ", Self::NAME)?;
         write!(f, "{}: {}", "channel_id", self.channel_id())?;
         write!(f, ", {}: {}", "funding_amount", self.funding_amount())?;
+        write!(
+            f,
+            ", {}: {}",
+            "funding_type_script",
+            self.funding_type_script()
+        )?;
         write!(
             f,
             ", {}: {}",
@@ -3718,10 +3724,10 @@ impl ::core::default::Default for AcceptChannel {
     }
 }
 impl AcceptChannel {
-    const DEFAULT_VALUE: [u8; 453] = [
-        197, 1, 0, 0, 60, 0, 0, 0, 92, 0, 0, 0, 108, 0, 0, 0, 124, 0, 0, 0, 132, 0, 0, 0, 148, 0,
-        0, 0, 156, 0, 0, 0, 189, 0, 0, 0, 222, 0, 0, 0, 255, 0, 0, 0, 32, 1, 0, 0, 65, 1, 0, 0, 98,
-        1, 0, 0, 131, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    const DEFAULT_VALUE: [u8; 457] = [
+        201, 1, 0, 0, 64, 0, 0, 0, 96, 0, 0, 0, 112, 0, 0, 0, 112, 0, 0, 0, 128, 0, 0, 0, 136, 0,
+        0, 0, 152, 0, 0, 0, 160, 0, 0, 0, 193, 0, 0, 0, 226, 0, 0, 0, 3, 1, 0, 0, 36, 1, 0, 0, 69,
+        1, 0, 0, 102, 1, 0, 0, 135, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -3734,9 +3740,9 @@ impl AcceptChannel {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     ];
-    pub const FIELD_COUNT: usize = 14;
+    pub const FIELD_COUNT: usize = 15;
     pub fn total_size(&self) -> usize {
         molecule::unpack_number(self.as_slice()) as usize
     }
@@ -3765,77 +3771,83 @@ impl AcceptChannel {
         let end = molecule::unpack_number(&slice[12..]) as usize;
         Uint128::new_unchecked(self.0.slice(start..end))
     }
-    pub fn max_tlc_value_in_flight(&self) -> Uint128 {
+    pub fn funding_type_script(&self) -> ScriptOpt {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[12..]) as usize;
         let end = molecule::unpack_number(&slice[16..]) as usize;
-        Uint128::new_unchecked(self.0.slice(start..end))
+        ScriptOpt::new_unchecked(self.0.slice(start..end))
     }
-    pub fn max_accept_tlcs(&self) -> Uint64 {
+    pub fn max_tlc_value_in_flight(&self) -> Uint128 {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[16..]) as usize;
         let end = molecule::unpack_number(&slice[20..]) as usize;
-        Uint64::new_unchecked(self.0.slice(start..end))
+        Uint128::new_unchecked(self.0.slice(start..end))
     }
-    pub fn min_tlc_value(&self) -> Uint128 {
+    pub fn max_accept_tlcs(&self) -> Uint64 {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[20..]) as usize;
         let end = molecule::unpack_number(&slice[24..]) as usize;
-        Uint128::new_unchecked(self.0.slice(start..end))
+        Uint64::new_unchecked(self.0.slice(start..end))
     }
-    pub fn to_self_delay(&self) -> Uint64 {
+    pub fn min_tlc_value(&self) -> Uint128 {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[24..]) as usize;
         let end = molecule::unpack_number(&slice[28..]) as usize;
-        Uint64::new_unchecked(self.0.slice(start..end))
+        Uint128::new_unchecked(self.0.slice(start..end))
     }
-    pub fn funding_pubkey(&self) -> Pubkey {
+    pub fn to_self_delay(&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;
-        Pubkey::new_unchecked(self.0.slice(start..end))
+        Uint64::new_unchecked(self.0.slice(start..end))
     }
-    pub fn revocation_basepoint(&self) -> Pubkey {
+    pub fn funding_pubkey(&self) -> Pubkey {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[32..]) as usize;
         let end = molecule::unpack_number(&slice[36..]) as usize;
         Pubkey::new_unchecked(self.0.slice(start..end))
     }
-    pub fn payment_basepoint(&self) -> Pubkey {
+    pub fn revocation_basepoint(&self) -> Pubkey {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[36..]) as usize;
         let end = molecule::unpack_number(&slice[40..]) as usize;
         Pubkey::new_unchecked(self.0.slice(start..end))
     }
-    pub fn delayed_payment_basepoint(&self) -> Pubkey {
+    pub fn payment_basepoint(&self) -> Pubkey {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[40..]) as usize;
         let end = molecule::unpack_number(&slice[44..]) as usize;
         Pubkey::new_unchecked(self.0.slice(start..end))
     }
-    pub fn tlc_basepoint(&self) -> Pubkey {
+    pub fn delayed_payment_basepoint(&self) -> Pubkey {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[44..]) as usize;
         let end = molecule::unpack_number(&slice[48..]) as usize;
         Pubkey::new_unchecked(self.0.slice(start..end))
     }
-    pub fn first_per_commitment_point(&self) -> Pubkey {
+    pub fn tlc_basepoint(&self) -> Pubkey {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[48..]) as usize;
         let end = molecule::unpack_number(&slice[52..]) as usize;
         Pubkey::new_unchecked(self.0.slice(start..end))
     }
-    pub fn second_per_commitment_point(&self) -> Pubkey {
+    pub fn first_per_commitment_point(&self) -> Pubkey {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[52..]) as usize;
         let end = molecule::unpack_number(&slice[56..]) as usize;
         Pubkey::new_unchecked(self.0.slice(start..end))
     }
-    pub fn next_local_nonce(&self) -> PubNonce {
+    pub fn second_per_commitment_point(&self) -> Pubkey {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[56..]) as usize;
+        let end = molecule::unpack_number(&slice[60..]) as usize;
+        Pubkey::new_unchecked(self.0.slice(start..end))
+    }
+    pub fn next_local_nonce(&self) -> PubNonce {
+        let slice = self.as_slice();
+        let start = molecule::unpack_number(&slice[60..]) as usize;
         if self.has_extra_fields() {
-            let end = molecule::unpack_number(&slice[60..]) as usize;
+            let end = molecule::unpack_number(&slice[64..]) as usize;
             PubNonce::new_unchecked(self.0.slice(start..end))
         } else {
             PubNonce::new_unchecked(self.0.slice(start..))
@@ -3870,6 +3882,7 @@ impl molecule::prelude::Entity for AcceptChannel {
         Self::new_builder()
             .channel_id(self.channel_id())
             .funding_amount(self.funding_amount())
+            .funding_type_script(self.funding_type_script())
             .max_tlc_value_in_flight(self.max_tlc_value_in_flight())
             .max_accept_tlcs(self.max_accept_tlcs())
             .min_tlc_value(self.min_tlc_value())
@@ -3905,6 +3918,12 @@ impl<'r> ::core::fmt::Display for AcceptChannelReader<'r> {
         write!(f, "{} {{ ", Self::NAME)?;
         write!(f, "{}: {}", "channel_id", self.channel_id())?;
         write!(f, ", {}: {}", "funding_amount", self.funding_amount())?;
+        write!(
+            f,
+            ", {}: {}",
+            "funding_type_script",
+            self.funding_type_script()
+        )?;
         write!(
             f,
             ", {}: {}",
@@ -3950,7 +3969,7 @@ impl<'r> ::core::fmt::Display for AcceptChannelReader<'r> {
     }
 }
 impl<'r> AcceptChannelReader<'r> {
-    pub const FIELD_COUNT: usize = 14;
+    pub const FIELD_COUNT: usize = 15;
     pub fn total_size(&self) -> usize {
         molecule::unpack_number(self.as_slice()) as usize
     }
@@ -3979,77 +3998,83 @@ impl<'r> AcceptChannelReader<'r> {
         let end = molecule::unpack_number(&slice[12..]) as usize;
         Uint128Reader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn max_tlc_value_in_flight(&self) -> Uint128Reader<'r> {
+    pub fn funding_type_script(&self) -> ScriptOptReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[12..]) as usize;
         let end = molecule::unpack_number(&slice[16..]) as usize;
-        Uint128Reader::new_unchecked(&self.as_slice()[start..end])
+        ScriptOptReader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn max_accept_tlcs(&self) -> Uint64Reader<'r> {
+    pub fn max_tlc_value_in_flight(&self) -> Uint128Reader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[16..]) as usize;
         let end = molecule::unpack_number(&slice[20..]) as usize;
-        Uint64Reader::new_unchecked(&self.as_slice()[start..end])
+        Uint128Reader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn min_tlc_value(&self) -> Uint128Reader<'r> {
+    pub fn max_accept_tlcs(&self) -> Uint64Reader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[20..]) as usize;
         let end = molecule::unpack_number(&slice[24..]) as usize;
-        Uint128Reader::new_unchecked(&self.as_slice()[start..end])
+        Uint64Reader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn to_self_delay(&self) -> Uint64Reader<'r> {
+    pub fn min_tlc_value(&self) -> Uint128Reader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[24..]) as usize;
         let end = molecule::unpack_number(&slice[28..]) as usize;
-        Uint64Reader::new_unchecked(&self.as_slice()[start..end])
+        Uint128Reader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn funding_pubkey(&self) -> PubkeyReader<'r> {
+    pub fn to_self_delay(&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;
-        PubkeyReader::new_unchecked(&self.as_slice()[start..end])
+        Uint64Reader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn revocation_basepoint(&self) -> PubkeyReader<'r> {
+    pub fn funding_pubkey(&self) -> PubkeyReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[32..]) as usize;
         let end = molecule::unpack_number(&slice[36..]) as usize;
         PubkeyReader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn payment_basepoint(&self) -> PubkeyReader<'r> {
+    pub fn revocation_basepoint(&self) -> PubkeyReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[36..]) as usize;
         let end = molecule::unpack_number(&slice[40..]) as usize;
         PubkeyReader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn delayed_payment_basepoint(&self) -> PubkeyReader<'r> {
+    pub fn payment_basepoint(&self) -> PubkeyReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[40..]) as usize;
         let end = molecule::unpack_number(&slice[44..]) as usize;
         PubkeyReader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn tlc_basepoint(&self) -> PubkeyReader<'r> {
+    pub fn delayed_payment_basepoint(&self) -> PubkeyReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[44..]) as usize;
         let end = molecule::unpack_number(&slice[48..]) as usize;
         PubkeyReader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn first_per_commitment_point(&self) -> PubkeyReader<'r> {
+    pub fn tlc_basepoint(&self) -> PubkeyReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[48..]) as usize;
         let end = molecule::unpack_number(&slice[52..]) as usize;
         PubkeyReader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn second_per_commitment_point(&self) -> PubkeyReader<'r> {
+    pub fn first_per_commitment_point(&self) -> PubkeyReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[52..]) as usize;
         let end = molecule::unpack_number(&slice[56..]) as usize;
         PubkeyReader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn next_local_nonce(&self) -> PubNonceReader<'r> {
+    pub fn second_per_commitment_point(&self) -> PubkeyReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[56..]) as usize;
+        let end = molecule::unpack_number(&slice[60..]) as usize;
+        PubkeyReader::new_unchecked(&self.as_slice()[start..end])
+    }
+    pub fn next_local_nonce(&self) -> PubNonceReader<'r> {
+        let slice = self.as_slice();
+        let start = molecule::unpack_number(&slice[60..]) as usize;
         if self.has_extra_fields() {
-            let end = molecule::unpack_number(&slice[60..]) as usize;
+            let end = molecule::unpack_number(&slice[64..]) as usize;
             PubNonceReader::new_unchecked(&self.as_slice()[start..end])
         } else {
             PubNonceReader::new_unchecked(&self.as_slice()[start..])
@@ -4104,18 +4129,19 @@ impl<'r> molecule::prelude::Reader<'r> for AcceptChannelReader<'r> {
         }
         Byte32Reader::verify(&slice[offsets[0]..offsets[1]], compatible)?;
         Uint128Reader::verify(&slice[offsets[1]..offsets[2]], compatible)?;
-        Uint128Reader::verify(&slice[offsets[2]..offsets[3]], compatible)?;
-        Uint64Reader::verify(&slice[offsets[3]..offsets[4]], compatible)?;
-        Uint128Reader::verify(&slice[offsets[4]..offsets[5]], compatible)?;
-        Uint64Reader::verify(&slice[offsets[5]..offsets[6]], compatible)?;
-        PubkeyReader::verify(&slice[offsets[6]..offsets[7]], compatible)?;
+        ScriptOptReader::verify(&slice[offsets[2]..offsets[3]], compatible)?;
+        Uint128Reader::verify(&slice[offsets[3]..offsets[4]], compatible)?;
+        Uint64Reader::verify(&slice[offsets[4]..offsets[5]], compatible)?;
+        Uint128Reader::verify(&slice[offsets[5]..offsets[6]], compatible)?;
+        Uint64Reader::verify(&slice[offsets[6]..offsets[7]], compatible)?;
         PubkeyReader::verify(&slice[offsets[7]..offsets[8]], compatible)?;
         PubkeyReader::verify(&slice[offsets[8]..offsets[9]], compatible)?;
         PubkeyReader::verify(&slice[offsets[9]..offsets[10]], compatible)?;
         PubkeyReader::verify(&slice[offsets[10]..offsets[11]], compatible)?;
         PubkeyReader::verify(&slice[offsets[11]..offsets[12]], compatible)?;
         PubkeyReader::verify(&slice[offsets[12]..offsets[13]], compatible)?;
-        PubNonceReader::verify(&slice[offsets[13]..offsets[14]], compatible)?;
+        PubkeyReader::verify(&slice[offsets[13]..offsets[14]], compatible)?;
+        PubNonceReader::verify(&slice[offsets[14]..offsets[15]], compatible)?;
         Ok(())
     }
 }
@@ -4123,6 +4149,7 @@ impl<'r> molecule::prelude::Reader<'r> for AcceptChannelReader<'r> {
 pub struct AcceptChannelBuilder {
     pub(crate) channel_id: Byte32,
     pub(crate) funding_amount: Uint128,
+    pub(crate) funding_type_script: ScriptOpt,
     pub(crate) max_tlc_value_in_flight: Uint128,
     pub(crate) max_accept_tlcs: Uint64,
     pub(crate) min_tlc_value: Uint128,
@@ -4137,7 +4164,7 @@ pub struct AcceptChannelBuilder {
     pub(crate) next_local_nonce: PubNonce,
 }
 impl AcceptChannelBuilder {
-    pub const FIELD_COUNT: usize = 14;
+    pub const FIELD_COUNT: usize = 15;
     pub fn channel_id(mut self, v: Byte32) -> Self {
         self.channel_id = v;
         self
@@ -4146,6 +4173,10 @@ impl AcceptChannelBuilder {
         self.funding_amount = v;
         self
     }
+    pub fn funding_type_script(mut self, v: ScriptOpt) -> Self {
+        self.funding_type_script = v;
+        self
+    }
     pub fn max_tlc_value_in_flight(mut self, v: Uint128) -> Self {
         self.max_tlc_value_in_flight = v;
         self
@@ -4202,6 +4233,7 @@ impl molecule::prelude::Builder for AcceptChannelBuilder {
         molecule::NUMBER_SIZE * (Self::FIELD_COUNT + 1)
             + self.channel_id.as_slice().len()
             + self.funding_amount.as_slice().len()
+            + self.funding_type_script.as_slice().len()
             + self.max_tlc_value_in_flight.as_slice().len()
             + self.max_accept_tlcs.as_slice().len()
             + self.min_tlc_value.as_slice().len()
@@ -4223,6 +4255,8 @@ impl molecule::prelude::Builder for AcceptChannelBuilder {
         offsets.push(total_size);
         total_size += self.funding_amount.as_slice().len();
         offsets.push(total_size);
+        total_size += self.funding_type_script.as_slice().len();
+        offsets.push(total_size);
         total_size += self.max_tlc_value_in_flight.as_slice().len();
         offsets.push(total_size);
         total_size += self.max_accept_tlcs.as_slice().len();
@@ -4252,6 +4286,7 @@ impl molecule::prelude::Builder for AcceptChannelBuilder {
         }
         writer.write_all(self.channel_id.as_slice())?;
         writer.write_all(self.funding_amount.as_slice())?;
+        writer.write_all(self.funding_type_script.as_slice())?;
         writer.write_all(self.max_tlc_value_in_flight.as_slice())?;
         writer.write_all(self.max_accept_tlcs.as_slice())?;
         writer.write_all(self.min_tlc_value.as_slice())?;
diff --git a/src/ckb/schema/pcn.mol b/src/ckb/schema/pcn.mol
index 434cd0c2..c25e3f65 100644
--- a/src/ckb/schema/pcn.mol
+++ b/src/ckb/schema/pcn.mol
@@ -30,6 +30,7 @@ table OpenChannel {
 table AcceptChannel {
     channel_id:                  Byte32,
     funding_amount:              Uint128,
+    funding_type_script:         ScriptOpt,
     max_tlc_value_in_flight:     Uint128,
     max_accept_tlcs:             Uint64,
     min_tlc_value:               Uint128,
diff --git a/src/ckb/types.rs b/src/ckb/types.rs
index 12a60f7b..f11d043e 100644
--- a/src/ckb/types.rs
+++ b/src/ckb/types.rs
@@ -503,10 +503,13 @@ impl TryFrom<molecule_pcn::OpenChannel> for OpenChannel {
     }
 }
 
+#[serde_as]
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct AcceptChannel {
     pub channel_id: Hash256,
     pub funding_amount: u128,
+    #[serde_as(as = "Option<EntityHex>")]
+    pub funding_type_script: Option<Script>,
     pub max_tlc_value_in_flight: u128,
     pub max_accept_tlcs: u64,
     pub min_tlc_value: u128,
@@ -549,6 +552,7 @@ impl TryFrom<molecule_pcn::AcceptChannel> for AcceptChannel {
         Ok(AcceptChannel {
             channel_id: accept_channel.channel_id().into(),
             funding_amount: accept_channel.funding_amount().unpack(),
+            funding_type_script: accept_channel.funding_type_script().to_opt(),
             max_tlc_value_in_flight: accept_channel.max_tlc_value_in_flight().unpack(),
             max_accept_tlcs: accept_channel.max_accept_tlcs().unpack(),
             min_tlc_value: accept_channel.min_tlc_value().unpack(),
diff --git a/src/ckb_chain/funding/funding_tx.rs b/src/ckb_chain/funding/funding_tx.rs
index 88cc7482..513ac509 100644
--- a/src/ckb_chain/funding/funding_tx.rs
+++ b/src/ckb_chain/funding/funding_tx.rs
@@ -118,7 +118,6 @@ impl TxBuilder for FundingTxBuilder {
         if let Some(ref udt_info) = self.request.udt_info {
             let udt_type_script = udt_info.type_script.clone();
             let owner = self.context.funding_source_lock_script.clone();
-            warn!("anan owner now: {:?}", owner);
             let owner_query = {
                 let mut query = CellQueryOptions::new_lock(owner.clone());
                 //query.secondary_script = Some(udt_type_script.clone());
@@ -131,14 +130,12 @@ impl TxBuilder for FundingTxBuilder {
             let udt_amount = self.request.local_amount as u128;
 
             let (owner_cells, _) = cell_collector.collect_live_cells(&owner_query, true)?;
-            warn!("anan owner_cells: {:?}", owner_cells.len());
             for cell in owner_cells.iter() {
                 let cell_capacity: u64 = cell.output.capacity().unpack();
                 let mut amount_bytes = [0u8; 16];
                 amount_bytes.copy_from_slice(&cell.output_data.as_ref()[0..16]);
                 let cell_udt_amount = u128::from_le_bytes(amount_bytes);
                 //FIXME(yukang): we may need to revise the check here
-                warn!("anan cell_capacity: {}, local_ckb_amount: {}, cell_udt_amount: {}, udt_amount: {}", cell_capacity, local_ckb_amount, cell_udt_amount, udt_amount);
                 if cell_capacity >= local_ckb_amount && cell_udt_amount >= udt_amount {
                     inputs.push(CellInput::new(cell.out_point.clone(), 0));
                     if cell_udt_amount > udt_amount {
@@ -164,11 +161,9 @@ impl TxBuilder for FundingTxBuilder {
             let owner_cell_dep = cell_dep_resolver
                 .resolve(&owner)
                 .ok_or_else(|| TxBuilderError::ResolveCellDepFailed(owner.clone()))?;
-            warn!("anan begin to resolve udt cell dep: {:?}", udt_type_script);
             let udt_cell_dep = cell_dep_resolver
                 .resolve(&udt_type_script)
                 .ok_or_else(|| TxBuilderError::ResolveCellDepFailed(udt_type_script.clone()))?;
-            warn!("anan udt_cell_dep: {:?}", udt_cell_dep);
             #[allow(clippy::mutable_key_type)]
             cell_deps.insert(owner_cell_dep);
             cell_deps.insert(udt_cell_dep);
diff --git a/tests/bruno/e2e/udt/09-node1-send-commitment-signed.bru b/tests/bruno/e2e/udt/09-node1-send-commitment-signed.bru
new file mode 100644
index 00000000..c0a857a2
--- /dev/null
+++ b/tests/bruno/e2e/udt/09-node1-send-commitment-signed.bru
@@ -0,0 +1,38 @@
+meta {
+  name: send commitment_signed message
+  type: http
+  seq: 9
+}
+
+post {
+  url: {{NODE1_RPC_URL}}/ckb
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "request": {
+      "ControlPcnChannel": {
+        "channel_id": "{{N1N2_CHANNEL_ID}}",
+        "command": {
+          "CommitmentSigned": []
+        }
+      }
+    }
+  }
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  // Sleep for sometime to make sure current operation finishes before next request starts.
+  await new Promise(r => setTimeout(r, 1000));
+}
diff --git a/tests/bruno/e2e/udt/10-node2-send-commitment-signed.bru b/tests/bruno/e2e/udt/10-node2-send-commitment-signed.bru
new file mode 100644
index 00000000..c2471969
--- /dev/null
+++ b/tests/bruno/e2e/udt/10-node2-send-commitment-signed.bru
@@ -0,0 +1,38 @@
+meta {
+  name: send commitment_signed message
+  type: http
+  seq: 10
+}
+
+post {
+  url: {{NODE2_RPC_URL}}/ckb
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "request": {
+      "ControlPcnChannel": {
+        "channel_id": "{{N1N2_CHANNEL_ID}}",
+        "command": {
+          "CommitmentSigned": []
+        }
+      }
+    }
+  }
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  // Sleep for sometime to make sure current operation finishes before next request starts.
+  await new Promise(r => setTimeout(r, 1000));
+}

From 4137129247c792b9d72c028b2f8219237f882458 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Wed, 5 Jun 2024 10:16:35 +0800
Subject: [PATCH 05/28] fix remote funding_script issue

---
 src/ckb/channel.rs | 4 ++++
 src/ckb/types.rs   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index daa22ba5..fc92ec75 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -941,6 +941,10 @@ where
                         .get_commitment_point(commitment_number + 1),
                     next_local_nonce: state.get_local_musig2_pubnonce(),
                 };
+                warn!(
+                    "anan set accept_channel funding script: {:?}",
+                    my_funding_type_script
+                );
 
                 let command = PCNMessageWithPeerId {
                     peer_id,
diff --git a/src/ckb/types.rs b/src/ckb/types.rs
index f11d043e..46d1fb6b 100644
--- a/src/ckb/types.rs
+++ b/src/ckb/types.rs
@@ -529,6 +529,7 @@ impl From<AcceptChannel> for molecule_pcn::AcceptChannel {
         molecule_pcn::AcceptChannel::new_builder()
             .channel_id(accept_channel.channel_id.into())
             .funding_amount(accept_channel.funding_amount.pack())
+            .funding_type_script(accept_channel.funding_type_script.pack())
             .max_tlc_value_in_flight(accept_channel.max_tlc_value_in_flight.pack())
             .max_accept_tlcs(accept_channel.max_accept_tlcs.pack())
             .min_tlc_value(accept_channel.min_tlc_value.pack())

From 5bae110930ec04105dd11ec46805f07cdcbb4fdd Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Wed, 5 Jun 2024 17:20:11 +0800
Subject: [PATCH 06/28] fix UDT funding amount issue

---
 src/ckb/channel.rs                  |   1 +
 src/ckb/network.rs                  |  33 +++++--
 src/ckb_chain/funding/funding_tx.rs | 134 ++++++++++++++++------------
 3 files changed, 104 insertions(+), 64 deletions(-)

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index fc92ec75..3d231576 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -1688,6 +1688,7 @@ impl ChannelActorState {
         } else {
             None
         };
+        warn!("anan get_funding_request: {:?}", udt_info);
         FundingRequest {
             udt_info,
             script: self.get_funding_lock_script(),
diff --git a/src/ckb/network.rs b/src/ckb/network.rs
index 68a3e979..8e9b9c2e 100644
--- a/src/ckb/network.rs
+++ b/src/ckb/network.rs
@@ -45,7 +45,9 @@ use super::{
 
 use crate::ckb::channel::{TxCollaborationCommand, TxUpdateCommand};
 use crate::ckb::types::TxSignatures;
-use crate::ckb_chain::{CkbChainMessage, FundingRequest, FundingTx, TraceTxRequest};
+use crate::ckb_chain::{
+    CkbChainMessage, FundingRequest, FundingTx, FundingUdtInfo, TraceTxRequest,
+};
 use crate::{unwrap_or_return, Error};
 
 pub const PCN_PROTOCOL_ID: ProtocolId = ProtocolId::new(42);
@@ -156,7 +158,7 @@ pub enum NetworkActorEvent {
     /// The two Hash256 are respectively newly agreed channel id and temp channel id,
     /// The two u128 are respectively local and remote funding amount,
     /// and the script is the lock script of the agreed funding cell.
-    ChannelAccepted(PeerId, Hash256, Hash256, u128, u128, Script),
+    ChannelAccepted(PeerId, Hash256, Hash256, u128, u128, Script, Option<Script>),
     /// A channel is ready to use.
     ChannelReady(Hash256, PeerId),
     /// A channel is being shutting down.
@@ -1027,7 +1029,15 @@ where
                         ))
                         .expect("myself alive");
                 }
-                NetworkActorEvent::ChannelAccepted(peer_id, new, old, local, remote, script) => {
+                NetworkActorEvent::ChannelAccepted(
+                    peer_id,
+                    new,
+                    old,
+                    local,
+                    remote,
+                    script,
+                    funding_script,
+                ) => {
                     assert_ne!(new, old, "new and old channel id must be different");
                     if let Some(session) = state.get_peer_session(&peer_id) {
                         if let Some(channel) = state.channels.remove(&old) {
@@ -1039,15 +1049,26 @@ where
                             });
 
                             debug!("Starting funding channel");
-                            // TODO: Here we imply that the one who receives AcceptChannel message
-                            // (i.e. the channel initiator) will send TxUpdate message first.
+                            // TODO: Here we implies the one who receives AcceptChannel message
+                            //  (i.e. the channel initiator) will send TxUpdate message first.
+                            dbg!(&script);
+                            let udt_info = if let Some(funding_script) = funding_script {
+                                Some(FundingUdtInfo {
+                                    type_script: funding_script,
+                                    // FIXME(yukang): this is hardcoded to 61 * 10^8 * 4 shannons
+                                    local_ckb_amount: 24400000000,
+                                    remote_ckb_amount: 24400000000,
+                                })
+                            } else {
+                                None
+                            };
                             myself
                                 .send_message(NetworkActorMessage::new_command(
                                     NetworkActorCommand::UpdateChannelFunding(
                                         new,
                                         Default::default(),
                                         FundingRequest {
-                                            udt_info: None,
+                                            udt_info,
                                             script,
                                             local_amount: local as u64,
                                             local_fee_rate: 0,
diff --git a/src/ckb_chain/funding/funding_tx.rs b/src/ckb_chain/funding/funding_tx.rs
index 513ac509..231a6b1a 100644
--- a/src/ckb_chain/funding/funding_tx.rs
+++ b/src/ckb_chain/funding/funding_tx.rs
@@ -9,7 +9,8 @@ use ckb_sdk::{
     traits::{
         CellCollector, CellDepResolver, CellQueryOptions, DefaultCellCollector,
         DefaultCellDepResolver, DefaultHeaderDepResolver, DefaultTransactionDependencyProvider,
-        HeaderDepResolver, SecpCkbRawKeySigner, TransactionDependencyProvider, ValueRangeOption,
+        HeaderDepResolver, QueryOrder, SecpCkbRawKeySigner, TransactionDependencyProvider,
+        ValueRangeOption,
     },
     tx_builder::{unlock_tx, CapacityBalancer, TxBuilder, TxBuilderError},
     unlock::{ScriptUnlocker, SecpSighashUnlocker},
@@ -115,74 +116,91 @@ impl TxBuilder for FundingTxBuilder {
         // Try to find a proper UDT input cell.
         let mut inputs = vec![];
         let mut cell_deps = HashSet::new();
-        if let Some(ref udt_info) = self.request.udt_info {
-            let udt_type_script = udt_info.type_script.clone();
-            let owner = self.context.funding_source_lock_script.clone();
-            let owner_query = {
-                let mut query = CellQueryOptions::new_lock(owner.clone());
-                //query.secondary_script = Some(udt_type_script.clone());
-                query.data_len_range = Some(ValueRangeOption::new_min(16));
-                query.min_total_capacity = u64::MAX;
-                query
-            };
 
+        if let Some(ref tx) = self.funding_tx.tx {
+            for input in tx.inputs().into_iter() {
+                inputs.push(input.clone());
+            }
+            for cell_dep in tx.cell_deps().into_iter() {
+                cell_deps.insert(cell_dep);
+            }
+        }
+
+        warn!("anan build_base now : {:?}", self.request.udt_info);
+        if let Some(ref udt_info) = self.request.udt_info {
             let local_ckb_amount = udt_info.local_ckb_amount;
             let udt_amount = self.request.local_amount as u128;
 
-            let (owner_cells, _) = cell_collector.collect_live_cells(&owner_query, true)?;
-            for cell in owner_cells.iter() {
-                let cell_capacity: u64 = cell.output.capacity().unpack();
-                let mut amount_bytes = [0u8; 16];
-                amount_bytes.copy_from_slice(&cell.output_data.as_ref()[0..16]);
-                let cell_udt_amount = u128::from_le_bytes(amount_bytes);
-                //FIXME(yukang): we may need to revise the check here
-                if cell_capacity >= local_ckb_amount && cell_udt_amount >= udt_amount {
-                    inputs.push(CellInput::new(cell.out_point.clone(), 0));
-                    if cell_udt_amount > udt_amount {
-                        let change_output = packed::CellOutput::new_builder()
-                            .capacity(Capacity::shannons(cell_capacity - local_ckb_amount).pack())
-                            .lock(owner.clone())
-                            .build();
-                        let change_output_data: Bytes =
-                            (cell_udt_amount - udt_amount).to_le_bytes().pack();
-
-                        outputs.push(change_output);
-                        outputs_data.push(change_output_data);
+            if udt_amount > 0 {
+                let udt_type_script = udt_info.type_script.clone();
+                let owner = self.context.funding_source_lock_script.clone();
+                let owner_query = {
+                    let mut query = CellQueryOptions::new_lock(owner.clone());
+                    query.secondary_script = Some(udt_type_script.clone());
+                    query.data_len_range = Some(ValueRangeOption::new_min(16));
+                    query.min_total_capacity = u64::MAX;
+                    query.order = QueryOrder::Desc;
+                    query
+                };
+
+                let (owner_cells, _) = cell_collector.collect_live_cells(&owner_query, true)?;
+                let mut found_udt_cell = false;
+                for cell in owner_cells.iter() {
+                    let cell_capacity: u64 = cell.output.capacity().unpack();
+                    let mut amount_bytes = [0u8; 16];
+                    amount_bytes.copy_from_slice(&cell.output_data.as_ref()[0..16]);
+                    let cell_udt_amount = u128::from_le_bytes(amount_bytes);
+                    //FIXME(yukang): we may need to revise the check here
+                    warn!(
+                        "anan compare : {:?} >= {:?} && {:?} >= {:?} result: {:?}",
+                        cell_capacity,
+                        local_ckb_amount,
+                        cell_udt_amount,
+                        udt_amount,
+                        cell_capacity >= local_ckb_amount && cell_udt_amount >= udt_amount
+                    );
+                    if cell_capacity >= local_ckb_amount && cell_udt_amount >= udt_amount {
+                        inputs.push(CellInput::new(cell.out_point.clone(), 0));
+                        if cell_udt_amount > udt_amount {
+                            let change_output = packed::CellOutput::new_builder()
+                                .capacity(
+                                    Capacity::shannons(cell_capacity - local_ckb_amount).pack(),
+                                )
+                                .lock(owner.clone())
+                                .build();
+                            let change_output_data: Bytes =
+                                (cell_udt_amount - udt_amount).to_le_bytes().pack();
+
+                            outputs.push(change_output);
+                            outputs_data.push(change_output_data);
+                        }
+                        warn!("anan find proper UDT owner cell: {:?}", cell);
+                        found_udt_cell = true;
+                        break;
                     }
-                    warn!("anan find proper UDT owner cell: {:?}", cell);
-                    break;
                 }
+                if !found_udt_cell {
+                    return Err(TxBuilderError::Other(anyhow!(
+                        "proper UDT owner cell not found"
+                    )));
+                }
+                let owner_cell_dep = cell_dep_resolver
+                    .resolve(&owner)
+                    .ok_or_else(|| TxBuilderError::ResolveCellDepFailed(owner.clone()))?;
+                let udt_cell_dep = cell_dep_resolver
+                    .resolve(&udt_type_script)
+                    .ok_or_else(|| TxBuilderError::ResolveCellDepFailed(udt_type_script.clone()))?;
+                #[allow(clippy::mutable_key_type)]
+                cell_deps.insert(owner_cell_dep);
+                cell_deps.insert(udt_cell_dep);
             }
-            if inputs.is_empty() {
-                return Err(TxBuilderError::Other(anyhow!(
-                    "proper UDT owner cell not found"
-                )));
-            }
-            let owner_cell_dep = cell_dep_resolver
-                .resolve(&owner)
-                .ok_or_else(|| TxBuilderError::ResolveCellDepFailed(owner.clone()))?;
-            let udt_cell_dep = cell_dep_resolver
-                .resolve(&udt_type_script)
-                .ok_or_else(|| TxBuilderError::ResolveCellDepFailed(udt_type_script.clone()))?;
-            #[allow(clippy::mutable_key_type)]
-            cell_deps.insert(owner_cell_dep);
-            cell_deps.insert(udt_cell_dep);
         }
 
-        let mut tx_inputs: Vec<packed::CellInput> =
-            inputs.into_iter().map(|input| input.into()).collect();
-
         if let Some(ref tx) = self.funding_tx.tx {
             for (i, output) in tx.outputs().into_iter().enumerate().skip(1) {
                 outputs.push(output.clone());
                 outputs_data.push(tx.outputs_data().get(i).unwrap_or_default().clone());
             }
-            for input in tx.inputs().into_iter() {
-                tx_inputs.push(input.clone());
-            }
-            for cell_dep in tx.cell_deps().into_iter() {
-                cell_deps.insert(cell_dep);
-            }
         }
 
         let builder = match self.funding_tx.tx {
@@ -190,15 +208,13 @@ impl TxBuilder for FundingTxBuilder {
             None => packed::Transaction::default().as_advanced_builder(),
         };
 
-        warn!("anan now here : {:?}", cell_deps);
         let tx_builder = builder
-            .set_inputs(tx_inputs)
+            .set_inputs(inputs)
             .set_outputs(outputs)
             .set_outputs_data(outputs_data)
             .set_cell_deps(cell_deps.into_iter().collect());
         warn!("anan tx_builder: {:?}", tx_builder);
         let tx = tx_builder.build();
-        warn!("anan tx_builder finished: {:?}", tx);
         Ok(tx)
     }
 }
@@ -316,6 +332,8 @@ impl FundingTxBuilder {
         )?;
 
         let mut funding_tx = self.funding_tx;
+        let tx_builder = tx.as_advanced_builder();
+        warn!("anan final tx_builder: {:?}", tx_builder);
         funding_tx.update_for_self(tx)?;
         Ok(funding_tx)
     }

From 89fe48819f9595a3f8b8b158d26396f448ab643e Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Thu, 6 Jun 2024 17:36:24 +0800
Subject: [PATCH 07/28] UDT funding tx is commited and channel is ready

---
 src/ckb/channel.rs                            | 114 ++++++++----------
 src/ckb/network.rs                            |  26 ++--
 src/ckb_chain/funding/funding_tx.rs           |  30 +++--
 ...=> 02-node1-node2-open-channel-normal.bru} |   4 +-
 .../bruno/e2e/udt/02-node2-connect-node3.bru  |  35 ------
 .../udt/03-node1-node2-open-channel-wrong.bru |  41 -------
 ...bru => 03-node2-accept-channel-normal.bru} |   8 +-
 ...ru => 04-node1-send-commitment-signed.bru} |   2 +-
 ...ode1-node2-open-channel-script-invalid.bru |  41 -------
 ...ru => 05-node2-send-commitment-signed.bru} |   2 +-
 .../bruno/e2e/udt/06-ckb-generate-blocks.bru  |  55 +++++++++
 ...06-node2-accept-channel-script-invalid.bru |  46 -------
 .../udt/08-node2-accept-channel-normal.bru    |  41 -------
 13 files changed, 149 insertions(+), 296 deletions(-)
 rename tests/bruno/e2e/udt/{07-node1-node2-open-channel-normal.bru => 02-node1-node2-open-channel-normal.bru} (93%)
 delete mode 100644 tests/bruno/e2e/udt/02-node2-connect-node3.bru
 delete mode 100644 tests/bruno/e2e/udt/03-node1-node2-open-channel-wrong.bru
 rename tests/bruno/e2e/udt/{04-node2-accept-channel-wrong.bru => 03-node2-accept-channel-normal.bru} (79%)
 rename tests/bruno/e2e/udt/{09-node1-send-commitment-signed.bru => 04-node1-send-commitment-signed.bru} (98%)
 delete mode 100644 tests/bruno/e2e/udt/05-node1-node2-open-channel-script-invalid.bru
 rename tests/bruno/e2e/udt/{10-node2-send-commitment-signed.bru => 05-node2-send-commitment-signed.bru} (98%)
 create mode 100644 tests/bruno/e2e/udt/06-ckb-generate-blocks.bru
 delete mode 100644 tests/bruno/e2e/udt/06-node2-accept-channel-script-invalid.bru
 delete mode 100644 tests/bruno/e2e/udt/08-node2-accept-channel-normal.bru

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index 3d231576..f1e64741 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -869,7 +869,7 @@ where
                 my_funding_amount,
                 seed,
                 open_channel,
-                my_funding_type_script,
+                accept_funding_type_script,
                 oneshot_channel,
             ) => {
                 let peer_id = self.peer_id.clone();
@@ -891,6 +891,15 @@ where
                     ..
                 } = &open_channel;
 
+                if accept_funding_type_script != *funding_type_script
+                    && accept_funding_type_script.is_some()
+                {
+                    return Err(Box::new(ProcessingChannelError::InvalidParameter(
+                            "Accept funding type script does not match open channel funding type script"
+                                .to_string(),
+                        )));
+                }
+
                 if *chain_hash != [0u8; 32].into() {
                     return Err(Box::new(ProcessingChannelError::InvalidParameter(format!(
                         "Invalid chain hash {:?}",
@@ -898,15 +907,9 @@ where
                     ))));
                 }
 
-                warn!(
-                    "anan accept_channel funding_type_script: {:?} my_funding_type_script: {:?}",
-                    funding_type_script, my_funding_type_script
-                );
-
                 let mut state = ChannelActorState::new_inbound_channel(
                     *channel_id,
                     my_funding_amount,
-                    my_funding_type_script.clone(),
                     funding_type_script.clone(),
                     &seed,
                     peer_id.clone(),
@@ -923,7 +926,7 @@ where
                 let accept_channel = AcceptChannel {
                     channel_id: *channel_id,
                     funding_amount: my_funding_amount,
-                    funding_type_script: my_funding_type_script.clone(),
+                    funding_type_script: funding_type_script.clone(),
                     max_tlc_value_in_flight: DEFAULT_MAX_TLC_VALUE_IN_FLIGHT,
                     max_accept_tlcs: DEFAULT_MAX_ACCEPT_TLCS,
                     to_local_delay: *to_local_delay,
@@ -943,7 +946,7 @@ where
                 };
                 warn!(
                     "anan set accept_channel funding script: {:?}",
-                    my_funding_type_script
+                    funding_type_script
                 );
 
                 let command = PCNMessageWithPeerId {
@@ -1196,8 +1199,6 @@ pub struct ChannelActorState {
 
     #[serde_as(as = "Option<EntityHex>")]
     pub funding_type_script: Option<Script>,
-    #[serde_as(as = "Option<EntityHex>")]
-    pub remote_funding_type_script: Option<Script>,
 
     // Is this channel initially inbound?
     // An inbound channel is one where the counterparty is the funder of the channel.
@@ -1428,7 +1429,6 @@ impl ChannelActorState {
         temp_channel_id: Hash256,
         local_value: u128,
         funding_type_script: Option<Script>,
-        remote_funding_type_script: Option<Script>,
         seed: &[u8],
         peer_id: PeerId,
         remote_value: u128,
@@ -1462,7 +1462,6 @@ impl ChannelActorState {
             funding_tx: None,
             is_acceptor: true,
             funding_type_script,
-            remote_funding_type_script,
             to_local_amount: local_value,
             id: channel_id,
             next_offering_tlc_id: 0,
@@ -1496,7 +1495,7 @@ impl ChannelActorState {
         seed: &[u8],
         peer_id: PeerId,
         value: u128,
-        my_funding_type_script: Option<Script>,
+        funding_type_script: Option<Script>,
         to_local_delay: LockTime,
     ) -> Self {
         let signer = InMemorySigner::generate_from_seed(seed);
@@ -1507,8 +1506,7 @@ impl ChannelActorState {
             state: ChannelState::NegotiatingFunding(NegotiatingFundingFlags::empty()),
             peer_id,
             funding_tx: None,
-            funding_type_script: my_funding_type_script,
-            remote_funding_type_script: None,
+            funding_type_script,
             is_acceptor: false,
             to_local_amount: value,
             id: temp_channel_id,
@@ -1681,9 +1679,9 @@ impl ChannelActorState {
         let udt_info = if let Some(type_script) = &self.funding_type_script {
             Some(FundingUdtInfo {
                 type_script: type_script.clone(),
-                // FIXME(yukang): this is hardcoded to 61 * 10^8 * 4 shannons
-                local_ckb_amount: 24400000000,
-                remote_ckb_amount: 24400000000,
+                // FIXME(yukang): this is hardcoded to 61 * 10^8 * 2 shannons
+                local_ckb_amount: 12200000000,
+                remote_ckb_amount: 12200000000,
             })
         } else {
             None
@@ -2009,10 +2007,10 @@ impl ChannelActorState {
         ));
         self.to_remote_amount = accept_channel.funding_amount;
         self.remote_nonce = Some(accept_channel.next_local_nonce.clone());
-        self.remote_funding_type_script = accept_channel.funding_type_script.clone();
+        self.funding_type_script = accept_channel.funding_type_script.clone();
         warn!(
-            "anan Remote funding type script: {:?}",
-            &self.remote_funding_type_script
+            "anan handle_accept_channel funding type script: {:?}",
+            &self.funding_type_script
         );
 
         let remote_pubkeys = (&accept_channel).into();
@@ -2853,47 +2851,37 @@ impl ChannelActorState {
         let commitment_lock_script =
             get_script_by_contract(Contract::CommitmentLock, &blake2b_256(witnesses)[0..20]);
 
-        match (&self.funding_type_script, &self.remote_funding_type_script) {
-            (Some(type_script), Some(remote_type_script)) => {
-                let immediate_output = packed::CellOutput::new_builder()
-                    .capacity(Capacity::shannons(6100000000).pack())
-                    .lock(immediate_secp256k1_lock_script.clone())
-                    .type_(Some(remote_type_script.clone()).pack())
-                    .build();
-                let immediate_output_data: Bytes = immediately_spendable_value.to_le_bytes().pack();
-
-                let commitment_lock_output = packed::CellOutput::new_builder()
-                    .capacity(Capacity::shannons(6100000000).pack())
-                    .lock(commitment_lock_script.clone())
-                    .type_(Some(type_script.clone()).pack())
-                    .build();
-                let commitment_lock_output_data: Bytes = time_locked_value.to_le_bytes().pack();
-
-                let outputs = vec![immediate_output, commitment_lock_output];
-                let outputs_data = vec![immediate_output_data, commitment_lock_output_data];
-                (outputs, outputs_data)
-            }
-            (None, None) => {
-                let outputs = vec![
-                    CellOutput::new_builder()
-                        .capacity((immediately_spendable_value as u64).pack())
-                        .lock(immediate_secp256k1_lock_script)
-                        .build(),
-                    CellOutput::new_builder()
-                        .capacity((time_locked_value as u64).pack())
-                        .lock(commitment_lock_script)
-                        .build(),
-                ];
-                let outputs_data = vec![Bytes::default(); outputs.len()];
-                (outputs, outputs_data)
-            }
-            _ => {
-                warn!(
-                    "self_type_script: {:?}, remote_type_script: {:?}",
-                    &self.funding_type_script, &self.remote_funding_type_script
-                );
-                panic!("Funding type script is not present");
-            }
+        if let Some(udt_type_script) = &self.funding_type_script {
+            let immediate_output = packed::CellOutput::new_builder()
+                .capacity(Capacity::shannons(6100000000).pack())
+                .lock(immediate_secp256k1_lock_script.clone())
+                .type_(Some(udt_type_script.clone()).pack())
+                .build();
+            let immediate_output_data: Bytes = immediately_spendable_value.to_le_bytes().pack();
+
+            let commitment_lock_output = packed::CellOutput::new_builder()
+                .capacity(Capacity::shannons(6100000000).pack())
+                .lock(commitment_lock_script.clone())
+                .type_(Some(udt_type_script.clone()).pack())
+                .build();
+            let commitment_lock_output_data: Bytes = time_locked_value.to_le_bytes().pack();
+
+            let outputs = vec![immediate_output, commitment_lock_output];
+            let outputs_data = vec![immediate_output_data, commitment_lock_output_data];
+            (outputs, outputs_data)
+        } else {
+            let outputs = vec![
+                CellOutput::new_builder()
+                    .capacity((immediately_spendable_value as u64).pack())
+                    .lock(immediate_secp256k1_lock_script)
+                    .build(),
+                CellOutput::new_builder()
+                    .capacity((time_locked_value as u64).pack())
+                    .lock(commitment_lock_script)
+                    .build(),
+            ];
+            let outputs_data = vec![Bytes::default(); outputs.len()];
+            (outputs, outputs_data)
         }
     }
 
diff --git a/src/ckb/network.rs b/src/ckb/network.rs
index 8e9b9c2e..388ea62b 100644
--- a/src/ckb/network.rs
+++ b/src/ckb/network.rs
@@ -608,7 +608,7 @@ impl NetworkActorState {
         }
 
         warn!(
-            "anan create_inbound_channel: our_funding_type: {:?}, remote_funding_type: {:?}",
+            "anan create_inbound_channel: accept_funding_type_script: {:?}, open_funding_type: {:?}",
             funding_type_script, open_channel.funding_type_script
         );
 
@@ -616,13 +616,23 @@ impl NetworkActorState {
             open_channel.funding_type_script.as_ref(),
             funding_type_script.as_ref(),
         ) {
-            (Some(_open_script), Some(_script)) => {
-                // TODO: may need to check the same UDT type script
+            (Some(open_channel_udt_script), Some(funding_type_script)) => {
+                if open_channel_udt_script != funding_type_script {
+                    return Err(ProcessingChannelError::InvalidParameter(
+                        "Funding type script mismatch".to_string(),
+                    ));
+                }
+            }
+            (Some(_), None) => {
+                // If the funding type script is provided in the open channel message,
+                // then both parties will use the same funding type script, it's OK the other
+                // does not provide it, he accept it means he agrees with the funding type script
+                // but he does not want to provice funding amount.
             }
             (None, None) => {}
-            _ => {
+            (None, Some(_)) => {
                 return Err(ProcessingChannelError::InvalidParameter(
-                    "Funding type script must both provided, or both not provided".to_string(),
+                    "The OpenChannel didn't provide UDT type script, so we don't expect script in AcceptChannel".to_string(),
                 ));
             }
         }
@@ -1055,9 +1065,9 @@ where
                             let udt_info = if let Some(funding_script) = funding_script {
                                 Some(FundingUdtInfo {
                                     type_script: funding_script,
-                                    // FIXME(yukang): this is hardcoded to 61 * 10^8 * 4 shannons
-                                    local_ckb_amount: 24400000000,
-                                    remote_ckb_amount: 24400000000,
+                                    // FIXME(yukang): this is hardcoded to 61 * 10^8 * 2 shannons
+                                    local_ckb_amount: 12200000000,
+                                    remote_ckb_amount: 12200000000,
                                 })
                             } else {
                                 None
diff --git a/src/ckb_chain/funding/funding_tx.rs b/src/ckb_chain/funding/funding_tx.rs
index 231a6b1a..a4f0320d 100644
--- a/src/ckb_chain/funding/funding_tx.rs
+++ b/src/ckb_chain/funding/funding_tx.rs
@@ -19,7 +19,7 @@ use ckb_sdk::{
 use ckb_types::{
     core::{BlockView, Capacity, DepType, TransactionView},
     h256,
-    packed::{self, Bytes, CellDep, CellInput, OutPoint, Script, Transaction},
+    packed::{self, Bytes, CellDep, CellInput, CellOutput, OutPoint, Script, Transaction},
     prelude::*,
 };
 use log::warn;
@@ -162,15 +162,24 @@ impl TxBuilder for FundingTxBuilder {
                     if cell_capacity >= local_ckb_amount && cell_udt_amount >= udt_amount {
                         inputs.push(CellInput::new(cell.out_point.clone(), 0));
                         if cell_udt_amount > udt_amount {
-                            let change_output = packed::CellOutput::new_builder()
-                                .capacity(
-                                    Capacity::shannons(cell_capacity - local_ckb_amount).pack(),
-                                )
-                                .lock(owner.clone())
-                                .build();
                             let change_output_data: Bytes =
                                 (cell_udt_amount - udt_amount).to_le_bytes().pack();
 
+                            let dummy_output = CellOutput::new_builder()
+                                .lock(owner.clone())
+                                .type_(Some(udt_type_script.clone()).pack())
+                                .build();
+                            let required_capacity = dummy_output
+                                .occupied_capacity(
+                                    Capacity::bytes(change_output_data.len()).unwrap(),
+                                )
+                                .unwrap()
+                                .pack();
+                            let change_output = dummy_output
+                                .as_builder()
+                                .capacity(required_capacity)
+                                .build();
+
                             outputs.push(change_output);
                             outputs_data.push(change_output_data);
                         }
@@ -300,17 +309,12 @@ impl FundingTxBuilder {
             // FIXME(yukang): how to add cell deps for udt?
             let udt_type_script = udt_info.type_script.clone();
             let tx_hash =
-                h256!("0x371c4d9727fa47c0d77d04bdbb9951a7c63860f50c26108372cd28a336a31058");
+                h256!("0xc24e3b64b9fb890ec319115713742029cefbd8cd2c9a47e9b4547192b23f3985");
             let out_point = OutPoint::new(tx_hash.pack(), 0);
             let cell_dep = CellDep::new_builder()
                 .out_point(out_point)
                 .dep_type(DepType::Code.into())
                 .build();
-            warn!(
-                "anan adding cell_dep: code_hash {:?} => {:?}",
-                ScriptId::from(&udt_type_script),
-                cell_dep
-            );
             cell_dep_resolver.insert(
                 ScriptId::from(&udt_type_script),
                 cell_dep,
diff --git a/tests/bruno/e2e/udt/07-node1-node2-open-channel-normal.bru b/tests/bruno/e2e/udt/02-node1-node2-open-channel-normal.bru
similarity index 93%
rename from tests/bruno/e2e/udt/07-node1-node2-open-channel-normal.bru
rename to tests/bruno/e2e/udt/02-node1-node2-open-channel-normal.bru
index 42752552..7a1739c0 100644
--- a/tests/bruno/e2e/udt/07-node1-node2-open-channel-normal.bru
+++ b/tests/bruno/e2e/udt/02-node1-node2-open-channel-normal.bru
@@ -1,7 +1,7 @@
 meta {
   name: Node1 open a channel to Node2
   type: http
-  seq: 7
+  seq: 2
 }
 
 post {
@@ -22,7 +22,7 @@ body:json {
       [
         {
           "peer_id": "{{NODE2_PEERID}}",
-          "funding_amount": 61000000000000,
+          "funding_amount": 1200,
           "funding_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df41902200000004e58a837b1ac0a72adc56aa876dad176227a9c17c464ecd8e49451d72c79bc29"
         }
       ]
diff --git a/tests/bruno/e2e/udt/02-node2-connect-node3.bru b/tests/bruno/e2e/udt/02-node2-connect-node3.bru
deleted file mode 100644
index 03cf125d..00000000
--- a/tests/bruno/e2e/udt/02-node2-connect-node3.bru
+++ /dev/null
@@ -1,35 +0,0 @@
-meta {
-  name: connect peer
-  type: http
-  seq: 2
-}
-
-post {
-  url: {{NODE3_RPC_URL}}/ckb
-  body: json
-  auth: none
-}
-
-headers {
-  Content-Type: application/json
-  Accept: application/json
-}
-
-body:json {
-  {
-    "request": {
-      "ConnectPeer": "{{NODE2_ADDR}}"
-    }
-  }
-
-}
-
-assert {
-  res.status: eq 200
-}
-
-script:post-response {
-  // Dialing a peer is async in tentacle. Sleep for some time to make sure
-  // we're connected to the peer.
-  await new Promise(r => setTimeout(r, 1000));
-}
diff --git a/tests/bruno/e2e/udt/03-node1-node2-open-channel-wrong.bru b/tests/bruno/e2e/udt/03-node1-node2-open-channel-wrong.bru
deleted file mode 100644
index 53bf2b5d..00000000
--- a/tests/bruno/e2e/udt/03-node1-node2-open-channel-wrong.bru
+++ /dev/null
@@ -1,41 +0,0 @@
-meta {
-  name: Node1 open a channel to Node2
-  type: http
-  seq: 3
-}
-
-post {
-  url: {{NODE1_RPC_URL}}/ckb
-  body: json
-  auth: none
-}
-
-headers {
-  Content-Type: application/json
-  Accept: application/json
-}
-
-body:json {
-  {
-    "request": {
-      "OpenChannel":
-      [
-        {
-          "peer_id": "{{NODE2_PEERID}}",
-          "funding_amount": 61000000000000,
-          "funding_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df41902200000004e58a837b1ac0a72adc56aa876dad176227a9c17c464ecd8e49451d72c79bc29"
-        }
-      ]
-    }
-  }
-}
-
-assert {
-  res.status: eq 200
-}
-
-script:post-response {
-  await new Promise(r => setTimeout(r, 1000));
-  console.log("N1N2 response: ", res.body.channel_id);
-  bru.setVar("N1N2_TEMP_CHANNEL_ID", res.body.channel_id);
-}
diff --git a/tests/bruno/e2e/udt/04-node2-accept-channel-wrong.bru b/tests/bruno/e2e/udt/03-node2-accept-channel-normal.bru
similarity index 79%
rename from tests/bruno/e2e/udt/04-node2-accept-channel-wrong.bru
rename to tests/bruno/e2e/udt/03-node2-accept-channel-normal.bru
index dbc7f6ed..5ffc17f4 100644
--- a/tests/bruno/e2e/udt/04-node2-accept-channel-wrong.bru
+++ b/tests/bruno/e2e/udt/03-node2-accept-channel-normal.bru
@@ -1,7 +1,7 @@
 meta {
-  name: accept a channel from a peer, UDT does not match with the requested one
+  name: accept a channel from a peer, a normal accept channel request
   type: http
-  seq: 4
+  seq: 3
 }
 
 post {
@@ -21,7 +21,7 @@ body:json {
       "AcceptChannel": [
         {
           "temp_channel_id": "{{N1N2_TEMP_CHANNEL_ID}}",
-          "funding_amount": 71000000000000
+          "funding_amount": 1234
         }
       ]
     }
@@ -29,7 +29,7 @@ body:json {
 }
 
 assert {
-  res.status: eq 500
+  res.status: eq 200
 }
 
 script:post-response {
diff --git a/tests/bruno/e2e/udt/09-node1-send-commitment-signed.bru b/tests/bruno/e2e/udt/04-node1-send-commitment-signed.bru
similarity index 98%
rename from tests/bruno/e2e/udt/09-node1-send-commitment-signed.bru
rename to tests/bruno/e2e/udt/04-node1-send-commitment-signed.bru
index c0a857a2..b388e9f2 100644
--- a/tests/bruno/e2e/udt/09-node1-send-commitment-signed.bru
+++ b/tests/bruno/e2e/udt/04-node1-send-commitment-signed.bru
@@ -1,7 +1,7 @@
 meta {
   name: send commitment_signed message
   type: http
-  seq: 9
+  seq: 4
 }
 
 post {
diff --git a/tests/bruno/e2e/udt/05-node1-node2-open-channel-script-invalid.bru b/tests/bruno/e2e/udt/05-node1-node2-open-channel-script-invalid.bru
deleted file mode 100644
index 07f2c409..00000000
--- a/tests/bruno/e2e/udt/05-node1-node2-open-channel-script-invalid.bru
+++ /dev/null
@@ -1,41 +0,0 @@
-meta {
-  name: Node1 open a channel to Node2
-  type: http
-  seq: 5
-}
-
-post {
-  url: {{NODE1_RPC_URL}}/ckb
-  body: json
-  auth: none
-}
-
-headers {
-  Content-Type: application/json
-  Accept: application/json
-}
-
-body:json {
-  {
-    "request": {
-      "OpenChannel":
-      [
-        {
-          "peer_id": "{{NODE2_PEERID}}",
-          "funding_amount": 61000000000000,
-          "funding_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df41902200000004e58a837b1ac0a72adc56aa876dad176227a9c17c464ecd8e49451d72c79bc29"
-        }
-      ]
-    }
-  }
-}
-
-assert {
-  res.status: eq 200
-}
-
-script:post-response {
-  await new Promise(r => setTimeout(r, 1000));
-  console.log("N1N2 response: ", res.body.channel_id);
-  bru.setVar("N1N2_TEMP_CHANNEL_ID", res.body.channel_id);
-}
diff --git a/tests/bruno/e2e/udt/10-node2-send-commitment-signed.bru b/tests/bruno/e2e/udt/05-node2-send-commitment-signed.bru
similarity index 98%
rename from tests/bruno/e2e/udt/10-node2-send-commitment-signed.bru
rename to tests/bruno/e2e/udt/05-node2-send-commitment-signed.bru
index c2471969..656d3b9a 100644
--- a/tests/bruno/e2e/udt/10-node2-send-commitment-signed.bru
+++ b/tests/bruno/e2e/udt/05-node2-send-commitment-signed.bru
@@ -1,7 +1,7 @@
 meta {
   name: send commitment_signed message
   type: http
-  seq: 10
+  seq: 5
 }
 
 post {
diff --git a/tests/bruno/e2e/udt/06-ckb-generate-blocks.bru b/tests/bruno/e2e/udt/06-ckb-generate-blocks.bru
new file mode 100644
index 00000000..cd65f8e5
--- /dev/null
+++ b/tests/bruno/e2e/udt/06-ckb-generate-blocks.bru
@@ -0,0 +1,55 @@
+meta {
+  name: generate a few blocks for channel 2
+  type: http
+  seq: 6
+}
+
+post {
+  url: {{CKB_RPC_URL}}
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "id": {{iteration}},
+    "jsonrpc": "2.0",
+    "method": "generate_block",
+    "params": []
+  }
+}
+
+vars:post-response {
+  max_iterations: 10
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:pre-request {
+  // Script taken from https://github.com/usebruno/bruno/discussions/385#discussioncomment-8015350
+  // This does not seem to work.
+  if(bru.getVar("iteration") === undefined){
+    console.log("Started generating blocks for channel 2...");
+    bru.setVar("iteration", 0);
+  }
+}
+
+script:post-response {
+  if(bru.getVar("iteration") < bru.getVar("max_iterations") -1){
+    bru.setVar("iteration", bru.getVar("iteration") + 1);
+    // This is the name of this bruno file, set this to continue generating blocks.
+    bru.setNextRequest("generate a few blocks for channel 2");
+  } else {
+    // Don't know why it takes so long for funding transaction to be confirmed.
+    await new Promise(r => setTimeout(r, 5000));
+  }
+  await new Promise(r => setTimeout(r, 10));
+  console.log("Generated the " + bru.getVar("iteration") + "th block");
+}
diff --git a/tests/bruno/e2e/udt/06-node2-accept-channel-script-invalid.bru b/tests/bruno/e2e/udt/06-node2-accept-channel-script-invalid.bru
deleted file mode 100644
index e04e805b..00000000
--- a/tests/bruno/e2e/udt/06-node2-accept-channel-script-invalid.bru
+++ /dev/null
@@ -1,46 +0,0 @@
-meta {
-  name: accept a channel from a peer, UDT does not match with the requested one
-  type: http
-  seq: 6
-}
-
-post {
-  url: {{NODE2_RPC_URL}}/ckb
-  body: json
-  auth: none
-}
-
-headers {
-  Content-Type: application/json
-  Accept: application/json
-}
-
-body:json {
-  {
-    "request": {
-      "AcceptChannel": [
-        {
-          "temp_channel_id": "{{N1N2_TEMP_CHANNEL_ID}}",
-          "funding_amount": 81000000000000,
-          "funding_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df41902200000004e58a837b1ac0a72adc56aa876dad176227a9c17c464ecd8e49451d72c79bc29"
-        }
-      ]
-    }
-  }
-}
-
-docs {
-  // FIXME: the `funding_type_script` is not correct for NODE2, so this request should fail.
-  // we should return proper error code and message.
-}
-
-assert {
-  res.status: eq 200
-}
-
-script:post-response {
-  // Sleep for sometime to make sure current operation finishes before next request starts.
-  await new Promise(r => setTimeout(r, 2000));
-  console.log("accept channel result: ", res.body);
-  bru.setVar("N1N2_CHANNEL_ID", res.body.new_channel_id);
-}
diff --git a/tests/bruno/e2e/udt/08-node2-accept-channel-normal.bru b/tests/bruno/e2e/udt/08-node2-accept-channel-normal.bru
deleted file mode 100644
index a72eadd3..00000000
--- a/tests/bruno/e2e/udt/08-node2-accept-channel-normal.bru
+++ /dev/null
@@ -1,41 +0,0 @@
-meta {
-  name: accept a channel from a peer, a normal accept channel request
-  type: http
-  seq: 8
-}
-
-post {
-  url: {{NODE2_RPC_URL}}/ckb
-  body: json
-  auth: none
-}
-
-headers {
-  Content-Type: application/json
-  Accept: application/json
-}
-
-body:json {
-  {
-    "request": {
-      "AcceptChannel": [
-        {
-          "temp_channel_id": "{{N1N2_TEMP_CHANNEL_ID}}",
-          "funding_amount": 91000000000000,
-          "funding_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df4190220000000e9218fa964cc80be12eb6eb750b43a94a649cfc6a71ba5c6ba37e88621fc3de3"
-        }
-      ]
-    }
-  }
-}
-
-assert {
-  res.status: eq 200
-}
-
-script:post-response {
-  // Sleep for sometime to make sure current operation finishes before next request starts.
-  await new Promise(r => setTimeout(r, 2000));
-  console.log("accept channel result: ", res.body);
-  bru.setVar("N1N2_CHANNEL_ID", res.body.new_channel_id);
-}

From e3bcc39ac0b83a00d6165457891a687053d39431 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Thu, 6 Jun 2024 18:26:13 +0800
Subject: [PATCH 08/28] fix shutdown signature issue

---
 src/ckb/channel.rs                            | 54 +++++++++++++------
 src/ckb/network.rs                            |  4 +-
 tests/bruno/e2e/udt/07-node2-gen-invoice.bru  | 44 +++++++++++++++
 tests/bruno/e2e/udt/08-node1-add-tlc.bru      | 51 ++++++++++++++++++
 tests/bruno/e2e/udt/09-node2-remove-tlc.bru   | 45 ++++++++++++++++
 .../udt/10-node1-send-shutdown-channel.bru    | 41 ++++++++++++++
 .../udt/11-node2-send-shutdown-channel-1.bru  | 41 ++++++++++++++
 7 files changed, 263 insertions(+), 17 deletions(-)
 create mode 100644 tests/bruno/e2e/udt/07-node2-gen-invoice.bru
 create mode 100644 tests/bruno/e2e/udt/08-node1-add-tlc.bru
 create mode 100644 tests/bruno/e2e/udt/09-node2-remove-tlc.bru
 create mode 100644 tests/bruno/e2e/udt/10-node1-send-shutdown-channel.bru
 create mode 100644 tests/bruno/e2e/udt/11-node2-send-shutdown-channel-1.bru

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index f1e64741..27e0793c 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -1680,8 +1680,8 @@ impl ChannelActorState {
             Some(FundingUdtInfo {
                 type_script: type_script.clone(),
                 // FIXME(yukang): this is hardcoded to 61 * 10^8 * 2 shannons
-                local_ckb_amount: 12200000000,
-                remote_ckb_amount: 12200000000,
+                local_ckb_amount: 122000000000,
+                remote_ckb_amount: 122000000000,
             })
         } else {
             None
@@ -2584,27 +2584,52 @@ impl ChannelActorState {
             );
 
         if let Some(type_script) = &self.funding_type_script {
+            warn!(
+                "anan UDT local_amount: {}, remote_amount: {}",
+                self.to_local_amount, self.to_remote_amount
+            );
             // FIXME(yukang): how to handle the CKB amount here,
             // after substracting tx fee, we should return the lefted CKB to the holder
-            let minimal_capacity = 61_0000_0000 as u64;
-            let holder_output = CellOutput::new_builder()
-                .capacity(minimal_capacity.pack())
+            // let minimal_capacity = 61_0000_0000 as u64;
+            // let holder_output = CellOutput::new_builder()
+            //     .capacity(minimal_capacity.pack())
+            //     .type_(Some(type_script.clone()).pack())
+            //     .lock(local_shutdown_script)
+            //     .build();
+            let holder_output_data = self.to_local_amount.to_le_bytes().pack();
+            let dummy_output = CellOutput::new_builder()
+                .lock(local_shutdown_script.clone())
                 .type_(Some(type_script.clone()).pack())
-                .lock(local_shutdown_script)
                 .build();
-            let holder_output_data = self.to_local_amount.to_le_bytes().pack();
+            let required_capacity = dummy_output
+                .occupied_capacity(Capacity::bytes(holder_output_data.len()).unwrap())
+                .unwrap()
+                .pack();
+            let holder_output = dummy_output
+                .as_builder()
+                .capacity(required_capacity)
+                .build();
 
-            let counterparty_output = CellOutput::new_builder()
-                .capacity(minimal_capacity.pack())
+            let counterparty_output_data = self.to_remote_amount.to_le_bytes().pack();
+            let dummy_output = CellOutput::new_builder()
+                .lock(remote_shutdown_script.clone())
                 .type_(Some(type_script.clone()).pack())
-                .lock(remote_shutdown_script)
                 .build();
-            let counterparty_output_data = self.to_remote_amount.to_le_bytes().pack();
+            let required_capacity = dummy_output
+                .occupied_capacity(Capacity::bytes(counterparty_output_data.len()).unwrap())
+                .unwrap()
+                .pack();
+            let counterparty_output = dummy_output
+                .as_builder()
+                .capacity(required_capacity)
+                .build();
 
             let outputs = self.order_things_for_musig2(holder_output, counterparty_output);
-            let tx_builder = tx_builder.set_outputs(outputs.to_vec());
-            let tx_builder =
-                tx_builder.set_outputs_data(vec![holder_output_data, counterparty_output_data]);
+            let outputs_data =
+                self.order_things_for_musig2(holder_output_data, counterparty_output_data);
+            let tx_builder = tx_builder
+                .set_outputs(outputs.to_vec())
+                .set_outputs_data(outputs_data);
             let tx = tx_builder.build();
             let message = get_funding_cell_message_to_sign(
                 u64::MAX,
@@ -2617,7 +2642,6 @@ impl ChannelActorState {
             );
             Ok((tx, message))
         } else {
-            // TODO: Check UDT type, if it is ckb then convert it into u64.
             let local_value = (self.to_local_amount - local_shutdown_fee) as u64;
             let remote_value = (self.to_remote_amount - remote_shutdown_fee) as u64;
             debug!(
diff --git a/src/ckb/network.rs b/src/ckb/network.rs
index 388ea62b..d90293d1 100644
--- a/src/ckb/network.rs
+++ b/src/ckb/network.rs
@@ -1066,8 +1066,8 @@ where
                                 Some(FundingUdtInfo {
                                     type_script: funding_script,
                                     // FIXME(yukang): this is hardcoded to 61 * 10^8 * 2 shannons
-                                    local_ckb_amount: 12200000000,
-                                    remote_ckb_amount: 12200000000,
+                                    local_ckb_amount: 122000000000,
+                                    remote_ckb_amount: 122000000000,
                                 })
                             } else {
                                 None
diff --git a/tests/bruno/e2e/udt/07-node2-gen-invoice.bru b/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
new file mode 100644
index 00000000..55b8dfe6
--- /dev/null
+++ b/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
@@ -0,0 +1,44 @@
+meta {
+  name: generate a invoice
+  type: http
+  seq: 07
+}
+
+post {
+  url: {{NODE2_RPC_URL}}/invoice
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+    {
+        "request": {
+            "NewInvoice": {
+                "amount": 200,
+                "currency": "Ckb",
+                "description": "test invoice generated by node2",
+                "expiry": 3600,
+                "final_cltv": 40,
+                "payment_preimage": "0x0000000000000000000000000000000000000000000000000000000000000002"
+            }
+        }
+    }
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  // Sleep for sometime to make sure current operation finishes before next request starts.
+  await new Promise(r => setTimeout(r, 100));
+  bru.setVar("payment_hash", res.body.payment_hash);
+  bru.setVar("payment_amount", res.body.invoice.amount);
+  console.log("generate invoice: ", res.body.encode_payment);
+  console.log("generated result: ", res.body);
+}
diff --git a/tests/bruno/e2e/udt/08-node1-add-tlc.bru b/tests/bruno/e2e/udt/08-node1-add-tlc.bru
new file mode 100644
index 00000000..e1a2cd5d
--- /dev/null
+++ b/tests/bruno/e2e/udt/08-node1-add-tlc.bru
@@ -0,0 +1,51 @@
+meta {
+  name: Node1 add tlc
+  type: http
+  seq: 08
+}
+
+post {
+  url: {{NODE1_RPC_URL}}/ckb
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "request": {
+      "ControlPcnChannel":
+        {
+          "channel_id": "{{N1N2_CHANNEL_ID}}",
+          "command": {
+            "AddTlc": [{
+              "amount": {{payment_amount}},
+              "payment_hash": "{{payment_hash}}",
+              "expiry": 40
+            }]
+          }
+        }
+    }
+  }
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:pre-request {
+  console.log("sending node1 AddTlc:", bru.getVar("payment_hash"));
+  console.log("amount: ", bru.getVar("payment_amount"));
+}
+
+script:post-response {
+  // Sleep for sometime to make sure current operation finishes before next request starts.
+  await new Promise(r => setTimeout(r, 100));
+  console.log("response from node1 AddTlc:", res.body);
+  bru.setVar("N1N2_TLC_ID1", res.body.tlc_id);
+
+}
diff --git a/tests/bruno/e2e/udt/09-node2-remove-tlc.bru b/tests/bruno/e2e/udt/09-node2-remove-tlc.bru
new file mode 100644
index 00000000..20363e3b
--- /dev/null
+++ b/tests/bruno/e2e/udt/09-node2-remove-tlc.bru
@@ -0,0 +1,45 @@
+meta {
+  name: remove tlc from NODE2
+  type: http
+  seq: 9
+}
+
+post {
+  url: {{NODE2_RPC_URL}}/ckb
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "request": {
+      "ControlPcnChannel": {
+        "channel_id": "{{N1N2_CHANNEL_ID}}",
+        "command": {
+          "RemoveTlc": {
+            "id": {{N1N2_TLC_ID1}},
+            "reason": {
+              "RemoveTlcFulfill": {
+                "payment_preimage": "0x0000000000000000000000000000000000000000000000000000000000000002"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  // Sleep for sometime to make sure current operation finishes before next request starts.
+  await new Promise(r => setTimeout(r, 100));
+}
diff --git a/tests/bruno/e2e/udt/10-node1-send-shutdown-channel.bru b/tests/bruno/e2e/udt/10-node1-send-shutdown-channel.bru
new file mode 100644
index 00000000..f2ccd2d1
--- /dev/null
+++ b/tests/bruno/e2e/udt/10-node1-send-shutdown-channel.bru
@@ -0,0 +1,41 @@
+meta {
+  name: Node1 send shutdown channel1
+  type: http
+  seq: 10
+}
+
+post {
+  url: {{NODE1_RPC_URL}}/ckb
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "request": {
+      "ControlPcnChannel": {
+        "channel_id": "{{N1N2_CHANNEL_ID}}",
+        "command": {
+          "Shutdown": {
+            "close_script": "0x490000001000000030000000310000002a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a00140000000101010101010101010101010101010101010101",
+            "fee": 200000000
+          }
+        }
+      }
+    }
+  }
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  // Sleep for sometime to make sure current operation finishes before next request starts.
+  await new Promise(r => setTimeout(r, 100));
+}
diff --git a/tests/bruno/e2e/udt/11-node2-send-shutdown-channel-1.bru b/tests/bruno/e2e/udt/11-node2-send-shutdown-channel-1.bru
new file mode 100644
index 00000000..1a4ba60a
--- /dev/null
+++ b/tests/bruno/e2e/udt/11-node2-send-shutdown-channel-1.bru
@@ -0,0 +1,41 @@
+meta {
+  name: Node2 send shutdown channel1
+  type: http
+  seq: 11
+}
+
+post {
+  url: {{NODE2_RPC_URL}}/ckb
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "request": {
+      "ControlPcnChannel": {
+        "channel_id": "{{N1N2_CHANNEL_ID}}",
+        "command": {
+          "Shutdown": {
+            "close_script": "0x490000001000000030000000310000002a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a00140000000101010101010101010101010101010101010101",
+            "fee": 200000000
+          }
+        }
+      }
+    }
+  }
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  // Sleep for sometime to make sure current operation finishes before next request starts.
+  await new Promise(r => setTimeout(r, 100));
+}

From eeb6e36ada9ccc7c89e51f9cf17f086a32091c5b Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Thu, 6 Jun 2024 21:27:53 +0800
Subject: [PATCH 09/28] UDT workflow passed and cleanup

---
 Cargo.lock                          |  3 ++-
 Cargo.toml                          |  3 +--
 src/ckb/channel.rs                  | 41 +++++------------------------
 src/ckb/network.rs                  | 19 ++-----------
 src/ckb_chain/funding/funding_tx.rs | 31 +++++++++++-----------
 5 files changed, 27 insertions(+), 70 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9446c522..c4b6693b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -908,7 +908,8 @@ dependencies = [
 [[package]]
 name = "ckb-sdk"
 version = "3.1.0"
-source = "git+https://github.com/chenyukang/ckb-sdk-rust.git?branch=v3.1.0-with-pcn-udt#4b712fa35652bcd8b1f9e832cf0ad85681d0c6f5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8487deb2c0a77bbc4d33c812aa8f3f93c8786730c37a516eebfc4246602413ca"
 dependencies = [
  "anyhow",
  "bech32 0.8.1",
diff --git a/Cargo.toml b/Cargo.toml
index 6eb353b5..f3cf1b3c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,8 +38,7 @@ tokio = { version = "1", features = [
     "signal",
 ] }
 home = "0.5.9"
-#ckb-sdk = "3.1.0"
-ckb-sdk = { git = "https://github.com/chenyukang/ckb-sdk-rust.git", branch = "v3.1.0-with-pcn-udt" }
+ckb-sdk = "3.1.0"
 thiserror = "1.0.58"
 anyhow = "1.0.81"
 env_logger = "0.11.3"
diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index 27e0793c..0ba51a88 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -944,10 +944,6 @@ where
                         .get_commitment_point(commitment_number + 1),
                     next_local_nonce: state.get_local_musig2_pubnonce(),
                 };
-                warn!(
-                    "anan set accept_channel funding script: {:?}",
-                    funding_type_script
-                );
 
                 let command = PCNMessageWithPeerId {
                     peer_id,
@@ -1451,11 +1447,6 @@ impl ChannelActorState {
             &channel_id, &temp_channel_id,
         );
 
-        warn!(
-            "anan new_inbound_channel funding_type_script: {:?}",
-            funding_type_script
-        );
-
         Self {
             state: ChannelState::NegotiatingFunding(NegotiatingFundingFlags::THEIR_INIT_SENT),
             peer_id,
@@ -1676,19 +1667,11 @@ impl ChannelActorState {
     }
 
     pub fn get_funding_request(&self, fee_rate: u64) -> FundingRequest {
-        let udt_info = if let Some(type_script) = &self.funding_type_script {
-            Some(FundingUdtInfo {
-                type_script: type_script.clone(),
-                // FIXME(yukang): this is hardcoded to 61 * 10^8 * 2 shannons
-                local_ckb_amount: 122000000000,
-                remote_ckb_amount: 122000000000,
-            })
-        } else {
-            None
-        };
-        warn!("anan get_funding_request: {:?}", udt_info);
         FundingRequest {
-            udt_info,
+            udt_info: self
+                .funding_type_script
+                .clone()
+                .map(FundingUdtInfo::new_with_script),
             script: self.get_funding_lock_script(),
             local_amount: self.to_local_amount as u64,
             local_fee_rate: fee_rate,
@@ -2008,10 +1991,6 @@ impl ChannelActorState {
         self.to_remote_amount = accept_channel.funding_amount;
         self.remote_nonce = Some(accept_channel.next_local_nonce.clone());
         self.funding_type_script = accept_channel.funding_type_script.clone();
-        warn!(
-            "anan handle_accept_channel funding type script: {:?}",
-            &self.funding_type_script
-        );
 
         let remote_pubkeys = (&accept_channel).into();
         self.remote_channel_parameters = Some(ChannelParametersOneParty {
@@ -2584,18 +2563,10 @@ impl ChannelActorState {
             );
 
         if let Some(type_script) = &self.funding_type_script {
-            warn!(
-                "anan UDT local_amount: {}, remote_amount: {}",
+            debug!(
+                "UDT local_amount: {}, remote_amount: {}",
                 self.to_local_amount, self.to_remote_amount
             );
-            // FIXME(yukang): how to handle the CKB amount here,
-            // after substracting tx fee, we should return the lefted CKB to the holder
-            // let minimal_capacity = 61_0000_0000 as u64;
-            // let holder_output = CellOutput::new_builder()
-            //     .capacity(minimal_capacity.pack())
-            //     .type_(Some(type_script.clone()).pack())
-            //     .lock(local_shutdown_script)
-            //     .build();
             let holder_output_data = self.to_local_amount.to_le_bytes().pack();
             let dummy_output = CellOutput::new_builder()
                 .lock(local_shutdown_script.clone())
diff --git a/src/ckb/network.rs b/src/ckb/network.rs
index d90293d1..3a2b570d 100644
--- a/src/ckb/network.rs
+++ b/src/ckb/network.rs
@@ -371,7 +371,6 @@ where
                     "Updating channel funding for channel {:?}, current tx: {:?}",
                     &channel_id, old_tx
                 );
-                warn!("anan fundingrequest: {:?}", request);
                 let mut tx = FundingTx::new();
                 tx.update_for_self(old_tx)?;
                 let tx = match call_t!(
@@ -607,11 +606,6 @@ impl NetworkActorState {
             return Ok((channel.clone(), temp_channel_id, id));
         }
 
-        warn!(
-            "anan create_inbound_channel: accept_funding_type_script: {:?}, open_funding_type: {:?}",
-            funding_type_script, open_channel.funding_type_script
-        );
-
         match (
             open_channel.funding_type_script.as_ref(),
             funding_type_script.as_ref(),
@@ -1062,23 +1056,14 @@ where
                             // TODO: Here we implies the one who receives AcceptChannel message
                             //  (i.e. the channel initiator) will send TxUpdate message first.
                             dbg!(&script);
-                            let udt_info = if let Some(funding_script) = funding_script {
-                                Some(FundingUdtInfo {
-                                    type_script: funding_script,
-                                    // FIXME(yukang): this is hardcoded to 61 * 10^8 * 2 shannons
-                                    local_ckb_amount: 122000000000,
-                                    remote_ckb_amount: 122000000000,
-                                })
-                            } else {
-                                None
-                            };
                             myself
                                 .send_message(NetworkActorMessage::new_command(
                                     NetworkActorCommand::UpdateChannelFunding(
                                         new,
                                         Default::default(),
                                         FundingRequest {
-                                            udt_info,
+                                            udt_info: funding_script
+                                                .map(FundingUdtInfo::new_with_script),
                                             script,
                                             local_amount: local as u64,
                                             local_fee_rate: 0,
diff --git a/src/ckb_chain/funding/funding_tx.rs b/src/ckb_chain/funding/funding_tx.rs
index a4f0320d..911dec97 100644
--- a/src/ckb_chain/funding/funding_tx.rs
+++ b/src/ckb_chain/funding/funding_tx.rs
@@ -65,6 +65,18 @@ pub struct FundingUdtInfo {
     pub remote_ckb_amount: u64,
 }
 
+impl FundingUdtInfo {
+    pub fn new_with_script(type_script: packed::Script) -> Self {
+        // FIXME(yukang): make sure the udt_amount is enough for split into at least 2 cells
+        let two_cells_amount: u64 = (142 + 10) * (10 as u64).pow(8);
+        Self {
+            type_script,
+            local_ckb_amount: two_cells_amount,
+            remote_ckb_amount: two_cells_amount,
+        }
+    }
+}
+
 #[serde_as]
 #[derive(Clone, Debug, Default, Deserialize)]
 pub struct FundingRequest {
@@ -126,9 +138,7 @@ impl TxBuilder for FundingTxBuilder {
             }
         }
 
-        warn!("anan build_base now : {:?}", self.request.udt_info);
         if let Some(ref udt_info) = self.request.udt_info {
-            let local_ckb_amount = udt_info.local_ckb_amount;
             let udt_amount = self.request.local_amount as u128;
 
             if udt_amount > 0 {
@@ -146,20 +156,11 @@ impl TxBuilder for FundingTxBuilder {
                 let (owner_cells, _) = cell_collector.collect_live_cells(&owner_query, true)?;
                 let mut found_udt_cell = false;
                 for cell in owner_cells.iter() {
-                    let cell_capacity: u64 = cell.output.capacity().unpack();
                     let mut amount_bytes = [0u8; 16];
                     amount_bytes.copy_from_slice(&cell.output_data.as_ref()[0..16]);
                     let cell_udt_amount = u128::from_le_bytes(amount_bytes);
                     //FIXME(yukang): we may need to revise the check here
-                    warn!(
-                        "anan compare : {:?} >= {:?} && {:?} >= {:?} result: {:?}",
-                        cell_capacity,
-                        local_ckb_amount,
-                        cell_udt_amount,
-                        udt_amount,
-                        cell_capacity >= local_ckb_amount && cell_udt_amount >= udt_amount
-                    );
-                    if cell_capacity >= local_ckb_amount && cell_udt_amount >= udt_amount {
+                    if cell_udt_amount >= udt_amount {
                         inputs.push(CellInput::new(cell.out_point.clone(), 0));
                         if cell_udt_amount > udt_amount {
                             let change_output_data: Bytes =
@@ -183,7 +184,7 @@ impl TxBuilder for FundingTxBuilder {
                             outputs.push(change_output);
                             outputs_data.push(change_output_data);
                         }
-                        warn!("anan find proper UDT owner cell: {:?}", cell);
+                        warn!("find proper UDT owner cell: {:?}", cell);
                         found_udt_cell = true;
                         break;
                     }
@@ -222,7 +223,7 @@ impl TxBuilder for FundingTxBuilder {
             .set_outputs(outputs)
             .set_outputs_data(outputs_data)
             .set_cell_deps(cell_deps.into_iter().collect());
-        warn!("anan tx_builder: {:?}", tx_builder);
+        warn!("tx_builder: {:?}", tx_builder);
         let tx = tx_builder.build();
         Ok(tx)
     }
@@ -337,7 +338,7 @@ impl FundingTxBuilder {
 
         let mut funding_tx = self.funding_tx;
         let tx_builder = tx.as_advanced_builder();
-        warn!("anan final tx_builder: {:?}", tx_builder);
+        warn!("final tx_builder: {:?}", tx_builder);
         funding_tx.update_for_self(tx)?;
         Ok(funding_tx)
     }

From 3a7c3997b3741c9aad33b32257769e73ab606c58 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Fri, 7 Jun 2024 18:36:58 +0800
Subject: [PATCH 10/28] rename funding_type_script to funding_udt_type_script

---
 src/ckb/channel.rs                            | 60 +++++++++++--------
 src/ckb/gen/pcn.rs                            | 52 ++++++++--------
 src/ckb/network.rs                            | 20 +++----
 src/ckb/schema/pcn.mol                        |  4 +-
 src/ckb/types.rs                              | 13 ++--
 .../02-node1-node2-open-channel-normal.bru    |  2 +-
 6 files changed, 80 insertions(+), 71 deletions(-)

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index 0ba51a88..00c8f234 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -869,7 +869,7 @@ where
                 my_funding_amount,
                 seed,
                 open_channel,
-                accept_funding_type_script,
+                accept_funding_udt_type_script,
                 oneshot_channel,
             ) => {
                 let peer_id = self.peer_id.clone();
@@ -882,7 +882,7 @@ where
                 let OpenChannel {
                     channel_id,
                     chain_hash,
-                    funding_type_script,
+                    funding_udt_type_script,
                     funding_amount,
                     to_local_delay,
                     first_per_commitment_point,
@@ -891,8 +891,8 @@ where
                     ..
                 } = &open_channel;
 
-                if accept_funding_type_script != *funding_type_script
-                    && accept_funding_type_script.is_some()
+                if accept_funding_udt_type_script != *funding_udt_type_script
+                    && accept_funding_udt_type_script.is_some()
                 {
                     return Err(Box::new(ProcessingChannelError::InvalidParameter(
                             "Accept funding type script does not match open channel funding type script"
@@ -907,10 +907,18 @@ where
                     ))));
                 }
 
+                if funding_udt_type_script.is_some() {
+                    // We have not implemented funding type script yet.
+                    // But don't panic, otherwise adversary can easily take us down.
+                    return Err(Box::new(ProcessingChannelError::InvalidParameter(
+                        "Funding type script is not none, but we are currently unable to process this".to_string(),
+                    )));
+                }
+
                 let mut state = ChannelActorState::new_inbound_channel(
                     *channel_id,
                     my_funding_amount,
-                    funding_type_script.clone(),
+                    funding_udt_type_script.clone(),
                     &seed,
                     peer_id.clone(),
                     *funding_amount,
@@ -926,7 +934,7 @@ where
                 let accept_channel = AcceptChannel {
                     channel_id: *channel_id,
                     funding_amount: my_funding_amount,
-                    funding_type_script: funding_type_script.clone(),
+                    funding_udt_type_script: funding_udt_type_script.clone(),
                     max_tlc_value_in_flight: DEFAULT_MAX_TLC_VALUE_IN_FLIGHT,
                     max_accept_tlcs: DEFAULT_MAX_ACCEPT_TLCS,
                     to_local_delay: *to_local_delay,
@@ -976,7 +984,7 @@ where
             ChannelInitializationParameter::OpenChannel(
                 funding_amount,
                 seed,
-                funding_type_script,
+                funding_udt_type_script,
                 tx,
             ) => {
                 let peer_id = self.peer_id.clone();
@@ -986,7 +994,7 @@ where
                     &seed,
                     self.peer_id.clone(),
                     funding_amount,
-                    funding_type_script.clone(),
+                    funding_udt_type_script.clone(),
                     LockTime::new(DEFAULT_TO_LOCAL_DELAY_BLOCKS),
                 );
 
@@ -994,7 +1002,7 @@ where
                 let message = PCNMessage::OpenChannel(OpenChannel {
                     chain_hash: Hash256::default(),
                     channel_id: channel.get_id(),
-                    funding_type_script,
+                    funding_udt_type_script: None,
                     funding_amount: channel.to_local_amount,
                     funding_fee_rate: DEFAULT_FEE_RATE,
                     commitment_fee_rate: DEFAULT_COMMITMENT_FEE_RATE,
@@ -1194,7 +1202,7 @@ pub struct ChannelActorState {
     pub funding_tx: Option<Transaction>,
 
     #[serde_as(as = "Option<EntityHex>")]
-    pub funding_type_script: Option<Script>,
+    pub funding_udt_type_script: Option<Script>,
 
     // Is this channel initially inbound?
     // An inbound channel is one where the counterparty is the funder of the channel.
@@ -1424,7 +1432,7 @@ impl ChannelActorState {
     pub fn new_inbound_channel<'a>(
         temp_channel_id: Hash256,
         local_value: u128,
-        funding_type_script: Option<Script>,
+        funding_udt_type_script: Option<Script>,
         seed: &[u8],
         peer_id: PeerId,
         remote_value: u128,
@@ -1452,7 +1460,7 @@ impl ChannelActorState {
             peer_id,
             funding_tx: None,
             is_acceptor: true,
-            funding_type_script,
+            funding_udt_type_script,
             to_local_amount: local_value,
             id: channel_id,
             next_offering_tlc_id: 0,
@@ -1486,7 +1494,7 @@ impl ChannelActorState {
         seed: &[u8],
         peer_id: PeerId,
         value: u128,
-        funding_type_script: Option<Script>,
+        funding_udt_type_script: Option<Script>,
         to_local_delay: LockTime,
     ) -> Self {
         let signer = InMemorySigner::generate_from_seed(seed);
@@ -1497,7 +1505,7 @@ impl ChannelActorState {
             state: ChannelState::NegotiatingFunding(NegotiatingFundingFlags::empty()),
             peer_id,
             funding_tx: None,
-            funding_type_script,
+            funding_udt_type_script,
             is_acceptor: false,
             to_local_amount: value,
             id: temp_channel_id,
@@ -1669,7 +1677,7 @@ impl ChannelActorState {
     pub fn get_funding_request(&self, fee_rate: u64) -> FundingRequest {
         FundingRequest {
             udt_info: self
-                .funding_type_script
+                .funding_udt_type_script
                 .clone()
                 .map(FundingUdtInfo::new_with_script),
             script: self.get_funding_lock_script(),
@@ -1990,7 +1998,7 @@ impl ChannelActorState {
         ));
         self.to_remote_amount = accept_channel.funding_amount;
         self.remote_nonce = Some(accept_channel.next_local_nonce.clone());
-        self.funding_type_script = accept_channel.funding_type_script.clone();
+        self.funding_udt_type_script = accept_channel.funding_udt_type_script.clone();
 
         let remote_pubkeys = (&accept_channel).into();
         self.remote_channel_parameters = Some(ChannelParametersOneParty {
@@ -2364,7 +2372,7 @@ impl ChannelActorState {
             panic!("Invalid funding transation")
         }
 
-        if self.funding_type_script.is_some() {
+        if self.funding_udt_type_script.is_some() {
             let (_output, data) =
                 tx.output_with_data(0)
                     .ok_or(ProcessingChannelError::InvalidParameter(
@@ -2562,7 +2570,7 @@ impl ChannelActorState {
                     .build(),
             );
 
-        if let Some(type_script) = &self.funding_type_script {
+        if let Some(type_script) = &self.funding_udt_type_script {
             debug!(
                 "UDT local_amount: {}, remote_amount: {}",
                 self.to_local_amount, self.to_remote_amount
@@ -2846,7 +2854,7 @@ impl ChannelActorState {
         let commitment_lock_script =
             get_script_by_contract(Contract::CommitmentLock, &blake2b_256(witnesses)[0..20]);
 
-        if let Some(udt_type_script) = &self.funding_type_script {
+        if let Some(udt_type_script) = &self.funding_udt_type_script {
             let immediate_output = packed::CellOutput::new_builder()
                 .capacity(Capacity::shannons(6100000000).pack())
                 .lock(immediate_secp256k1_lock_script.clone())
@@ -3473,7 +3481,7 @@ mod tests {
                 OpenChannelCommand {
                     peer_id: node_b.peer_id.clone(),
                     funding_amount: 100000000000,
-                    funding_type_script: None,
+                    funding_udt_type_script: None,
                 },
                 rpc_reply,
             ))
@@ -3506,7 +3514,7 @@ mod tests {
                 OpenChannelCommand {
                     peer_id: node_b.peer_id.clone(),
                     funding_amount: 100000000000,
-                    funding_type_script: None,
+                    funding_udt_type_script: None,
                 },
                 rpc_reply,
             ))
@@ -3531,7 +3539,7 @@ mod tests {
                 AcceptChannelCommand {
                     temp_channel_id: open_channel_result.channel_id,
                     funding_amount: 6100000000,
-                    funding_type_script: None,
+                    funding_udt_type_script: None,
                 },
                 rpc_reply,
             ))
@@ -3556,7 +3564,7 @@ mod tests {
                 OpenChannelCommand {
                     peer_id: node_b.peer_id.clone(),
                     funding_amount: 100000000000,
-                    funding_type_script: None,
+                    funding_udt_type_script: None,
                 },
                 rpc_reply,
             ))
@@ -3580,7 +3588,7 @@ mod tests {
                 AcceptChannelCommand {
                     temp_channel_id: open_channel_result.channel_id,
                     funding_amount: 1000,
-                    funding_type_script: None,
+                    funding_udt_type_script: None,
                 },
                 rpc_reply,
             ))
@@ -3673,7 +3681,7 @@ mod tests {
                 OpenChannelCommand {
                     peer_id: node_b.peer_id.clone(),
                     funding_amount: 100000000000,
-                    funding_type_script: None,
+                    funding_udt_type_script: None,
                 },
                 rpc_reply,
             ))
@@ -3698,7 +3706,7 @@ mod tests {
                 AcceptChannelCommand {
                     temp_channel_id: open_channel_result.channel_id,
                     funding_amount: 6100000000,
-                    funding_type_script: None,
+                    funding_udt_type_script: None,
                 },
                 rpc_reply,
             ))
diff --git a/src/ckb/gen/pcn.rs b/src/ckb/gen/pcn.rs
index f87fddd3..687fc30d 100644
--- a/src/ckb/gen/pcn.rs
+++ b/src/ckb/gen/pcn.rs
@@ -2896,8 +2896,8 @@ impl ::core::fmt::Display for OpenChannel {
         write!(
             f,
             ", {}: {}",
-            "funding_type_script",
-            self.funding_type_script()
+            "funding_udt_type_script",
+            self.funding_udt_type_script()
         )?;
         write!(f, ", {}: {}", "funding_amount", self.funding_amount())?;
         write!(f, ", {}: {}", "funding_fee_rate", self.funding_fee_rate())?;
@@ -3008,7 +3008,7 @@ impl OpenChannel {
         let end = molecule::unpack_number(&slice[12..]) as usize;
         Byte32::new_unchecked(self.0.slice(start..end))
     }
-    pub fn funding_type_script(&self) -> ScriptOpt {
+    pub fn funding_udt_type_script(&self) -> ScriptOpt {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[12..]) as usize;
         let end = molecule::unpack_number(&slice[16..]) as usize;
@@ -3143,7 +3143,7 @@ impl molecule::prelude::Entity for OpenChannel {
         Self::new_builder()
             .chain_hash(self.chain_hash())
             .channel_id(self.channel_id())
-            .funding_type_script(self.funding_type_script())
+            .funding_udt_type_script(self.funding_udt_type_script())
             .funding_amount(self.funding_amount())
             .funding_fee_rate(self.funding_fee_rate())
             .commitment_fee_rate(self.commitment_fee_rate())
@@ -3186,8 +3186,8 @@ impl<'r> ::core::fmt::Display for OpenChannelReader<'r> {
         write!(
             f,
             ", {}: {}",
-            "funding_type_script",
-            self.funding_type_script()
+            "funding_udt_type_script",
+            self.funding_udt_type_script()
         )?;
         write!(f, ", {}: {}", "funding_amount", self.funding_amount())?;
         write!(f, ", {}: {}", "funding_fee_rate", self.funding_fee_rate())?;
@@ -3272,7 +3272,7 @@ impl<'r> OpenChannelReader<'r> {
         let end = molecule::unpack_number(&slice[12..]) as usize;
         Byte32Reader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn funding_type_script(&self) -> ScriptOptReader<'r> {
+    pub fn funding_udt_type_script(&self) -> ScriptOptReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[12..]) as usize;
         let end = molecule::unpack_number(&slice[16..]) as usize;
@@ -3451,7 +3451,7 @@ impl<'r> molecule::prelude::Reader<'r> for OpenChannelReader<'r> {
 pub struct OpenChannelBuilder {
     pub(crate) chain_hash: Byte32,
     pub(crate) channel_id: Byte32,
-    pub(crate) funding_type_script: ScriptOpt,
+    pub(crate) funding_udt_type_script: ScriptOpt,
     pub(crate) funding_amount: Uint128,
     pub(crate) funding_fee_rate: Uint64,
     pub(crate) commitment_fee_rate: Uint64,
@@ -3479,8 +3479,8 @@ impl OpenChannelBuilder {
         self.channel_id = v;
         self
     }
-    pub fn funding_type_script(mut self, v: ScriptOpt) -> Self {
-        self.funding_type_script = v;
+    pub fn funding_udt_type_script(mut self, v: ScriptOpt) -> Self {
+        self.funding_udt_type_script = v;
         self
     }
     pub fn funding_amount(mut self, v: Uint128) -> Self {
@@ -3555,7 +3555,7 @@ impl molecule::prelude::Builder for OpenChannelBuilder {
         molecule::NUMBER_SIZE * (Self::FIELD_COUNT + 1)
             + self.chain_hash.as_slice().len()
             + self.channel_id.as_slice().len()
-            + self.funding_type_script.as_slice().len()
+            + self.funding_udt_type_script.as_slice().len()
             + self.funding_amount.as_slice().len()
             + self.funding_fee_rate.as_slice().len()
             + self.commitment_fee_rate.as_slice().len()
@@ -3581,7 +3581,7 @@ impl molecule::prelude::Builder for OpenChannelBuilder {
         offsets.push(total_size);
         total_size += self.channel_id.as_slice().len();
         offsets.push(total_size);
-        total_size += self.funding_type_script.as_slice().len();
+        total_size += self.funding_udt_type_script.as_slice().len();
         offsets.push(total_size);
         total_size += self.funding_amount.as_slice().len();
         offsets.push(total_size);
@@ -3620,7 +3620,7 @@ impl molecule::prelude::Builder for OpenChannelBuilder {
         }
         writer.write_all(self.chain_hash.as_slice())?;
         writer.write_all(self.channel_id.as_slice())?;
-        writer.write_all(self.funding_type_script.as_slice())?;
+        writer.write_all(self.funding_udt_type_script.as_slice())?;
         writer.write_all(self.funding_amount.as_slice())?;
         writer.write_all(self.funding_fee_rate.as_slice())?;
         writer.write_all(self.commitment_fee_rate.as_slice())?;
@@ -3670,8 +3670,8 @@ impl ::core::fmt::Display for AcceptChannel {
         write!(
             f,
             ", {}: {}",
-            "funding_type_script",
-            self.funding_type_script()
+            "funding_udt_type_script",
+            self.funding_udt_type_script()
         )?;
         write!(
             f,
@@ -3771,7 +3771,7 @@ impl AcceptChannel {
         let end = molecule::unpack_number(&slice[12..]) as usize;
         Uint128::new_unchecked(self.0.slice(start..end))
     }
-    pub fn funding_type_script(&self) -> ScriptOpt {
+    pub fn funding_udt_type_script(&self) -> ScriptOpt {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[12..]) as usize;
         let end = molecule::unpack_number(&slice[16..]) as usize;
@@ -3882,7 +3882,7 @@ impl molecule::prelude::Entity for AcceptChannel {
         Self::new_builder()
             .channel_id(self.channel_id())
             .funding_amount(self.funding_amount())
-            .funding_type_script(self.funding_type_script())
+            .funding_udt_type_script(self.funding_udt_type_script())
             .max_tlc_value_in_flight(self.max_tlc_value_in_flight())
             .max_accept_tlcs(self.max_accept_tlcs())
             .min_tlc_value(self.min_tlc_value())
@@ -3921,8 +3921,8 @@ impl<'r> ::core::fmt::Display for AcceptChannelReader<'r> {
         write!(
             f,
             ", {}: {}",
-            "funding_type_script",
-            self.funding_type_script()
+            "funding_udt_type_script",
+            self.funding_udt_type_script()
         )?;
         write!(
             f,
@@ -3998,7 +3998,7 @@ impl<'r> AcceptChannelReader<'r> {
         let end = molecule::unpack_number(&slice[12..]) as usize;
         Uint128Reader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn funding_type_script(&self) -> ScriptOptReader<'r> {
+    pub fn funding_udt_type_script(&self) -> ScriptOptReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[12..]) as usize;
         let end = molecule::unpack_number(&slice[16..]) as usize;
@@ -4149,7 +4149,7 @@ impl<'r> molecule::prelude::Reader<'r> for AcceptChannelReader<'r> {
 pub struct AcceptChannelBuilder {
     pub(crate) channel_id: Byte32,
     pub(crate) funding_amount: Uint128,
-    pub(crate) funding_type_script: ScriptOpt,
+    pub(crate) funding_udt_type_script: ScriptOpt,
     pub(crate) max_tlc_value_in_flight: Uint128,
     pub(crate) max_accept_tlcs: Uint64,
     pub(crate) min_tlc_value: Uint128,
@@ -4173,8 +4173,8 @@ impl AcceptChannelBuilder {
         self.funding_amount = v;
         self
     }
-    pub fn funding_type_script(mut self, v: ScriptOpt) -> Self {
-        self.funding_type_script = v;
+    pub fn funding_udt_type_script(mut self, v: ScriptOpt) -> Self {
+        self.funding_udt_type_script = v;
         self
     }
     pub fn max_tlc_value_in_flight(mut self, v: Uint128) -> Self {
@@ -4233,7 +4233,7 @@ impl molecule::prelude::Builder for AcceptChannelBuilder {
         molecule::NUMBER_SIZE * (Self::FIELD_COUNT + 1)
             + self.channel_id.as_slice().len()
             + self.funding_amount.as_slice().len()
-            + self.funding_type_script.as_slice().len()
+            + self.funding_udt_type_script.as_slice().len()
             + self.max_tlc_value_in_flight.as_slice().len()
             + self.max_accept_tlcs.as_slice().len()
             + self.min_tlc_value.as_slice().len()
@@ -4255,7 +4255,7 @@ impl molecule::prelude::Builder for AcceptChannelBuilder {
         offsets.push(total_size);
         total_size += self.funding_amount.as_slice().len();
         offsets.push(total_size);
-        total_size += self.funding_type_script.as_slice().len();
+        total_size += self.funding_udt_type_script.as_slice().len();
         offsets.push(total_size);
         total_size += self.max_tlc_value_in_flight.as_slice().len();
         offsets.push(total_size);
@@ -4286,7 +4286,7 @@ impl molecule::prelude::Builder for AcceptChannelBuilder {
         }
         writer.write_all(self.channel_id.as_slice())?;
         writer.write_all(self.funding_amount.as_slice())?;
-        writer.write_all(self.funding_type_script.as_slice())?;
+        writer.write_all(self.funding_udt_type_script.as_slice())?;
         writer.write_all(self.max_tlc_value_in_flight.as_slice())?;
         writer.write_all(self.max_accept_tlcs.as_slice())?;
         writer.write_all(self.min_tlc_value.as_slice())?;
diff --git a/src/ckb/network.rs b/src/ckb/network.rs
index 3a2b570d..981935cf 100644
--- a/src/ckb/network.rs
+++ b/src/ckb/network.rs
@@ -100,7 +100,7 @@ pub struct OpenChannelCommand {
     pub peer_id: PeerId,
     pub funding_amount: u128,
     #[serde_as(as = "Option<EntityHex>")]
-    pub funding_type_script: Option<Script>,
+    pub funding_udt_type_script: Option<Script>,
 }
 
 #[derive(Debug)]
@@ -108,7 +108,7 @@ pub struct AcceptChannelCommand {
     pub temp_channel_id: Hash256,
     pub funding_amount: u128,
     #[serde_as(as = "Option<EntityHex>")]
-    pub funding_type_script: Option<Script>,
+    pub funding_udt_type_script: Option<Script>,
 }
 
 impl NetworkActorMessage {
@@ -561,7 +561,7 @@ impl NetworkActorState {
         let OpenChannelCommand {
             peer_id,
             funding_amount,
-            funding_type_script,
+            funding_udt_type_script,
         } = open_channel;
         let seed = self.generate_channel_seed();
         let (tx, rx) = oneshot::channel::<Hash256>();
@@ -571,7 +571,7 @@ impl NetworkActorState {
             ChannelInitializationParameter::OpenChannel(
                 funding_amount,
                 seed,
-                funding_type_script,
+                funding_udt_type_script,
                 tx,
             ),
             network.clone().get_cell(),
@@ -590,7 +590,7 @@ impl NetworkActorState {
         let AcceptChannelCommand {
             temp_channel_id,
             funding_amount,
-            funding_type_script,
+            funding_udt_type_script,
         } = accept_channel;
         let (peer_id, open_channel) = self
             .to_be_accepted_channels
@@ -607,11 +607,11 @@ impl NetworkActorState {
         }
 
         match (
-            open_channel.funding_type_script.as_ref(),
-            funding_type_script.as_ref(),
+            open_channel.funding_udt_type_script.as_ref(),
+            funding_udt_type_script.as_ref(),
         ) {
-            (Some(open_channel_udt_script), Some(funding_type_script)) => {
-                if open_channel_udt_script != funding_type_script {
+            (Some(open_channel_udt_script), Some(funding_udt_type_script)) => {
+                if open_channel_udt_script != funding_udt_type_script {
                     return Err(ProcessingChannelError::InvalidParameter(
                         "Funding type script mismatch".to_string(),
                     ));
@@ -640,7 +640,7 @@ impl NetworkActorState {
                 funding_amount,
                 seed,
                 open_channel,
-                funding_type_script,
+                funding_udt_type_script,
                 Some(tx),
             ),
             network.clone().get_cell(),
diff --git a/src/ckb/schema/pcn.mol b/src/ckb/schema/pcn.mol
index c25e3f65..0d5ca74a 100644
--- a/src/ckb/schema/pcn.mol
+++ b/src/ckb/schema/pcn.mol
@@ -8,7 +8,7 @@ vector SignatureVec <Signature>;
 table OpenChannel {
     chain_hash:                  Byte32,
     channel_id:                  Byte32,
-    funding_type_script:         ScriptOpt,
+    funding_udt_type_script:         ScriptOpt,
     funding_amount:              Uint128,
     funding_fee_rate:            Uint64,
     commitment_fee_rate:         Uint64,
@@ -30,7 +30,7 @@ table OpenChannel {
 table AcceptChannel {
     channel_id:                  Byte32,
     funding_amount:              Uint128,
-    funding_type_script:         ScriptOpt,
+    funding_udt_type_script:         ScriptOpt,
     max_tlc_value_in_flight:     Uint128,
     max_accept_tlcs:             Uint64,
     min_tlc_value:               Uint128,
diff --git a/src/ckb/types.rs b/src/ckb/types.rs
index 46d1fb6b..651714b9 100644
--- a/src/ckb/types.rs
+++ b/src/ckb/types.rs
@@ -427,7 +427,8 @@ impl TryFrom<Byte66> for PubNonce {
 pub struct OpenChannel {
     pub chain_hash: Hash256,
     pub channel_id: Hash256,
-    pub funding_type_script: Option<Script>,
+    #[serde_as(as = "Option<EntityHex>")]
+    pub funding_udt_type_script: Option<Script>,
     pub funding_amount: u128,
     pub funding_fee_rate: u64,
     pub commitment_fee_rate: u64,
@@ -451,7 +452,7 @@ impl From<OpenChannel> for molecule_pcn::OpenChannel {
         molecule_pcn::OpenChannel::new_builder()
             .chain_hash(open_channel.chain_hash.into())
             .channel_id(open_channel.channel_id.into())
-            .funding_type_script(open_channel.funding_type_script.pack())
+            .funding_udt_type_script(open_channel.funding_udt_type_script.pack())
             .funding_amount(open_channel.funding_amount.pack())
             .funding_fee_rate(open_channel.funding_fee_rate.pack())
             .commitment_fee_rate(open_channel.commitment_fee_rate.pack())
@@ -479,7 +480,7 @@ impl TryFrom<molecule_pcn::OpenChannel> for OpenChannel {
         Ok(OpenChannel {
             chain_hash: open_channel.chain_hash().into(),
             channel_id: open_channel.channel_id().into(),
-            funding_type_script: open_channel.funding_type_script().to_opt(),
+            funding_udt_type_script: open_channel.funding_udt_type_script().to_opt(),
             funding_amount: open_channel.funding_amount().unpack(),
             funding_fee_rate: open_channel.funding_fee_rate().unpack(),
             commitment_fee_rate: open_channel.commitment_fee_rate().unpack(),
@@ -509,7 +510,7 @@ pub struct AcceptChannel {
     pub channel_id: Hash256,
     pub funding_amount: u128,
     #[serde_as(as = "Option<EntityHex>")]
-    pub funding_type_script: Option<Script>,
+    pub funding_udt_type_script: Option<Script>,
     pub max_tlc_value_in_flight: u128,
     pub max_accept_tlcs: u64,
     pub min_tlc_value: u128,
@@ -529,7 +530,7 @@ impl From<AcceptChannel> for molecule_pcn::AcceptChannel {
         molecule_pcn::AcceptChannel::new_builder()
             .channel_id(accept_channel.channel_id.into())
             .funding_amount(accept_channel.funding_amount.pack())
-            .funding_type_script(accept_channel.funding_type_script.pack())
+            .funding_udt_type_script(accept_channel.funding_udt_type_script.pack())
             .max_tlc_value_in_flight(accept_channel.max_tlc_value_in_flight.pack())
             .max_accept_tlcs(accept_channel.max_accept_tlcs.pack())
             .min_tlc_value(accept_channel.min_tlc_value.pack())
@@ -553,7 +554,7 @@ impl TryFrom<molecule_pcn::AcceptChannel> for AcceptChannel {
         Ok(AcceptChannel {
             channel_id: accept_channel.channel_id().into(),
             funding_amount: accept_channel.funding_amount().unpack(),
-            funding_type_script: accept_channel.funding_type_script().to_opt(),
+            funding_udt_type_script: accept_channel.funding_udt_type_script().to_opt(),
             max_tlc_value_in_flight: accept_channel.max_tlc_value_in_flight().unpack(),
             max_accept_tlcs: accept_channel.max_accept_tlcs().unpack(),
             min_tlc_value: accept_channel.min_tlc_value().unpack(),
diff --git a/tests/bruno/e2e/udt/02-node1-node2-open-channel-normal.bru b/tests/bruno/e2e/udt/02-node1-node2-open-channel-normal.bru
index 7a1739c0..18ff3f5b 100644
--- a/tests/bruno/e2e/udt/02-node1-node2-open-channel-normal.bru
+++ b/tests/bruno/e2e/udt/02-node1-node2-open-channel-normal.bru
@@ -23,7 +23,7 @@ body:json {
         {
           "peer_id": "{{NODE2_PEERID}}",
           "funding_amount": 1200,
-          "funding_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df41902200000004e58a837b1ac0a72adc56aa876dad176227a9c17c464ecd8e49451d72c79bc29"
+          "funding_udt_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df41902200000004e58a837b1ac0a72adc56aa876dad176227a9c17c464ecd8e49451d72c79bc29"
         }
       ]
     }

From 4d28fc08fe5f7ede2ca3693be8da4b27021f2b6f Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Fri, 7 Jun 2024 18:42:53 +0800
Subject: [PATCH 11/28] fix debug logs in is_tx_final

---
 src/ckb/channel.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index 00c8f234..04161c00 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -2382,16 +2382,17 @@ impl ChannelActorState {
                 let mut amount_bytes = [0u8; 16];
                 amount_bytes.copy_from_slice(&data.as_ref()[0..16]);
                 let udt_amount = u128::from_le_bytes(amount_bytes);
-                warn!(
+                debug!(
                     "udt_amount: {}, to_remote_amount: {}, to_local_amount: {}",
                     udt_amount, self.to_remote_amount, self.to_local_amount
                 );
-                if udt_amount == self.to_remote_amount + self.to_local_amount {
-                    return Ok(true);
-                }
-            } else {
-                return Ok(false);
+                return Ok(udt_amount == self.to_remote_amount + self.to_local_amount);
             }
+            debug!(
+                "is_tx_final: output data length {} is less than 16",
+                data.as_ref().len()
+            );
+            return Ok(false);
         }
         let current_capacity: u64 = first_output.capacity().unpack();
         let is_complete = current_capacity == (self.to_local_amount + self.to_remote_amount) as u64;

From 0ffd9df4303bc0963fd2ade31b79e85ae52d35d7 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Fri, 7 Jun 2024 18:57:13 +0800
Subject: [PATCH 12/28] remove is_tx_final assertion

---
 src/ckb/channel.rs | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index 04161c00..a91ae236 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -2455,22 +2455,11 @@ impl ChannelActorState {
                     "Received TxComplete message, funding tx is present {:?}",
                     tx
                 );
-                let first_output =
-                    tx.raw()
-                        .outputs()
-                        .get(0)
-                        .ok_or(ProcessingChannelError::InvalidParameter(
-                            "Funding transaction should have at least one output".to_string(),
-                        ))?;
-
-                let first_output_capacity =
-                    u64::from_le_bytes(first_output.capacity().as_slice().try_into().unwrap())
-                        as u128;
-
-                if self.to_local_amount + self.to_remote_amount != first_output_capacity {
-                    return Err(ProcessingChannelError::InvalidParameter(
-                        format!("Funding transaction output amount mismatch ({} given, {} to local , {} to remote)", first_output_capacity, self.to_local_amount, self.to_remote_amount)
-                    ));
+                let check = self.is_tx_final(tx);
+                if !check.is_ok_and(|ok| ok) {
+                    return Err(ProcessingChannelError::InvalidState(format!(
+                        "Received TxComplete message, but funding tx is not final"
+                    )));
                 }
             }
         }

From e3c2c21269baa30ef9bbfdc12a36ba7ca8a78ef2 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Fri, 7 Jun 2024 19:03:42 +0800
Subject: [PATCH 13/28] variable rename

---
 src/ckb/channel.rs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index a91ae236..cdec8267 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -2565,40 +2565,39 @@ impl ChannelActorState {
                 "UDT local_amount: {}, remote_amount: {}",
                 self.to_local_amount, self.to_remote_amount
             );
-            let holder_output_data = self.to_local_amount.to_le_bytes().pack();
+            let local_output_data = self.to_local_amount.to_le_bytes().pack();
             let dummy_output = CellOutput::new_builder()
                 .lock(local_shutdown_script.clone())
                 .type_(Some(type_script.clone()).pack())
                 .build();
             let required_capacity = dummy_output
-                .occupied_capacity(Capacity::bytes(holder_output_data.len()).unwrap())
+                .occupied_capacity(Capacity::bytes(local_output_data.len()).unwrap())
                 .unwrap()
                 .pack();
-            let holder_output = dummy_output
+            let local_output = dummy_output
                 .as_builder()
                 .capacity(required_capacity)
                 .build();
 
-            let counterparty_output_data = self.to_remote_amount.to_le_bytes().pack();
+            let remote_output_data = self.to_remote_amount.to_le_bytes().pack();
             let dummy_output = CellOutput::new_builder()
                 .lock(remote_shutdown_script.clone())
                 .type_(Some(type_script.clone()).pack())
                 .build();
             let required_capacity = dummy_output
-                .occupied_capacity(Capacity::bytes(counterparty_output_data.len()).unwrap())
+                .occupied_capacity(Capacity::bytes(remote_output_data.len()).unwrap())
                 .unwrap()
                 .pack();
-            let counterparty_output = dummy_output
+            let remote_output = dummy_output
                 .as_builder()
                 .capacity(required_capacity)
                 .build();
 
-            let outputs = self.order_things_for_musig2(holder_output, counterparty_output);
-            let outputs_data =
-                self.order_things_for_musig2(holder_output_data, counterparty_output_data);
+            let outputs = self.order_things_for_musig2(local_output, remote_output);
+            let outputs_data = self.order_things_for_musig2(local_output_data, remote_output_data);
             let tx_builder = tx_builder
                 .set_outputs(outputs.to_vec())
-                .set_outputs_data(outputs_data);
+                .set_outputs_data(outputs_data.to_vec());
             let tx = tx_builder.build();
             let message = get_funding_cell_message_to_sign(
                 u64::MAX,

From f8a729c6d82a2b7e738eb324d247d627d0090283 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Fri, 7 Jun 2024 19:10:52 +0800
Subject: [PATCH 14/28] fix udt commitment transaction capacity

---
 src/ckb/channel.rs | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index cdec8267..f9987112 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -3,7 +3,7 @@ use ckb_hash::{blake2b_256, new_blake2b};
 use ckb_sdk::Since;
 use ckb_types::{
     core::{Capacity, TransactionBuilder, TransactionView},
-    packed::{self, Bytes, CellInput, CellOutput, OutPoint, Script, Transaction},
+    packed::{Bytes, CellInput, CellOutput, OutPoint, Script, Transaction},
     prelude::{AsTransactionBuilder, IntoTransactionView, Pack, Unpack},
 };
 
@@ -2844,19 +2844,33 @@ impl ChannelActorState {
             get_script_by_contract(Contract::CommitmentLock, &blake2b_256(witnesses)[0..20]);
 
         if let Some(udt_type_script) = &self.funding_udt_type_script {
-            let immediate_output = packed::CellOutput::new_builder()
-                .capacity(Capacity::shannons(6100000000).pack())
+            let immediate_output_data = immediately_spendable_value.to_le_bytes().pack();
+            let dummy_output = CellOutput::new_builder()
                 .lock(immediate_secp256k1_lock_script.clone())
                 .type_(Some(udt_type_script.clone()).pack())
                 .build();
-            let immediate_output_data: Bytes = immediately_spendable_value.to_le_bytes().pack();
+            let required_capacity = dummy_output
+                .occupied_capacity(Capacity::bytes(immediate_output_data.len()).unwrap())
+                .unwrap()
+                .pack();
+            let immediate_output = dummy_output
+                .as_builder()
+                .capacity(required_capacity)
+                .build();
 
-            let commitment_lock_output = packed::CellOutput::new_builder()
-                .capacity(Capacity::shannons(6100000000).pack())
+            let commitment_lock_output_data = time_locked_value.to_le_bytes().pack();
+            let dummy_output = CellOutput::new_builder()
                 .lock(commitment_lock_script.clone())
                 .type_(Some(udt_type_script.clone()).pack())
                 .build();
-            let commitment_lock_output_data: Bytes = time_locked_value.to_le_bytes().pack();
+            let required_capacity = dummy_output
+                .occupied_capacity(Capacity::bytes(commitment_lock_output_data.len()).unwrap())
+                .unwrap()
+                .pack();
+            let commitment_lock_output = dummy_output
+                .as_builder()
+                .capacity(required_capacity)
+                .build();
 
             let outputs = vec![immediate_output, commitment_lock_output];
             let outputs_data = vec![immediate_output_data, commitment_lock_output_data];

From 0d3525fcc55a8572a787c9fff6c3ec36bcb8644b Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Sat, 8 Jun 2024 08:28:38 +0800
Subject: [PATCH 15/28] init simple udt for dev chain

---
 src/ckb_chain/contracts.rs                    |  4 +-
 src/ckb_chain/funding/funding_tx.rs           | 46 ++++++-------------
 tests/deploy/.gitignore                       |  3 +-
 tests/deploy/create-dotenv-file.sh            |  1 +
 tests/deploy/deploy.sh                        |  1 +
 tests/deploy/init-dev-chain.sh                |  1 +
 .../migrations/templates/simple-udt.toml      | 10 ++++
 tests/nodes/start.sh                          |  2 +
 8 files changed, 33 insertions(+), 35 deletions(-)
 create mode 100644 tests/deploy/migrations/templates/simple-udt.toml

diff --git a/src/ckb_chain/contracts.rs b/src/ckb_chain/contracts.rs
index 2d315479..5298009d 100644
--- a/src/ckb_chain/contracts.rs
+++ b/src/ckb_chain/contracts.rs
@@ -124,7 +124,6 @@ pub enum Contract {
     Secp256k1Lock,
     AlwaysSuccess,
     CkbAuth,
-    #[allow(dead_code)]
     SimpleUDT,
 }
 
@@ -155,7 +154,6 @@ impl std::fmt::Debug for ContractsContext {
 
 enum EnvironmentVariableType {
     CodeHash,
-    // FIXME(yukang): warning suppression
     #[allow(dead_code)]
     TypeHash,
     TxIndex,
@@ -189,6 +187,7 @@ fn get_environment_variable(
         Contract::FundingLock => "FUNDING_LOCK",
         Contract::CommitmentLock => "COMMITMENT_LOCK",
         Contract::AlwaysSuccess => "ALWAYS_SUCCESS",
+        Contract::SimpleUDT => "SIMPLE_UDT",
         _ => panic!("Unsupported contract type {:?}", contract),
     };
     let type_desc = match env_type {
@@ -238,6 +237,7 @@ impl ContractsContext {
                         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(
diff --git a/src/ckb_chain/funding/funding_tx.rs b/src/ckb_chain/funding/funding_tx.rs
index 911dec97..d7e451ad 100644
--- a/src/ckb_chain/funding/funding_tx.rs
+++ b/src/ckb_chain/funding/funding_tx.rs
@@ -1,7 +1,10 @@
 use std::collections::{HashMap, HashSet};
 
 use super::super::FundingError;
-use crate::ckb::serde_utils::EntityHex;
+use crate::{
+    ckb::serde_utils::EntityHex,
+    ckb_chain::contracts::{get_cell_deps_by_contracts, Contract},
+};
 
 use anyhow::anyhow;
 use ckb_sdk::{
@@ -17,9 +20,8 @@ use ckb_sdk::{
     CkbRpcClient, ScriptId,
 };
 use ckb_types::{
-    core::{BlockView, Capacity, DepType, TransactionView},
-    h256,
-    packed::{self, Bytes, CellDep, CellInput, CellOutput, OutPoint, Script, Transaction},
+    core::{BlockView, Capacity, TransactionView},
+    packed::{self, Bytes, CellInput, CellOutput, Script, Transaction},
     prelude::*,
 };
 use log::warn;
@@ -113,7 +115,7 @@ impl TxBuilder for FundingTxBuilder {
     fn build_base(
         &self,
         cell_collector: &mut dyn CellCollector,
-        cell_dep_resolver: &dyn CellDepResolver,
+        _cell_dep_resolver: &dyn CellDepResolver,
         _header_dep_resolver: &dyn HeaderDepResolver,
         _tx_dep_provider: &dyn TransactionDependencyProvider,
     ) -> Result<TransactionView, TxBuilderError> {
@@ -194,15 +196,12 @@ impl TxBuilder for FundingTxBuilder {
                         "proper UDT owner cell not found"
                     )));
                 }
-                let owner_cell_dep = cell_dep_resolver
-                    .resolve(&owner)
-                    .ok_or_else(|| TxBuilderError::ResolveCellDepFailed(owner.clone()))?;
-                let udt_cell_dep = cell_dep_resolver
-                    .resolve(&udt_type_script)
-                    .ok_or_else(|| TxBuilderError::ResolveCellDepFailed(udt_type_script.clone()))?;
-                #[allow(clippy::mutable_key_type)]
-                cell_deps.insert(owner_cell_dep);
-                cell_deps.insert(udt_cell_dep);
+                // TODO(yukang): `get_cell_deps_by_contracts` currently return all cell deps for all contracts_context
+                // we need to filter the cell deps by the contracts_context
+                let udt_cell_deps = get_cell_deps_by_contracts(vec![Contract::SimpleUDT]);
+                for cell_dep in udt_cell_deps {
+                    cell_deps.insert(cell_dep);
+                }
             }
         }
 
@@ -301,28 +300,11 @@ impl FundingTxBuilder {
             CapacityBalancer::new_simple(sender, placeholder_witness, self.request.local_fee_rate);
 
         let ckb_client = CkbRpcClient::new(&self.context.rpc_url);
-        let mut cell_dep_resolver = {
+        let cell_dep_resolver = {
             let genesis_block = ckb_client.get_block_by_number(0.into()).unwrap().unwrap();
             DefaultCellDepResolver::from_genesis(&BlockView::from(genesis_block)).unwrap()
         };
 
-        if let Some(ref udt_info) = self.request.udt_info {
-            // FIXME(yukang): how to add cell deps for udt?
-            let udt_type_script = udt_info.type_script.clone();
-            let tx_hash =
-                h256!("0xc24e3b64b9fb890ec319115713742029cefbd8cd2c9a47e9b4547192b23f3985");
-            let out_point = OutPoint::new(tx_hash.pack(), 0);
-            let cell_dep = CellDep::new_builder()
-                .out_point(out_point)
-                .dep_type(DepType::Code.into())
-                .build();
-            cell_dep_resolver.insert(
-                ScriptId::from(&udt_type_script),
-                cell_dep,
-                "Simple UDT".to_string(),
-            );
-        }
-
         let header_dep_resolver = DefaultHeaderDepResolver::new(&self.context.rpc_url);
         let mut cell_collector = DefaultCellCollector::new(&self.context.rpc_url);
         let tx_dep_provider = DefaultTransactionDependencyProvider::new(&self.context.rpc_url, 10);
diff --git a/tests/deploy/.gitignore b/tests/deploy/.gitignore
index d8174644..33e94f03 100644
--- a/tests/deploy/.gitignore
+++ b/tests/deploy/.gitignore
@@ -2,4 +2,5 @@
 /node-data/
 /.env
 /.env.local
-/migrations
\ No newline at end of file
+/migrations/*
+!/migrations/templates/
\ No newline at end of file
diff --git a/tests/deploy/create-dotenv-file.sh b/tests/deploy/create-dotenv-file.sh
index d39b19c7..d014bba4 100755
--- a/tests/deploy/create-dotenv-file.sh
+++ b/tests/deploy/create-dotenv-file.sh
@@ -73,3 +73,4 @@ create_dotenv_for_contract() {
 create_dotenv_for_contract always_success
 create_dotenv_for_contract funding-lock
 create_dotenv_for_contract commitment-lock
+create_dotenv_for_contract simple-udt
diff --git a/tests/deploy/deploy.sh b/tests/deploy/deploy.sh
index f1145adf..0eb68754 100755
--- a/tests/deploy/deploy.sh
+++ b/tests/deploy/deploy.sh
@@ -58,5 +58,6 @@ deploy_and_generate_blocks() {
 deploy_and_generate_blocks always_success
 deploy_and_generate_blocks funding-lock
 deploy_and_generate_blocks commitment-lock
+deploy_and_generate_blocks simple-udt
 
 ./create-dotenv-file.sh >.env
diff --git a/tests/deploy/init-dev-chain.sh b/tests/deploy/init-dev-chain.sh
index 1f967571..4181ec58 100755
--- a/tests/deploy/init-dev-chain.sh
+++ b/tests/deploy/init-dev-chain.sh
@@ -50,6 +50,7 @@ if ! [[ -d "$data_dir" ]]; then
     # The address of node 1 can be seen with the following command:
     # echo | HOME=/tmp ckb-cli account import --local-only --privkey-path "$script_dir/../nodes/1/ckb-chain/key"
     ckb-cli wallet transfer --to-address ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqgx5lf4pczpamsfam48evs0c8nvwqqa59qapt46f --capacity 5000000000 --fee-rate 2000 --privkey-path "$script_dir/../nodes/deployer/ckb-chain/key"
+
     sleep 1
     "$script_dir/generate-blocks.sh" 6
     sleep 1
diff --git a/tests/deploy/migrations/templates/simple-udt.toml b/tests/deploy/migrations/templates/simple-udt.toml
new file mode 100644
index 00000000..34dc85b8
--- /dev/null
+++ b/tests/deploy/migrations/templates/simple-udt.toml
@@ -0,0 +1,10 @@
+[[cells]]
+name = "simple_udt"
+enable_type_id = true
+location = { file = "contracts/simple_udt" }
+
+# The lock script set to output cells
+[lock]
+code_hash = "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"
+args = "0xc8328aabcd9b9e8e64fbc566c4385c3bdeb219d7"
+hash_type = "type"
\ No newline at end of file
diff --git a/tests/nodes/start.sh b/tests/nodes/start.sh
index 0fff2d22..59f0864e 100755
--- a/tests/nodes/start.sh
+++ b/tests/nodes/start.sh
@@ -30,6 +30,7 @@ else
     fi
     export $(xargs <"$deploy_dir/.env")
 fi
+
 if [[ -f "$deploy_dir/.env.local" ]]; then
     # Local environment variables, may used to override the default ones.
     export $(xargs <"$deploy_dir/.env.local")
@@ -56,4 +57,5 @@ fi
 
 # -n means we will exit when any of the background processes exits.
 # https://www.gnu.org/software/bash/manual/bash.html#index-wait
+# wait -n
 wait -n
\ No newline at end of file

From 333c9fad2d665076040a35ec183a57d6e736e18f Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Sun, 9 Jun 2024 11:56:38 +0800
Subject: [PATCH 16/28] refactor udt funding transaction logic

---
 src/ckb_chain/funding/funding_tx.rs | 170 +++++++++++++++-------------
 1 file changed, 92 insertions(+), 78 deletions(-)

diff --git a/src/ckb_chain/funding/funding_tx.rs b/src/ckb_chain/funding/funding_tx.rs
index d7e451ad..8d056484 100644
--- a/src/ckb_chain/funding/funding_tx.rs
+++ b/src/ckb_chain/funding/funding_tx.rs
@@ -9,11 +9,11 @@ use crate::{
 use anyhow::anyhow;
 use ckb_sdk::{
     constants::SIGHASH_TYPE_HASH,
+    rpc::ckb_indexer::SearchMode,
     traits::{
         CellCollector, CellDepResolver, CellQueryOptions, DefaultCellCollector,
         DefaultCellDepResolver, DefaultHeaderDepResolver, DefaultTransactionDependencyProvider,
-        HeaderDepResolver, QueryOrder, SecpCkbRawKeySigner, TransactionDependencyProvider,
-        ValueRangeOption,
+        HeaderDepResolver, SecpCkbRawKeySigner, TransactionDependencyProvider, ValueRangeOption,
     },
     tx_builder::{unlock_tx, CapacityBalancer, TxBuilder, TxBuilderError},
     unlock::{ScriptUnlocker, SecpSighashUnlocker},
@@ -123,88 +123,24 @@ impl TxBuilder for FundingTxBuilder {
             .build_funding_cell()
             .map_err(|err| TxBuilderError::Other(err.into()))?;
 
+        let mut inputs = vec![];
+        let mut cell_deps = HashSet::new();
+
         // Funding cell does not need new cell deps and header deps. The type script deps will be added with inputs.
         let mut outputs: Vec<packed::CellOutput> = vec![funding_cell_output];
         let mut outputs_data: Vec<packed::Bytes> = vec![funding_cell_output_data];
 
-        // Try to find a proper UDT input cell.
-        let mut inputs = vec![];
-        let mut cell_deps = HashSet::new();
-
         if let Some(ref tx) = self.funding_tx.tx {
-            for input in tx.inputs().into_iter() {
-                inputs.push(input.clone());
-            }
-            for cell_dep in tx.cell_deps().into_iter() {
-                cell_deps.insert(cell_dep);
-            }
-        }
-
-        if let Some(ref udt_info) = self.request.udt_info {
-            let udt_amount = self.request.local_amount as u128;
-
-            if udt_amount > 0 {
-                let udt_type_script = udt_info.type_script.clone();
-                let owner = self.context.funding_source_lock_script.clone();
-                let owner_query = {
-                    let mut query = CellQueryOptions::new_lock(owner.clone());
-                    query.secondary_script = Some(udt_type_script.clone());
-                    query.data_len_range = Some(ValueRangeOption::new_min(16));
-                    query.min_total_capacity = u64::MAX;
-                    query.order = QueryOrder::Desc;
-                    query
-                };
-
-                let (owner_cells, _) = cell_collector.collect_live_cells(&owner_query, true)?;
-                let mut found_udt_cell = false;
-                for cell in owner_cells.iter() {
-                    let mut amount_bytes = [0u8; 16];
-                    amount_bytes.copy_from_slice(&cell.output_data.as_ref()[0..16]);
-                    let cell_udt_amount = u128::from_le_bytes(amount_bytes);
-                    //FIXME(yukang): we may need to revise the check here
-                    if cell_udt_amount >= udt_amount {
-                        inputs.push(CellInput::new(cell.out_point.clone(), 0));
-                        if cell_udt_amount > udt_amount {
-                            let change_output_data: Bytes =
-                                (cell_udt_amount - udt_amount).to_le_bytes().pack();
-
-                            let dummy_output = CellOutput::new_builder()
-                                .lock(owner.clone())
-                                .type_(Some(udt_type_script.clone()).pack())
-                                .build();
-                            let required_capacity = dummy_output
-                                .occupied_capacity(
-                                    Capacity::bytes(change_output_data.len()).unwrap(),
-                                )
-                                .unwrap()
-                                .pack();
-                            let change_output = dummy_output
-                                .as_builder()
-                                .capacity(required_capacity)
-                                .build();
-
-                            outputs.push(change_output);
-                            outputs_data.push(change_output_data);
-                        }
-                        warn!("find proper UDT owner cell: {:?}", cell);
-                        found_udt_cell = true;
-                        break;
-                    }
-                }
-                if !found_udt_cell {
-                    return Err(TxBuilderError::Other(anyhow!(
-                        "proper UDT owner cell not found"
-                    )));
-                }
-                // TODO(yukang): `get_cell_deps_by_contracts` currently return all cell deps for all contracts_context
-                // we need to filter the cell deps by the contracts_context
-                let udt_cell_deps = get_cell_deps_by_contracts(vec![Contract::SimpleUDT]);
-                for cell_dep in udt_cell_deps {
-                    cell_deps.insert(cell_dep);
-                }
-            }
+            inputs = tx.inputs().into_iter().collect();
+            cell_deps = tx.cell_deps().into_iter().collect();
         }
-
+        self.build_udt_inputs_outputs(
+            cell_collector,
+            &mut inputs,
+            &mut outputs,
+            &mut outputs_data,
+            &mut cell_deps,
+        )?;
         if let Some(ref tx) = self.funding_tx.tx {
             for (i, output) in tx.outputs().into_iter().enumerate().skip(1) {
                 outputs.push(output.clone());
@@ -280,6 +216,84 @@ impl FundingTxBuilder {
         }
     }
 
+    fn build_udt_inputs_outputs(
+        &self,
+        cell_collector: &mut dyn CellCollector,
+        inputs: &mut Vec<CellInput>,
+        outputs: &mut Vec<packed::CellOutput>,
+        outputs_data: &mut Vec<packed::Bytes>,
+        cell_deps: &mut HashSet<packed::CellDep>,
+    ) -> Result<(), TxBuilderError> {
+        let udt_amount = self.request.local_amount as u128;
+        let udt_info = match &self.request.udt_info {
+            Some(ref udt_info) if self.request.local_amount > 0 => udt_info,
+            _ => return Ok(()),
+        };
+
+        let udt_type_script = udt_info.type_script.clone();
+        let owner = self.context.funding_source_lock_script.clone();
+        let mut found_udt_amount = 0;
+        let mut found_enough_udt_cells = false;
+
+        let mut query = CellQueryOptions::new_lock(owner.clone());
+        query.script_search_mode = Some(SearchMode::Exact);
+        query.secondary_script = Some(udt_type_script.clone());
+        query.data_len_range = Some(ValueRangeOption::new_min(16));
+
+        loop {
+            // each query will found at most one cell because of `min_total_capacity == 1` in CellQueryOptions
+            let (udt_cells, _) = cell_collector.collect_live_cells(&query, true)?;
+            if udt_cells.is_empty() {
+                break;
+            }
+            for cell in udt_cells.iter() {
+                let mut amount_bytes = [0u8; 16];
+                amount_bytes.copy_from_slice(&cell.output_data.as_ref()[0..16]);
+                let cell_udt_amount = u128::from_le_bytes(amount_bytes);
+                found_udt_amount += cell_udt_amount;
+                inputs.push(CellInput::new(cell.out_point.clone(), 0));
+
+                if found_udt_amount >= udt_amount {
+                    let change_output_data: Bytes =
+                        (udt_amount - found_udt_amount).to_le_bytes().pack();
+
+                    let dummy_output = CellOutput::new_builder()
+                        .lock(owner.clone())
+                        .type_(Some(udt_type_script.clone()).pack())
+                        .build();
+                    let required_capacity = dummy_output
+                        .occupied_capacity(Capacity::bytes(change_output_data.len()).unwrap())
+                        .unwrap()
+                        .pack();
+                    let change_output = dummy_output
+                        .as_builder()
+                        .capacity(required_capacity)
+                        .build();
+
+                    outputs.push(change_output);
+                    outputs_data.push(change_output_data);
+
+                    warn!("find proper UDT owner cells: {:?}", inputs);
+                    found_enough_udt_cells = true;
+                    break;
+                }
+            }
+        }
+        if !found_enough_udt_cells {
+            return Err(TxBuilderError::Other(anyhow!(
+                "can not find enough UDT owner cells for funding transaction"
+            )));
+        } else {
+            // TODO(yukang): `get_cell_deps_by_contracts` currently return all cell deps for all contracts_context
+            // we need to filter the cell deps by the contracts_context
+            let udt_cell_deps = get_cell_deps_by_contracts(vec![Contract::SimpleUDT]);
+            for cell_dep in udt_cell_deps {
+                cell_deps.insert(cell_dep);
+            }
+        }
+        return Ok(());
+    }
+
     fn build(self) -> Result<FundingTx, FundingError> {
         // Build ScriptUnlocker
         let signer = SecpCkbRawKeySigner::new_with_secret_keys(vec![]);

From e8a0cd798e5156c4c9490e68c9d99658b48a57fb Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Sun, 9 Jun 2024 12:06:20 +0800
Subject: [PATCH 17/28] check_tx_complete_preconditions will return error
 earlier

---
 src/ckb/channel.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index f9987112..f814dd48 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -788,6 +788,7 @@ impl<S> ChannelActor<S> {
                 )?;
             }
             TxCollaborationCommand::TxComplete(_) => {
+                state.check_tx_complete_preconditions()?;
                 let pcn_msg = PCNMessage::TxComplete(TxComplete {
                     channel_id: state.get_id(),
                 });
@@ -799,8 +800,6 @@ impl<S> ChannelActor<S> {
                         )),
                     ))
                     .expect("network actor alive");
-
-                state.check_tx_complete_preconditions()?;
                 state.update_state(ChannelState::CollaboratingFundingTx(
                     flags | CollaboratingFundingTxFlags::OUR_TX_COMPLETE_SENT,
                 ));

From e9b1a4599329f9ec9b69a30269a8ba2328bf4b6d Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Sun, 9 Jun 2024 12:29:17 +0800
Subject: [PATCH 18/28] resolve issues with RPC refactor

---
 src/ckb/network.rs                                     |  2 --
 src/ckb/types.rs                                       |  5 +----
 src/rpc/channel.rs                                     | 10 ++++++++++
 ...nnel-normal.bru => 02-node1-node2-open-channel.bru} |  2 +-
 ...-channel-normal.bru => 03-node2-accept-channel.bru} |  0
 tests/nodes/start.sh                                   |  3 +--
 6 files changed, 13 insertions(+), 9 deletions(-)
 rename tests/bruno/e2e/udt/{02-node1-node2-open-channel-normal.bru => 02-node1-node2-open-channel.bru} (89%)
 rename tests/bruno/e2e/udt/{03-node2-accept-channel-normal.bru => 03-node2-accept-channel.bru} (100%)

diff --git a/src/ckb/network.rs b/src/ckb/network.rs
index 981935cf..d2105e66 100644
--- a/src/ckb/network.rs
+++ b/src/ckb/network.rs
@@ -99,7 +99,6 @@ pub enum NetworkActorCommand {
 pub struct OpenChannelCommand {
     pub peer_id: PeerId,
     pub funding_amount: u128,
-    #[serde_as(as = "Option<EntityHex>")]
     pub funding_udt_type_script: Option<Script>,
 }
 
@@ -107,7 +106,6 @@ pub struct OpenChannelCommand {
 pub struct AcceptChannelCommand {
     pub temp_channel_id: Hash256,
     pub funding_amount: u128,
-    #[serde_as(as = "Option<EntityHex>")]
     pub funding_udt_type_script: Option<Script>,
 }
 
diff --git a/src/ckb/types.rs b/src/ckb/types.rs
index 651714b9..becb4e14 100644
--- a/src/ckb/types.rs
+++ b/src/ckb/types.rs
@@ -427,7 +427,6 @@ impl TryFrom<Byte66> for PubNonce {
 pub struct OpenChannel {
     pub chain_hash: Hash256,
     pub channel_id: Hash256,
-    #[serde_as(as = "Option<EntityHex>")]
     pub funding_udt_type_script: Option<Script>,
     pub funding_amount: u128,
     pub funding_fee_rate: u64,
@@ -504,12 +503,10 @@ impl TryFrom<molecule_pcn::OpenChannel> for OpenChannel {
     }
 }
 
-#[serde_as]
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone)]
 pub struct AcceptChannel {
     pub channel_id: Hash256,
     pub funding_amount: u128,
-    #[serde_as(as = "Option<EntityHex>")]
     pub funding_udt_type_script: Option<Script>,
     pub max_tlc_value_in_flight: u128,
     pub max_accept_tlcs: u64,
diff --git a/src/rpc/channel.rs b/src/rpc/channel.rs
index 03d183da..793e07ac 100644
--- a/src/rpc/channel.rs
+++ b/src/rpc/channel.rs
@@ -26,6 +26,7 @@ pub struct OpenChannelParams {
     pub peer_id: PeerId,
     #[serde_as(as = "U128Hex")]
     pub funding_amount: u128,
+    pub funding_udt_type_script: Option<Script>,
 }
 
 #[derive(Clone, Serialize)]
@@ -39,6 +40,7 @@ pub struct AcceptChannelParams {
     pub temporary_channel_id: Hash256,
     #[serde_as(as = "U128Hex")]
     pub funding_amount: u128,
+    pub funding_udt_type_script: Option<Script>,
 }
 
 #[derive(Clone, Serialize)]
@@ -183,6 +185,10 @@ where
                 OpenChannelCommand {
                     peer_id: params.peer_id.clone(),
                     funding_amount: params.funding_amount.clone(),
+                    funding_udt_type_script: params
+                        .funding_udt_type_script
+                        .clone()
+                        .map(|s| s.into()),
                 },
                 rpc_reply,
             ))
@@ -208,6 +214,10 @@ where
                 AcceptChannelCommand {
                     temp_channel_id: params.temporary_channel_id,
                     funding_amount: params.funding_amount,
+                    funding_udt_type_script: params
+                        .funding_udt_type_script
+                        .clone()
+                        .map(|s| s.into()),
                 },
                 rpc_reply,
             ))
diff --git a/tests/bruno/e2e/udt/02-node1-node2-open-channel-normal.bru b/tests/bruno/e2e/udt/02-node1-node2-open-channel.bru
similarity index 89%
rename from tests/bruno/e2e/udt/02-node1-node2-open-channel-normal.bru
rename to tests/bruno/e2e/udt/02-node1-node2-open-channel.bru
index 18ff3f5b..88c23999 100644
--- a/tests/bruno/e2e/udt/02-node1-node2-open-channel-normal.bru
+++ b/tests/bruno/e2e/udt/02-node1-node2-open-channel.bru
@@ -23,7 +23,7 @@ body:json {
         {
           "peer_id": "{{NODE2_PEERID}}",
           "funding_amount": 1200,
-          "funding_udt_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df41902200000004e58a837b1ac0a72adc56aa876dad176227a9c17c464ecd8e49451d72c79bc29"
+          "funding_udt_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df419022000000032e555f3ff8e135cece1351a6a2971518392c1e30375c1e006ad0ce8eac07947"
         }
       ]
     }
diff --git a/tests/bruno/e2e/udt/03-node2-accept-channel-normal.bru b/tests/bruno/e2e/udt/03-node2-accept-channel.bru
similarity index 100%
rename from tests/bruno/e2e/udt/03-node2-accept-channel-normal.bru
rename to tests/bruno/e2e/udt/03-node2-accept-channel.bru
diff --git a/tests/nodes/start.sh b/tests/nodes/start.sh
index 59f0864e..5362315f 100755
--- a/tests/nodes/start.sh
+++ b/tests/nodes/start.sh
@@ -57,5 +57,4 @@ fi
 
 # -n means we will exit when any of the background processes exits.
 # https://www.gnu.org/software/bash/manual/bash.html#index-wait
-# wait -n
-wait -n
\ No newline at end of file
+wait -n

From 75f61c1baa860df2b1ffe17d87780e737c0a906a Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Sun, 9 Jun 2024 21:03:17 +0800
Subject: [PATCH 19/28] fix bugs from merge RPC refactor

---
 src/ckb/channel.rs                            | 10 +---
 src/ckb_chain/funding/funding_tx.rs           | 34 ++++++------
 src/rpc/channel.rs                            |  2 +-
 .../bruno/e2e/udt/01-node1-connect-node2.bru  | 16 +++---
 .../e2e/udt/02-node1-node2-open-channel.bru   | 35 ++++++++-----
 .../bruno/e2e/udt/03-node2-accept-channel.bru | 25 +++++----
 .../udt/04-node1-send-commitment-signed.bru   | 19 +++----
 .../udt/05-node2-send-commitment-signed.bru   | 19 +++----
 tests/bruno/e2e/udt/07-node2-gen-invoice.bru  | 52 ++++++++++++-------
 tests/bruno/e2e/udt/08-node1-add-tlc.bru      | 31 ++++++-----
 tests/bruno/e2e/udt/09-node2-remove-tlc.bru   | 26 +++++-----
 .../udt/10-node1-send-shutdown-channel.bru    | 26 ++++++----
 .../udt/11-node2-send-shutdown-channel-1.bru  | 41 ---------------
 .../udt/11-node2-send-shutdown-channel.bru    | 45 ++++++++++++++++
 14 files changed, 204 insertions(+), 177 deletions(-)
 delete mode 100644 tests/bruno/e2e/udt/11-node2-send-shutdown-channel-1.bru
 create mode 100644 tests/bruno/e2e/udt/11-node2-send-shutdown-channel.bru

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index f814dd48..f632cb1e 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -906,14 +906,6 @@ where
                     ))));
                 }
 
-                if funding_udt_type_script.is_some() {
-                    // We have not implemented funding type script yet.
-                    // But don't panic, otherwise adversary can easily take us down.
-                    return Err(Box::new(ProcessingChannelError::InvalidParameter(
-                        "Funding type script is not none, but we are currently unable to process this".to_string(),
-                    )));
-                }
-
                 let mut state = ChannelActorState::new_inbound_channel(
                     *channel_id,
                     my_funding_amount,
@@ -1001,7 +993,7 @@ where
                 let message = PCNMessage::OpenChannel(OpenChannel {
                     chain_hash: Hash256::default(),
                     channel_id: channel.get_id(),
-                    funding_udt_type_script: None,
+                    funding_udt_type_script,
                     funding_amount: channel.to_local_amount,
                     funding_fee_rate: DEFAULT_FEE_RATE,
                     commitment_fee_rate: DEFAULT_COMMITMENT_FEE_RATE,
diff --git a/src/ckb_chain/funding/funding_tx.rs b/src/ckb_chain/funding/funding_tx.rs
index 8d056484..5c16e8a3 100644
--- a/src/ckb_chain/funding/funding_tx.rs
+++ b/src/ckb_chain/funding/funding_tx.rs
@@ -233,7 +233,6 @@ impl FundingTxBuilder {
         let udt_type_script = udt_info.type_script.clone();
         let owner = self.context.funding_source_lock_script.clone();
         let mut found_udt_amount = 0;
-        let mut found_enough_udt_cells = false;
 
         let mut query = CellQueryOptions::new_lock(owner.clone());
         query.script_search_mode = Some(SearchMode::Exact);
@@ -250,12 +249,17 @@ impl FundingTxBuilder {
                 let mut amount_bytes = [0u8; 16];
                 amount_bytes.copy_from_slice(&cell.output_data.as_ref()[0..16]);
                 let cell_udt_amount = u128::from_le_bytes(amount_bytes);
+                let ckb_amount: u64 = cell.output.capacity().unpack();
+                warn!(
+                    "found udt cell ckb_amount: {:?} udt_amount: {:?} cell: {:?}",
+                    ckb_amount, cell_udt_amount, cell
+                );
                 found_udt_amount += cell_udt_amount;
                 inputs.push(CellInput::new(cell.out_point.clone(), 0));
 
                 if found_udt_amount >= udt_amount {
                     let change_output_data: Bytes =
-                        (udt_amount - found_udt_amount).to_le_bytes().pack();
+                        (found_udt_amount - udt_amount).to_le_bytes().pack();
 
                     let dummy_output = CellOutput::new_builder()
                         .lock(owner.clone())
@@ -274,24 +278,20 @@ impl FundingTxBuilder {
                     outputs_data.push(change_output_data);
 
                     warn!("find proper UDT owner cells: {:?}", inputs);
-                    found_enough_udt_cells = true;
-                    break;
+
+                    // TODO(yukang): `get_cell_deps_by_contracts` currently return all cell deps for all contracts_context
+                    // we need to filter the cell deps by the contracts_context
+                    let udt_cell_deps = get_cell_deps_by_contracts(vec![Contract::SimpleUDT]);
+                    for cell_dep in udt_cell_deps {
+                        cell_deps.insert(cell_dep);
+                    }
+                    return Ok(());
                 }
             }
         }
-        if !found_enough_udt_cells {
-            return Err(TxBuilderError::Other(anyhow!(
-                "can not find enough UDT owner cells for funding transaction"
-            )));
-        } else {
-            // TODO(yukang): `get_cell_deps_by_contracts` currently return all cell deps for all contracts_context
-            // we need to filter the cell deps by the contracts_context
-            let udt_cell_deps = get_cell_deps_by_contracts(vec![Contract::SimpleUDT]);
-            for cell_dep in udt_cell_deps {
-                cell_deps.insert(cell_dep);
-            }
-        }
-        return Ok(());
+        return Err(TxBuilderError::Other(anyhow!(
+            "can not find enough UDT owner cells for funding transaction"
+        )));
     }
 
     fn build(self) -> Result<FundingTx, FundingError> {
diff --git a/src/rpc/channel.rs b/src/rpc/channel.rs
index 793e07ac..9f4946cf 100644
--- a/src/rpc/channel.rs
+++ b/src/rpc/channel.rs
@@ -20,7 +20,7 @@ use serde_with::{serde_as, DisplayFromStr};
 use tentacle::secio::PeerId;
 
 #[serde_as]
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Debug)]
 pub struct OpenChannelParams {
     #[serde_as(as = "DisplayFromStr")]
     pub peer_id: PeerId,
diff --git a/tests/bruno/e2e/udt/01-node1-connect-node2.bru b/tests/bruno/e2e/udt/01-node1-connect-node2.bru
index 7b3f8c39..5f915052 100644
--- a/tests/bruno/e2e/udt/01-node1-connect-node2.bru
+++ b/tests/bruno/e2e/udt/01-node1-connect-node2.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{NODE2_RPC_URL}}/ckb
+  url: {{NODE2_RPC_URL}}
   body: json
   auth: none
 }
@@ -14,18 +14,20 @@ headers {
   Content-Type: application/json
   Accept: application/json
 }
-
 body:json {
   {
-    "request": {
-      "ConnectPeer": "{{NODE1_ADDR}}"
-    }
+    "id": "42",
+    "jsonrpc": "2.0",
+    "method": "connect_peer",
+    "params": [
+      {"address": "{{NODE1_ADDR}}"}
+    ]
   }
-
 }
 
 assert {
-  res.status: eq 200
+  res.body.error: isUndefined
+  res.body.result: isNull
 }
 
 script:post-response {
diff --git a/tests/bruno/e2e/udt/02-node1-node2-open-channel.bru b/tests/bruno/e2e/udt/02-node1-node2-open-channel.bru
index 88c23999..09032e81 100644
--- a/tests/bruno/e2e/udt/02-node1-node2-open-channel.bru
+++ b/tests/bruno/e2e/udt/02-node1-node2-open-channel.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{NODE1_RPC_URL}}/ckb
+  url: {{NODE1_RPC_URL}}
   body: json
   auth: none
 }
@@ -15,27 +15,34 @@ headers {
   Accept: application/json
 }
 
+
 body:json {
   {
-    "request": {
-      "OpenChannel":
-      [
-        {
-          "peer_id": "{{NODE2_PEERID}}",
-          "funding_amount": 1200,
-          "funding_udt_type_script": "0x55000000100000003000000031000000e1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df419022000000032e555f3ff8e135cece1351a6a2971518392c1e30375c1e006ad0ce8eac07947"
-        }
-      ]
-    }
+    "id": "42",
+    "jsonrpc": "2.0",
+    "method": "open_channel",
+    "params": [
+      {
+        "peer_id": "{{NODE2_PEERID}}",
+          "funding_amount": "0x4b0",
+          "funding_udt_type_script": {
+            "code_hash": "0xe1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df419",
+            "hash_type": "data1",
+            "args": "0x32e555f3ff8e135cece1351a6a2971518392c1e30375c1e006ad0ce8eac07947"
+          }
+      }
+    ]
   }
 }
 
 assert {
-  res.status: eq 200
+  res.body.error: isUndefined
+  res.body.result.temporary_channel_id: isDefined
 }
 
 script:post-response {
   await new Promise(r => setTimeout(r, 1000));
-  console.log("N1N2 response: ", res.body.channel_id);
-  bru.setVar("N1N2_TEMP_CHANNEL_ID", res.body.channel_id);
+  console.log("N1N2 response: ", res.body);
+  console.log("N1N2 response: ", res.body.result.temporary_channel_id);
+  bru.setVar("N1N2_TEMP_CHANNEL_ID", res.body.result.temporary_channel_id);
 }
diff --git a/tests/bruno/e2e/udt/03-node2-accept-channel.bru b/tests/bruno/e2e/udt/03-node2-accept-channel.bru
index 5ffc17f4..66b56905 100644
--- a/tests/bruno/e2e/udt/03-node2-accept-channel.bru
+++ b/tests/bruno/e2e/udt/03-node2-accept-channel.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{NODE2_RPC_URL}}/ckb
+  url: {{NODE2_RPC_URL}}
   body: json
   auth: none
 }
@@ -15,26 +15,29 @@ headers {
   Accept: application/json
 }
 
+
 body:json {
   {
-    "request": {
-      "AcceptChannel": [
-        {
-          "temp_channel_id": "{{N1N2_TEMP_CHANNEL_ID}}",
-          "funding_amount": 1234
-        }
-      ]
-    }
+    "id": "42",
+    "jsonrpc": "2.0",
+    "method": "accept_channel",
+    "params": [
+      {
+        "temporary_channel_id": "{{N1N2_TEMP_CHANNEL_ID}}",
+        "funding_amount": "0x4d2"
+      }
+    ]
   }
 }
 
 assert {
-  res.status: eq 200
+  res.body.error: isUndefined
+  res.body.result.channel_id: isDefined
 }
 
 script:post-response {
   // Sleep for sometime to make sure current operation finishes before next request starts.
   await new Promise(r => setTimeout(r, 2000));
   console.log("accept channel result: ", res.body);
-  bru.setVar("N1N2_CHANNEL_ID", res.body.new_channel_id);
+  bru.setVar("N1N2_CHANNEL_ID",  res.body.result.channel_id);
 }
diff --git a/tests/bruno/e2e/udt/04-node1-send-commitment-signed.bru b/tests/bruno/e2e/udt/04-node1-send-commitment-signed.bru
index b388e9f2..5bdc6610 100644
--- a/tests/bruno/e2e/udt/04-node1-send-commitment-signed.bru
+++ b/tests/bruno/e2e/udt/04-node1-send-commitment-signed.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{NODE1_RPC_URL}}/ckb
+  url: {{NODE1_RPC_URL}}
   body: json
   auth: none
 }
@@ -17,19 +17,20 @@ headers {
 
 body:json {
   {
-    "request": {
-      "ControlPcnChannel": {
-        "channel_id": "{{N1N2_CHANNEL_ID}}",
-        "command": {
-          "CommitmentSigned": []
-        }
+    "id": "42",
+    "jsonrpc": "2.0",
+    "method": "commitment_signed",
+    "params": [
+      {
+        "channel_id": "{{N1N2_CHANNEL_ID}}"
       }
-    }
+    ]
   }
 }
 
 assert {
-  res.status: eq 200
+  res.body.error: isUndefined
+  res.body.result: isNull
 }
 
 script:post-response {
diff --git a/tests/bruno/e2e/udt/05-node2-send-commitment-signed.bru b/tests/bruno/e2e/udt/05-node2-send-commitment-signed.bru
index 656d3b9a..cdac5136 100644
--- a/tests/bruno/e2e/udt/05-node2-send-commitment-signed.bru
+++ b/tests/bruno/e2e/udt/05-node2-send-commitment-signed.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{NODE2_RPC_URL}}/ckb
+  url: {{NODE2_RPC_URL}}
   body: json
   auth: none
 }
@@ -17,19 +17,20 @@ headers {
 
 body:json {
   {
-    "request": {
-      "ControlPcnChannel": {
-        "channel_id": "{{N1N2_CHANNEL_ID}}",
-        "command": {
-          "CommitmentSigned": []
-        }
+    "id": "42",
+    "jsonrpc": "2.0",
+    "method": "commitment_signed",
+    "params": [
+      {
+        "channel_id": "{{N1N2_CHANNEL_ID}}"
       }
-    }
+    ]
   }
 }
 
 assert {
-  res.status: eq 200
+  res.body.error: isUndefined
+  res.body.result: isNull
 }
 
 script:post-response {
diff --git a/tests/bruno/e2e/udt/07-node2-gen-invoice.bru b/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
index 55b8dfe6..872dc907 100644
--- a/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
+++ b/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{NODE2_RPC_URL}}/invoice
+  url: {{NODE2_RPC_URL}}
   body: json
   auth: none
 }
@@ -15,30 +15,46 @@ headers {
   Accept: application/json
 }
 
-body:json {
-    {
-        "request": {
-            "NewInvoice": {
-                "amount": 200,
-                "currency": "Ckb",
-                "description": "test invoice generated by node2",
-                "expiry": 3600,
-                "final_cltv": 40,
-                "payment_preimage": "0x0000000000000000000000000000000000000000000000000000000000000002"
-            }
-        }
+script:pre-request {
+  // generate random preimage
+  function generateRandomPreimage() {
+    let hash = '0x';
+    for (let i = 0; i < 64; i++) {
+        hash += Math.floor(Math.random() * 16).toString(16);
     }
+    return hash;
+  }
+  const payment_preimage = generateRandomPreimage();
+  bru.setVar("payment_preimage", payment_preimage);
+}
+
+body:json {
+  {
+    "id": "42",
+    "jsonrpc": "2.0",
+    "method": "new_invoice",
+    "params": [
+      {
+        "amount": "0xc8",
+        "currency": "Ckb",
+        "description": "test invoice generated by node3",
+        "expiry": "0xe10",
+        "final_cltv": "0x28",
+        "payment_preimage": "{{payment_preimage}}"
+      }
+    ]
+  }
 }
 
 assert {
-  res.status: eq 200
+  res.body.error: isUndefined
+  res.body.result: isDefined
 }
 
 script:post-response {
   // Sleep for sometime to make sure current operation finishes before next request starts.
   await new Promise(r => setTimeout(r, 100));
-  bru.setVar("payment_hash", res.body.payment_hash);
-  bru.setVar("payment_amount", res.body.invoice.amount);
-  console.log("generate invoice: ", res.body.encode_payment);
-  console.log("generated result: ", res.body);
+  console.log("generated result: ", res.body.result);
+  bru.setVar("payment_hash", res.body.result.invoice.data.payment_hash);
+  bru.setVar("payment_amount", res.body.result.invoice.amount);
 }
diff --git a/tests/bruno/e2e/udt/08-node1-add-tlc.bru b/tests/bruno/e2e/udt/08-node1-add-tlc.bru
index e1a2cd5d..b6c82c60 100644
--- a/tests/bruno/e2e/udt/08-node1-add-tlc.bru
+++ b/tests/bruno/e2e/udt/08-node1-add-tlc.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{NODE1_RPC_URL}}/ckb
+  url: {{NODE1_RPC_URL}}
   body: json
   auth: none
 }
@@ -17,24 +17,23 @@ headers {
 
 body:json {
   {
-    "request": {
-      "ControlPcnChannel":
-        {
-          "channel_id": "{{N1N2_CHANNEL_ID}}",
-          "command": {
-            "AddTlc": [{
-              "amount": {{payment_amount}},
-              "payment_hash": "{{payment_hash}}",
-              "expiry": 40
-            }]
-          }
-        }
-    }
+    "id": "42",
+    "jsonrpc": "2.0",
+    "method": "add_tlc",
+    "params": [
+      {
+        "channel_id": "{{N1N2_CHANNEL_ID}}",
+        "amount": "{{payment_amount}}",
+        "payment_hash": "{{payment_hash}}",
+        "expiry": 40
+      }
+    ]
   }
 }
 
 assert {
-  res.status: eq 200
+  res.body.error: isUndefined
+  res.body.result.tlc_id: isDefined
 }
 
 script:pre-request {
@@ -46,6 +45,6 @@ script:post-response {
   // Sleep for sometime to make sure current operation finishes before next request starts.
   await new Promise(r => setTimeout(r, 100));
   console.log("response from node1 AddTlc:", res.body);
-  bru.setVar("N1N2_TLC_ID1", res.body.tlc_id);
+  bru.setVar("N1N2_TLC_ID1", res.body.result.tlc_id);
 
 }
diff --git a/tests/bruno/e2e/udt/09-node2-remove-tlc.bru b/tests/bruno/e2e/udt/09-node2-remove-tlc.bru
index 20363e3b..f9761878 100644
--- a/tests/bruno/e2e/udt/09-node2-remove-tlc.bru
+++ b/tests/bruno/e2e/udt/09-node2-remove-tlc.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{NODE2_RPC_URL}}/ckb
+  url: {{NODE2_RPC_URL}}
   body: json
   auth: none
 }
@@ -17,26 +17,24 @@ headers {
 
 body:json {
   {
-    "request": {
-      "ControlPcnChannel": {
+    "id": "42",
+    "jsonrpc": "2.0",
+    "method": "remove_tlc",
+    "params": [
+      {
         "channel_id": "{{N1N2_CHANNEL_ID}}",
-        "command": {
-          "RemoveTlc": {
-            "id": {{N1N2_TLC_ID1}},
-            "reason": {
-              "RemoveTlcFulfill": {
-                "payment_preimage": "0x0000000000000000000000000000000000000000000000000000000000000002"
-              }
-            }
-          }
+        "tlc_id": "{{N1N2_TLC_ID1}}",
+        "reason": {
+          "payment_preimage": "{{payment_preimage}}"
         }
       }
-    }
+    ]
   }
 }
 
 assert {
-  res.status: eq 200
+  res.body.error: isUndefined
+  res.body.result: isNull
 }
 
 script:post-response {
diff --git a/tests/bruno/e2e/udt/10-node1-send-shutdown-channel.bru b/tests/bruno/e2e/udt/10-node1-send-shutdown-channel.bru
index f2ccd2d1..7d687f9e 100644
--- a/tests/bruno/e2e/udt/10-node1-send-shutdown-channel.bru
+++ b/tests/bruno/e2e/udt/10-node1-send-shutdown-channel.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{NODE1_RPC_URL}}/ckb
+  url: {{NODE1_RPC_URL}}
   body: json
   auth: none
 }
@@ -17,22 +17,26 @@ headers {
 
 body:json {
   {
-    "request": {
-      "ControlPcnChannel": {
+    "id": "42",
+    "jsonrpc": "2.0",
+    "method": "shutdown_channel",
+    "params": [
+      {
         "channel_id": "{{N1N2_CHANNEL_ID}}",
-        "command": {
-          "Shutdown": {
-            "close_script": "0x490000001000000030000000310000002a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a00140000000101010101010101010101010101010101010101",
-            "fee": 200000000
-          }
-        }
+        "close_script": {
+          "code_hash": "0x2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a",
+          "hash_type": "data",
+          "args": "0x0101010101010101010101010101010101010101"
+        },
+        "fee": "0xbebc200"
       }
-    }
+    ]
   }
 }
 
 assert {
-  res.status: eq 200
+  res.body.error: isUndefined
+  res.body.result: isNull
 }
 
 script:post-response {
diff --git a/tests/bruno/e2e/udt/11-node2-send-shutdown-channel-1.bru b/tests/bruno/e2e/udt/11-node2-send-shutdown-channel-1.bru
deleted file mode 100644
index 1a4ba60a..00000000
--- a/tests/bruno/e2e/udt/11-node2-send-shutdown-channel-1.bru
+++ /dev/null
@@ -1,41 +0,0 @@
-meta {
-  name: Node2 send shutdown channel1
-  type: http
-  seq: 11
-}
-
-post {
-  url: {{NODE2_RPC_URL}}/ckb
-  body: json
-  auth: none
-}
-
-headers {
-  Content-Type: application/json
-  Accept: application/json
-}
-
-body:json {
-  {
-    "request": {
-      "ControlPcnChannel": {
-        "channel_id": "{{N1N2_CHANNEL_ID}}",
-        "command": {
-          "Shutdown": {
-            "close_script": "0x490000001000000030000000310000002a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a00140000000101010101010101010101010101010101010101",
-            "fee": 200000000
-          }
-        }
-      }
-    }
-  }
-}
-
-assert {
-  res.status: eq 200
-}
-
-script:post-response {
-  // Sleep for sometime to make sure current operation finishes before next request starts.
-  await new Promise(r => setTimeout(r, 100));
-}
diff --git a/tests/bruno/e2e/udt/11-node2-send-shutdown-channel.bru b/tests/bruno/e2e/udt/11-node2-send-shutdown-channel.bru
new file mode 100644
index 00000000..4080bcd2
--- /dev/null
+++ b/tests/bruno/e2e/udt/11-node2-send-shutdown-channel.bru
@@ -0,0 +1,45 @@
+meta {
+  name: Node2 send shutdown channel1
+  type: http
+  seq: 11
+}
+
+post {
+  url: {{NODE2_RPC_URL}}
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "id": "42",
+    "jsonrpc": "2.0",
+    "method": "shutdown_channel",
+    "params": [
+      {
+        "channel_id": "{{N1N2_CHANNEL_ID}}",
+        "close_script": {
+          "code_hash": "0x2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a",
+          "hash_type": "data",
+          "args": "0x0101010101010101010101010101010101010101"
+        },
+        "fee": "0xbebc200"
+      }
+    ]
+  }
+}
+
+assert {
+  res.body.error: isUndefined
+  res.body.result: isNull
+}
+
+script:post-response {
+  // Sleep for sometime to make sure current operation finishes before next request starts.
+  await new Promise(r => setTimeout(r, 100));
+}

From c8bc3317161421fd1cf3071f358261ad4aeab9c2 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Mon, 10 Jun 2024 14:08:51 +0800
Subject: [PATCH 20/28] add udt-init for setup udt development and testing

---
 .github/workflows/e2e.yml         |    1 +
 tests/deploy/deploy.sh            |    8 +
 tests/deploy/udt-init/.gitignore  |    1 +
 tests/deploy/udt-init/Cargo.lock  | 2578 +++++++++++++++++++++++++++++
 tests/deploy/udt-init/Cargo.toml  |   16 +
 tests/deploy/udt-init/README.md   |    1 +
 tests/deploy/udt-init/src/main.rs |  227 +++
 7 files changed, 2832 insertions(+)
 create mode 100644 tests/deploy/udt-init/.gitignore
 create mode 100644 tests/deploy/udt-init/Cargo.lock
 create mode 100644 tests/deploy/udt-init/Cargo.toml
 create mode 100644 tests/deploy/udt-init/README.md
 create mode 100644 tests/deploy/udt-init/src/main.rs

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index c88027fb..563e6065 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -11,6 +11,7 @@ jobs:
           - 3-nodes-transfer
           - invoice-ops
           - open-use-close-a-channel
+          - udt
         release:
           - "0.116.1"
     name: e2e test for ${{ matrix.workflow }}
diff --git a/tests/deploy/deploy.sh b/tests/deploy/deploy.sh
index 0eb68754..9c5c6346 100755
--- a/tests/deploy/deploy.sh
+++ b/tests/deploy/deploy.sh
@@ -4,6 +4,7 @@ set -xeuo pipefail
 
 script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 data_dir="$script_dir/node-data"
+udt_init_dir="$script_dir/udt-init"
 cd "$script_dir" || exit 1
 
 miner_key_file="$data_dir/specs/miner.key"
@@ -55,9 +56,16 @@ deploy_and_generate_blocks() {
     generate_blocks
 }
 
+run_udt_init() {
+    export $(xargs <".env")
+    cd "$udt_init_dir" || exit 1
+    cargo run -- "$@"
+}
+
 deploy_and_generate_blocks always_success
 deploy_and_generate_blocks funding-lock
 deploy_and_generate_blocks commitment-lock
 deploy_and_generate_blocks simple-udt
 
 ./create-dotenv-file.sh >.env
+run_udt_init
\ No newline at end of file
diff --git a/tests/deploy/udt-init/.gitignore b/tests/deploy/udt-init/.gitignore
new file mode 100644
index 00000000..1de56593
--- /dev/null
+++ b/tests/deploy/udt-init/.gitignore
@@ -0,0 +1 @@
+target
\ No newline at end of file
diff --git a/tests/deploy/udt-init/Cargo.lock b/tests/deploy/udt-init/Cargo.lock
new file mode 100644
index 00000000..683c6c53
--- /dev/null
+++ b/tests/deploy/udt-init/Cargo.lock
@@ -0,0 +1,2578 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "ahash"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+dependencies = [
+ "getrandom 0.2.15",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "backtrace"
+version = "0.3.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "bech32"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b"
+
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+
+[[package]]
+name = "blake2b-ref"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "294d17c72e0ba59fad763caa112368d0672083779cdebbb97164f4bb4c1e339a"
+
+[[package]]
+name = "blake2b-rs"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89a8565807f21b913288968e391819e7f9b2f0f46c7b89549c051cccf3a2771"
+dependencies = [
+ "cc",
+ "cty",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cacache"
+version = "12.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "142316461ed3a3dfcba10417317472da5bfd0461e4d276bf7c07b330766d9490"
+dependencies = [
+ "digest",
+ "either",
+ "futures",
+ "hex",
+ "libc",
+ "memmap2",
+ "miette",
+ "reflink-copy",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sha1",
+ "sha2",
+ "ssri",
+ "tempfile",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "walkdir",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "ckb-chain-spec"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e955d55380bbd2ca883b4426fb1483e61f06fe65c8b377d5d4bceeb03ecf07bb"
+dependencies = [
+ "cacache",
+ "ckb-constant",
+ "ckb-crypto",
+ "ckb-dao-utils",
+ "ckb-error",
+ "ckb-hash",
+ "ckb-jsonrpc-types",
+ "ckb-logger",
+ "ckb-pow",
+ "ckb-rational",
+ "ckb-resource",
+ "ckb-traits",
+ "ckb-types",
+ "serde",
+ "toml",
+]
+
+[[package]]
+name = "ckb-channel"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "853f561e90ff59d858dc87c1ac385fae948984859c874fd8d3bd1bbab335889d"
+dependencies = [
+ "crossbeam-channel",
+]
+
+[[package]]
+name = "ckb-constant"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baf91b16a3b8360c85211dfdff3d2adc0a1f3ae571ea6b1637d55d6b227e312"
+
+[[package]]
+name = "ckb-crypto"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e2094270f5632808cbff1c37a37ffb9b3e79f7a99e78927fb228d8c343793eb"
+dependencies = [
+ "ckb-fixed-hash",
+ "faster-hex",
+ "lazy_static",
+ "rand",
+ "secp256k1",
+ "thiserror",
+]
+
+[[package]]
+name = "ckb-dao-utils"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eb3606c602a424098317bfde4b7d6427d4fe5dfe1a6d4ebc831ce0308508085"
+dependencies = [
+ "byteorder",
+ "ckb-error",
+ "ckb-types",
+]
+
+[[package]]
+name = "ckb-error"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01041f8a1d7eeaf85caca3547bb78d929d6a4d62774509d7eb438b6bc310ba30"
+dependencies = [
+ "anyhow",
+ "ckb-occupied-capacity",
+ "derive_more",
+ "thiserror",
+]
+
+[[package]]
+name = "ckb-fixed-hash"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a7491f18717b84827923935cc5adb1bcdf9c924e377b478d089f4694e7c779b"
+dependencies = [
+ "ckb-fixed-hash-core",
+ "ckb-fixed-hash-macros",
+]
+
+[[package]]
+name = "ckb-fixed-hash-core"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9509f63fedb9b6e42cfd0db47d3dc5acb6b029da546d5d4451d08afc44c70cf8"
+dependencies = [
+ "ckb_schemars",
+ "faster-hex",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "ckb-fixed-hash-macros"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdd89533a5da746f50798752a46f5f084f110c849335be94baf506790ebee931"
+dependencies = [
+ "ckb-fixed-hash-core",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ckb-gen-types"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a0f2d0f4224507a027d25d64824dd0dc8d367c8b5bead30289eaffe1381a7fb"
+dependencies = [
+ "cfg-if 1.0.0",
+ "ckb-error",
+ "ckb-fixed-hash",
+ "ckb-hash",
+ "ckb-occupied-capacity",
+ "molecule",
+ "numext-fixed-uint",
+]
+
+[[package]]
+name = "ckb-hash"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5754bc49cf76a7e8829fe6a7cf1eea1284cbca9777b521f072c76d6ae28d303"
+dependencies = [
+ "blake2b-ref",
+ "blake2b-rs",
+]
+
+[[package]]
+name = "ckb-jsonrpc-types"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef7e123043ca3701cf05ba4c3699b34f3b179609109a4c8c3afa68922f722be7"
+dependencies = [
+ "ckb-types",
+ "ckb_schemars",
+ "faster-hex",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "ckb-logger"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ebecd56c9acb453bdcb5c39e66b6b7f980bdf72b35515750bc295fa635287d"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "ckb-merkle-mountain-range"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56ccb671c5921be8a84686e6212ca184cb1d7c51cadcdbfcbd1cc3f042f5dfb8"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "ckb-mock-tx-types"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1ddfee88ad65ff6fd828695a78ec49be60888c58e631feb66d130008ce130d0"
+dependencies = [
+ "ckb-jsonrpc-types",
+ "ckb-traits",
+ "ckb-types",
+ "serde",
+]
+
+[[package]]
+name = "ckb-occupied-capacity"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee4aa07af7cec38d15cfe4c1ce150514fba5a4e78996bbbd098982106bee7d8d"
+dependencies = [
+ "ckb-occupied-capacity-core",
+ "ckb-occupied-capacity-macros",
+]
+
+[[package]]
+name = "ckb-occupied-capacity-core"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a63ed90996ba24ab26d5ac8ae22fd002a293f4a4e4526042e1adf84b1889e176"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "ckb-occupied-capacity-macros"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a6aae3f1f8d194cd5bd4328c9c7281f0d7acc73976b2771576cdc06a9ed608f"
+dependencies = [
+ "ckb-occupied-capacity-core",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ckb-pow"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb981de6e56107cd3e1660a9105bb07891277b21604946f70bf5097dd03690f7"
+dependencies = [
+ "byteorder",
+ "ckb-hash",
+ "ckb-types",
+ "eaglesong",
+ "log",
+ "serde",
+]
+
+[[package]]
+name = "ckb-rational"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570e816c80fffdfafb58c7c895df8c08c64ba56ce79d824e5ff976dd1a7381"
+dependencies = [
+ "numext-fixed-uint",
+ "serde",
+]
+
+[[package]]
+name = "ckb-resource"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d482493fabf4ce3670277d7dbaa5811872379535031431dc6b19699722c7b846"
+dependencies = [
+ "ckb-system-scripts",
+ "ckb-types",
+ "includedir",
+ "includedir_codegen",
+ "phf",
+ "serde",
+ "walkdir",
+]
+
+[[package]]
+name = "ckb-script"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2d6528e95a0f93d4a39e569b1ffffd60cbb0a9ae8f1c96dd465e2576ad510a9"
+dependencies = [
+ "byteorder",
+ "ckb-chain-spec",
+ "ckb-error",
+ "ckb-hash",
+ "ckb-logger",
+ "ckb-traits",
+ "ckb-types",
+ "ckb-vm",
+ "faster-hex",
+ "serde",
+]
+
+[[package]]
+name = "ckb-sdk"
+version = "3.2.0"
+source = "git+https://github.com/chenyukang/ckb-sdk-rust.git?branch=pcn-udt#940ca3d87b9556b3b995725bb8b0db038bbf4a2a"
+dependencies = [
+ "anyhow",
+ "bech32",
+ "bitflags 1.3.2",
+ "bytes",
+ "ckb-chain-spec",
+ "ckb-crypto",
+ "ckb-dao-utils",
+ "ckb-hash",
+ "ckb-jsonrpc-types",
+ "ckb-mock-tx-types",
+ "ckb-resource",
+ "ckb-script",
+ "ckb-traits",
+ "ckb-types",
+ "dashmap",
+ "derive-getters",
+ "dyn-clone",
+ "enum-repr-derive",
+ "futures",
+ "jsonrpc-core",
+ "lazy_static",
+ "log",
+ "lru",
+ "parking_lot",
+ "reqwest",
+ "secp256k1",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sha3",
+ "sparse-merkle-tree",
+ "thiserror",
+ "tokio",
+ "tokio-util",
+]
+
+[[package]]
+name = "ckb-system-scripts"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa5c59063142de7a68cfad4449c6b3863563856219a2925dfb8c5f019ec2aa47"
+dependencies = [
+ "blake2b-rs",
+ "faster-hex",
+ "includedir",
+ "includedir_codegen",
+ "phf",
+]
+
+[[package]]
+name = "ckb-traits"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c528f704f3088ec2dd467d374920b64b2bbb9ed9c4e8e12931c069a99150d8bc"
+dependencies = [
+ "ckb-types",
+]
+
+[[package]]
+name = "ckb-types"
+version = "0.116.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b05cc1c6aab0c40b323b233617b67860f9d679fac431a34d1f1b0853d700e9d"
+dependencies = [
+ "bit-vec",
+ "bytes",
+ "ckb-channel",
+ "ckb-constant",
+ "ckb-error",
+ "ckb-fixed-hash",
+ "ckb-gen-types",
+ "ckb-hash",
+ "ckb-merkle-mountain-range",
+ "ckb-occupied-capacity",
+ "ckb-rational",
+ "derive_more",
+ "golomb-coded-set",
+ "merkle-cbt",
+ "molecule",
+ "numext-fixed-uint",
+ "once_cell",
+ "paste",
+]
+
+[[package]]
+name = "ckb-vm"
+version = "0.24.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2c3d68dc7f891e5555c7ebc054722b28ab005e51c5076f54c20d36002dc8e83"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "cc",
+ "ckb-vm-definitions",
+ "derive_more",
+ "goblin 0.2.3",
+ "goblin 0.4.0",
+ "rand",
+ "scroll",
+ "serde",
+]
+
+[[package]]
+name = "ckb-vm-definitions"
+version = "0.24.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2fdf9c8ee14409b2208d23b9ad88828242d7881153ddc04872b66d2e018a52f"
+dependencies = [
+ "paste",
+]
+
+[[package]]
+name = "ckb_schemars"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f21f99fca82a4eb8708e406e99246987b087ecc1e1babeece1a0b1d5238b1750"
+dependencies = [
+ "ckb_schemars_derive",
+ "dyn-clone",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "ckb_schemars_derive"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40c813b4fadbdd9f33b1cf02a1ddfa9537d955c8d2fbe150d1fc1684dbf78e73"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "cty"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
+
+[[package]]
+name = "dashmap"
+version = "5.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+dependencies = [
+ "cfg-if 1.0.0",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "derive-getters"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0122f262bf9c9a367829da84f808d9fb128c10ef283bbe7b0922a77cf07b2747"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "dyn-clone"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
+
+[[package]]
+name = "eaglesong"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d978bd5d343e8ab9b5c0fc8d93ff9c602fdc96616ffff9c05ac7a155419b824"
+
+[[package]]
+name = "either"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "enum-repr-derive"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6f2936062c28214e84685742fa4affc52a39d036e8a3dcf98034810e449ec95"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "faster-hex"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51e2ce894d53b295cf97b05685aa077950ff3e8541af83217fc720a6437169f8"
+
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
+[[package]]
+name = "flate2"
+version = "1.0.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "gimli"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+
+[[package]]
+name = "goblin"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d20fd25aa456527ce4f544271ae4fea65d2eda4a6561ea56f39fb3ee4f7e3884"
+dependencies = [
+ "log",
+ "plain",
+ "scroll",
+]
+
+[[package]]
+name = "goblin"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "532a09cd3df2c6bbfc795fb0434bff8f22255d1d07328180e918a2e6ce122d4d"
+dependencies = [
+ "log",
+ "plain",
+ "scroll",
+]
+
+[[package]]
+name = "golomb-coded-set"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812f314a99fb5b7f0f9d0a8388539578f83f3aca6a65f588b8dbeefb731e2f98"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "heapsize"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "hyper"
+version = "0.14.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes",
+ "hyper",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "includedir"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afd126bd778c00c43a9dc76d1609a0894bf4222088088b2217ccc0ce9e816db7"
+dependencies = [
+ "flate2",
+ "phf",
+]
+
+[[package]]
+name = "includedir_codegen"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ac1500c9780957c9808c4ec3b94002f35aab01483833f5a8bce7dfb243e3148"
+dependencies = [
+ "flate2",
+ "phf_codegen",
+ "walkdir",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "js-sys"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "jsonrpc-core"
+version = "18.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
+dependencies = [
+ "futures",
+ "futures-executor",
+ "futures-util",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+]
+
+[[package]]
+name = "keccak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+
+[[package]]
+name = "lru"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
+dependencies = [
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+
+[[package]]
+name = "memmap2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "merkle-cbt"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "171d2f700835121c3b04ccf0880882987a050fd5c7ae88148abf537d33dd3a56"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "thiserror",
+ "unicode-width",
+]
+
+[[package]]
+name = "miette-derive"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "molecule"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fd9767ab5e5f2ea40f71ff4c8bdb633c50509052e093c2fdd0e390a749dfa3"
+dependencies = [
+ "bytes",
+ "cfg-if 1.0.0",
+ "faster-hex",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "numext-constructor"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "621fe0f044729f810c6815cdd77e8f5e0cd803ce4f6a38380ebfc1322af98661"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "numext-fixed-uint"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c68c76f96d589d1009a666c5072f37f3114d682696505f2cf445f27766c7d70"
+dependencies = [
+ "numext-fixed-uint-core",
+ "numext-fixed-uint-hack",
+]
+
+[[package]]
+name = "numext-fixed-uint-core"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6aab1d6457b97b49482f22a92f0f58a2f39bdd7f3b2f977eae67e8bc206aa980"
+dependencies = [
+ "heapsize",
+ "numext-constructor",
+ "rand",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "numext-fixed-uint-hack"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0200f8d55c36ec1b6a8cf810115be85d4814f045e0097dfd50033ba25adb4c9e"
+dependencies = [
+ "numext-fixed-uint-core",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "object"
+version = "0.35.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "openssl"
+version = "0.10.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+dependencies = [
+ "bitflags 2.5.0",
+ "cfg-if 1.0.0",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "phf"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
+dependencies = [
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.85"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
+ "rand_pcg",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+dependencies = [
+ "bitflags 2.5.0",
+]
+
+[[package]]
+name = "reflink-copy"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c3138c30c59ed9b8572f82bed97ea591ecd7e45012566046cc39e72679cff22"
+dependencies = [
+ "cfg-if 1.0.0",
+ "rustix",
+ "windows",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.11.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-tls",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.5.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "scroll"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec"
+dependencies = [
+ "scroll_derive",
+]
+
+[[package]]
+name = "scroll_derive"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "secp256k1"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62"
+dependencies = [
+ "secp256k1-sys",
+]
+
+[[package]]
+name = "secp256k1-sys"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
+dependencies = [
+ "bitflags 2.5.0",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+
+[[package]]
+name = "serde"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "serde_derive_internals"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha-1"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha3"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+dependencies = [
+ "digest",
+ "keccak",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "sparse-merkle-tree"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8851f6c92491ebe5528eabc1244292175a739eb0162974f9f9670a7dc748748b"
+dependencies = [
+ "blake2b-rs",
+ "cc",
+ "cfg-if 0.1.10",
+]
+
+[[package]]
+name = "ssri"
+version = "9.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da7a2b3c2bc9693bcb40870c4e9b5bf0d79f9cb46273321bf855ec513e919082"
+dependencies = [
+ "base64",
+ "digest",
+ "hex",
+ "miette",
+ "serde",
+ "sha-1",
+ "sha2",
+ "thiserror",
+ "xxhash-rust",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if 1.0.0",
+ "fastrand",
+ "rustix",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "udt-init"
+version = "0.1.0"
+dependencies = [
+ "ckb-jsonrpc-types",
+ "ckb-sdk",
+ "ckb-types",
+ "hex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
+[[package]]
+name = "url"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+dependencies = [
+ "cfg-if 1.0.0",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+dependencies = [
+ "cfg-if 1.0.0",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+
+[[package]]
+name = "web-sys"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132"
+dependencies = [
+ "windows-core",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if 1.0.0",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "xxhash-rust"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03"
diff --git a/tests/deploy/udt-init/Cargo.toml b/tests/deploy/udt-init/Cargo.toml
new file mode 100644
index 00000000..c2a41391
--- /dev/null
+++ b/tests/deploy/udt-init/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "udt-init"
+version = "0.1.0"
+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"
+serde = { version = "1.0", features = ["derive"] }
+serde_derive = "1.0"
+serde_json = "1.0"
+thiserror = "1.0.30"
+hex = "0.4.3"
diff --git a/tests/deploy/udt-init/README.md b/tests/deploy/udt-init/README.md
new file mode 100644
index 00000000..e932da2e
--- /dev/null
+++ b/tests/deploy/udt-init/README.md
@@ -0,0 +1 @@
+# udt-dev-init
diff --git a/tests/deploy/udt-init/src/main.rs b/tests/deploy/udt-init/src/main.rs
new file mode 100644
index 00000000..f0afcf82
--- /dev/null
+++ b/tests/deploy/udt-init/src/main.rs
@@ -0,0 +1,227 @@
+use ckb_sdk::{
+    transaction::{
+        builder::{sudt::SudtTransactionBuilder, CkbTransactionBuilder},
+        handler::{sighash::Secp256k1Blake160SighashAllScriptHandler, sudt::SudtHandler},
+        input::InputIterator,
+        signer::{SignContexts, TransactionSigner},
+        TransactionBuilderConfiguration,
+    },
+    Address, CkbRpcClient, NetworkInfo, ScriptId,
+};
+use ckb_types::{
+    core::{DepType, ScriptHashType},
+    h256,
+    packed::{OutPoint, Script},
+    prelude::{Entity, Pack},
+    H256,
+};
+use ckb_types::{packed::CellDep, prelude::Builder};
+
+use std::{error::Error as StdErr, str::FromStr};
+
+const SIMPLE_CODE_HASH: H256 =
+    h256!("0xe1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df419");
+const CKB_SHANNONS: u64 = 100_000_000;
+
+fn get_env_hex(name: &str) -> H256 {
+    let value = std::env::var(name).expect("env var");
+    // strip prefix 0x
+    eprintln!("{}: {}", name, value);
+    let value = value.trim_start_matches("0x");
+    H256::from_str(&value).expect("parse hex")
+}
+
+fn gen_dev_udt_handler() -> SudtHandler {
+    let simple_udt_tx = get_env_hex("NEXT_PUBLIC_SIMPLE_UDT_TX_HASH");
+
+    let (out_point, script_id) = (
+        OutPoint::new_builder()
+            .tx_hash(simple_udt_tx.pack())
+            .index(0u32.pack())
+            .build(),
+        ScriptId::new_data1(SIMPLE_CODE_HASH.clone()),
+    );
+
+    let cell_dep = CellDep::new_builder()
+        .out_point(out_point)
+        .dep_type(DepType::Code.into())
+        .build();
+
+    let udt_handler = ckb_sdk::transaction::handler::sudt::SudtHandler::new_with_customize(
+        vec![cell_dep],
+        script_id,
+    );
+    return udt_handler;
+}
+
+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())
+        .index(0u32.pack())
+        .build();
+
+    let cell_dep = CellDep::new_builder()
+        .out_point(out_point)
+        .dep_type(DepType::DepGroup.into())
+        .build();
+
+    let sighash_handler =
+        Secp256k1Blake160SighashAllScriptHandler::new_with_customize(vec![cell_dep]);
+    return sighash_handler;
+}
+
+fn generate_configuration(
+) -> Result<(NetworkInfo, TransactionBuilderConfiguration), Box<dyn StdErr>> {
+    let network_info = NetworkInfo::devnet();
+    let mut configuration =
+        TransactionBuilderConfiguration::new_devnet().expect("new devnet configuration");
+
+    let sighash_handler = gen_dev_sighash_handler();
+    configuration.register_script_handler(Box::new(sighash_handler));
+    let sudt_handler = gen_dev_udt_handler();
+    configuration.register_script_handler(Box::new(sudt_handler));
+    return Ok((network_info, configuration));
+}
+
+fn init_or_send_udt(
+    issuer_address: &str,
+    sender_info: &(&str, H256),
+    receiver_address: Option<&str>,
+    sudt_amount: u128,
+    apply: bool,
+) -> Result<(), Box<dyn StdErr>> {
+    let (network_info, configuration) = generate_configuration()?;
+
+    let issuer = Address::from_str(issuer_address)?;
+    let sender = Address::from_str(sender_info.0)?;
+    let receiver = if let Some(addr) = receiver_address {
+        Address::from_str(addr)?
+    } else {
+        sender.clone()
+    };
+
+    let iterator = InputIterator::new_with_address(&[sender.clone()], &network_info);
+    let owner_mode = receiver_address.is_none();
+    let mut builder = SudtTransactionBuilder::new(configuration, iterator, &issuer, owner_mode)?;
+    builder.add_output(&receiver, sudt_amount);
+
+    let mut tx_with_groups = builder.build(&Default::default())?;
+
+    let private_keys = vec![sender_info.1.clone()];
+
+    TransactionSigner::new(&network_info).sign_transaction(
+        &mut tx_with_groups,
+        &SignContexts::new_sighash_h256(private_keys)?,
+    )?;
+
+    let json_tx = ckb_jsonrpc_types::TransactionView::from(tx_with_groups.get_tx_view().clone());
+    println!("tx: {}", serde_json::to_string_pretty(&json_tx).unwrap());
+
+    if apply {
+        let tx_hash = CkbRpcClient::new(network_info.url.as_str())
+            .send_transaction(json_tx.inner, None)
+            .expect("send transaction");
+        println!(">>> tx {} sent! <<<", tx_hash);
+    } else {
+        let result = CkbRpcClient::new(network_info.url.as_str())
+            .test_tx_pool_accept(json_tx.inner.clone(), None)
+            .expect("accept transaction");
+        println!(">>> check tx result: {:?}  <<<", result);
+    }
+
+    Ok(())
+}
+
+fn check_account(address: &str, issuer_address: &str) -> Result<(), Box<dyn StdErr>> {
+    let (network_info, configuration) = generate_configuration()?;
+    let issuer = Address::from_str(issuer_address)?;
+    let sender = Address::from_str(address)?;
+    let iterator = InputIterator::new_with_address(&[sender.clone()], &network_info);
+    let builder = SudtTransactionBuilder::new(configuration, iterator, &issuer, false)?;
+
+    let (account_ckb_amount, account_udt_amount) = builder.check()?;
+    eprintln!(
+        "account: {:?} udt_amount: {}",
+        account_ckb_amount / CKB_SHANNONS,
+        account_udt_amount
+    );
+    Ok(())
+}
+
+fn generate_blocks(num: u64) -> Result<(), Box<dyn StdErr>> {
+    let network_info = NetworkInfo::devnet();
+    let rpc_client = CkbRpcClient::new(network_info.url.as_str());
+    for i in 0..num {
+        rpc_client.generate_block()?;
+        // sleep 200ms
+        std::thread::sleep(std::time::Duration::from_millis(200));
+        eprintln!("block generated: {}", i);
+    }
+    Ok(())
+}
+
+fn generate_udt_type_script(address: &str) -> ckb_types::packed::Script {
+    let address = Address::from_str(address).expect("parse address");
+    let sudt_owner_lock_script: Script = (&address).into();
+
+    let res = Script::new_builder()
+        .code_hash(SIMPLE_CODE_HASH.pack())
+        .hash_type(ScriptHashType::Data1.into())
+        .args(sudt_owner_lock_script.calc_script_hash().as_bytes().pack())
+        .build();
+    res
+}
+
+fn main() -> Result<(), Box<dyn StdErr>> {
+    // The address is from
+    // ckb-cli account import --local-only --privkey-path tests/nodes/deployer/ckb-chain/key
+    let udt_owner = ("ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwgx292hnvmn68xf779vmzrshpmm6epn4c0cgwga", h256!("0xd00c06bfd800d27397002dca6fb0993d5ba6399b4238b2f29ee9deb97593d2bc"));
+
+    let wallets = [
+        ("ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqgx5lf4pczpamsfam48evs0c8nvwqqa59qapt46f", h256!("0xcccd5f7e693b60447623fb71a5983f15a426938c33699b1a81d1239cfa656cd1")),
+        ("ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqt4vqqyehpxn47deg5l6eeqtkfrt5kfkfchkwv62", h256!("0x85af6ff21ea891dbb384b771e02317427e7b66e84b4516c03d74ca4fd5ad0500")),
+        ("ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqtrnd9f2lh5vlwlj23dedf7jje65cdj8qs7q4awr", h256!("0xd00c06bfd800d27397002dca6fb0993d5ba6399b4238b2f29ee9deb975ffffff")),
+    ];
+
+    init_or_send_udt(udt_owner.0, &udt_owner, None, 1000000000000, true).expect("init udt");
+    generate_blocks(4).expect("ok");
+
+    init_or_send_udt(
+        udt_owner.0,
+        &udt_owner,
+        Some(wallets[0].0),
+        200000000000,
+        true,
+    )?;
+    generate_blocks(4).expect("ok");
+
+    init_or_send_udt(
+        udt_owner.0,
+        &udt_owner,
+        Some(wallets[1].0),
+        200000000000,
+        true,
+    )?;
+    generate_blocks(4).expect("ok");
+
+    init_or_send_udt(
+        udt_owner.0,
+        &udt_owner,
+        Some(wallets[2].0),
+        200000000000,
+        true,
+    )?;
+    generate_blocks(4).expect("ok");
+
+    check_account(udt_owner.0, udt_owner.0)?;
+    check_account(wallets[0].0, udt_owner.0)?;
+    check_account(wallets[1].0, udt_owner.0)?;
+    check_account(wallets[2].0, udt_owner.0)?;
+
+    let script = generate_udt_type_script(udt_owner.0);
+    println!("initialized udt_type_script: {} ...", script);
+
+    Ok(())
+}

From be1d0abc12aaacfb9a1b1849fc503a047ad4b2f9 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Mon, 10 Jun 2024 14:24:34 +0800
Subject: [PATCH 21/28] debug e2e ci

---
 .github/workflows/e2e.yml | 3 ++-
 .gitignore                | 1 +
 tests/deploy/deploy.sh    | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 563e6065..e71301fa 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 name: E2E tests
 
 jobs:
-  e2e-testing:
+  run-e2e-test:
     strategy:
       fail-fast: false
       matrix:
@@ -31,6 +31,7 @@ jobs:
         run: |
           # Prebuild the program so that we can run the following script faster
           cargo build
+          cd tests/deploy/udt-init && cargo build && cd -
           ./tests/nodes/start.sh &
 
           # Wait for the nodes to start, the initialization takes some time
diff --git a/.gitignore b/.gitignore
index 2ec02623..eedf3741 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /result*
 
 /tests/nodes/*/ckb/store
+/tests/deploy/udt-init/target
diff --git a/tests/deploy/deploy.sh b/tests/deploy/deploy.sh
index 9c5c6346..6529e778 100755
--- a/tests/deploy/deploy.sh
+++ b/tests/deploy/deploy.sh
@@ -58,8 +58,10 @@ deploy_and_generate_blocks() {
 
 run_udt_init() {
     export $(xargs <".env")
-    cd "$udt_init_dir" || exit 1
-    cargo run -- "$@"
+    (
+        cd "$udt_init_dir" || exit 1
+        cargo run -- "$@"
+    )
 }
 
 deploy_and_generate_blocks always_success

From 08146c183d618c21a08402463cebfcd5ca501777 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Mon, 10 Jun 2024 19:14:12 +0800
Subject: [PATCH 22/28] add wallet for each nodes to simplify code

---
 .github/workflows/e2e.yml             |  2 +-
 tests/deploy/deploy.sh                |  4 +-
 tests/deploy/init-dev-chain.sh        |  9 +++--
 tests/deploy/udt-init/src/main.rs     | 55 +++++++++++++++------------
 tests/nodes/1/ckb-chain/wallet        |  1 +
 tests/nodes/2/ckb-chain/key           |  2 +-
 tests/nodes/2/ckb-chain/wallet        |  1 +
 tests/nodes/3/ckb-chain/wallet        |  1 +
 tests/nodes/deployer/ckb-chain/wallet |  1 +
 9 files changed, 44 insertions(+), 32 deletions(-)
 create mode 100644 tests/nodes/1/ckb-chain/wallet
 create mode 100644 tests/nodes/2/ckb-chain/wallet
 create mode 100644 tests/nodes/3/ckb-chain/wallet
 create mode 100644 tests/nodes/deployer/ckb-chain/wallet

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index e71301fa..935d0c97 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 name: E2E tests
 
 jobs:
-  run-e2e-test:
+  e2e-testing:
     strategy:
       fail-fast: false
       matrix:
diff --git a/tests/deploy/deploy.sh b/tests/deploy/deploy.sh
index 6529e778..2ab19c0f 100755
--- a/tests/deploy/deploy.sh
+++ b/tests/deploy/deploy.sh
@@ -5,6 +5,7 @@ set -xeuo pipefail
 script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 data_dir="$script_dir/node-data"
 udt_init_dir="$script_dir/udt-init"
+nodes_dir="$script_dir/../nodes"
 cd "$script_dir" || exit 1
 
 miner_key_file="$data_dir/specs/miner.key"
@@ -35,7 +36,7 @@ function deploy() {
     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 ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwgx292hnvmn68xf779vmzrshpmm6epn4c0cgwga \
+    ckb-cli deploy gen-txs --from-address $(cat "$nodes_dir/deployer/ckb-chain/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'
@@ -58,6 +59,7 @@ deploy_and_generate_blocks() {
 
 run_udt_init() {
     export $(xargs <".env")
+    export NODES_DIR="$nodes_dir"
     (
         cd "$udt_init_dir" || exit 1
         cargo run -- "$@"
diff --git a/tests/deploy/init-dev-chain.sh b/tests/deploy/init-dev-chain.sh
index 4181ec58..ba18a487 100755
--- a/tests/deploy/init-dev-chain.sh
+++ b/tests/deploy/init-dev-chain.sh
@@ -16,6 +16,7 @@ check_deps ckb ckb-cli perl
 
 script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 data_dir="$script_dir/node-data"
+nodes_dir="$script_dir/../nodes"
 
 # If -f is used, we will remove old state data. Otherwise we will skip the initialization.
 while getopts "f" opt; do
@@ -48,21 +49,21 @@ if ! [[ -d "$data_dir" ]]; then
 
     # Transfer some money to the node 1.
     # The address of node 1 can be seen with the following command:
-    # echo | HOME=/tmp ckb-cli account import --local-only --privkey-path "$script_dir/../nodes/1/ckb-chain/key"
-    ckb-cli wallet transfer --to-address ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqgx5lf4pczpamsfam48evs0c8nvwqqa59qapt46f --capacity 5000000000 --fee-rate 2000 --privkey-path "$script_dir/../nodes/deployer/ckb-chain/key"
+    # echo | HOME=/tmp ckb-cli account import --local-only --privkey-path "$$nodes_dir/1/ckb-chain/key"
+    ckb-cli wallet transfer --to-address $(cat "$nodes_dir/1/ckb-chain/wallet") --capacity 5000000000 --fee-rate 2000 --privkey-path "$nodes_dir/deployer/ckb-chain/key"
 
     sleep 1
     "$script_dir/generate-blocks.sh" 6
     sleep 1
 
     # Transfer some money to the node 2.
-    ckb-cli wallet transfer --to-address ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqt4vqqyehpxn47deg5l6eeqtkfrt5kfkfchkwv62 --capacity 5000000000 --fee-rate 2000 --privkey-path "$script_dir/../nodes/deployer/ckb-chain/key"
+    ckb-cli wallet transfer --to-address $(cat "$nodes_dir/2/ckb-chain/wallet") --capacity 5000000000 --fee-rate 2000 --privkey-path "$nodes_dir/deployer/ckb-chain/key"
     sleep 1
     "$script_dir/generate-blocks.sh" 6
     sleep 1
 
     # Transfer some money to the node 3.
-    ckb-cli wallet transfer --to-address ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqtrnd9f2lh5vlwlj23dedf7jje65cdj8qs7q4awr --capacity 5000000000 --fee-rate 2000 --privkey-path "$script_dir/../nodes/deployer/ckb-chain/key"
+    ckb-cli wallet transfer --to-address $(cat "$nodes_dir/3/ckb-chain/wallet") --capacity 5000000000 --fee-rate 2000 --privkey-path "$nodes_dir/deployer/ckb-chain/key"
     sleep 1
     # Generate a few blocks so that above transaction is confirmed.
     echo "begin to generate blocks for wallet updating..."
diff --git a/tests/deploy/udt-init/src/main.rs b/tests/deploy/udt-init/src/main.rs
index f0afcf82..51cfd675 100644
--- a/tests/deploy/udt-init/src/main.rs
+++ b/tests/deploy/udt-init/src/main.rs
@@ -78,16 +78,14 @@ fn generate_configuration(
     let mut configuration =
         TransactionBuilderConfiguration::new_devnet().expect("new devnet configuration");
 
-    let sighash_handler = gen_dev_sighash_handler();
-    configuration.register_script_handler(Box::new(sighash_handler));
-    let sudt_handler = gen_dev_udt_handler();
-    configuration.register_script_handler(Box::new(sudt_handler));
+    configuration.register_script_handler(Box::new(gen_dev_sighash_handler()));
+    configuration.register_script_handler(Box::new(gen_dev_udt_handler()));
     return Ok((network_info, configuration));
 }
 
 fn init_or_send_udt(
     issuer_address: &str,
-    sender_info: &(&str, H256),
+    sender_info: &(String, H256),
     receiver_address: Option<&str>,
     sudt_amount: u128,
     apply: bool,
@@ -95,7 +93,7 @@ fn init_or_send_udt(
     let (network_info, configuration) = generate_configuration()?;
 
     let issuer = Address::from_str(issuer_address)?;
-    let sender = Address::from_str(sender_info.0)?;
+    let sender = Address::from_str(&sender_info.0)?;
     let receiver = if let Some(addr) = receiver_address {
         Address::from_str(addr)?
     } else {
@@ -174,53 +172,60 @@ fn generate_udt_type_script(address: &str) -> ckb_types::packed::Script {
     res
 }
 
-fn main() -> Result<(), Box<dyn StdErr>> {
-    // The address is from
-    // ckb-cli account import --local-only --privkey-path tests/nodes/deployer/ckb-chain/key
-    let udt_owner = ("ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwgx292hnvmn68xf779vmzrshpmm6epn4c0cgwga", h256!("0xd00c06bfd800d27397002dca6fb0993d5ba6399b4238b2f29ee9deb97593d2bc"));
+fn get_nodes_info(node: &str) -> (String, H256) {
+    let nodes_dir = std::env::var("NODES_DIR").expect("env var");
+    let node_dir = format!("{}/{}", nodes_dir, node);
+    let wallet =
+        std::fs::read_to_string(format!("{}/ckb-chain/wallet", node_dir)).expect("read failed");
+    let key = std::fs::read_to_string(format!("{}/ckb-chain/key", node_dir)).expect("read failed");
+    eprintln!("node {}: wallet: {}", node, wallet);
+    (wallet, H256::from_str(&key.trim()).expect("parse hex"))
+}
 
+fn main() -> Result<(), Box<dyn StdErr>> {
+    let udt_owner = get_nodes_info("deployer");
     let wallets = [
-        ("ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqgx5lf4pczpamsfam48evs0c8nvwqqa59qapt46f", h256!("0xcccd5f7e693b60447623fb71a5983f15a426938c33699b1a81d1239cfa656cd1")),
-        ("ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqt4vqqyehpxn47deg5l6eeqtkfrt5kfkfchkwv62", h256!("0x85af6ff21ea891dbb384b771e02317427e7b66e84b4516c03d74ca4fd5ad0500")),
-        ("ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqtrnd9f2lh5vlwlj23dedf7jje65cdj8qs7q4awr", h256!("0xd00c06bfd800d27397002dca6fb0993d5ba6399b4238b2f29ee9deb975ffffff")),
+        get_nodes_info("1"),
+        get_nodes_info("2"),
+        get_nodes_info("3"),
     ];
 
-    init_or_send_udt(udt_owner.0, &udt_owner, None, 1000000000000, true).expect("init udt");
+    init_or_send_udt(&udt_owner.0, &udt_owner, None, 1000000000000, true).expect("init udt");
     generate_blocks(4).expect("ok");
 
     init_or_send_udt(
-        udt_owner.0,
+        &udt_owner.0,
         &udt_owner,
-        Some(wallets[0].0),
+        Some(&wallets[0].0),
         200000000000,
         true,
     )?;
     generate_blocks(4).expect("ok");
 
     init_or_send_udt(
-        udt_owner.0,
+        &udt_owner.0,
         &udt_owner,
-        Some(wallets[1].0),
+        Some(&wallets[1].0),
         200000000000,
         true,
     )?;
     generate_blocks(4).expect("ok");
 
     init_or_send_udt(
-        udt_owner.0,
+        &udt_owner.0,
         &udt_owner,
-        Some(wallets[2].0),
+        Some(&wallets[2].0),
         200000000000,
         true,
     )?;
     generate_blocks(4).expect("ok");
 
-    check_account(udt_owner.0, udt_owner.0)?;
-    check_account(wallets[0].0, udt_owner.0)?;
-    check_account(wallets[1].0, udt_owner.0)?;
-    check_account(wallets[2].0, udt_owner.0)?;
+    check_account(&udt_owner.0, &udt_owner.0)?;
+    check_account(&wallets[0].0, &udt_owner.0)?;
+    check_account(&wallets[1].0, &udt_owner.0)?;
+    check_account(&wallets[2].0, &udt_owner.0)?;
 
-    let script = generate_udt_type_script(udt_owner.0);
+    let script = generate_udt_type_script(&udt_owner.0);
     println!("initialized udt_type_script: {} ...", script);
 
     Ok(())
diff --git a/tests/nodes/1/ckb-chain/wallet b/tests/nodes/1/ckb-chain/wallet
new file mode 100644
index 00000000..da733ced
--- /dev/null
+++ b/tests/nodes/1/ckb-chain/wallet
@@ -0,0 +1 @@
+ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqgx5lf4pczpamsfam48evs0c8nvwqqa59qapt46f
\ No newline at end of file
diff --git a/tests/nodes/2/ckb-chain/key b/tests/nodes/2/ckb-chain/key
index 98c013f6..64816769 100644
--- a/tests/nodes/2/ckb-chain/key
+++ b/tests/nodes/2/ckb-chain/key
@@ -1 +1 @@
-85af6ff21ea891dbb384b771e02317427e7b66e84b4516c03d74ca4fd5ad0500
+85af6ff21ea891dbb384b771e02317427e7b66e84b4516c03d74ca4fd5ad0500
\ No newline at end of file
diff --git a/tests/nodes/2/ckb-chain/wallet b/tests/nodes/2/ckb-chain/wallet
new file mode 100644
index 00000000..23badbbf
--- /dev/null
+++ b/tests/nodes/2/ckb-chain/wallet
@@ -0,0 +1 @@
+ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqt4vqqyehpxn47deg5l6eeqtkfrt5kfkfchkwv62
\ No newline at end of file
diff --git a/tests/nodes/3/ckb-chain/wallet b/tests/nodes/3/ckb-chain/wallet
new file mode 100644
index 00000000..259dfe1d
--- /dev/null
+++ b/tests/nodes/3/ckb-chain/wallet
@@ -0,0 +1 @@
+ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqtrnd9f2lh5vlwlj23dedf7jje65cdj8qs7q4awr
\ No newline at end of file
diff --git a/tests/nodes/deployer/ckb-chain/wallet b/tests/nodes/deployer/ckb-chain/wallet
new file mode 100644
index 00000000..4328eb14
--- /dev/null
+++ b/tests/nodes/deployer/ckb-chain/wallet
@@ -0,0 +1 @@
+ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwgx292hnvmn68xf779vmzrshpmm6epn4c0cgwga
\ No newline at end of file

From 86f46b3a28d2111064bf29269918492970e32d99 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Tue, 11 Jun 2024 11:42:53 +0800
Subject: [PATCH 23/28] add UDT type script for invoice

---
 src/invoice/invoice_impl.rs                  | 66 +++++++++++++++-----
 src/rpc/invoice.rs                           |  5 ++
 tests/bruno/e2e/udt/07-node2-gen-invoice.bru | 14 ++++-
 3 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/src/invoice/invoice_impl.rs b/src/invoice/invoice_impl.rs
index 738bbe9a..8c6feb73 100644
--- a/src/invoice/invoice_impl.rs
+++ b/src/invoice/invoice_impl.rs
@@ -29,6 +29,7 @@ use std::{cmp::Ordering, str::FromStr};
 
 const SIGNATURE_U5_SIZE: usize = 104;
 
+/// The currency of the invoice, can also used to represent the CKB network chain.
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
 pub enum Currency {
     Ckb,
@@ -153,21 +154,6 @@ pub struct InvoiceData {
     pub attrs: Vec<Attribute>,
 }
 
-macro_rules! attr_getter {
-    ($name:ident, $attr_name:ident, $attr:ty) => {
-        pub fn $name(&self) -> Option<&$attr> {
-            self.data
-                .attrs
-                .iter()
-                .filter_map(|attr| match attr {
-                    Attribute::$attr_name(val) => Some(val),
-                    _ => None,
-                })
-                .next()
-        }
-    };
-}
-
 /// Represents a syntactically and semantically correct lightning BOLT11 invoice
 ///
 /// There are three ways to construct a `CkbInvoice`:
@@ -185,6 +171,21 @@ pub struct CkbInvoice {
     pub data: InvoiceData,
 }
 
+macro_rules! attr_getter {
+    ($name:ident, $attr_name:ident, $attr:ty) => {
+        pub fn $name(&self) -> Option<&$attr> {
+            self.data
+                .attrs
+                .iter()
+                .filter_map(|attr| match attr {
+                    Attribute::$attr_name(val) => Some(val),
+                    _ => None,
+                })
+                .next()
+        }
+    };
+}
+
 impl CkbInvoice {
     fn hrp_part(&self) -> String {
         format!(
@@ -311,6 +312,17 @@ impl CkbInvoice {
         })
     }
 
+    pub fn udt_type_script(&self) -> Option<&Script> {
+        self.data
+            .attrs
+            .iter()
+            .filter_map(|attr| match attr {
+                Attribute::UdtScript(script) => Some(&script.0),
+                _ => None,
+            })
+            .next()
+    }
+
     attr_getter!(payee_pub_key, PayeePublicKey, PublicKey);
     attr_getter!(expiry_time, ExpiryTime, Duration);
     attr_getter!(description, Description, String);
@@ -320,7 +332,6 @@ impl CkbInvoice {
         FinalHtlcMinimumCltvExpiry,
         u64
     );
-    attr_getter!(udt_script, UdtScript, CkbScript);
     attr_getter!(payment_preimage, PaymentPreimage, Hash256);
     attr_getter!(fallback_address, FallbackAddr, String);
 }
@@ -618,6 +629,10 @@ impl InvoiceBuilder {
         self
     }
 
+    pub fn udt_type_script(self, script: Script) -> Self {
+        self.add_attr(Attribute::UdtScript(CkbScript(script)))
+    }
+
     attr_setter!(payment_preimage, PaymentPreimage, Hash256);
     attr_setter!(description, Description, String);
     attr_setter!(payee_pub_key, PayeePublicKey, PublicKey);
@@ -1224,4 +1239,23 @@ mod tests {
         let payment_preimage = invoice.payment_preimage();
         assert!(payment_preimage.is_none());
     }
+
+    #[test]
+    fn test_invoice_udt_script() {
+        let script = Script::default();
+        let private_key = gen_rand_private_key();
+        let invoice = InvoiceBuilder::new(Currency::Ckb)
+            .amount(Some(1280))
+            .prefix(Some(SiPrefix::Kilo))
+            .payment_hash(rand_sha256_hash())
+            .udt_type_script(script.clone())
+            .build_with_sign(|hash| Secp256k1::new().sign_ecdsa_recoverable(hash, &private_key))
+            .unwrap();
+        assert_eq!(invoice.udt_type_script().unwrap(), &script);
+
+        let res = serde_json::to_string(&invoice);
+        assert_eq!(res.is_ok(), true);
+        let decoded = serde_json::from_str::<CkbInvoice>(&res.unwrap()).unwrap();
+        assert_eq!(decoded, invoice);
+    }
 }
diff --git a/src/rpc/invoice.rs b/src/rpc/invoice.rs
index 48dfebb2..82b4a83e 100644
--- a/src/rpc/invoice.rs
+++ b/src/rpc/invoice.rs
@@ -3,6 +3,7 @@ use std::time::Duration;
 use crate::ckb::serde_utils::{U128Hex, U64Hex};
 use crate::ckb::types::Hash256;
 use crate::invoice::{CkbInvoice, Currency, InvoiceBuilder, InvoiceStore};
+use ckb_jsonrpc_types::Script;
 use jsonrpsee::types::error::CALL_EXECUTION_FAILED_CODE;
 use jsonrpsee::{core::async_trait, proc_macros::rpc, types::ErrorObjectOwned};
 use serde::{Deserialize, Serialize};
@@ -23,6 +24,7 @@ pub struct NewInvoiceParams {
     pub final_cltv: Option<u64>,
     #[serde_as(as = "Option<U64Hex>")]
     pub final_htlc_timeout: Option<u64>,
+    pub udt_type_script: Option<Script>,
 }
 
 #[derive(Clone, Serialize, Deserialize)]
@@ -91,6 +93,9 @@ where
         if let Some(final_cltv) = params.final_cltv {
             invoice_builder = invoice_builder.final_cltv(final_cltv);
         };
+        if let Some(udt_type_script) = &params.udt_type_script {
+            invoice_builder = invoice_builder.udt_type_script(udt_type_script.clone().into());
+        };
 
         match invoice_builder.build() {
             Ok(invoice) => match self.store.insert_invoice(invoice.clone()) {
diff --git a/tests/bruno/e2e/udt/07-node2-gen-invoice.bru b/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
index 872dc907..4100a259 100644
--- a/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
+++ b/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
@@ -37,10 +37,15 @@ body:json {
       {
         "amount": "0xc8",
         "currency": "Ckb",
-        "description": "test invoice generated by node3",
+        "description": "test invoice generated by node2",
         "expiry": "0xe10",
         "final_cltv": "0x28",
-        "payment_preimage": "{{payment_preimage}}"
+        "payment_preimage": "{{payment_preimage}}",
+        "udt_type_script": {
+            "code_hash": "0xe1e354d6d643ad42724d40967e334984534e0367405c5ae42a9d7d63d77df419",
+            "hash_type": "data1",
+            "args": "0x32e555f3ff8e135cece1351a6a2971518392c1e30375c1e006ad0ce8eac07947"
+        }
       }
     ]
   }
@@ -55,6 +60,11 @@ script:post-response {
   // Sleep for sometime to make sure current operation finishes before next request starts.
   await new Promise(r => setTimeout(r, 100));
   console.log("generated result: ", res.body.result);
+  // assert `UdtScript` is present in the response data
+  let udt_script_attr = res.body.result.invoice.data.attrs.find((attr) => attr.UdtScript);
+  if (udt_script_attr.UdtScript === undefined) {
+    throw new Error("UdtScript is not present in the response data");
+  }
   bru.setVar("payment_hash", res.body.result.invoice.data.payment_hash);
   bru.setVar("payment_amount", res.body.result.invoice.amount);
 }

From 659e4745ac041c3bdef54ca583e15ddc17783582 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Tue, 11 Jun 2024 16:19:51 +0800
Subject: [PATCH 24/28] fix cell deps issue for UDT

---
 src/ckb/channel.rs | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index f632cb1e..86e1c0e9 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -2543,13 +2543,18 @@ impl ChannelActorState {
                 )));
             }
         };
-        let tx_builder = TransactionBuilder::default()
-            .cell_deps(get_cell_deps_by_contracts(vec![Contract::CommitmentLock]))
-            .input(
-                CellInput::new_builder()
-                    .previous_output(self.get_funding_transaction_outpoint())
-                    .build(),
-            );
+
+        let mut contracts = vec![Contract::CommitmentLock];
+        if self.funding_udt_type_script.is_some() {
+            // TODO(yukang): we need to find corresponding dep cells for UDT
+            contracts.push(Contract::SimpleUDT);
+        }
+        let cell_deps = get_cell_deps_by_contracts(contracts);
+        let tx_builder = TransactionBuilder::default().cell_deps(cell_deps).input(
+            CellInput::new_builder()
+                .previous_output(self.get_funding_transaction_outpoint())
+                .build(),
+        );
 
         if let Some(type_script) = &self.funding_udt_type_script {
             debug!(
@@ -2644,8 +2649,13 @@ impl ChannelActorState {
     // so as to consume the funding cell.
     pub fn build_commitment_tx(&self, local: bool) -> (TransactionView, [u8; 32]) {
         let funding_out_point = self.get_funding_transaction_outpoint();
+        let mut contracts = vec![Contract::CommitmentLock];
+        if self.funding_udt_type_script.is_some() {
+            // TODO(yukang): we need to find corresponding dep cells for UDT
+            contracts.push(Contract::SimpleUDT);
+        }
         let tx_builder = TransactionBuilder::default()
-            .cell_deps(get_cell_deps_by_contracts(vec![Contract::CommitmentLock]))
+            .cell_deps(get_cell_deps_by_contracts(contracts))
             .input(
                 CellInput::new_builder()
                     .previous_output(funding_out_point.clone())

From 4d4e2c3fa595b528422f77ed78a47453d6c3da96 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Wed, 12 Jun 2024 14:38:16 +0800
Subject: [PATCH 25/28] fix white spaces indent

---
 src/ckb/schema/pcn.mol | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ckb/schema/pcn.mol b/src/ckb/schema/pcn.mol
index 0d5ca74a..43b6f0d0 100644
--- a/src/ckb/schema/pcn.mol
+++ b/src/ckb/schema/pcn.mol
@@ -8,7 +8,7 @@ vector SignatureVec <Signature>;
 table OpenChannel {
     chain_hash:                  Byte32,
     channel_id:                  Byte32,
-    funding_udt_type_script:         ScriptOpt,
+    funding_udt_type_script:     ScriptOpt,
     funding_amount:              Uint128,
     funding_fee_rate:            Uint64,
     commitment_fee_rate:         Uint64,
@@ -30,7 +30,7 @@ table OpenChannel {
 table AcceptChannel {
     channel_id:                  Byte32,
     funding_amount:              Uint128,
-    funding_udt_type_script:         ScriptOpt,
+    funding_udt_type_script:     ScriptOpt,
     max_tlc_value_in_flight:     Uint128,
     max_accept_tlcs:             Uint64,
     min_tlc_value:               Uint128,

From d8aa5d9839b5e0daee56ac51c959519fabd3b9f6 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Wed, 12 Jun 2024 15:10:52 +0800
Subject: [PATCH 26/28] remove udt_type_script from accept channel

---
 src/ckb/channel.rs     |  17 ------
 src/ckb/gen/pcn.rs     | 135 +++++++++++++++--------------------------
 src/ckb/network.rs     |  28 ---------
 src/ckb/schema/pcn.mol |   1 -
 src/ckb/types.rs       |   3 -
 src/ckb_chain/actor.rs |   8 ++-
 src/rpc/channel.rs     |   5 --
 7 files changed, 55 insertions(+), 142 deletions(-)

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index 86e1c0e9..41d5788e 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -155,7 +155,6 @@ pub enum ChannelInitializationParameter {
         u128,
         [u8; 32],
         OpenChannel,
-        Option<Script>,
         Option<oneshot::Sender<Hash256>>,
     ),
     /// Reestablish a channel with given channel id.
@@ -868,7 +867,6 @@ where
                 my_funding_amount,
                 seed,
                 open_channel,
-                accept_funding_udt_type_script,
                 oneshot_channel,
             ) => {
                 let peer_id = self.peer_id.clone();
@@ -890,15 +888,6 @@ where
                     ..
                 } = &open_channel;
 
-                if accept_funding_udt_type_script != *funding_udt_type_script
-                    && accept_funding_udt_type_script.is_some()
-                {
-                    return Err(Box::new(ProcessingChannelError::InvalidParameter(
-                            "Accept funding type script does not match open channel funding type script"
-                                .to_string(),
-                        )));
-                }
-
                 if *chain_hash != [0u8; 32].into() {
                     return Err(Box::new(ProcessingChannelError::InvalidParameter(format!(
                         "Invalid chain hash {:?}",
@@ -925,7 +914,6 @@ where
                 let accept_channel = AcceptChannel {
                     channel_id: *channel_id,
                     funding_amount: my_funding_amount,
-                    funding_udt_type_script: funding_udt_type_script.clone(),
                     max_tlc_value_in_flight: DEFAULT_MAX_TLC_VALUE_IN_FLIGHT,
                     max_accept_tlcs: DEFAULT_MAX_ACCEPT_TLCS,
                     to_local_delay: *to_local_delay,
@@ -1989,8 +1977,6 @@ impl ChannelActorState {
         ));
         self.to_remote_amount = accept_channel.funding_amount;
         self.remote_nonce = Some(accept_channel.next_local_nonce.clone());
-        self.funding_udt_type_script = accept_channel.funding_udt_type_script.clone();
-
         let remote_pubkeys = (&accept_channel).into();
         self.remote_channel_parameters = Some(ChannelParametersOneParty {
             pubkeys: remote_pubkeys,
@@ -3543,7 +3529,6 @@ mod tests {
                 AcceptChannelCommand {
                     temp_channel_id: open_channel_result.channel_id,
                     funding_amount: 6100000000,
-                    funding_udt_type_script: None,
                 },
                 rpc_reply,
             ))
@@ -3592,7 +3577,6 @@ mod tests {
                 AcceptChannelCommand {
                     temp_channel_id: open_channel_result.channel_id,
                     funding_amount: 1000,
-                    funding_udt_type_script: None,
                 },
                 rpc_reply,
             ))
@@ -3710,7 +3694,6 @@ mod tests {
                 AcceptChannelCommand {
                     temp_channel_id: open_channel_result.channel_id,
                     funding_amount: 6100000000,
-                    funding_udt_type_script: None,
                 },
                 rpc_reply,
             ))
diff --git a/src/ckb/gen/pcn.rs b/src/ckb/gen/pcn.rs
index 687fc30d..91b8a7ba 100644
--- a/src/ckb/gen/pcn.rs
+++ b/src/ckb/gen/pcn.rs
@@ -3667,12 +3667,6 @@ impl ::core::fmt::Display for AcceptChannel {
         write!(f, "{} {{ ", Self::NAME)?;
         write!(f, "{}: {}", "channel_id", self.channel_id())?;
         write!(f, ", {}: {}", "funding_amount", self.funding_amount())?;
-        write!(
-            f,
-            ", {}: {}",
-            "funding_udt_type_script",
-            self.funding_udt_type_script()
-        )?;
         write!(
             f,
             ", {}: {}",
@@ -3724,10 +3718,10 @@ impl ::core::default::Default for AcceptChannel {
     }
 }
 impl AcceptChannel {
-    const DEFAULT_VALUE: [u8; 457] = [
-        201, 1, 0, 0, 64, 0, 0, 0, 96, 0, 0, 0, 112, 0, 0, 0, 112, 0, 0, 0, 128, 0, 0, 0, 136, 0,
-        0, 0, 152, 0, 0, 0, 160, 0, 0, 0, 193, 0, 0, 0, 226, 0, 0, 0, 3, 1, 0, 0, 36, 1, 0, 0, 69,
-        1, 0, 0, 102, 1, 0, 0, 135, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    const DEFAULT_VALUE: [u8; 453] = [
+        197, 1, 0, 0, 60, 0, 0, 0, 92, 0, 0, 0, 108, 0, 0, 0, 124, 0, 0, 0, 132, 0, 0, 0, 148, 0,
+        0, 0, 156, 0, 0, 0, 189, 0, 0, 0, 222, 0, 0, 0, 255, 0, 0, 0, 32, 1, 0, 0, 65, 1, 0, 0, 98,
+        1, 0, 0, 131, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -3740,9 +3734,9 @@ impl AcceptChannel {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     ];
-    pub const FIELD_COUNT: usize = 15;
+    pub const FIELD_COUNT: usize = 14;
     pub fn total_size(&self) -> usize {
         molecule::unpack_number(self.as_slice()) as usize
     }
@@ -3771,83 +3765,77 @@ impl AcceptChannel {
         let end = molecule::unpack_number(&slice[12..]) as usize;
         Uint128::new_unchecked(self.0.slice(start..end))
     }
-    pub fn funding_udt_type_script(&self) -> ScriptOpt {
+    pub fn max_tlc_value_in_flight(&self) -> Uint128 {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[12..]) as usize;
         let end = molecule::unpack_number(&slice[16..]) as usize;
-        ScriptOpt::new_unchecked(self.0.slice(start..end))
+        Uint128::new_unchecked(self.0.slice(start..end))
     }
-    pub fn max_tlc_value_in_flight(&self) -> Uint128 {
+    pub fn max_accept_tlcs(&self) -> Uint64 {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[16..]) as usize;
         let end = molecule::unpack_number(&slice[20..]) as usize;
-        Uint128::new_unchecked(self.0.slice(start..end))
+        Uint64::new_unchecked(self.0.slice(start..end))
     }
-    pub fn max_accept_tlcs(&self) -> Uint64 {
+    pub fn min_tlc_value(&self) -> Uint128 {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[20..]) as usize;
         let end = molecule::unpack_number(&slice[24..]) as usize;
-        Uint64::new_unchecked(self.0.slice(start..end))
+        Uint128::new_unchecked(self.0.slice(start..end))
     }
-    pub fn min_tlc_value(&self) -> Uint128 {
+    pub fn to_self_delay(&self) -> Uint64 {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[24..]) as usize;
         let end = molecule::unpack_number(&slice[28..]) as usize;
-        Uint128::new_unchecked(self.0.slice(start..end))
+        Uint64::new_unchecked(self.0.slice(start..end))
     }
-    pub fn to_self_delay(&self) -> Uint64 {
+    pub fn funding_pubkey(&self) -> Pubkey {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[28..]) as usize;
         let end = molecule::unpack_number(&slice[32..]) as usize;
-        Uint64::new_unchecked(self.0.slice(start..end))
+        Pubkey::new_unchecked(self.0.slice(start..end))
     }
-    pub fn funding_pubkey(&self) -> Pubkey {
+    pub fn revocation_basepoint(&self) -> Pubkey {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[32..]) as usize;
         let end = molecule::unpack_number(&slice[36..]) as usize;
         Pubkey::new_unchecked(self.0.slice(start..end))
     }
-    pub fn revocation_basepoint(&self) -> Pubkey {
+    pub fn payment_basepoint(&self) -> Pubkey {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[36..]) as usize;
         let end = molecule::unpack_number(&slice[40..]) as usize;
         Pubkey::new_unchecked(self.0.slice(start..end))
     }
-    pub fn payment_basepoint(&self) -> Pubkey {
+    pub fn delayed_payment_basepoint(&self) -> Pubkey {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[40..]) as usize;
         let end = molecule::unpack_number(&slice[44..]) as usize;
         Pubkey::new_unchecked(self.0.slice(start..end))
     }
-    pub fn delayed_payment_basepoint(&self) -> Pubkey {
+    pub fn tlc_basepoint(&self) -> Pubkey {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[44..]) as usize;
         let end = molecule::unpack_number(&slice[48..]) as usize;
         Pubkey::new_unchecked(self.0.slice(start..end))
     }
-    pub fn tlc_basepoint(&self) -> Pubkey {
+    pub fn first_per_commitment_point(&self) -> Pubkey {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[48..]) as usize;
         let end = molecule::unpack_number(&slice[52..]) as usize;
         Pubkey::new_unchecked(self.0.slice(start..end))
     }
-    pub fn first_per_commitment_point(&self) -> Pubkey {
+    pub fn second_per_commitment_point(&self) -> Pubkey {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[52..]) as usize;
         let end = molecule::unpack_number(&slice[56..]) as usize;
         Pubkey::new_unchecked(self.0.slice(start..end))
     }
-    pub fn second_per_commitment_point(&self) -> Pubkey {
-        let slice = self.as_slice();
-        let start = molecule::unpack_number(&slice[56..]) as usize;
-        let end = molecule::unpack_number(&slice[60..]) as usize;
-        Pubkey::new_unchecked(self.0.slice(start..end))
-    }
     pub fn next_local_nonce(&self) -> PubNonce {
         let slice = self.as_slice();
-        let start = molecule::unpack_number(&slice[60..]) as usize;
+        let start = molecule::unpack_number(&slice[56..]) as usize;
         if self.has_extra_fields() {
-            let end = molecule::unpack_number(&slice[64..]) as usize;
+            let end = molecule::unpack_number(&slice[60..]) as usize;
             PubNonce::new_unchecked(self.0.slice(start..end))
         } else {
             PubNonce::new_unchecked(self.0.slice(start..))
@@ -3882,7 +3870,6 @@ impl molecule::prelude::Entity for AcceptChannel {
         Self::new_builder()
             .channel_id(self.channel_id())
             .funding_amount(self.funding_amount())
-            .funding_udt_type_script(self.funding_udt_type_script())
             .max_tlc_value_in_flight(self.max_tlc_value_in_flight())
             .max_accept_tlcs(self.max_accept_tlcs())
             .min_tlc_value(self.min_tlc_value())
@@ -3918,12 +3905,6 @@ impl<'r> ::core::fmt::Display for AcceptChannelReader<'r> {
         write!(f, "{} {{ ", Self::NAME)?;
         write!(f, "{}: {}", "channel_id", self.channel_id())?;
         write!(f, ", {}: {}", "funding_amount", self.funding_amount())?;
-        write!(
-            f,
-            ", {}: {}",
-            "funding_udt_type_script",
-            self.funding_udt_type_script()
-        )?;
         write!(
             f,
             ", {}: {}",
@@ -3969,7 +3950,7 @@ impl<'r> ::core::fmt::Display for AcceptChannelReader<'r> {
     }
 }
 impl<'r> AcceptChannelReader<'r> {
-    pub const FIELD_COUNT: usize = 15;
+    pub const FIELD_COUNT: usize = 14;
     pub fn total_size(&self) -> usize {
         molecule::unpack_number(self.as_slice()) as usize
     }
@@ -3998,83 +3979,77 @@ impl<'r> AcceptChannelReader<'r> {
         let end = molecule::unpack_number(&slice[12..]) as usize;
         Uint128Reader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn funding_udt_type_script(&self) -> ScriptOptReader<'r> {
+    pub fn max_tlc_value_in_flight(&self) -> Uint128Reader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[12..]) as usize;
         let end = molecule::unpack_number(&slice[16..]) as usize;
-        ScriptOptReader::new_unchecked(&self.as_slice()[start..end])
+        Uint128Reader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn max_tlc_value_in_flight(&self) -> Uint128Reader<'r> {
+    pub fn max_accept_tlcs(&self) -> Uint64Reader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[16..]) as usize;
         let end = molecule::unpack_number(&slice[20..]) as usize;
-        Uint128Reader::new_unchecked(&self.as_slice()[start..end])
+        Uint64Reader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn max_accept_tlcs(&self) -> Uint64Reader<'r> {
+    pub fn min_tlc_value(&self) -> Uint128Reader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[20..]) as usize;
         let end = molecule::unpack_number(&slice[24..]) as usize;
-        Uint64Reader::new_unchecked(&self.as_slice()[start..end])
+        Uint128Reader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn min_tlc_value(&self) -> Uint128Reader<'r> {
+    pub fn to_self_delay(&self) -> Uint64Reader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[24..]) as usize;
         let end = molecule::unpack_number(&slice[28..]) as usize;
-        Uint128Reader::new_unchecked(&self.as_slice()[start..end])
+        Uint64Reader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn to_self_delay(&self) -> Uint64Reader<'r> {
+    pub fn funding_pubkey(&self) -> PubkeyReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[28..]) as usize;
         let end = molecule::unpack_number(&slice[32..]) as usize;
-        Uint64Reader::new_unchecked(&self.as_slice()[start..end])
+        PubkeyReader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn funding_pubkey(&self) -> PubkeyReader<'r> {
+    pub fn revocation_basepoint(&self) -> PubkeyReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[32..]) as usize;
         let end = molecule::unpack_number(&slice[36..]) as usize;
         PubkeyReader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn revocation_basepoint(&self) -> PubkeyReader<'r> {
+    pub fn payment_basepoint(&self) -> PubkeyReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[36..]) as usize;
         let end = molecule::unpack_number(&slice[40..]) as usize;
         PubkeyReader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn payment_basepoint(&self) -> PubkeyReader<'r> {
+    pub fn delayed_payment_basepoint(&self) -> PubkeyReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[40..]) as usize;
         let end = molecule::unpack_number(&slice[44..]) as usize;
         PubkeyReader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn delayed_payment_basepoint(&self) -> PubkeyReader<'r> {
+    pub fn tlc_basepoint(&self) -> PubkeyReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[44..]) as usize;
         let end = molecule::unpack_number(&slice[48..]) as usize;
         PubkeyReader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn tlc_basepoint(&self) -> PubkeyReader<'r> {
+    pub fn first_per_commitment_point(&self) -> PubkeyReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[48..]) as usize;
         let end = molecule::unpack_number(&slice[52..]) as usize;
         PubkeyReader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn first_per_commitment_point(&self) -> PubkeyReader<'r> {
+    pub fn second_per_commitment_point(&self) -> PubkeyReader<'r> {
         let slice = self.as_slice();
         let start = molecule::unpack_number(&slice[52..]) as usize;
         let end = molecule::unpack_number(&slice[56..]) as usize;
         PubkeyReader::new_unchecked(&self.as_slice()[start..end])
     }
-    pub fn second_per_commitment_point(&self) -> PubkeyReader<'r> {
-        let slice = self.as_slice();
-        let start = molecule::unpack_number(&slice[56..]) as usize;
-        let end = molecule::unpack_number(&slice[60..]) as usize;
-        PubkeyReader::new_unchecked(&self.as_slice()[start..end])
-    }
     pub fn next_local_nonce(&self) -> PubNonceReader<'r> {
         let slice = self.as_slice();
-        let start = molecule::unpack_number(&slice[60..]) as usize;
+        let start = molecule::unpack_number(&slice[56..]) as usize;
         if self.has_extra_fields() {
-            let end = molecule::unpack_number(&slice[64..]) as usize;
+            let end = molecule::unpack_number(&slice[60..]) as usize;
             PubNonceReader::new_unchecked(&self.as_slice()[start..end])
         } else {
             PubNonceReader::new_unchecked(&self.as_slice()[start..])
@@ -4129,19 +4104,18 @@ impl<'r> molecule::prelude::Reader<'r> for AcceptChannelReader<'r> {
         }
         Byte32Reader::verify(&slice[offsets[0]..offsets[1]], compatible)?;
         Uint128Reader::verify(&slice[offsets[1]..offsets[2]], compatible)?;
-        ScriptOptReader::verify(&slice[offsets[2]..offsets[3]], compatible)?;
-        Uint128Reader::verify(&slice[offsets[3]..offsets[4]], compatible)?;
-        Uint64Reader::verify(&slice[offsets[4]..offsets[5]], compatible)?;
-        Uint128Reader::verify(&slice[offsets[5]..offsets[6]], compatible)?;
-        Uint64Reader::verify(&slice[offsets[6]..offsets[7]], compatible)?;
+        Uint128Reader::verify(&slice[offsets[2]..offsets[3]], compatible)?;
+        Uint64Reader::verify(&slice[offsets[3]..offsets[4]], compatible)?;
+        Uint128Reader::verify(&slice[offsets[4]..offsets[5]], compatible)?;
+        Uint64Reader::verify(&slice[offsets[5]..offsets[6]], compatible)?;
+        PubkeyReader::verify(&slice[offsets[6]..offsets[7]], compatible)?;
         PubkeyReader::verify(&slice[offsets[7]..offsets[8]], compatible)?;
         PubkeyReader::verify(&slice[offsets[8]..offsets[9]], compatible)?;
         PubkeyReader::verify(&slice[offsets[9]..offsets[10]], compatible)?;
         PubkeyReader::verify(&slice[offsets[10]..offsets[11]], compatible)?;
         PubkeyReader::verify(&slice[offsets[11]..offsets[12]], compatible)?;
         PubkeyReader::verify(&slice[offsets[12]..offsets[13]], compatible)?;
-        PubkeyReader::verify(&slice[offsets[13]..offsets[14]], compatible)?;
-        PubNonceReader::verify(&slice[offsets[14]..offsets[15]], compatible)?;
+        PubNonceReader::verify(&slice[offsets[13]..offsets[14]], compatible)?;
         Ok(())
     }
 }
@@ -4149,7 +4123,6 @@ impl<'r> molecule::prelude::Reader<'r> for AcceptChannelReader<'r> {
 pub struct AcceptChannelBuilder {
     pub(crate) channel_id: Byte32,
     pub(crate) funding_amount: Uint128,
-    pub(crate) funding_udt_type_script: ScriptOpt,
     pub(crate) max_tlc_value_in_flight: Uint128,
     pub(crate) max_accept_tlcs: Uint64,
     pub(crate) min_tlc_value: Uint128,
@@ -4164,7 +4137,7 @@ pub struct AcceptChannelBuilder {
     pub(crate) next_local_nonce: PubNonce,
 }
 impl AcceptChannelBuilder {
-    pub const FIELD_COUNT: usize = 15;
+    pub const FIELD_COUNT: usize = 14;
     pub fn channel_id(mut self, v: Byte32) -> Self {
         self.channel_id = v;
         self
@@ -4173,10 +4146,6 @@ impl AcceptChannelBuilder {
         self.funding_amount = v;
         self
     }
-    pub fn funding_udt_type_script(mut self, v: ScriptOpt) -> Self {
-        self.funding_udt_type_script = v;
-        self
-    }
     pub fn max_tlc_value_in_flight(mut self, v: Uint128) -> Self {
         self.max_tlc_value_in_flight = v;
         self
@@ -4233,7 +4202,6 @@ impl molecule::prelude::Builder for AcceptChannelBuilder {
         molecule::NUMBER_SIZE * (Self::FIELD_COUNT + 1)
             + self.channel_id.as_slice().len()
             + self.funding_amount.as_slice().len()
-            + self.funding_udt_type_script.as_slice().len()
             + self.max_tlc_value_in_flight.as_slice().len()
             + self.max_accept_tlcs.as_slice().len()
             + self.min_tlc_value.as_slice().len()
@@ -4255,8 +4223,6 @@ impl molecule::prelude::Builder for AcceptChannelBuilder {
         offsets.push(total_size);
         total_size += self.funding_amount.as_slice().len();
         offsets.push(total_size);
-        total_size += self.funding_udt_type_script.as_slice().len();
-        offsets.push(total_size);
         total_size += self.max_tlc_value_in_flight.as_slice().len();
         offsets.push(total_size);
         total_size += self.max_accept_tlcs.as_slice().len();
@@ -4286,7 +4252,6 @@ impl molecule::prelude::Builder for AcceptChannelBuilder {
         }
         writer.write_all(self.channel_id.as_slice())?;
         writer.write_all(self.funding_amount.as_slice())?;
-        writer.write_all(self.funding_udt_type_script.as_slice())?;
         writer.write_all(self.max_tlc_value_in_flight.as_slice())?;
         writer.write_all(self.max_accept_tlcs.as_slice())?;
         writer.write_all(self.min_tlc_value.as_slice())?;
diff --git a/src/ckb/network.rs b/src/ckb/network.rs
index d2105e66..204cb02e 100644
--- a/src/ckb/network.rs
+++ b/src/ckb/network.rs
@@ -106,7 +106,6 @@ pub struct OpenChannelCommand {
 pub struct AcceptChannelCommand {
     pub temp_channel_id: Hash256,
     pub funding_amount: u128,
-    pub funding_udt_type_script: Option<Script>,
 }
 
 impl NetworkActorMessage {
@@ -588,7 +587,6 @@ impl NetworkActorState {
         let AcceptChannelCommand {
             temp_channel_id,
             funding_amount,
-            funding_udt_type_script,
         } = accept_channel;
         let (peer_id, open_channel) = self
             .to_be_accepted_channels
@@ -604,31 +602,6 @@ impl NetworkActorState {
             return Ok((channel.clone(), temp_channel_id, id));
         }
 
-        match (
-            open_channel.funding_udt_type_script.as_ref(),
-            funding_udt_type_script.as_ref(),
-        ) {
-            (Some(open_channel_udt_script), Some(funding_udt_type_script)) => {
-                if open_channel_udt_script != funding_udt_type_script {
-                    return Err(ProcessingChannelError::InvalidParameter(
-                        "Funding type script mismatch".to_string(),
-                    ));
-                }
-            }
-            (Some(_), None) => {
-                // If the funding type script is provided in the open channel message,
-                // then both parties will use the same funding type script, it's OK the other
-                // does not provide it, he accept it means he agrees with the funding type script
-                // but he does not want to provice funding amount.
-            }
-            (None, None) => {}
-            (None, Some(_)) => {
-                return Err(ProcessingChannelError::InvalidParameter(
-                    "The OpenChannel didn't provide UDT type script, so we don't expect script in AcceptChannel".to_string(),
-                ));
-            }
-        }
-
         let seed = self.generate_channel_seed();
         let (tx, rx) = oneshot::channel::<Hash256>();
         let channel = Actor::spawn_linked(
@@ -638,7 +611,6 @@ impl NetworkActorState {
                 funding_amount,
                 seed,
                 open_channel,
-                funding_udt_type_script,
                 Some(tx),
             ),
             network.clone().get_cell(),
diff --git a/src/ckb/schema/pcn.mol b/src/ckb/schema/pcn.mol
index 43b6f0d0..d84ef781 100644
--- a/src/ckb/schema/pcn.mol
+++ b/src/ckb/schema/pcn.mol
@@ -30,7 +30,6 @@ table OpenChannel {
 table AcceptChannel {
     channel_id:                  Byte32,
     funding_amount:              Uint128,
-    funding_udt_type_script:     ScriptOpt,
     max_tlc_value_in_flight:     Uint128,
     max_accept_tlcs:             Uint64,
     min_tlc_value:               Uint128,
diff --git a/src/ckb/types.rs b/src/ckb/types.rs
index becb4e14..5a387cdd 100644
--- a/src/ckb/types.rs
+++ b/src/ckb/types.rs
@@ -507,7 +507,6 @@ impl TryFrom<molecule_pcn::OpenChannel> for OpenChannel {
 pub struct AcceptChannel {
     pub channel_id: Hash256,
     pub funding_amount: u128,
-    pub funding_udt_type_script: Option<Script>,
     pub max_tlc_value_in_flight: u128,
     pub max_accept_tlcs: u64,
     pub min_tlc_value: u128,
@@ -527,7 +526,6 @@ impl From<AcceptChannel> for molecule_pcn::AcceptChannel {
         molecule_pcn::AcceptChannel::new_builder()
             .channel_id(accept_channel.channel_id.into())
             .funding_amount(accept_channel.funding_amount.pack())
-            .funding_udt_type_script(accept_channel.funding_udt_type_script.pack())
             .max_tlc_value_in_flight(accept_channel.max_tlc_value_in_flight.pack())
             .max_accept_tlcs(accept_channel.max_accept_tlcs.pack())
             .min_tlc_value(accept_channel.min_tlc_value.pack())
@@ -551,7 +549,6 @@ impl TryFrom<molecule_pcn::AcceptChannel> for AcceptChannel {
         Ok(AcceptChannel {
             channel_id: accept_channel.channel_id().into(),
             funding_amount: accept_channel.funding_amount().unpack(),
-            funding_udt_type_script: accept_channel.funding_udt_type_script().to_opt(),
             max_tlc_value_in_flight: accept_channel.max_tlc_value_in_flight().unpack(),
             max_accept_tlcs: accept_channel.max_accept_tlcs().unpack(),
             min_tlc_value: accept_channel.min_tlc_value().unpack(),
diff --git a/src/ckb_chain/actor.rs b/src/ckb_chain/actor.rs
index 9097d803..2ba70970 100644
--- a/src/ckb_chain/actor.rs
+++ b/src/ckb_chain/actor.rs
@@ -117,15 +117,17 @@ impl Actor for CkbChainActor {
                                     if (e.code.code() == -1107 || e.code.code() == -1111) =>
                                 {
                                     log::warn!(
-                                        "[{}] transaction already in pool",
-                                        myself.get_name().unwrap_or_default()
+                                        "[{}] transaction { } already in pool",
+                                        myself.get_name().unwrap_or_default(),
+                                        tx.hash(),
                                     );
                                     Ok(())
                                 }
                                 _ => {
                                     log::error!(
-                                        "[{}] send transaction failed: {:?}",
+                                        "[{}] send transaction {} failed: {:?}",
                                         myself.get_name().unwrap_or_default(),
+                                        tx.hash(),
                                         err
                                     );
                                     Err(err)
diff --git a/src/rpc/channel.rs b/src/rpc/channel.rs
index 9f4946cf..5f85ee0f 100644
--- a/src/rpc/channel.rs
+++ b/src/rpc/channel.rs
@@ -40,7 +40,6 @@ pub struct AcceptChannelParams {
     pub temporary_channel_id: Hash256,
     #[serde_as(as = "U128Hex")]
     pub funding_amount: u128,
-    pub funding_udt_type_script: Option<Script>,
 }
 
 #[derive(Clone, Serialize)]
@@ -214,10 +213,6 @@ where
                 AcceptChannelCommand {
                     temp_channel_id: params.temporary_channel_id,
                     funding_amount: params.funding_amount,
-                    funding_udt_type_script: params
-                        .funding_udt_type_script
-                        .clone()
-                        .map(|s| s.into()),
                 },
                 rpc_reply,
             ))

From 7249c9f41d9d5d3c1bf6cd24cb83a6cf42b2d091 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Wed, 12 Jun 2024 17:15:02 +0800
Subject: [PATCH 27/28] fix the transaction fee issue for UDT

---
 src/ckb/channel.rs                  | 88 ++++++++++++++---------------
 src/ckb/network.rs                  | 23 +++++++-
 src/ckb_chain/funding/funding_tx.rs | 14 +++--
 3 files changed, 72 insertions(+), 53 deletions(-)

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index 41d5788e..ff85d431 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -2,7 +2,7 @@ use bitflags::bitflags;
 use ckb_hash::{blake2b_256, new_blake2b};
 use ckb_sdk::Since;
 use ckb_types::{
-    core::{Capacity, TransactionBuilder, TransactionView},
+    core::{TransactionBuilder, TransactionView},
     packed::{Bytes, CellInput, CellOutput, OutPoint, Script, Transaction},
     prelude::{AsTransactionBuilder, IntoTransactionView, Pack, Unpack},
 };
@@ -133,6 +133,7 @@ pub const DEFAULT_MAX_TLC_VALUE_IN_FLIGHT: u128 = u128::MAX;
 pub const DEFAULT_MAX_ACCEPT_TLCS: u64 = u64::MAX;
 pub const DEFAULT_MIN_TLC_VALUE: u128 = 0;
 pub const DEFAULT_TO_LOCAL_DELAY_BLOCKS: u64 = 10;
+pub const DEFAULT_UDT_MINIMAL_CKB_AMOUNT: u64 = 200 * 100_000_000; // 200 CKB
 
 #[derive(Debug)]
 pub struct TxUpdateCommand {
@@ -1190,6 +1191,12 @@ pub struct ChannelActorState {
     pub to_local_amount: u128,
     pub to_remote_amount: u128,
 
+    // only used for UDT scenario:
+    // `to_local_amount` and `to_remote_amount` are the amount of UDT
+    // we need to keep track of the CKB amount from partners in the channel.
+    pub local_ckb_amount: u64,
+    pub remote_ckb_amount: u64,
+
     // Signer is used to sign the commitment transactions.
     pub signer: InMemorySigner,
 
@@ -1466,6 +1473,8 @@ impl ChannelActorState {
             local_shutdown_fee: None,
             remote_shutdown_signature: None,
             remote_shutdown_fee: None,
+            local_ckb_amount: DEFAULT_UDT_MINIMAL_CKB_AMOUNT,
+            remote_ckb_amount: DEFAULT_UDT_MINIMAL_CKB_AMOUNT,
         }
     }
 
@@ -1509,6 +1518,8 @@ impl ChannelActorState {
             remote_shutdown_fee: None,
             local_shutdown_signature: None,
             remote_shutdown_signature: None,
+            local_ckb_amount: DEFAULT_UDT_MINIMAL_CKB_AMOUNT,
+            remote_ckb_amount: DEFAULT_UDT_MINIMAL_CKB_AMOUNT,
         }
     }
 
@@ -1655,10 +1666,9 @@ impl ChannelActorState {
 
     pub fn get_funding_request(&self, fee_rate: u64) -> FundingRequest {
         FundingRequest {
-            udt_info: self
-                .funding_udt_type_script
-                .clone()
-                .map(FundingUdtInfo::new_with_script),
+            udt_info: self.funding_udt_type_script.as_ref().map(|script| {
+                FundingUdtInfo::new(script, self.local_ckb_amount, self.remote_ckb_amount)
+            }),
             script: self.get_funding_lock_script(),
             local_amount: self.to_local_amount as u64,
             local_fee_rate: fee_rate,
@@ -2544,36 +2554,33 @@ impl ChannelActorState {
 
         if let Some(type_script) = &self.funding_udt_type_script {
             debug!(
-                "UDT local_amount: {}, remote_amount: {}",
+                "shutdown UDT local_amount: {}, remote_amount: {}",
                 self.to_local_amount, self.to_remote_amount
             );
-            let local_output_data = self.to_local_amount.to_le_bytes().pack();
-            let dummy_output = CellOutput::new_builder()
+
+            let local_capacity: u64 = self.local_ckb_amount - local_shutdown_fee as u64;
+            debug!(
+                "shutdown_tx local_capacity: {} - {} = {}",
+                self.local_ckb_amount, local_shutdown_fee, local_capacity
+            );
+            let local_output = CellOutput::new_builder()
                 .lock(local_shutdown_script.clone())
                 .type_(Some(type_script.clone()).pack())
+                .capacity(local_capacity.pack())
                 .build();
-            let required_capacity = dummy_output
-                .occupied_capacity(Capacity::bytes(local_output_data.len()).unwrap())
-                .unwrap()
-                .pack();
-            let local_output = dummy_output
-                .as_builder()
-                .capacity(required_capacity)
-                .build();
+            let local_output_data = self.to_local_amount.to_le_bytes().pack();
 
-            let remote_output_data = self.to_remote_amount.to_le_bytes().pack();
-            let dummy_output = CellOutput::new_builder()
+            let remote_capacity: u64 = self.remote_ckb_amount - remote_shutdown_fee as u64;
+            debug!(
+                "shutdown_tx remote_capacity: {} - {} = {}",
+                self.remote_ckb_amount, remote_shutdown_fee, remote_capacity
+            );
+            let remote_output = CellOutput::new_builder()
                 .lock(remote_shutdown_script.clone())
                 .type_(Some(type_script.clone()).pack())
+                .capacity(remote_capacity.pack())
                 .build();
-            let required_capacity = dummy_output
-                .occupied_capacity(Capacity::bytes(remote_output_data.len()).unwrap())
-                .unwrap()
-                .pack();
-            let remote_output = dummy_output
-                .as_builder()
-                .capacity(required_capacity)
-                .build();
+            let remote_output_data = self.to_remote_amount.to_le_bytes().pack();
 
             let outputs = self.order_things_for_musig2(local_output, remote_output);
             let outputs_data = self.order_things_for_musig2(local_output_data, remote_output_data);
@@ -2831,32 +2838,25 @@ impl ChannelActorState {
             get_script_by_contract(Contract::CommitmentLock, &blake2b_256(witnesses)[0..20]);
 
         if let Some(udt_type_script) = &self.funding_udt_type_script {
+            //FIXME(yukang): we need to add logic for transaction fee here
+            let (time_locked_ckb_amount, immediately_spendable_ckb_amount) = if local {
+                (self.local_ckb_amount, self.remote_ckb_amount)
+            } else {
+                (self.remote_ckb_amount, self.local_ckb_amount)
+            };
+
             let immediate_output_data = immediately_spendable_value.to_le_bytes().pack();
-            let dummy_output = CellOutput::new_builder()
+            let immediate_output = CellOutput::new_builder()
                 .lock(immediate_secp256k1_lock_script.clone())
                 .type_(Some(udt_type_script.clone()).pack())
-                .build();
-            let required_capacity = dummy_output
-                .occupied_capacity(Capacity::bytes(immediate_output_data.len()).unwrap())
-                .unwrap()
-                .pack();
-            let immediate_output = dummy_output
-                .as_builder()
-                .capacity(required_capacity)
+                .capacity(immediately_spendable_ckb_amount.pack())
                 .build();
 
             let commitment_lock_output_data = time_locked_value.to_le_bytes().pack();
-            let dummy_output = CellOutput::new_builder()
+            let commitment_lock_output = CellOutput::new_builder()
                 .lock(commitment_lock_script.clone())
                 .type_(Some(udt_type_script.clone()).pack())
-                .build();
-            let required_capacity = dummy_output
-                .occupied_capacity(Capacity::bytes(commitment_lock_output_data.len()).unwrap())
-                .unwrap()
-                .pack();
-            let commitment_lock_output = dummy_output
-                .as_builder()
-                .capacity(required_capacity)
+                .capacity(time_locked_ckb_amount.pack())
                 .build();
 
             let outputs = vec![immediate_output, commitment_lock_output];
diff --git a/src/ckb/network.rs b/src/ckb/network.rs
index 204cb02e..e41b9123 100644
--- a/src/ckb/network.rs
+++ b/src/ckb/network.rs
@@ -155,7 +155,17 @@ pub enum NetworkActorEvent {
     /// The two Hash256 are respectively newly agreed channel id and temp channel id,
     /// The two u128 are respectively local and remote funding amount,
     /// and the script is the lock script of the agreed funding cell.
-    ChannelAccepted(PeerId, Hash256, Hash256, u128, u128, Script, Option<Script>),
+    ChannelAccepted(
+        PeerId,
+        Hash256,
+        Hash256,
+        u128,
+        u128,
+        Script,
+        Option<Script>,
+        u64,
+        u64,
+    ),
     /// A channel is ready to use.
     ChannelReady(Hash256, PeerId),
     /// A channel is being shutting down.
@@ -1011,6 +1021,8 @@ where
                     remote,
                     script,
                     funding_script,
+                    local_ckb_amount,
+                    remote_ckb_amount,
                 ) => {
                     assert_ne!(new, old, "new and old channel id must be different");
                     if let Some(session) = state.get_peer_session(&peer_id) {
@@ -1032,8 +1044,13 @@ where
                                         new,
                                         Default::default(),
                                         FundingRequest {
-                                            udt_info: funding_script
-                                                .map(FundingUdtInfo::new_with_script),
+                                            udt_info: funding_script.as_ref().map(|type_script| {
+                                                FundingUdtInfo::new(
+                                                    type_script,
+                                                    local_ckb_amount,
+                                                    remote_ckb_amount,
+                                                )
+                                            }),
                                             script,
                                             local_amount: local as u64,
                                             local_fee_rate: 0,
diff --git a/src/ckb_chain/funding/funding_tx.rs b/src/ckb_chain/funding/funding_tx.rs
index 5c16e8a3..b301e3be 100644
--- a/src/ckb_chain/funding/funding_tx.rs
+++ b/src/ckb_chain/funding/funding_tx.rs
@@ -68,13 +68,15 @@ pub struct FundingUdtInfo {
 }
 
 impl FundingUdtInfo {
-    pub fn new_with_script(type_script: packed::Script) -> Self {
-        // FIXME(yukang): make sure the udt_amount is enough for split into at least 2 cells
-        let two_cells_amount: u64 = (142 + 10) * (10 as u64).pow(8);
+    pub fn new(
+        type_script: &packed::Script,
+        local_ckb_amount: u64,
+        remote_ckb_amount: u64,
+    ) -> Self {
         Self {
-            type_script,
-            local_ckb_amount: two_cells_amount,
-            remote_ckb_amount: two_cells_amount,
+            type_script: type_script.clone(),
+            local_ckb_amount,
+            remote_ckb_amount,
         }
     }
 }

From 12e4b50ca80e90af1bb7fa807fd74b0a08bbe0bf Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Wed, 12 Jun 2024 17:57:47 +0800
Subject: [PATCH 28/28] resolve rebase conflicts with channel auto accept

---
 src/ckb/channel.rs                            |  3 ++
 src/ckb/network.rs                            |  2 +-
 .../bruno/e2e/udt/03-node2-accept-channel.bru | 12 +++---
 ...-blocks.bru => 04-ckb-generate-blocks.bru} |  2 +-
 .../udt/04-node1-send-commitment-signed.bru   | 39 -------------------
 ...n-invoice.bru => 05-node2-gen-invoice.bru} |  2 +-
 .../udt/05-node2-send-commitment-signed.bru   | 39 -------------------
 ...node1-add-tlc.bru => 06-node1-add-tlc.bru} |  2 +-
 ...remove-tlc.bru => 07-node2-remove-tlc.bru} |  2 +-
 ...bru => 08-node1-send-shutdown-channel.bru} |  2 +-
 ...bru => 09-node2-send-shutdown-channel.bru} |  2 +-
 11 files changed, 15 insertions(+), 92 deletions(-)
 rename tests/bruno/e2e/udt/{06-ckb-generate-blocks.bru => 04-ckb-generate-blocks.bru} (99%)
 delete mode 100644 tests/bruno/e2e/udt/04-node1-send-commitment-signed.bru
 rename tests/bruno/e2e/udt/{07-node2-gen-invoice.bru => 05-node2-gen-invoice.bru} (99%)
 delete mode 100644 tests/bruno/e2e/udt/05-node2-send-commitment-signed.bru
 rename tests/bruno/e2e/udt/{08-node1-add-tlc.bru => 06-node1-add-tlc.bru} (98%)
 rename tests/bruno/e2e/udt/{09-node2-remove-tlc.bru => 07-node2-remove-tlc.bru} (98%)
 rename tests/bruno/e2e/udt/{10-node1-send-shutdown-channel.bru => 08-node1-send-shutdown-channel.bru} (98%)
 rename tests/bruno/e2e/udt/{11-node2-send-shutdown-channel.bru => 09-node2-send-shutdown-channel.bru} (98%)

diff --git a/src/ckb/channel.rs b/src/ckb/channel.rs
index ff85d431..3b56a396 100644
--- a/src/ckb/channel.rs
+++ b/src/ckb/channel.rs
@@ -200,6 +200,9 @@ impl<S> ChannelActor<S> {
                             state.to_local_amount,
                             state.to_remote_amount,
                             state.get_funding_lock_script(),
+                            state.funding_udt_type_script.clone(),
+                            state.local_ckb_amount,
+                            state.remote_ckb_amount,
                         ),
                     ))
                     .expect("network actor alive");
diff --git a/src/ckb/network.rs b/src/ckb/network.rs
index e41b9123..904d6427 100644
--- a/src/ckb/network.rs
+++ b/src/ckb/network.rs
@@ -740,7 +740,7 @@ impl NetworkActorState {
         peer_id: PeerId,
         open_channel: OpenChannel,
     ) -> ProcessingChannelResult {
-        if open_channel.funding_type_script.is_none()
+        if open_channel.funding_udt_type_script.is_none()
             && open_channel.funding_amount < self.open_channel_min_ckb_funding_amount
         {
             return Err(ProcessingChannelError::InvalidParameter(format!(
diff --git a/tests/bruno/e2e/udt/03-node2-accept-channel.bru b/tests/bruno/e2e/udt/03-node2-accept-channel.bru
index 66b56905..99bb57c2 100644
--- a/tests/bruno/e2e/udt/03-node2-accept-channel.bru
+++ b/tests/bruno/e2e/udt/03-node2-accept-channel.bru
@@ -1,5 +1,5 @@
 meta {
-  name: accept a channel from a peer, a normal accept channel request
+  name: get channel list from node2
   type: http
   seq: 3
 }
@@ -15,16 +15,14 @@ headers {
   Accept: application/json
 }
 
-
 body:json {
   {
     "id": "42",
     "jsonrpc": "2.0",
-    "method": "accept_channel",
+    "method": "list_channels",
     "params": [
       {
-        "temporary_channel_id": "{{N1N2_TEMP_CHANNEL_ID}}",
-        "funding_amount": "0x4d2"
+        "peer_id": "{{NODE1_PEERID}}"
       }
     ]
   }
@@ -32,12 +30,12 @@ body:json {
 
 assert {
   res.body.error: isUndefined
-  res.body.result.channel_id: isDefined
+  res.body.result.channels: isDefined
 }
 
 script:post-response {
   // Sleep for sometime to make sure current operation finishes before next request starts.
   await new Promise(r => setTimeout(r, 2000));
   console.log("accept channel result: ", res.body);
-  bru.setVar("N1N2_CHANNEL_ID",  res.body.result.channel_id);
+  bru.setVar("N1N2_CHANNEL_ID", res.body.result.channels[0].channel_id);
 }
diff --git a/tests/bruno/e2e/udt/06-ckb-generate-blocks.bru b/tests/bruno/e2e/udt/04-ckb-generate-blocks.bru
similarity index 99%
rename from tests/bruno/e2e/udt/06-ckb-generate-blocks.bru
rename to tests/bruno/e2e/udt/04-ckb-generate-blocks.bru
index cd65f8e5..159a5fff 100644
--- a/tests/bruno/e2e/udt/06-ckb-generate-blocks.bru
+++ b/tests/bruno/e2e/udt/04-ckb-generate-blocks.bru
@@ -1,7 +1,7 @@
 meta {
   name: generate a few blocks for channel 2
   type: http
-  seq: 6
+  seq: 4
 }
 
 post {
diff --git a/tests/bruno/e2e/udt/04-node1-send-commitment-signed.bru b/tests/bruno/e2e/udt/04-node1-send-commitment-signed.bru
deleted file mode 100644
index 5bdc6610..00000000
--- a/tests/bruno/e2e/udt/04-node1-send-commitment-signed.bru
+++ /dev/null
@@ -1,39 +0,0 @@
-meta {
-  name: send commitment_signed message
-  type: http
-  seq: 4
-}
-
-post {
-  url: {{NODE1_RPC_URL}}
-  body: json
-  auth: none
-}
-
-headers {
-  Content-Type: application/json
-  Accept: application/json
-}
-
-body:json {
-  {
-    "id": "42",
-    "jsonrpc": "2.0",
-    "method": "commitment_signed",
-    "params": [
-      {
-        "channel_id": "{{N1N2_CHANNEL_ID}}"
-      }
-    ]
-  }
-}
-
-assert {
-  res.body.error: isUndefined
-  res.body.result: isNull
-}
-
-script:post-response {
-  // Sleep for sometime to make sure current operation finishes before next request starts.
-  await new Promise(r => setTimeout(r, 1000));
-}
diff --git a/tests/bruno/e2e/udt/07-node2-gen-invoice.bru b/tests/bruno/e2e/udt/05-node2-gen-invoice.bru
similarity index 99%
rename from tests/bruno/e2e/udt/07-node2-gen-invoice.bru
rename to tests/bruno/e2e/udt/05-node2-gen-invoice.bru
index 4100a259..cd19c848 100644
--- a/tests/bruno/e2e/udt/07-node2-gen-invoice.bru
+++ b/tests/bruno/e2e/udt/05-node2-gen-invoice.bru
@@ -1,7 +1,7 @@
 meta {
   name: generate a invoice
   type: http
-  seq: 07
+  seq: 05
 }
 
 post {
diff --git a/tests/bruno/e2e/udt/05-node2-send-commitment-signed.bru b/tests/bruno/e2e/udt/05-node2-send-commitment-signed.bru
deleted file mode 100644
index cdac5136..00000000
--- a/tests/bruno/e2e/udt/05-node2-send-commitment-signed.bru
+++ /dev/null
@@ -1,39 +0,0 @@
-meta {
-  name: send commitment_signed message
-  type: http
-  seq: 5
-}
-
-post {
-  url: {{NODE2_RPC_URL}}
-  body: json
-  auth: none
-}
-
-headers {
-  Content-Type: application/json
-  Accept: application/json
-}
-
-body:json {
-  {
-    "id": "42",
-    "jsonrpc": "2.0",
-    "method": "commitment_signed",
-    "params": [
-      {
-        "channel_id": "{{N1N2_CHANNEL_ID}}"
-      }
-    ]
-  }
-}
-
-assert {
-  res.body.error: isUndefined
-  res.body.result: isNull
-}
-
-script:post-response {
-  // Sleep for sometime to make sure current operation finishes before next request starts.
-  await new Promise(r => setTimeout(r, 1000));
-}
diff --git a/tests/bruno/e2e/udt/08-node1-add-tlc.bru b/tests/bruno/e2e/udt/06-node1-add-tlc.bru
similarity index 98%
rename from tests/bruno/e2e/udt/08-node1-add-tlc.bru
rename to tests/bruno/e2e/udt/06-node1-add-tlc.bru
index b6c82c60..4a960eec 100644
--- a/tests/bruno/e2e/udt/08-node1-add-tlc.bru
+++ b/tests/bruno/e2e/udt/06-node1-add-tlc.bru
@@ -1,7 +1,7 @@
 meta {
   name: Node1 add tlc
   type: http
-  seq: 08
+  seq: 6
 }
 
 post {
diff --git a/tests/bruno/e2e/udt/09-node2-remove-tlc.bru b/tests/bruno/e2e/udt/07-node2-remove-tlc.bru
similarity index 98%
rename from tests/bruno/e2e/udt/09-node2-remove-tlc.bru
rename to tests/bruno/e2e/udt/07-node2-remove-tlc.bru
index f9761878..04a3d617 100644
--- a/tests/bruno/e2e/udt/09-node2-remove-tlc.bru
+++ b/tests/bruno/e2e/udt/07-node2-remove-tlc.bru
@@ -1,7 +1,7 @@
 meta {
   name: remove tlc from NODE2
   type: http
-  seq: 9
+  seq: 7
 }
 
 post {
diff --git a/tests/bruno/e2e/udt/10-node1-send-shutdown-channel.bru b/tests/bruno/e2e/udt/08-node1-send-shutdown-channel.bru
similarity index 98%
rename from tests/bruno/e2e/udt/10-node1-send-shutdown-channel.bru
rename to tests/bruno/e2e/udt/08-node1-send-shutdown-channel.bru
index 7d687f9e..fd5f59c1 100644
--- a/tests/bruno/e2e/udt/10-node1-send-shutdown-channel.bru
+++ b/tests/bruno/e2e/udt/08-node1-send-shutdown-channel.bru
@@ -1,7 +1,7 @@
 meta {
   name: Node1 send shutdown channel1
   type: http
-  seq: 10
+  seq: 8
 }
 
 post {
diff --git a/tests/bruno/e2e/udt/11-node2-send-shutdown-channel.bru b/tests/bruno/e2e/udt/09-node2-send-shutdown-channel.bru
similarity index 98%
rename from tests/bruno/e2e/udt/11-node2-send-shutdown-channel.bru
rename to tests/bruno/e2e/udt/09-node2-send-shutdown-channel.bru
index 4080bcd2..38211c5f 100644
--- a/tests/bruno/e2e/udt/11-node2-send-shutdown-channel.bru
+++ b/tests/bruno/e2e/udt/09-node2-send-shutdown-channel.bru
@@ -1,7 +1,7 @@
 meta {
   name: Node2 send shutdown channel1
   type: http
-  seq: 11
+  seq: 9
 }
 
 post {