rpc: use channel_id for external funding open result

Author: joii2020

crates/fiber-lib/src/rpc/README.md

@@ -393,7 +393,7 @@ Opens a channel with external funding. The node will negotiate the channel with
 
 ##### Returns
 
-* `temporary_channel_id` - <em>[Hash256](#type-hash256)</em>, The temporary channel ID of the channel being opened.
+* `channel_id` - <em>[Hash256](#type-hash256)</em>, The channel ID of the channel being opened.
  Use this ID to submit the signed funding transaction.
 * `unsigned_funding_tx` - <em>`ckb_jsonrpc_types::Transaction`</em>, The final unsigned funding transaction that needs to be signed.
  The user should sign this transaction with their wallet and submit it
@@ -414,14 +414,14 @@ Submits a signed funding transaction for an externally funded channel.
 
 ##### Params
 
-* `channel_id` - <em>[Hash256](#type-hash256)</em>, The temporary channel ID returned from `open_channel_with_external_funding`.
+* `channel_id` - <em>[Hash256](#type-hash256)</em>, The channel ID returned from `open_channel_with_external_funding`.
 * `signed_funding_tx` - <em>`ckb_jsonrpc_types::Transaction`</em>, The signed funding transaction. This must be the same final transaction structure
  that was returned from `open_channel_with_external_funding`, with valid
  witnesses (signatures) added, and should be ready for direct broadcast.
 
 ##### Returns
 
-* `channel_id` - <em>[Hash256](#type-hash256)</em>, The channel ID (may be updated from temporary to final after peer exchange).
+* `channel_id` - <em>[Hash256](#type-hash256)</em>, The channel ID.
 * `funding_tx_hash` - <em>`H256`</em>, The hash of the funding transaction that was submitted.
 
 ---

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

@@ -420,9 +420,9 @@ pub struct OpenChannelWithExternalFundingParams {
 /// Result of opening a channel with external funding.
 #[derive(Clone, Serialize, Deserialize)]
 pub struct OpenChannelWithExternalFundingResult {
-    /// The temporary channel ID of the channel being opened.
+    /// The channel ID of the channel being opened.
     /// Use this ID to submit the signed funding transaction.
-    pub temporary_channel_id: Hash256,
+    pub channel_id: Hash256,
 
     /// The final unsigned funding transaction that needs to be signed.
     /// The user should sign this transaction with their wallet and submit it
@@ -433,7 +433,7 @@ pub struct OpenChannelWithExternalFundingResult {
 /// Parameters for submitting a signed funding transaction for external funding.
 #[derive(Serialize, Deserialize, Debug)]
 pub struct SubmitSignedFundingTxParams {
-    /// The temporary channel ID returned from `open_channel_with_external_funding`.
+    /// The channel ID returned from `open_channel_with_external_funding`.
     pub channel_id: Hash256,
 
     /// The signed funding transaction. This must be the same final transaction structure
@@ -445,7 +445,7 @@ pub struct SubmitSignedFundingTxParams {
 /// Result of submitting a signed funding transaction.
 #[derive(Clone, Serialize, Deserialize)]
 pub struct SubmitSignedFundingTxResult {
-    /// The channel ID (may be updated from temporary to final after peer exchange).
+    /// The channel ID.
     pub channel_id: Hash256,
 
     /// The hash of the funding transaction that was submitted.
@@ -830,7 +830,7 @@ where
         };
         handle_actor_call!(self.actor, message, params).map(|response| {
             OpenChannelWithExternalFundingResult {
-                temporary_channel_id: response.channel_id,
+                channel_id: response.channel_id,
                 unsigned_funding_tx: response.unsigned_funding_tx.into(),
             }
         })

fiber-js/src/types/channel.ts

@@ -116,7 +116,7 @@ interface OpenChannelWithExternalFundingParams {
 }
 
 interface OpenChannelWithExternalFundingResult {
-    temporary_channel_id: HexString;
+    channel_id: HexString;
     unsigned_funding_tx: CkbJsonRpcTransaction;
 }