From cab384f04ff176e804ac3de7dd1af74e755c001b Mon Sep 17 00:00:00 2001
From: quake <quake.wang@gmail.com>
Date: Thu, 21 Nov 2024 11:19:41 +0900
Subject: [PATCH] fix: channel should be public by default

---
 src/rpc/README.md                                             | 2 +-
 src/rpc/channel.rs                                            | 4 ++--
 tests/bruno/e2e/router-pay/03-node1-node2-open-channel.bru    | 1 -
 tests/bruno/e2e/router-pay/07-node2-node3-open-channel.bru    | 1 -
 tests/bruno/e2e/router-pay/26-node2-node1-open-channel.bru    | 1 -
 .../bruno/e2e/udt-router-pay/03-node1-node2-open-channel.bru  | 1 -
 .../bruno/e2e/udt-router-pay/07-node2-node3-open-channel.bru  | 1 -
 7 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/rpc/README.md b/src/rpc/README.md
index 9f140e95d..9ff443c12 100644
--- a/src/rpc/README.md
+++ b/src/rpc/README.md
@@ -148,7 +148,7 @@ Attempts to open a channel with a peer.
 
 * `peer_id` - PeerId, The peer ID to open a channel with.
 * `funding_amount` - u128, The amount of CKB or UDT to fund the channel with.
-* `public` - `Option<bool>`, Whether this is a public channel (will be broadcasted to network, and can be used to forward TLCs), an optional parameter (default value false).
+* `public` - `Option<bool>`, Whether this is a public channel (will be broadcasted to network, and can be used to forward TLCs), an optional parameter, default value is true.
 * `funding_udt_type_script` - `Option<Script>`, The type script of the UDT to fund the channel with, an optional parameter.
 * `shutdown_script` - `Option<Script>`, The script used to receive the channel balance, an optional parameter, default value is the secp256k1_blake160_sighash_all script corresponding to the configured private key.
 * `commitment_delay_epoch` - `Option<EpochNumberWithFraction>`, The delay time for the commitment transaction, must be an [EpochNumberWithFraction](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0017-tx-valid-since/e-i-l-encoding.png) in u64 format, an optional parameter, default value is 24 hours.
diff --git a/src/rpc/channel.rs b/src/rpc/channel.rs
index 27b5f753f..765f7bc81 100644
--- a/src/rpc/channel.rs
+++ b/src/rpc/channel.rs
@@ -39,7 +39,7 @@ pub(crate) struct OpenChannelParams {
     #[serde_as(as = "U128Hex")]
     funding_amount: u128,
 
-    /// Whether this is a public channel (will be broadcasted to network, and can be used to forward TLCs), an optional parameter (default value false).
+    /// Whether this is a public channel (will be broadcasted to network, and can be used to forward TLCs), an optional parameter, default value is true.
     public: Option<bool>,
 
     /// The type script of the UDT to fund the channel with, an optional parameter.
@@ -402,7 +402,7 @@ where
                 OpenChannelCommand {
                     peer_id: params.peer_id.clone(),
                     funding_amount: params.funding_amount,
-                    public: params.public.unwrap_or(false),
+                    public: params.public.unwrap_or(true),
                     shutdown_script: params.shutdown_script.clone().map(|s| s.into()),
                     commitment_delay_epoch: params
                         .commitment_delay_epoch
diff --git a/tests/bruno/e2e/router-pay/03-node1-node2-open-channel.bru b/tests/bruno/e2e/router-pay/03-node1-node2-open-channel.bru
index 5edf74683..e06d4b0c2 100644
--- a/tests/bruno/e2e/router-pay/03-node1-node2-open-channel.bru
+++ b/tests/bruno/e2e/router-pay/03-node1-node2-open-channel.bru
@@ -24,7 +24,6 @@ body:json {
       {
         "peer_id": "{{NODE2_PEERID}}",
         "funding_amount": "0x377aab54d000",
-        "public": true,
         "tlc_fee_proportional_millionths": "0x4B0"
       }
     ]
diff --git a/tests/bruno/e2e/router-pay/07-node2-node3-open-channel.bru b/tests/bruno/e2e/router-pay/07-node2-node3-open-channel.bru
index 0f45bdc32..7ce37c339 100644
--- a/tests/bruno/e2e/router-pay/07-node2-node3-open-channel.bru
+++ b/tests/bruno/e2e/router-pay/07-node2-node3-open-channel.bru
@@ -24,7 +24,6 @@ body:json {
       {
         "peer_id": "{{NODE3_PEERID}}",
         "funding_amount": "0x377aab54d000",
-        "public": true,
         "tlc_fee_proportional_millionths": "0x578"
       }
     ]
diff --git a/tests/bruno/e2e/router-pay/26-node2-node1-open-channel.bru b/tests/bruno/e2e/router-pay/26-node2-node1-open-channel.bru
index 40f4f5cf8..b0564fa94 100644
--- a/tests/bruno/e2e/router-pay/26-node2-node1-open-channel.bru
+++ b/tests/bruno/e2e/router-pay/26-node2-node1-open-channel.bru
@@ -24,7 +24,6 @@ body:json {
       {
         "peer_id": "{{NODE1_PEERID}}",
         "funding_amount": "0x277aab54d000",
-        "public": true,
         "tlc_fee_proportional_millionths": "0x4B0"
       }
     ]
diff --git a/tests/bruno/e2e/udt-router-pay/03-node1-node2-open-channel.bru b/tests/bruno/e2e/udt-router-pay/03-node1-node2-open-channel.bru
index ce5c4febf..98b49a215 100644
--- a/tests/bruno/e2e/udt-router-pay/03-node1-node2-open-channel.bru
+++ b/tests/bruno/e2e/udt-router-pay/03-node1-node2-open-channel.bru
@@ -24,7 +24,6 @@ body:json {
       {
         "peer_id": "{{NODE2_PEERID}}",
         "funding_amount": "0x3B9ACA00",
-        "public": true,
         "tlc_fee_proportional_millionths": "0x4B0",
         "funding_udt_type_script": {
             "code_hash": "{{UDT_CODE_HASH}}",
diff --git a/tests/bruno/e2e/udt-router-pay/07-node2-node3-open-channel.bru b/tests/bruno/e2e/udt-router-pay/07-node2-node3-open-channel.bru
index abce7ff53..709b5e867 100644
--- a/tests/bruno/e2e/udt-router-pay/07-node2-node3-open-channel.bru
+++ b/tests/bruno/e2e/udt-router-pay/07-node2-node3-open-channel.bru
@@ -24,7 +24,6 @@ body:json {
       {
         "peer_id": "{{NODE3_PEERID}}",
         "funding_amount": "0x3B9ACA00",
-        "public": true,
         "funding_udt_type_script": {
             "code_hash": "{{UDT_CODE_HASH}}",
             "hash_type": "data1",