fix types related bug

.gitignore

@@ -1,3 +1,4 @@
 /target/
 **/node_modules/**
 **/pkg/**
+/test

index.html

@@ -7,8 +7,8 @@
     <script type="module">
         import LightClient from "./light-client-js/dist/index.js";
 
-        const devConfig = await (await fetch("./dev-config.toml")).text();
-        const devSpec = await (await fetch("./dev-spec.toml")).text();
+        const devConfig = await (await fetch("./test/dev-config.toml")).text();
+        const devSpec = await (await fetch("./test/dev-spec.toml")).text();
 
         console.log(LightClient);
         window.initWorkers = async () => {
@@ -20,11 +20,23 @@
                     type: "DevNet",
                     config: devConfig,
                     spec: devSpec
-                }
+                },
+                "info"
             );
 
             $("#init-button").removeClass("loading");
         };
+        window.doTest = async () => {
+            await window.client.setScripts([{ script: { codeHash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8", hashType: "type", args: "0xef0273afa67242b1b407eced450f78b2c02a2a23", }, scriptType: "lock", blockNumber: "0xb8d328" }], 0)
+
+
+            console.log(await window.client.getCellsCapacity({ script: { codeHash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8", hashType: "type", args: "0xef0273afa67242b1b407eced450f78b2c02a2a23" }, scriptType: "lock" }))
+
+
+            console.log(await window.client.getCells({ script: { codeHash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8", hashType: "type", args: "0xef0273afa67242b1b407eced450f78b2c02a2a23" }, scriptType: "lock" }))
+
+            console.log(await window.client.getTransactions({ script: { codeHash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8", hashType: "type", args: "0xef0273afa67242b1b407eced450f78b2c02a2a23" }, scriptType: "lock" }))
+        };
     </script>
 
 </head>

light-client-js/src/index.ts

@@ -1,5 +1,5 @@
 import { ClientFindCellsResponse, ClientFindTransactionsGroupedResponse, ClientFindTransactionsResponse, ClientIndexerSearchKeyLike, ClientIndexerSearchKeyTransactionLike, ClientTransactionResponse } from "@ckb-ccc/core/client";
-import { FetchResponse, JsonRpcLocalNode, JsonRpcRemoteNode, JsonRpcScriptStatus, LocalNode, localNodeTo, NetworkFlag, RemoteNode, remoteNodeTo, ScriptStatus, scriptStatusFrom, scriptStatusTo, transformFetchResponse } from "./types";
+import { FetchResponse, JsonRpcLocalNode, JsonRpcRemoteNode, JsonRpcScriptStatus, LocalNode, localNodeTo, NetworkFlag, RemoteNode, remoteNodeTo, ScriptStatus, scriptStatusFrom, scriptStatusTo, LightClientWasmSetScriptsCommand, transformFetchResponse, LightClientWasmOrder } from "./types";
 import { ClientBlock, ClientBlockHeader, Hex, hexFrom, HexLike, Num, numFrom, NumLike, numToHex, TransactionLike } from "@ckb-ccc/core/barrel";
 import { JsonRpcBlockHeader, JsonRpcTransformers } from "@ckb-ccc/core/advancedBarrel";
 const DEFAULT_BUFFER_SIZE = 50 * (1 << 20);
@@ -125,7 +125,7 @@ class LightClient {
      * @param scripts Array of script status
      * @param command An optional enum parameter to control the behavior of set_scripts
      */
