From abed42d848fab5184b59d863393bb30eb45b4457 Mon Sep 17 00:00:00 2001 From: "Fred K. Schott" Date: Tue, 26 Nov 2019 15:58:33 -0800 Subject: [PATCH] fix source directory, based on issues found with test improvements --- src/api.ts | 7 +++++-- src/common/serverinfo.ts | 3 ++- src/common/types/commands/index.ts | 1 + src/common/types/commands/ledger_data.ts | 12 ++++++++++++ src/common/types/objects/index.ts | 1 + src/common/types/objects/ledger_data.ts | 6 ++++++ src/offline/generate-address.ts | 2 +- 7 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 src/common/types/commands/ledger_data.ts create mode 100644 src/common/types/objects/ledger_data.ts diff --git a/src/api.ts b/src/api.ts index 8197d0c4..fae7eab3 100644 --- a/src/api.ts +++ b/src/api.ts @@ -62,8 +62,9 @@ import { BookOffersRequest, BookOffersResponse, GatewayBalancesRequest, GatewayBalancesResponse, LedgerRequest, LedgerResponse, + LedgerDataRequest, LedgerDataResponse, LedgerEntryRequest, LedgerEntryResponse, - ServerInfoRequest, ServerInfoResponse + ServerInfoRequest, ServerInfoResponse, } from './common/types/commands' @@ -175,6 +176,8 @@ class RippleAPI extends EventEmitter { Promise async request(command: 'ledger', params: LedgerRequest): Promise + async request(command: 'ledger_data', params?: LedgerDataRequest): + Promise async request(command: 'ledger_entry', params: LedgerEntryRequest): Promise async request(command: 'server_info', params?: ServerInfoRequest): @@ -205,7 +208,7 @@ class RippleAPI extends EventEmitter { command: string, params: object = {}, currentResponse: T - ): Promise { + ): Promise { if (!currentResponse.marker) { return Promise.reject( new errors.NotFoundError('response does not have a next page') diff --git a/src/common/serverinfo.ts b/src/common/serverinfo.ts index 5ad6f568..f1e50ad5 100644 --- a/src/common/serverinfo.ts +++ b/src/common/serverinfo.ts @@ -29,7 +29,8 @@ export type GetServerInfoResponse = { reserveIncrementXRP: string, ledgerVersion: number }, - validationQuorum: number + validationQuorum: number, + networkLedger?: string } function renameKeys(object, mapping) { diff --git a/src/common/types/commands/index.ts b/src/common/types/commands/index.ts index 0c3e581e..43ac8ffc 100644 --- a/src/common/types/commands/index.ts +++ b/src/common/types/commands/index.ts @@ -5,5 +5,6 @@ export * from './account_offers' export * from './book_offers' export * from './gateway_balances' export * from './ledger' +export * from './ledger_data' export * from './ledger_entry' export * from './server_info' diff --git a/src/common/types/commands/ledger_data.ts b/src/common/types/commands/ledger_data.ts new file mode 100644 index 00000000..668607a4 --- /dev/null +++ b/src/common/types/commands/ledger_data.ts @@ -0,0 +1,12 @@ +import { LedgerData } from '../objects' + +export interface LedgerDataRequest { + id?: any + ledger_hash?: string + ledger_index?: string + binary?: boolean + limit?: number + marker?: string +} + +export type LedgerDataResponse = LedgerData; \ No newline at end of file diff --git a/src/common/types/objects/index.ts b/src/common/types/objects/index.ts index 6bd5c2f6..26658a51 100644 --- a/src/common/types/objects/index.ts +++ b/src/common/types/objects/index.ts @@ -1,6 +1,7 @@ export * from './adjustments' export * from './amounts' export * from './ledger' +export * from './ledger_data' export * from './ledger_entries' export * from './memos' export * from './orders' diff --git a/src/common/types/objects/ledger_data.ts b/src/common/types/objects/ledger_data.ts new file mode 100644 index 00000000..03fc8b9e --- /dev/null +++ b/src/common/types/objects/ledger_data.ts @@ -0,0 +1,6 @@ +export interface LedgerData { + ledger_index: string + ledger_hash: string + marker: string + state: ({ data?: string; LedgerEntryType?: string; index: string } & any)[] +} \ No newline at end of file diff --git a/src/offline/generate-address.ts b/src/offline/generate-address.ts index be6367ea..af3b4866 100644 --- a/src/offline/generate-address.ts +++ b/src/offline/generate-address.ts @@ -11,7 +11,7 @@ export type GeneratedAddress = { export interface GenerateAddressOptions { // The entropy to use to generate the seed. - entropy?: Uint8Array, + entropy?: Uint8Array | number[], // The digital signature algorithm to generate an address for. Can be `ecdsa-secp256k1` (default) or `ed25519`. algorithm?: 'ecdsa-secp256k1' | 'ed25519',