fix bug of get cells

nervosnetwork · Dec 13, 2024 · a3ce904 · a3ce904
1 parent d699a39
commit a3ce904
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 8 deletions.
diff --git a/light-client-js/src/index.ts b/light-client-js/src/index.ts
@@ -1,5 +1,5 @@
-import { ClientFindCellsResponse, ClientFindTransactionsGroupedResponse, ClientFindTransactionsResponse, ClientIndexerSearchKeyLike, ClientIndexerSearchKeyTransactionLike, ClientTransactionResponse } from "@ckb-ccc/core";
-import { FetchResponse, LocalNode, localNodeTo, RemoteNode, remoteNodeTo, ScriptStatus, scriptStatusFrom, scriptStatusTo, LightClientSetScriptsCommand, transformFetchResponse, cccOrderToLightClientWasmOrder, GetTransactionsResponse, TxWithCell, TxWithCells, lightClientGetTransactionsResultTo, LightClientLocalNode, LightClientRemoteNode, LightClientScriptStatus, NetworkSetting } from "./types";
+import { ClientIndexerSearchKeyLike, ClientIndexerSearchKeyTransactionLike, ClientTransactionResponse } from "@ckb-ccc/core";
+import { FetchResponse, LocalNode, localNodeTo, RemoteNode, remoteNodeTo, ScriptStatus, scriptStatusFrom, scriptStatusTo, LightClientSetScriptsCommand, transformFetchResponse, cccOrderToLightClientWasmOrder, GetTransactionsResponse, TxWithCell, TxWithCells, lightClientGetTransactionsResultTo, LightClientLocalNode, LightClientRemoteNode, LightClientScriptStatus, NetworkSetting, GetCellsResponse, getCellsResponseFrom } 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";
 import { Mutex } from "async-mutex";
