@ledgerhq/coin-xrp 2.0.3-nightly.1 → 2.1.0-next.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +25 -7
- package/lib/api/index.js +6 -2
- package/lib/api/index.js.map +1 -1
- package/lib/api/index.test.js +24 -1
- package/lib/api/index.test.js.map +1 -1
- package/lib/logic/listOperations.d.ts +2 -9
- package/lib/logic/listOperations.d.ts.map +1 -1
- package/lib/logic/listOperations.js +5 -5
- package/lib/logic/listOperations.js.map +1 -1
- package/lib/types/model.d.ts +8 -0
- package/lib/types/model.d.ts.map +1 -1
- package/lib-es/api/index.js +6 -2
- package/lib-es/api/index.js.map +1 -1
- package/lib-es/api/index.test.js +24 -1
- package/lib-es/api/index.test.js.map +1 -1
- package/lib-es/logic/listOperations.d.ts +2 -9
- package/lib-es/logic/listOperations.d.ts.map +1 -1
- package/lib-es/logic/listOperations.js +5 -5
- package/lib-es/logic/listOperations.js.map +1 -1
- package/lib-es/types/model.d.ts +8 -0
- package/lib-es/types/model.d.ts.map +1 -1
- package/package.json +5 -5
- package/src/api/index.test.ts +31 -1
- package/src/api/index.ts +7 -3
- package/src/logic/listOperations.ts +7 -19
- package/src/types/model.ts +10 -0
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @ledgerhq/coin-xrp@2.0.3
|
|
2
|
+
> @ledgerhq/coin-xrp@2.0.3 build /home/runner/work/ledger-live/ledger-live/libs/coin-modules/coin-xrp
|
|
3
3
|
> tsc && tsc -m esnext --moduleResolution bundler --outDir lib-es
|
|
4
4
|
|
package/CHANGELOG.md
CHANGED
|
@@ -1,19 +1,37 @@
|
|
|
1
1
|
# @ledgerhq/coin-xrp
|
|
2
2
|
|
|
3
|
-
## 2.0
|
|
3
|
+
## 2.1.0-next.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#9470](https://github.com/LedgerHQ/ledger-live/pull/9470) [`5086b4c`](https://github.com/LedgerHQ/ledger-live/commit/5086b4c53e37009cbeec4567be9e095fabca99d4) Thanks [@jprudent](https://github.com/jprudent)! - Fix: iteration on api/listOperations
|
|
8
|
+
Fix: end iteration when no cursor provided on logic/listOperations
|
|
9
|
+
|
|
10
|
+
### Patch Changes
|
|
11
|
+
|
|
12
|
+
- Updated dependencies [[`5abde51`](https://github.com/LedgerHQ/ledger-live/commit/5abde5192d32f493ece2f99aec0e2de0c411f9e5), [`cc00249`](https://github.com/LedgerHQ/ledger-live/commit/cc002495f3e107aba283a3aa4abca90954de6d76)]:
|
|
13
|
+
- @ledgerhq/types-live@6.63.0-next.0
|
|
14
|
+
- @ledgerhq/coin-framework@2.3.0-next.0
|
|
15
|
+
|
|
16
|
+
## 2.0.3
|
|
4
17
|
|
|
5
18
|
### Patch Changes
|
|
6
19
|
|
|
7
|
-
- Updated dependencies [[`
|
|
8
|
-
- @ledgerhq/types-live@6.62.0
|
|
9
|
-
- @ledgerhq/coin-framework@2.2.0
|
|
20
|
+
- Updated dependencies [[`8675df1`](https://github.com/LedgerHQ/ledger-live/commit/8675df12c24067877358f27e1e7c66f739ff0c78), [`0a59343`](https://github.com/LedgerHQ/ledger-live/commit/0a59343b591dab4e886c21cb47f7339231997331), [`ede6db0`](https://github.com/LedgerHQ/ledger-live/commit/ede6db0b94193cc9072aeb87e90f4098f0434af0), [`1461449`](https://github.com/LedgerHQ/ledger-live/commit/146144941c13e60182da8d79592f706d12a6f00e)]:
|
|
21
|
+
- @ledgerhq/types-live@6.62.0
|
|
22
|
+
- @ledgerhq/coin-framework@2.2.0
|
|
23
|
+
- @ledgerhq/cryptoassets@13.13.0
|
|
24
|
+
- @ledgerhq/live-network@2.0.5
|
|
10
25
|
|
|
11
|
-
## 2.0.3-
|
|
26
|
+
## 2.0.3-next.0
|
|
12
27
|
|
|
13
28
|
### Patch Changes
|
|
14
29
|
|
|
15
|
-
- Updated dependencies [[`
|
|
16
|
-
- @ledgerhq/
|
|
30
|
+
- Updated dependencies [[`8675df1`](https://github.com/LedgerHQ/ledger-live/commit/8675df12c24067877358f27e1e7c66f739ff0c78), [`0a59343`](https://github.com/LedgerHQ/ledger-live/commit/0a59343b591dab4e886c21cb47f7339231997331), [`ede6db0`](https://github.com/LedgerHQ/ledger-live/commit/ede6db0b94193cc9072aeb87e90f4098f0434af0), [`1461449`](https://github.com/LedgerHQ/ledger-live/commit/146144941c13e60182da8d79592f706d12a6f00e)]:
|
|
31
|
+
- @ledgerhq/types-live@6.62.0-next.0
|
|
32
|
+
- @ledgerhq/coin-framework@2.2.0-next.0
|
|
33
|
+
- @ledgerhq/cryptoassets@13.13.0-next.0
|
|
34
|
+
- @ledgerhq/live-network@2.0.5-next.0
|
|
17
35
|
|
|
18
36
|
## 2.0.2
|
|
19
37
|
|
package/lib/api/index.js
CHANGED
|
@@ -30,11 +30,15 @@ async function estimate(_addr, _amount) {
|
|
|
30
30
|
}
|
|
31
31
|
async function operationsFromHeight(address, minHeight) {
|
|
32
32
|
async function fetchNextPage(state) {
|
|
33
|
-
const
|
|
33
|
+
const options = {
|
|
34
34
|
limit: state.pageSize,
|
|
35
35
|
minHeight: state.minHeight,
|
|
36
36
|
order: "asc",
|
|
37
|
-
}
|
|
37
|
+
};
|
|
38
|
+
if (state.apiNextCursor) {
|
|
39
|
+
options.token = state.apiNextCursor;
|
|
40
|
+
}
|
|
41
|
+
const [operations, apiNextCursor] = await (0, logic_1.listOperations)(address, options);
|
|
38
42
|
const newCurrentIteration = state.currentIteration + 1;
|
|
39
43
|
let continueIteration = true;
|
|
40
44
|
if (apiNextCursor === "") {
|
package/lib/api/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;AAoBA,8BAYC;AA1BD,yCAAqC;AACrC,uDAAuD;AACvD,oCASkB;AAGlB,SAAgB,SAAS,CAAC,MAAiB;IACzC,gBAAU,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IAE5E,OAAO;QACL,SAAS,EAAT,iBAAS;QACT,OAAO,EAAP,eAAO;QACP,gBAAgB,EAAE,KAAK;QACvB,YAAY,EAAE,QAAQ;QACtB,UAAU,EAAV,kBAAU;QACV,SAAS,EAAT,iBAAS;QACT,cAAc,EAAE,UAAU;KAC3B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,KAAK,CAAC,OAAe,EAAE,WAA2B;IAC/D,MAAM,kBAAkB,GAAG,MAAM,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,EAAE,GAAG,MAAM,IAAA,wBAAgB,EAAC,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,WAAW,CAAC,CAAC;IAChF,OAAO,EAAE,CAAC,qBAAqB,CAAC;AAClC,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,KAAa,EAAE,OAAe;IACpD,MAAM,IAAI,GAAG,MAAM,IAAA,oBAAY,GAAE,CAAC;IAClC,OAAO,IAAI,CAAC,GAAG,CAAC;AAClB,CAAC;AAYD,KAAK,UAAU,oBAAoB,CACjC,OAAe,EACf,SAAiB;IAEjB,KAAK,UAAU,aAAa,CAAC,KAAsB;QACjD,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"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"}
|
package/lib/api/index.test.js
CHANGED
|
@@ -10,7 +10,7 @@ const mockGetServerInfos = jest.fn().mockResolvedValue({
|
|
|
10
10
|
const mockGetTransactions = jest.fn();
|
|
11
11
|
jest.mock("../network", () => ({
|
|
12
12
|
getServerInfos: () => mockGetServerInfos(),
|
|
13
|
-
getTransactions: () => mockGetTransactions(),
|
|
13
|
+
getTransactions: (address, options) => mockGetTransactions(address, options),
|
|
14
14
|
}));
|
|
15
15
|
describe("listOperations", () => {
|
|
16
16
|
const api = (0, index_1.createApi)({ node: "https://localhost" });
|
|
@@ -100,6 +100,29 @@ describe("listOperations", () => {
|
|
|
100
100
|
expect(mockGetTransactions).toHaveBeenCalledTimes(10);
|
|
101
101
|
expect(results.length).toBe(txs.length * 10);
|
|
102
102
|
});
|
|
103
|
+
it("should pass the token returned by previous calls", async () => {
|
|
104
|
+
const txs = givenTxs(BigInt(10), BigInt(10), "src", "dest");
|
|
105
|
+
mockGetTransactions
|
|
106
|
+
.mockReturnValueOnce(mockNetworkTxs(txs, defaultMarker))
|
|
107
|
+
.mockReturnValueOnce(mockNetworkTxs(txs, undefined));
|
|
108
|
+
const [results, _] = await api.listOperations("src", { minHeight: 0 });
|
|
109
|
+
// called 2 times because the second time there is no marker
|
|
110
|
+
expect(mockGetServerInfos).toHaveBeenCalledTimes(2);
|
|
111
|
+
expect(mockGetTransactions).toHaveBeenCalledTimes(2);
|
|
112
|
+
// check tokens are passed
|
|
113
|
+
const baseOptions = {
|
|
114
|
+
ledger_index_min: 1,
|
|
115
|
+
limit: 200,
|
|
116
|
+
forward: true,
|
|
117
|
+
};
|
|
118
|
+
expect(mockGetTransactions).toHaveBeenNthCalledWith(1, "src", baseOptions);
|
|
119
|
+
const optionsWithToken = {
|
|
120
|
+
...baseOptions,
|
|
121
|
+
marker: defaultMarker,
|
|
122
|
+
};
|
|
123
|
+
expect(mockGetTransactions).toHaveBeenNthCalledWith(2, "src", optionsWithToken);
|
|
124
|
+
expect(results.length).toBe(txs.length * 2);
|
|
125
|
+
});
|
|
103
126
|
it.each([
|
|
104
127
|
{
|
|
105
128
|
address: "WHATEVER_ADDRESS",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/api/index.test.ts"],"names":[],"mappings":";;AAAA,oCAAwC;AACxC,mCAAoC;
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/api/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { XrpOperation } from "../types";
|
|
2
|
-
type Order = "asc" | "desc";
|
|
1
|
+
import { ListOperationsOptions, XrpOperation } from "../types";
|
|
3
2
|
/**
|
|
4
3
|
* Returns list of "Payment" Operations associated to an account.
|
|
5
4
|
* @param address Account address
|
|
@@ -13,11 +12,5 @@ type Order = "asc" | "desc";
|
|
|
13
12
|
* this parameter is added as a workaround for the issue LIVE-16705
|
|
14
13
|
* @returns a list of operations is descending order and a token to be used for pagination
|
|
15
14
|
*/
|
|
16
|
-
export declare function listOperations(address: string, { limit, minHeight, token, order
|
|
17
|
-
limit?: number;
|
|
18
|
-
token?: string;
|
|
19
|
-
order?: Order;
|
|
20
|
-
minHeight?: number;
|
|
21
|
-
}): Promise<[XrpOperation[], string]>;
|
|
22
|
-
export {};
|
|
15
|
+
export declare function listOperations(address: string, { limit, minHeight, token, order }: ListOperationsOptions): Promise<[XrpOperation[], string]>;
|
|
23
16
|
//# sourceMappingURL=listOperations.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listOperations.d.ts","sourceRoot":"","sources":["../../src/logic/listOperations.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,YAAY,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"listOperations.d.ts","sourceRoot":"","sources":["../../src/logic/listOperations.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAW,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxE;;;;;;;;;;;;GAYG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,qBAAqB,GACxD,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE,MAAM,CAAC,CAAC,CA2EnC"}
|
|
@@ -16,7 +16,7 @@ const utils_1 = require("./utils");
|
|
|
16
16
|
* this parameter is added as a workaround for the issue LIVE-16705
|
|
17
17
|
* @returns a list of operations is descending order and a token to be used for pagination
|
|
18
18
|
*/
|
|
19
|
-
async function listOperations(address, { limit, minHeight, token, order
|
|
19
|
+
async function listOperations(address, { limit, minHeight, token, order }) {
|
|
20
20
|
const serverInfo = await (0, network_1.getServerInfos)();
|
|
21
21
|
const ledgers = serverInfo.info.complete_ledgers.split("-");
|
|
22
22
|
const minLedgerVersion = Number(ledgers[0]);
|
|
@@ -50,13 +50,13 @@ async function listOperations(address, { limit, minHeight, token, order, }) {
|
|
|
50
50
|
async function getPaymentTransactions(address, options) {
|
|
51
51
|
const response = await (0, network_1.getTransactions)(address, options);
|
|
52
52
|
const txs = response.transactions;
|
|
53
|
-
const
|
|
53
|
+
const responseMarker = response.marker;
|
|
54
54
|
// Filter out the transactions that are not "Payment" type because the filter on "tx_type" of the node RPC is not working as expected.
|
|
55
55
|
const paymentTxs = txs.filter(tx => tx.tx_json.TransactionType === "Payment");
|
|
56
56
|
const shortage = (options.limit && txs.length < options.limit) || false;
|
|
57
|
-
const nextOptions =
|
|
58
|
-
if (
|
|
59
|
-
nextOptions.marker =
|
|
57
|
+
const { marker, ...nextOptions } = options;
|
|
58
|
+
if (responseMarker) {
|
|
59
|
+
nextOptions.marker = responseMarker;
|
|
60
60
|
if (nextOptions.limit)
|
|
61
61
|
nextOptions.limit -= paymentTxs.length;
|
|
62
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listOperations.js","sourceRoot":"","sources":["../../src/logic/listOperations.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"listOperations.js","sourceRoot":"","sources":["../../src/logic/listOperations.ts"],"names":[],"mappings":"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"}
|
package/lib/types/model.d.ts
CHANGED
|
@@ -28,4 +28,12 @@ export type XrpOperation = {
|
|
|
28
28
|
memos?: XrpMemo[];
|
|
29
29
|
};
|
|
30
30
|
};
|
|
31
|
+
type Order = "asc" | "desc";
|
|
32
|
+
export type ListOperationsOptions = {
|
|
33
|
+
limit?: number;
|
|
34
|
+
token?: string;
|
|
35
|
+
order?: Order;
|
|
36
|
+
minHeight?: number;
|
|
37
|
+
};
|
|
38
|
+
export {};
|
|
31
39
|
//# sourceMappingURL=model.d.ts.map
|
package/lib/types/model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/types/model.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AACF,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,IAAI,GAAG,KAAK,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,EAAE,IAAI,CAAC;IACX,yBAAyB,EAAE,MAAM,CAAC;IAClC,OAAO,CAAC,EAAE;QACR,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;KACnB,CAAC;CACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/types/model.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AACF,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,IAAI,GAAG,KAAK,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,EAAE,IAAI,CAAC;IACX,yBAAyB,EAAE,MAAM,CAAC;IAClC,OAAO,CAAC,EAAE;QACR,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;KACnB,CAAC;CACH,CAAC;AAEF,KAAK,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;AAC5B,MAAM,MAAM,qBAAqB,GAAG;IAElC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC"}
|
package/lib-es/api/index.js
CHANGED
|
@@ -24,11 +24,15 @@ async function estimate(_addr, _amount) {
|
|
|
24
24
|
}
|
|
25
25
|
async function operationsFromHeight(address, minHeight) {
|
|
26
26
|
async function fetchNextPage(state) {
|
|
27
|
-
const
|
|
27
|
+
const options = {
|
|
28
28
|
limit: state.pageSize,
|
|
29
29
|
minHeight: state.minHeight,
|
|
30
30
|
order: "asc",
|
|
31
|
-
}
|
|
31
|
+
};
|
|
32
|
+
if (state.apiNextCursor) {
|
|
33
|
+
options.token = state.apiNextCursor;
|
|
34
|
+
}
|
|
35
|
+
const [operations, apiNextCursor] = await listOperations(address, options);
|
|
32
36
|
const newCurrentIteration = state.currentIteration + 1;
|
|
33
37
|
let continueIteration = true;
|
|
34
38
|
if (apiNextCursor === "") {
|
package/lib-es/api/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,UAA8B,MAAM,WAAW,CAAC;AACvD,OAAO,EACL,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,YAAY,EACZ,UAAU,EACV,oBAAoB,EACpB,SAAS,EACT,cAAc,GACf,MAAM,UAAU,CAAC;AAGlB,MAAM,UAAU,SAAS,CAAC,MAAiB;IACzC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IAE5E,OAAO;QACL,SAAS;QACT,OAAO;QACP,gBAAgB,EAAE,KAAK;QACvB,YAAY,EAAE,QAAQ;QACtB,UAAU;QACV,SAAS;QACT,cAAc,EAAE,UAAU;KAC3B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,KAAK,CAAC,OAAe,EAAE,WAA2B;IAC/D,MAAM,kBAAkB,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,EAAE,GAAG,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,WAAW,CAAC,CAAC;IAChF,OAAO,EAAE,CAAC,qBAAqB,CAAC;AAClC,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,KAAa,EAAE,OAAe;IACpD,MAAM,IAAI,GAAG,MAAM,YAAY,EAAE,CAAC;IAClC,OAAO,IAAI,CAAC,GAAG,CAAC;AAClB,CAAC;AAYD,KAAK,UAAU,oBAAoB,CACjC,OAAe,EACf,SAAiB;IAEjB,KAAK,UAAU,aAAa,CAAC,KAAsB;QACjD,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"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"}
|
package/lib-es/api/index.test.js
CHANGED
|
@@ -8,7 +8,7 @@ const mockGetServerInfos = jest.fn().mockResolvedValue({
|
|
|
8
8
|
const mockGetTransactions = jest.fn();
|
|
9
9
|
jest.mock("../network", () => ({
|
|
10
10
|
getServerInfos: () => mockGetServerInfos(),
|
|
11
|
-
getTransactions: () => mockGetTransactions(),
|
|
11
|
+
getTransactions: (address, options) => mockGetTransactions(address, options),
|
|
12
12
|
}));
|
|
13
13
|
describe("listOperations", () => {
|
|
14
14
|
const api = createApi({ node: "https://localhost" });
|
|
@@ -98,6 +98,29 @@ describe("listOperations", () => {
|
|
|
98
98
|
expect(mockGetTransactions).toHaveBeenCalledTimes(10);
|
|
99
99
|
expect(results.length).toBe(txs.length * 10);
|
|
100
100
|
});
|
|
101
|
+
it("should pass the token returned by previous calls", async () => {
|
|
102
|
+
const txs = givenTxs(BigInt(10), BigInt(10), "src", "dest");
|
|
103
|
+
mockGetTransactions
|
|
104
|
+
.mockReturnValueOnce(mockNetworkTxs(txs, defaultMarker))
|
|
105
|
+
.mockReturnValueOnce(mockNetworkTxs(txs, undefined));
|
|
106
|
+
const [results, _] = await api.listOperations("src", { minHeight: 0 });
|
|
107
|
+
// called 2 times because the second time there is no marker
|
|
108
|
+
expect(mockGetServerInfos).toHaveBeenCalledTimes(2);
|
|
109
|
+
expect(mockGetTransactions).toHaveBeenCalledTimes(2);
|
|
110
|
+
// check tokens are passed
|
|
111
|
+
const baseOptions = {
|
|
112
|
+
ledger_index_min: 1,
|
|
113
|
+
limit: 200,
|
|
114
|
+
forward: true,
|
|
115
|
+
};
|
|
116
|
+
expect(mockGetTransactions).toHaveBeenNthCalledWith(1, "src", baseOptions);
|
|
117
|
+
const optionsWithToken = {
|
|
118
|
+
...baseOptions,
|
|
119
|
+
marker: defaultMarker,
|
|
120
|
+
};
|
|
121
|
+
expect(mockGetTransactions).toHaveBeenNthCalledWith(2, "src", optionsWithToken);
|
|
122
|
+
expect(results.length).toBe(txs.length * 2);
|
|
123
|
+
});
|
|
101
124
|
it.each([
|
|
102
125
|
{
|
|
103
126
|
address: "WHATEVER_ADDRESS",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/api/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/api/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { XrpOperation } from "../types";
|
|
2
|
-
type Order = "asc" | "desc";
|
|
1
|
+
import { ListOperationsOptions, XrpOperation } from "../types";
|
|
3
2
|
/**
|
|
4
3
|
* Returns list of "Payment" Operations associated to an account.
|
|
5
4
|
* @param address Account address
|
|
@@ -13,11 +12,5 @@ type Order = "asc" | "desc";
|
|
|
13
12
|
* this parameter is added as a workaround for the issue LIVE-16705
|
|
14
13
|
* @returns a list of operations is descending order and a token to be used for pagination
|
|
15
14
|
*/
|
|
16
|
-
export declare function listOperations(address: string, { limit, minHeight, token, order
|
|
17
|
-
limit?: number;
|
|
18
|
-
token?: string;
|
|
19
|
-
order?: Order;
|
|
20
|
-
minHeight?: number;
|
|
21
|
-
}): Promise<[XrpOperation[], string]>;
|
|
22
|
-
export {};
|
|
15
|
+
export declare function listOperations(address: string, { limit, minHeight, token, order }: ListOperationsOptions): Promise<[XrpOperation[], string]>;
|
|
23
16
|
//# sourceMappingURL=listOperations.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listOperations.d.ts","sourceRoot":"","sources":["../../src/logic/listOperations.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,YAAY,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"listOperations.d.ts","sourceRoot":"","sources":["../../src/logic/listOperations.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAW,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxE;;;;;;;;;;;;GAYG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,qBAAqB,GACxD,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE,MAAM,CAAC,CAAC,CA2EnC"}
|
|
@@ -13,7 +13,7 @@ import { RIPPLE_EPOCH } from "./utils";
|
|
|
13
13
|
* this parameter is added as a workaround for the issue LIVE-16705
|
|
14
14
|
* @returns a list of operations is descending order and a token to be used for pagination
|
|
15
15
|
*/
|
|
16
|
-
export async function listOperations(address, { limit, minHeight, token, order
|
|
16
|
+
export async function listOperations(address, { limit, minHeight, token, order }) {
|
|
17
17
|
const serverInfo = await getServerInfos();
|
|
18
18
|
const ledgers = serverInfo.info.complete_ledgers.split("-");
|
|
19
19
|
const minLedgerVersion = Number(ledgers[0]);
|
|
@@ -47,13 +47,13 @@ export async function listOperations(address, { limit, minHeight, token, order,
|
|
|
47
47
|
async function getPaymentTransactions(address, options) {
|
|
48
48
|
const response = await getTransactions(address, options);
|
|
49
49
|
const txs = response.transactions;
|
|
50
|
-
const
|
|
50
|
+
const responseMarker = response.marker;
|
|
51
51
|
// Filter out the transactions that are not "Payment" type because the filter on "tx_type" of the node RPC is not working as expected.
|
|
52
52
|
const paymentTxs = txs.filter(tx => tx.tx_json.TransactionType === "Payment");
|
|
53
53
|
const shortage = (options.limit && txs.length < options.limit) || false;
|
|
54
|
-
const nextOptions =
|
|
55
|
-
if (
|
|
56
|
-
nextOptions.marker =
|
|
54
|
+
const { marker, ...nextOptions } = options;
|
|
55
|
+
if (responseMarker) {
|
|
56
|
+
nextOptions.marker = responseMarker;
|
|
57
57
|
if (nextOptions.limit)
|
|
58
58
|
nextOptions.limit -= paymentTxs.length;
|
|
59
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listOperations.js","sourceRoot":"","sources":["../../src/logic/listOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAA0B,MAAM,YAAY,CAAC;AAGrF,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"listOperations.js","sourceRoot":"","sources":["../../src/logic/listOperations.ts"],"names":[],"mappings":"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"}
|
package/lib-es/types/model.d.ts
CHANGED
|
@@ -28,4 +28,12 @@ export type XrpOperation = {
|
|
|
28
28
|
memos?: XrpMemo[];
|
|
29
29
|
};
|
|
30
30
|
};
|
|
31
|
+
type Order = "asc" | "desc";
|
|
32
|
+
export type ListOperationsOptions = {
|
|
33
|
+
limit?: number;
|
|
34
|
+
token?: string;
|
|
35
|
+
order?: Order;
|
|
36
|
+
minHeight?: number;
|
|
37
|
+
};
|
|
38
|
+
export {};
|
|
31
39
|
//# sourceMappingURL=model.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/types/model.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AACF,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,IAAI,GAAG,KAAK,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,EAAE,IAAI,CAAC;IACX,yBAAyB,EAAE,MAAM,CAAC;IAClC,OAAO,CAAC,EAAE;QACR,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;KACnB,CAAC;CACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/types/model.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AACF,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,IAAI,GAAG,KAAK,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,EAAE,IAAI,CAAC;IACX,yBAAyB,EAAE,MAAM,CAAC;IAClC,OAAO,CAAC,EAAE;QACR,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;KACnB,CAAC;CACH,CAAC;AAEF,KAAK,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;AAC5B,MAAM,MAAM,qBAAqB,GAAG;IAElC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/coin-xrp",
|
|
3
|
-
"version": "2.0
|
|
3
|
+
"version": "2.1.0-next.0",
|
|
4
4
|
"description": "Ledger XRP Coin integration",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger",
|
|
@@ -104,13 +104,13 @@
|
|
|
104
104
|
"ripple-address-codec": "^5.0.0",
|
|
105
105
|
"ripple-binary-codec": "^1.3.0",
|
|
106
106
|
"rxjs": "^7.8.1",
|
|
107
|
-
"@ledgerhq/coin-framework": "^2.
|
|
107
|
+
"@ledgerhq/coin-framework": "^2.3.0-next.0",
|
|
108
108
|
"@ledgerhq/cryptoassets": "^13.13.0",
|
|
109
109
|
"@ledgerhq/devices": "8.4.4",
|
|
110
|
+
"@ledgerhq/errors": "^6.19.1",
|
|
110
111
|
"@ledgerhq/live-network": "^2.0.5",
|
|
111
|
-
"@ledgerhq/types-live": "^6.
|
|
112
|
-
"@ledgerhq/logs": "^6.12.0"
|
|
113
|
-
"@ledgerhq/errors": "^6.19.1"
|
|
112
|
+
"@ledgerhq/types-live": "^6.63.0-next.0",
|
|
113
|
+
"@ledgerhq/logs": "^6.12.0"
|
|
114
114
|
},
|
|
115
115
|
"devDependencies": {
|
|
116
116
|
"@faker-js/faker": "^8.4.1",
|
package/src/api/index.test.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { RIPPLE_EPOCH } from "../logic";
|
|
2
2
|
import { createApi } from "./index";
|
|
3
|
+
import { GetTransactionsOptions } from "../network";
|
|
3
4
|
|
|
4
5
|
const mockGetServerInfos = jest.fn().mockResolvedValue({
|
|
5
6
|
info: {
|
|
@@ -9,7 +10,8 @@ const mockGetServerInfos = jest.fn().mockResolvedValue({
|
|
|
9
10
|
const mockGetTransactions = jest.fn();
|
|
10
11
|
jest.mock("../network", () => ({
|
|
11
12
|
getServerInfos: () => mockGetServerInfos(),
|
|
12
|
-
getTransactions: () =>
|
|
13
|
+
getTransactions: (address: string, options: GetTransactionsOptions) =>
|
|
14
|
+
mockGetTransactions(address, options),
|
|
13
15
|
}));
|
|
14
16
|
|
|
15
17
|
describe("listOperations", () => {
|
|
@@ -112,6 +114,34 @@ describe("listOperations", () => {
|
|
|
112
114
|
expect(results.length).toBe(txs.length * 10);
|
|
113
115
|
});
|
|
114
116
|
|
|
117
|
+
it("should pass the token returned by previous calls", async () => {
|
|
118
|
+
const txs = givenTxs(BigInt(10), BigInt(10), "src", "dest");
|
|
119
|
+
mockGetTransactions
|
|
120
|
+
.mockReturnValueOnce(mockNetworkTxs(txs, defaultMarker))
|
|
121
|
+
.mockReturnValueOnce(mockNetworkTxs(txs, undefined));
|
|
122
|
+
|
|
123
|
+
const [results, _] = await api.listOperations("src", { minHeight: 0 });
|
|
124
|
+
|
|
125
|
+
// called 2 times because the second time there is no marker
|
|
126
|
+
expect(mockGetServerInfos).toHaveBeenCalledTimes(2);
|
|
127
|
+
expect(mockGetTransactions).toHaveBeenCalledTimes(2);
|
|
128
|
+
|
|
129
|
+
// check tokens are passed
|
|
130
|
+
const baseOptions = {
|
|
131
|
+
ledger_index_min: 1,
|
|
132
|
+
limit: 200,
|
|
133
|
+
forward: true,
|
|
134
|
+
};
|
|
135
|
+
expect(mockGetTransactions).toHaveBeenNthCalledWith(1, "src", baseOptions);
|
|
136
|
+
const optionsWithToken = {
|
|
137
|
+
...baseOptions,
|
|
138
|
+
marker: defaultMarker,
|
|
139
|
+
};
|
|
140
|
+
expect(mockGetTransactions).toHaveBeenNthCalledWith(2, "src", optionsWithToken);
|
|
141
|
+
|
|
142
|
+
expect(results.length).toBe(txs.length * 2);
|
|
143
|
+
});
|
|
144
|
+
|
|
115
145
|
it.each([
|
|
116
146
|
{
|
|
117
147
|
address: "WHATEVER_ADDRESS",
|
package/src/api/index.ts
CHANGED
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
lastBlock,
|
|
17
17
|
listOperations,
|
|
18
18
|
} from "../logic";
|
|
19
|
-
import { XrpOperation } from "../types";
|
|
19
|
+
import { ListOperationsOptions, XrpOperation } from "../types";
|
|
20
20
|
|
|
21
21
|
export function createApi(config: XrpConfig): Api {
|
|
22
22
|
coinConfig.setCoinConfig(() => ({ ...config, status: { type: "active" } }));
|
|
@@ -58,11 +58,15 @@ async function operationsFromHeight(
|
|
|
58
58
|
minHeight: number,
|
|
59
59
|
): Promise<[XrpOperation[], string]> {
|
|
60
60
|
async function fetchNextPage(state: PaginationState): Promise<PaginationState> {
|
|
61
|
-
const
|
|
61
|
+
const options: ListOperationsOptions = {
|
|
62
62
|
limit: state.pageSize,
|
|
63
63
|
minHeight: state.minHeight,
|
|
64
64
|
order: "asc",
|
|
65
|
-
}
|
|
65
|
+
};
|
|
66
|
+
if (state.apiNextCursor) {
|
|
67
|
+
options.token = state.apiNextCursor;
|
|
68
|
+
}
|
|
69
|
+
const [operations, apiNextCursor] = await listOperations(address, options);
|
|
66
70
|
const newCurrentIteration = state.currentIteration + 1;
|
|
67
71
|
let continueIteration = true;
|
|
68
72
|
if (apiNextCursor === "") {
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { getServerInfos, getTransactions, GetTransactionsOptions } from "../network";
|
|
2
2
|
import type { XrplOperation } from "../network/types";
|
|
3
|
-
import { XrpMemo, XrpOperation } from "../types";
|
|
3
|
+
import { ListOperationsOptions, XrpMemo, XrpOperation } from "../types";
|
|
4
4
|
import { RIPPLE_EPOCH } from "./utils";
|
|
5
5
|
|
|
6
|
-
type Order = "asc" | "desc";
|
|
7
6
|
/**
|
|
8
7
|
* Returns list of "Payment" Operations associated to an account.
|
|
9
8
|
* @param address Account address
|
|
@@ -19,19 +18,7 @@ type Order = "asc" | "desc";
|
|
|
19
18
|
*/
|
|
20
19
|
export async function listOperations(
|
|
21
20
|
address: string,
|
|
22
|
-
{
|
|
23
|
-
limit,
|
|
24
|
-
minHeight,
|
|
25
|
-
token,
|
|
26
|
-
order,
|
|
27
|
-
}: {
|
|
28
|
-
// pagination:
|
|
29
|
-
limit?: number;
|
|
30
|
-
token?: string;
|
|
31
|
-
order?: Order;
|
|
32
|
-
// filters:
|
|
33
|
-
minHeight?: number;
|
|
34
|
-
},
|
|
21
|
+
{ limit, minHeight, token, order }: ListOperationsOptions,
|
|
35
22
|
): Promise<[XrpOperation[], string]> {
|
|
36
23
|
const serverInfo = await getServerInfos();
|
|
37
24
|
const ledgers = serverInfo.info.complete_ledgers.split("-");
|
|
@@ -75,13 +62,14 @@ export async function listOperations(
|
|
|
75
62
|
): Promise<[boolean, GetTransactionsOptions, XrplOperation[]]> {
|
|
76
63
|
const response = await getTransactions(address, options);
|
|
77
64
|
const txs = response.transactions;
|
|
78
|
-
const
|
|
65
|
+
const responseMarker = response.marker;
|
|
79
66
|
// Filter out the transactions that are not "Payment" type because the filter on "tx_type" of the node RPC is not working as expected.
|
|
80
67
|
const paymentTxs = txs.filter(tx => tx.tx_json.TransactionType === "Payment");
|
|
81
68
|
const shortage = (options.limit && txs.length < options.limit) || false;
|
|
82
|
-
const nextOptions =
|
|
83
|
-
|
|
84
|
-
|
|
69
|
+
const { marker, ...nextOptions } = options;
|
|
70
|
+
|
|
71
|
+
if (responseMarker) {
|
|
72
|
+
(nextOptions as GetTransactionsOptions).marker = responseMarker;
|
|
85
73
|
if (nextOptions.limit) nextOptions.limit -= paymentTxs.length;
|
|
86
74
|
}
|
|
87
75
|
return [shortage, nextOptions, paymentTxs];
|
package/src/types/model.ts
CHANGED
|
@@ -29,3 +29,13 @@ export type XrpOperation = {
|
|
|
29
29
|
memos?: XrpMemo[];
|
|
30
30
|
};
|
|
31
31
|
};
|
|
32
|
+
|
|
33
|
+
type Order = "asc" | "desc";
|
|
34
|
+
export type ListOperationsOptions = {
|
|
35
|
+
// pagination:
|
|
36
|
+
limit?: number;
|
|
37
|
+
token?: string;
|
|
38
|
+
order?: Order;
|
|
39
|
+
// filters:
|
|
40
|
+
minHeight?: number;
|
|
41
|
+
};
|