-    async setScripts(scripts: ScriptStatus[], command?: "all" | "partial" | "delete"): Promise<void> {
+    async setScripts(scripts: ScriptStatus[], command?: LightClientWasmSetScriptsCommand): Promise<void> {
         await this.invokeLightClientCommand("set_scripts", [scripts.map(x => scriptStatusFrom(x)), command]);
     }
     /**
@@ -143,14 +143,14 @@ class LightClient {
      */
     async getCells(
         searchKey: ClientIndexerSearchKeyLike,
-        order?: "asc" | "desc",
+        order?: LightClientWasmOrder,
         limit?: NumLike,
         afterCursor?: string
     ): Promise<ClientFindCellsResponse> {
         return JsonRpcTransformers.findCellsResponseTo(await this.invokeLightClientCommand("get_cells", [
             JsonRpcTransformers.indexerSearchKeyFrom(searchKey),
-            order ?? "asc",
-            numToHex(limit ?? 10),
+            order ?? LightClientWasmOrder.Asc,
+            Number(numFrom(numToHex(limit ?? 10))),
             afterCursor
         ]));
     }
@@ -164,7 +164,7 @@ class LightClient {
      */
     async getTransactions(
         searchKey: ClientIndexerSearchKeyTransactionLike,
-        order?: "asc" | "desc",
+        order?: LightClientWasmOrder,
         limit?: NumLike,
         afterCursor?: string
     ): Promise<ClientFindTransactionsResponse | ClientFindTransactionsGroupedResponse> {
@@ -173,8 +173,8 @@ class LightClient {
                 "get_transactions",
                 [
                     JsonRpcTransformers.indexerSearchKeyTransactionFrom(searchKey),
-                    order ?? "asc",
-                    numToHex(limit ?? 10),
+                    order ?? LightClientWasmOrder.Asc,
+                    Number(numFrom(numToHex(limit ?? 10))),
                     afterCursor
                 ]
             )

light-client-js/src/types.ts

@@ -1,3 +1,4 @@
+import { ScriptLike } from "@ckb-ccc/core";
 import { JsonRpcScript, JsonRpcTransformers } from "@ckb-ccc/core/advancedBarrel";
 import { Num, Script } from "@ckb-ccc/core/barrel";
 
@@ -40,7 +41,7 @@ interface JsonRpcScriptStatus {
 }
 
 interface ScriptStatus {
-    script: Script,
+    script: ScriptLike,
     scriptType: JsonRpcScriptType,
     blockNumber: Num
 }
@@ -151,7 +152,15 @@ export function localNodeTo(input: JsonRpcLocalNode): LocalNode {
     })
 }
 type NetworkFlag = { type: "MainNet" } | { type: "TestNet" } | { type: "DevNet"; spec: string; config: string; };
-
+export enum LightClientWasmSetScriptsCommand {
+    All = 0,
+    Partial = 1,
+    Delete = 2,
+}
+export enum LightClientWasmOrder {
+    Desc = 0,
+    Asc = 1,
+}
 export type {
     LightClientFunctionCall,
     WorkerInitializeOptions,

light-client-lib/src/service.rs

@@ -154,7 +154,7 @@ pub struct PeerSyncState {
     pub proved_best_known_header: Option<HeaderView>,
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, Debug)]
 pub struct SearchKey {
     pub script: Script,
     pub script_type: ScriptType,
@@ -175,7 +175,7 @@ impl Default for SearchKey {
     }
 }
 
-#[derive(Deserialize, Default, Serialize)]
+#[derive(Deserialize, Default, Serialize, Debug)]
 pub struct SearchKeyFilter {
     pub script: Option<Script>,
     pub script_len_range: Option<[Uint64; 2]>,
@@ -184,7 +184,7 @@ pub struct SearchKeyFilter {
     pub block_range: Option<[BlockNumber; 2]>,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Debug)]
 #[serde(rename_all = "snake_case")]
 pub enum ScriptType {
     Lock,

light-client-lib/src/storage/db/browser.rs

@@ -31,7 +31,7 @@ use light_client_db_common::{
     DbCommandRequest, DbCommandResponse, InputCommand, OutputCommand, KV,
 };
 
-use log::{debug, info};
+use log::debug;
 
 use crate::{
     error::{Error, Result},
@@ -417,7 +417,7 @@ impl Storage {
                         skip: 0,
                     })
                     .unwrap();
-                info!("Received {:?}", remove_keys);
+                debug!("Received {:?}", remove_keys);
                 if let DbCommandResponse::IteratorKey { keys } = remove_keys {
                     batch.delete_many(keys).unwrap();
                 } else {

light-client-wasm/src/lib.rs

@@ -26,6 +26,7 @@ use ckb_light_client_lib::{
     types::RunEnv,
     verify::verify_tx,
 };
+use log::debug;
 use serde::{Deserialize, Serialize};
 use serde_wasm_bindgen::Serializer;
 use wasm_bindgen::prelude::*;
@@ -947,6 +948,7 @@ pub fn get_cells_capacity(search_key: JsValue) -> Result<JsValue, JsValue> {
     }
 
     let search_key: SearchKey = serde_wasm_bindgen::from_value(search_key)?;
+    debug!("Call get_cells_capacity: {:?}", search_key);
     let (prefix, from_key, direction, skip) = build_query_options(
         &search_key,
         KeyPrefix::CellLockScript,