@@ -177,13 +177,14 @@ class LightClient {
         order?: "asc" | "desc",
         limit?: NumLike,
         afterCursor?: Hex
-    ): Promise<ClientFindCellsResponse> {
-        return JsonRpcTransformers.findCellsResponseTo(await this.invokeLightClientCommand("get_cells", [
+    ): Promise<GetCellsResponse> {
+        const resp = await this.invokeLightClientCommand("get_cells", [
             JsonRpcTransformers.indexerSearchKeyFrom(searchKey),
             cccOrderToLightClientWasmOrder(order ?? "asc"),
             Number(numFrom(numToHex(limit ?? 10))),
             afterCursor ? bytesFrom(afterCursor) : afterCursor
-        ]));
+        ]);
+        return getCellsResponseFrom(resp);
     }
     /**
      * See https://github.com/nervosnetwork/ckb-indexer#get_transactions

diff --git a/light-client-js/src/types.test.ts b/light-client-js/src/types.test.ts
@@ -1,6 +1,6 @@
 import { expect, test } from "@jest/globals";
-import { cccOrderToLightClientWasmOrder, FetchResponse, GetTransactionsResponse, lightClientGetTransactionsResultTo, LightClientLocalNode, LightClientOrder, LightClientRemoteNode, LightClientScriptStatus, LightClientTxWithCell, LightClientTxWithCells, LocalNode, localNodeTo, RemoteNode, remoteNodeTo, scriptStatusFrom, scriptStatusTo, transformFetchResponse, TxWithCell, TxWithCells } from "./types";
-import { Transaction } from "@ckb-ccc/core";
+import { cccOrderToLightClientWasmOrder, FetchResponse, GetCellsResponse, getCellsResponseFrom, GetTransactionsResponse, lightClientGetTransactionsResultTo, LightClientLocalNode, LightClientOrder, LightClientRemoteNode, LightClientScriptStatus, LightClientTxWithCell, LightClientTxWithCells, LocalNode, localNodeTo, RemoteNode, remoteNodeTo, scriptStatusFrom, scriptStatusTo, transformFetchResponse, TxWithCell, TxWithCells } from "./types";
+import { CellOutput, OutPoint, Transaction } from "@ckb-ccc/core";
 test("test transform fetch response", () => {
     const a: FetchResponse<number> = { status: "fetched", data: 1 };
     const b: FetchResponse<number> = { status: "added", timestamp: 0n };
@@ -203,3 +203,46 @@ test("test lightClientGetTransactionsResultTo", () => {
         ]
     } as GetTransactionsResponse<TxWithCells>);
 });
+
+test("test getCellsResponseFrom", () => {
+    const lhsValue = getCellsResponseFrom({
+        last_cursor: "0x12345678",
+        objects: [{
+            block_number: "0x2345",
+            tx_index: "0x9999",
+            out_point: {
+                index: "0x11112222",
+                tx_hash: "0x23456789"
+            },
+            output: {
+                capacity: "0x111",
+                lock: {
+                    args: "0x2345",
+                    code_hash: "0x2222",
+                    hash_type: "data"
+                }
+            }
+        }]
+    });
+    const rhsValue: GetCellsResponse = {
+        lastCursor: "0x12345678",
+        cells: [{
+            blockNumber: 9029n,
+            txIndex: 39321n,
+            outPoint: OutPoint.from({
+                index: 0x11112222n,
+                txHash: "0x23456789"
+            }),
+            outputData: "0x",
+            cellOutput: CellOutput.from({
+                capacity: 0x111n,
+                lock: {
+                    args: "0x2345",
+                    codeHash: "0x2222",
+                    hashType: "data"
+                }
+            })
+        }]
+    }
+    expect(lhsValue).toStrictEqual(rhsValue);
+});
diff --git a/light-client-js/src/types.ts b/light-client-js/src/types.ts
@@ -1,10 +1,14 @@
 import { numFrom } from "@ckb-ccc/core";
 import { Hex } from "@ckb-ccc/core";
 import { hexFrom } from "@ckb-ccc/core";
+import { Cell } from "@ckb-ccc/core";
+import { CellOutputLike } from "@ckb-ccc/core";
+import { BytesLike } from "@ckb-ccc/core";
+import { OutPointLike } from "@ckb-ccc/core";
 import { numToHex } from "@ckb-ccc/core";
 import { ClientBlockHeader } from "@ckb-ccc/core";
 import { ScriptLike } from "@ckb-ccc/core";
-import { JsonRpcBlockHeader, JsonRpcScript, JsonRpcTransaction, JsonRpcTransformers } from "@ckb-ccc/core/advancedBarrel";
+import { JsonRpcBlockHeader, JsonRpcCellOutput, JsonRpcOutPoint, JsonRpcScript, JsonRpcTransaction, JsonRpcTransformers } from "@ckb-ccc/core/advancedBarrel";
 import { Num, Transaction } from "@ckb-ccc/core/barrel";
 
 interface WorkerInitializeOptions {
@@ -260,9 +264,48 @@ export function lightClientGetTransactionsResultTo(input: LightClientPagination<
             }))
         }) as GetTransactionsResponse<TxWithCells>
     }
+}
+
+interface LightClientGetCellsResponse {
+    last_cursor: string;
+    objects: {
+        out_point: JsonRpcOutPoint;
+        output: JsonRpcCellOutput;
+        output_data?: Hex;
+        block_number: Hex;
+        tx_index: Hex;
+    }[];
+}
+
+
+interface CellWithBlockNumAndTxIndex {
+    outPoint: OutPointLike;
+    cellOutput: CellOutputLike;
+    outputData: BytesLike;
+    blockNumber: Num;
+    txIndex: Num;
+};
+
+interface GetCellsResponse {
+    lastCursor: string;
+    cells: CellWithBlockNumAndTxIndex[];
+}
 
 
+
+export function getCellsResponseFrom(input: LightClientGetCellsResponse): GetCellsResponse {
+    return {
+        lastCursor: input.last_cursor,
+        cells: input.objects.map(item => ({
+            outPoint: JsonRpcTransformers.outPointTo(item.out_point),
+            cellOutput: JsonRpcTransformers.cellOutputTo(item.output),
+            outputData: item.output_data ?? "0x",
+            blockNumber: numFrom(item.block_number),
+            txIndex: numFrom(item.tx_index)
+        }))
+    }
 }
+
 export type {
     LightClientFunctionCall,
     WorkerInitializeOptions,
@@ -281,4 +324,6 @@ export type {
     TxWithCell,
     TxWithCells,
     GetTransactionsResponse,
+    CellWithBlockNumAndTxIndex,
+    GetCellsResponse
 }