From 5db06faaa727a3cc7c4cf98d4b5bb0078d8707c6 Mon Sep 17 00:00:00 2001 From: Keith Date: Mon, 27 May 2019 10:16:45 +0800 Subject: [PATCH] feat(rpc): add total_tx_cycles and total_tx_size in tx_pool_info --- packages/ckb-sdk-rpc/__tests__/formatters/fixtures.json | 8 ++++++-- packages/ckb-sdk-rpc/src/resultFormatter.ts | 9 ++++++++- packages/ckb-sdk-rpc/types/CKB_RPC/index.d.ts | 4 ++++ packages/ckb-types/index.d.ts | 3 +++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/packages/ckb-sdk-rpc/__tests__/formatters/fixtures.json b/packages/ckb-sdk-rpc/__tests__/formatters/fixtures.json index b3a476b0..b73e8245 100644 --- a/packages/ckb-sdk-rpc/__tests__/formatters/fixtures.json +++ b/packages/ckb-sdk-rpc/__tests__/formatters/fixtures.json @@ -517,13 +517,17 @@ "orphan": "33", "pending": "34", "proposed": "22", - "last_txs_updated_at": "1555507787683" + "last_txs_updated_at": "1555507787683", + "total_tx_cycles": "12", + "total_tx_size": "156" }, "target": { "orphan": "33", "pending": "34", "proposed": "22", - "lastTxsUpdatedAt": "1555507787683" + "lastTxsUpdatedAt": "1555507787683", + "totalTxCycles": "12", + "totalTxSize": "156" } }], "toPeers": [{ diff --git a/packages/ckb-sdk-rpc/src/resultFormatter.ts b/packages/ckb-sdk-rpc/src/resultFormatter.ts index 8b26f503..e951671f 100644 --- a/packages/ckb-sdk-rpc/src/resultFormatter.ts +++ b/packages/ckb-sdk-rpc/src/resultFormatter.ts @@ -113,9 +113,16 @@ const formatter = { }, toTxPoolInfo: (info: CKB_RPC.TxPoolInfo): CKBComponents.TxPoolInfo => { if (!info) return info - const { last_txs_updated_at: lastTxsUpdatedAt, ...rest } = info + const { + last_txs_updated_at: lastTxsUpdatedAt, + total_tx_cycles: totalTxCycles, + total_tx_size: totalTxSize, + ...rest + } = info return { lastTxsUpdatedAt, + totalTxCycles, + totalTxSize, ...rest, } }, diff --git a/packages/ckb-sdk-rpc/types/CKB_RPC/index.d.ts b/packages/ckb-sdk-rpc/types/CKB_RPC/index.d.ts index 4c9c1745..944430ea 100644 --- a/packages/ckb-sdk-rpc/types/CKB_RPC/index.d.ts +++ b/packages/ckb-sdk-rpc/types/CKB_RPC/index.d.ts @@ -18,6 +18,8 @@ declare module CKB_RPC { export type BlockNumber = CKBComponents.BlockNumber export type EpochInHeader = string export type Difficulty = CKBComponents.Difficulty + export type Cycles = CKBComponents.Cycles + export type Size = CKBComponents.Size export enum TransactionStatus { Pending = 'pending', @@ -138,6 +140,8 @@ declare module CKB_RPC { pending: Count proposed: Count last_txs_updated_at: Timestamp + total_tx_cycles: Cycles + total_tx_size: Size } export interface Epoch { diff --git a/packages/ckb-types/index.d.ts b/packages/ckb-types/index.d.ts index bb66d2e4..3ffcf48a 100644 --- a/packages/ckb-types/index.d.ts +++ b/packages/ckb-types/index.d.ts @@ -17,6 +17,7 @@ declare namespace CKBComponents { export type Timestamp = string export type Nonce = string export type Cycles = string + export type Size = string /** * @typedef Bytes, keep consistent with CKB * @description Bytes will be serialized to string @@ -243,6 +244,8 @@ declare namespace CKBComponents { pending: Count proposed: Count lastTxsUpdatedAt: Timestamp + totalTxCycles: Cycles + totalTxSize: Size } export enum CapacityUnit {