chore: update ckb to 0.121.0 (#205)

Officeyutong · web-flow · commit e71f28e06adc · 2025-01-23T13:56:19.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/light-client-bin/Cargo.toml b/light-client-bin/Cargo.toml
@@ -9,15 +9,15 @@ homepage = "https://github.com/nervosnetwork/ckb-light-client"
 repository = "https://github.com/nervosnetwork/ckb-light-client"
 
 [dependencies]
-ckb-async-runtime = "0.121.0-rc1"
-ckb-chain-spec = "0.121.0-rc1"
-ckb-network = "0.121.0-rc1"
-ckb-stop-handler = "0.121.0-rc1"
-ckb-resource = "0.121.0-rc1"
-ckb-jsonrpc-types = "0.121.0-rc1"
-ckb-types = "0.121.0-rc1"
-ckb-traits = "0.121.0-rc1"
-ckb-systemtime = "0.121.0-rc1"
+ckb-async-runtime = "0.121.0"
+ckb-chain-spec = "0.121.0"
+ckb-network = "0.121.0"
+ckb-stop-handler = "0.121.0"
+ckb-resource = "0.121.0"
+ckb-jsonrpc-types = "0.121.0"
+ckb-types = "0.121.0"
+ckb-traits = "0.121.0"
+ckb-systemtime = "0.121.0"
 
 ckb-light-client-lib = { path = "../light-client-lib" }
 clap = { version = "4", features = ["cargo"] }
diff --git a/light-client-bin/src/subcmds.rs b/light-client-bin/src/subcmds.rs
@@ -3,7 +3,8 @@ use std::sync::{Arc, RwLock};
 use ckb_async_runtime::new_global_runtime;
 use ckb_chain_spec::ChainSpec;
 use ckb_network::{
-    tokio, CKBProtocol, CKBProtocolHandler, Flags, NetworkService, NetworkState, SupportProtocols,
+    network::TransportType, tokio, CKBProtocol, CKBProtocolHandler, Flags, NetworkService,
+    NetworkState, SupportProtocols,
 };
 use ckb_resource::Resource;
 use ckb_stop_handler::{broadcast_exit_signals, wait_all_ckb_services_exit};
@@ -128,6 +129,8 @@ impl RunConfig {
                 clap::crate_version!().to_owned(),
                 Flags::DISCOVERY,
             ),
+            // Usually native light-client only connects to peers through TCP
+            TransportType::Tcp,
         )
         .start(&handle)
         .map_err(|err| {
diff --git a/light-client-lib/Cargo.toml b/light-client-lib/Cargo.toml
@@ -12,19 +12,19 @@ repository = "https://github.com/nervosnetwork/ckb-light-client"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-ckb-app-config = "0.121.0-rc1"
-ckb-constant = "0.121.0-rc1"
-ckb-types = "0.121.0-rc1"
-ckb-network = "0.121.0-rc1"
-ckb-jsonrpc-types = "0.121.0-rc1"
-ckb-error = "0.121.0-rc1"
-ckb-script = "0.121.0-rc1"
-ckb-chain-spec = "0.121.0-rc1"
-ckb-traits = "0.121.0-rc1"
-ckb-resource = "0.121.0-rc1"
-ckb-verification = "0.121.0-rc1"
-ckb-hash = "0.121.0-rc1"
-ckb-systemtime = "0.121.0-rc1"
+ckb-app-config = "0.121.0"
+ckb-constant = "0.121.0"
+ckb-types = "0.121.0"
+ckb-network = "0.121.0"
+ckb-jsonrpc-types = "0.121.0"
+ckb-error = "0.121.0"
+ckb-script = "0.121.0"
+ckb-chain-spec = "0.121.0"
+ckb-traits = "0.121.0"
+ckb-resource = "0.121.0"
+ckb-verification = "0.121.0"
+ckb-hash = "0.121.0"
+ckb-systemtime = "0.121.0"
 
 log = "0.4.14"
 path-clean = "0.1.0"
@@ -65,11 +65,11 @@ serde_json = "1.0.134"
 wasm-bindgen-test = "0.3.45"
 
 [dev-dependencies]
-ckb-shared = "0.121.0-rc1"
-ckb-chain = "0.121.0-rc1"
-ckb-tx-pool = "0.121.0-rc1"
-ckb-store = "0.121.0-rc1"
-ckb-systemtime = { version = "0.121.0-rc1", features = ["enable_faketime"] }
+ckb-shared = "0.121.0"
+ckb-chain = "0.121.0"
+ckb-tx-pool = "0.121.0"
+ckb-store = "0.121.0"
+ckb-systemtime = { version = "0.121.0", features = ["enable_faketime"] }
 tempfile = "3.0"
 rand = "0.8"
 serde_json = "1.0"
diff --git a/light-client-lib/src/tests/utils/chain.rs b/light-client-lib/src/tests/utils/chain.rs
@@ -4,7 +4,7 @@ use ckb_app_config::{BlockAssemblerConfig, NetworkConfig};
 use ckb_chain::{start_chain_services, ChainController};
 use ckb_chain_spec::{consensus::Consensus, ChainSpec};
 use ckb_jsonrpc_types::JsonBytes;
-use ckb_network::{Flags, NetworkController, NetworkService, NetworkState};
+use ckb_network::{network::TransportType, Flags, NetworkController, NetworkService, NetworkState};
 use ckb_resource::Resource;
 use ckb_shared::{Shared, SharedBuilder};
 use ckb_types::{core, prelude::*};
@@ -143,6 +143,7 @@ fn dummy_network(shared: &Shared) -> NetworkController {
             "test".to_string(),
             Flags::all(),
         ),
+        TransportType::Tcp,
     )
     .start(shared.async_handle())
     .expect("Start network service failed")
diff --git a/wasm/light-client-js/package.json b/wasm/light-client-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ckb-light-client-js",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "dist/index.js",
   "license": "MIT",
   "devDependencies": {
diff --git a/wasm/light-client-js/src/index.ts b/wasm/light-client-js/src/index.ts
@@ -49,8 +49,9 @@ class LightClient {
      * Start the light client.
      * @param networkSetting Network setting for light-client-wasm. You can specify config if you are using mainnet or testnet. You must provide config and spec if you are using devnet.
      * @param logLevel Log Level for light-client-db-worker and light-client-wasm
+     * @param transportType Specify transport type. `ws` stands for non-secure WebSocket, while `wss` stands for WebSocket over SSL.
      */
-    async start(networkSetting: NetworkSetting, networkSecretKey: Hex, logLevel: "trace" | "debug" | "info" | "error" = "info") {
+    async start(networkSetting: NetworkSetting, networkSecretKey: Hex, logLevel: "trace" | "debug" | "info" | "error" = "info", transportType: "ws" | "wss" = "ws") {
         this.dbWorker.postMessage({
             inputBuffer: this.inputBuffer,
             outputBuffer: this.outputBuffer,
@@ -62,7 +63,8 @@ class LightClient {
             networkFlag: networkSetting,
             logLevel: logLevel,
             traceLogBuffer: this.traceLogBuffer,
-            networkSecretKey: bytesFrom(networkSecretKey)
+            networkSecretKey: bytesFrom(networkSecretKey),
+            transportType
         } as LightClientWorkerInitializeOptions);
         await new Promise<void>((res, rej) => {
             this.dbWorker.onmessage = () => res();
diff --git a/wasm/light-client-js/src/lightclient.worker.ts b/wasm/light-client-js/src/lightclient.worker.ts
@@ -8,7 +8,7 @@ onmessage = async (evt) => {
     if (!loaded) {
         const data = evt.data as LightClientWorkerInitializeOptions;
         wasmModule.set_shared_array(data.inputBuffer, data.outputBuffer);
-        await wasmModule.light_client(data.networkFlag, data.logLevel, data.networkSecretKey);
+        await wasmModule.light_client(data.networkFlag, data.logLevel, data.networkSecretKey, data.transportType);
         self.postMessage({});
         loaded = true;
         return;
diff --git a/wasm/light-client-js/src/types.ts b/wasm/light-client-js/src/types.ts
@@ -14,6 +14,7 @@ interface WorkerInitializeOptions {
     inputBuffer: SharedArrayBuffer;
     outputBuffer: SharedArrayBuffer;
     logLevel: string;
+    transportType: "ws" | "wss";
 }
 interface DbWorkerInitializeOptions extends WorkerInitializeOptions {
 }
diff --git a/wasm/light-client-wasm/Cargo.toml b/wasm/light-client-wasm/Cargo.toml
@@ -22,15 +22,15 @@ log = "0.4"
 wasm-logger = "0.2"
 serde-wasm-bindgen = "0.6.5"
 
-ckb-chain-spec = "0.121.0-rc1"
-ckb-resource = "0.121.0-rc1"
-ckb-network = "0.121.0-rc1"
-ckb-async-runtime = "0.121.0-rc1"
-ckb-types = "0.121.0-rc1"
-ckb-jsonrpc-types = "0.121.0-rc1"
-ckb-stop-handler = "0.121.0-rc1"
-ckb-systemtime = "0.121.0-rc1"
-ckb-app-config = "0.121.0-rc1"
+ckb-chain-spec = "0.121.0"
+ckb-resource = "0.121.0"
+ckb-network = "0.121.0"
+ckb-async-runtime = "0.121.0"
+ckb-types = "0.121.0"
+ckb-jsonrpc-types = "0.121.0"
+ckb-stop-handler = "0.121.0"
+ckb-systemtime = "0.121.0"
+ckb-app-config = "0.121.0"
 
 
 getrandom = { version = "0.2", features = ["js"] }
diff --git a/wasm/light-client-wasm/src/lib.rs b/wasm/light-client-wasm/src/lib.rs
@@ -34,8 +34,8 @@ use wasm_bindgen::prelude::*;
 use ckb_chain_spec::{consensus::Consensus, ChainSpec};
 use ckb_jsonrpc_types::{JsonBytes, Transaction};
 use ckb_network::{
-    extract_peer_id, CKBProtocol, CKBProtocolHandler, Flags, NetworkController, NetworkService,
-    NetworkState, SupportProtocols,
+    extract_peer_id, network::TransportType, CKBProtocol, CKBProtocolHandler, Flags,
+    NetworkController, NetworkService, NetworkState, SupportProtocols,
 };
 use ckb_resource::Resource;
 use ckb_stop_handler::broadcast_exit_signals;
@@ -79,11 +79,20 @@ enum NetworkSetting {
     DevNet { spec: String, config: String },
 }
 
+#[derive(Deserialize, Debug)]
+enum WasmTransportType {
+    #[serde(rename = "ws")]
+    Ws,
+    #[serde(rename = "wss")]
+    Wss,
+}
+
 #[wasm_bindgen]
 pub async fn light_client(
     network_setting: JsValue,
     log_level: String,
     network_secret_key: JsValue,
+    wasm_transport_type: JsValue,
 ) -> Result<(), JsValue> {
     if !status(0b0) {
         return Err(JsValue::from_str("Can't start twice"));
@@ -94,6 +103,12 @@ pub async fn light_client(
     ));
     let network_flag: NetworkSetting = serde_wasm_bindgen::from_value(network_setting)?;
 
+    let wasm_transport_type: WasmTransportType =
+        serde_wasm_bindgen::from_value(wasm_transport_type)?;
+    debug!(
+        "Starting with wasm transport type = {:?}",
+        wasm_transport_type
+    );
     let mut config = match &network_flag {
         NetworkSetting::TestNet { config } => config
             .as_ref()
@@ -217,6 +232,10 @@ pub async fn light_client(
             "0.1.0".to_owned(),
             Flags::DISCOVERY,
         ),
+        match wasm_transport_type {
+            WasmTransportType::Ws => TransportType::Ws,
+            WasmTransportType::Wss => TransportType::Wss,
+        },
     )
     .start(&handle)
     .map_err(|err| {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ckb-light-client-js",`
`3`		`- "version": "1.0.1",`
	`3`	`+ "version": "1.0.2",`
`4`	`4`	`"main": "dist/index.js",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"devDependencies": {`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ interface WorkerInitializeOptions {`
`14`	`14`	`inputBuffer: SharedArrayBuffer;`
`15`	`15`	`outputBuffer: SharedArrayBuffer;`
`16`	`16`	`logLevel: string;`
	`17`	`+ transportType: "ws" \| "wss";`
`17`	`18`	`}`
`18`	`19`	`interface DbWorkerInitializeOptions extends WorkerInitializeOptions {`
`19`	`20`	`}`