@ledgerhq/coin-canton 0.5.0-nightly.1 → 0.5.0-nightly.3

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.
Files changed (199) hide show
  1. package/.turbo/turbo-build.log +1 -1
  2. package/.unimportedrc.json +12 -4
  3. package/CHANGELOG.md +32 -0
  4. package/lib/api/getBalance.integ.test.js +1 -1
  5. package/lib/api/getBalance.integ.test.js.map +1 -1
  6. package/lib/api/index.d.ts.map +1 -1
  7. package/lib/api/index.js +11 -8
  8. package/lib/api/index.js.map +1 -1
  9. package/lib/bridge/broadcast.d.ts.map +1 -1
  10. package/lib/bridge/broadcast.js +2 -1
  11. package/lib/bridge/broadcast.js.map +1 -1
  12. package/lib/bridge/createTransaction.test.js +1 -1
  13. package/lib/bridge/createTransaction.test.js.map +1 -1
  14. package/lib/bridge/index.d.ts +3 -3
  15. package/lib/bridge/index.d.ts.map +1 -1
  16. package/lib/bridge/index.js +9 -1
  17. package/lib/bridge/index.js.map +1 -1
  18. package/lib/bridge/onboard.d.ts +10 -0
  19. package/lib/bridge/onboard.d.ts.map +1 -0
  20. package/lib/bridge/onboard.integ.test.d.ts +2 -0
  21. package/lib/bridge/onboard.integ.test.d.ts.map +1 -0
  22. package/lib/bridge/onboard.integ.test.js +156 -0
  23. package/lib/bridge/onboard.integ.test.js.map +1 -0
  24. package/lib/bridge/onboard.js +139 -0
  25. package/lib/bridge/onboard.js.map +1 -0
  26. package/lib/bridge/prepareTransaction.d.ts.map +1 -1
  27. package/lib/bridge/prepareTransaction.js +5 -7
  28. package/lib/bridge/prepareTransaction.js.map +1 -1
  29. package/lib/bridge/signOperation.d.ts.map +1 -1
  30. package/lib/bridge/signOperation.js +7 -9
  31. package/lib/bridge/signOperation.js.map +1 -1
  32. package/lib/bridge/sync.d.ts.map +1 -1
  33. package/lib/bridge/sync.integ.test.d.ts +2 -0
  34. package/lib/bridge/sync.integ.test.d.ts.map +1 -0
  35. package/lib/bridge/sync.integ.test.js +175 -0
  36. package/lib/bridge/sync.integ.test.js.map +1 -0
  37. package/lib/bridge/sync.js +40 -36
  38. package/lib/bridge/sync.js.map +1 -1
  39. package/lib/bridge/updateTransaction.d.ts.map +1 -1
  40. package/lib/bridge/updateTransaction.js +0 -4
  41. package/lib/bridge/updateTransaction.js.map +1 -1
  42. package/lib/common-logic/history/listOperations.d.ts.map +1 -1
  43. package/lib/common-logic/history/listOperations.js +19 -31
  44. package/lib/common-logic/history/listOperations.js.map +1 -1
  45. package/lib/common-logic/transaction/broadcast.d.ts.map +1 -1
  46. package/lib/common-logic/transaction/broadcast.js +2 -1
  47. package/lib/common-logic/transaction/broadcast.js.map +1 -1
  48. package/lib/common-logic/transaction/broadcast.test.js +3 -3
  49. package/lib/common-logic/transaction/broadcast.test.js.map +1 -1
  50. package/lib/common-logic/transaction/combine.d.ts +1 -1
  51. package/lib/common-logic/transaction/combine.d.ts.map +1 -1
  52. package/lib/common-logic/transaction/combine.js +2 -3
  53. package/lib/common-logic/transaction/combine.js.map +1 -1
  54. package/lib/common-logic/transaction/combine.test.js +3 -13
  55. package/lib/common-logic/transaction/combine.test.js.map +1 -1
  56. package/lib/common-logic/transaction/craftTransaction.d.ts +5 -3
  57. package/lib/common-logic/transaction/craftTransaction.d.ts.map +1 -1
  58. package/lib/common-logic/transaction/craftTransaction.js +11 -12
  59. package/lib/common-logic/transaction/craftTransaction.js.map +1 -1
  60. package/lib/network/gateway.d.ts +196 -5
  61. package/lib/network/gateway.d.ts.map +1 -1
  62. package/lib/network/gateway.integ.test.js +121 -11
  63. package/lib/network/gateway.integ.test.js.map +1 -1
  64. package/lib/network/gateway.js +99 -21
  65. package/lib/network/gateway.js.map +1 -1
  66. package/lib/network/node.d.ts +2 -2
  67. package/lib/network/node.d.ts.map +1 -1
  68. package/lib/network/node.js.map +1 -1
  69. package/lib/network/types.d.ts +1 -1
  70. package/lib/network/types.d.ts.map +1 -1
  71. package/lib/signer/getAddress.d.ts.map +1 -1
  72. package/lib/signer/getAddress.js +2 -2
  73. package/lib/signer/getAddress.js.map +1 -1
  74. package/lib/test/cantonTestUtils.d.ts +33 -0
  75. package/lib/test/cantonTestUtils.d.ts.map +1 -0
  76. package/lib/test/cantonTestUtils.js +159 -0
  77. package/lib/test/cantonTestUtils.js.map +1 -0
  78. package/lib/types/bridge.d.ts +7 -1
  79. package/lib/types/bridge.d.ts.map +1 -1
  80. package/lib/types/index.d.ts +1 -10
  81. package/lib/types/index.d.ts.map +1 -1
  82. package/lib/types/index.js +1 -0
  83. package/lib/types/index.js.map +1 -1
  84. package/lib/types/onboard.d.ts +55 -0
  85. package/lib/types/onboard.d.ts.map +1 -0
  86. package/lib/types/onboard.js +22 -0
  87. package/lib/types/onboard.js.map +1 -0
  88. package/lib-es/api/getBalance.integ.test.js +1 -1
  89. package/lib-es/api/getBalance.integ.test.js.map +1 -1
  90. package/lib-es/api/index.d.ts.map +1 -1
  91. package/lib-es/api/index.js +12 -9
  92. package/lib-es/api/index.js.map +1 -1
  93. package/lib-es/bridge/broadcast.d.ts.map +1 -1
  94. package/lib-es/bridge/broadcast.js +2 -1
  95. package/lib-es/bridge/broadcast.js.map +1 -1
  96. package/lib-es/bridge/createTransaction.test.js +1 -1
  97. package/lib-es/bridge/createTransaction.test.js.map +1 -1
  98. package/lib-es/bridge/index.d.ts +3 -3
  99. package/lib-es/bridge/index.d.ts.map +1 -1
  100. package/lib-es/bridge/index.js +9 -1
  101. package/lib-es/bridge/index.js.map +1 -1
  102. package/lib-es/bridge/onboard.d.ts +10 -0
  103. package/lib-es/bridge/onboard.d.ts.map +1 -0
  104. package/lib-es/bridge/onboard.integ.test.d.ts +2 -0
  105. package/lib-es/bridge/onboard.integ.test.d.ts.map +1 -0
  106. package/lib-es/bridge/onboard.integ.test.js +151 -0
  107. package/lib-es/bridge/onboard.integ.test.js.map +1 -0
  108. package/lib-es/bridge/onboard.js +133 -0
  109. package/lib-es/bridge/onboard.js.map +1 -0
  110. package/lib-es/bridge/prepareTransaction.d.ts.map +1 -1
  111. package/lib-es/bridge/prepareTransaction.js +6 -8
  112. package/lib-es/bridge/prepareTransaction.js.map +1 -1
  113. package/lib-es/bridge/signOperation.d.ts.map +1 -1
  114. package/lib-es/bridge/signOperation.js +8 -10
  115. package/lib-es/bridge/signOperation.js.map +1 -1
  116. package/lib-es/bridge/sync.d.ts.map +1 -1
  117. package/lib-es/bridge/sync.integ.test.d.ts +2 -0
  118. package/lib-es/bridge/sync.integ.test.d.ts.map +1 -0
  119. package/lib-es/bridge/sync.integ.test.js +137 -0
  120. package/lib-es/bridge/sync.integ.test.js.map +1 -0
  121. package/lib-es/bridge/sync.js +39 -35
  122. package/lib-es/bridge/sync.js.map +1 -1
  123. package/lib-es/bridge/updateTransaction.d.ts.map +1 -1
  124. package/lib-es/bridge/updateTransaction.js +0 -4
  125. package/lib-es/bridge/updateTransaction.js.map +1 -1
  126. package/lib-es/common-logic/history/listOperations.d.ts.map +1 -1
  127. package/lib-es/common-logic/history/listOperations.js +20 -29
  128. package/lib-es/common-logic/history/listOperations.js.map +1 -1
  129. package/lib-es/common-logic/transaction/broadcast.d.ts.map +1 -1
  130. package/lib-es/common-logic/transaction/broadcast.js +2 -1
  131. package/lib-es/common-logic/transaction/broadcast.js.map +1 -1
  132. package/lib-es/common-logic/transaction/broadcast.test.js +3 -3
  133. package/lib-es/common-logic/transaction/broadcast.test.js.map +1 -1
  134. package/lib-es/common-logic/transaction/combine.d.ts +1 -1
  135. package/lib-es/common-logic/transaction/combine.d.ts.map +1 -1
  136. package/lib-es/common-logic/transaction/combine.js +2 -3
  137. package/lib-es/common-logic/transaction/combine.js.map +1 -1
  138. package/lib-es/common-logic/transaction/combine.test.js +3 -13
  139. package/lib-es/common-logic/transaction/combine.test.js.map +1 -1
  140. package/lib-es/common-logic/transaction/craftTransaction.d.ts +5 -3
  141. package/lib-es/common-logic/transaction/craftTransaction.d.ts.map +1 -1
  142. package/lib-es/common-logic/transaction/craftTransaction.js +11 -12
  143. package/lib-es/common-logic/transaction/craftTransaction.js.map +1 -1
  144. package/lib-es/network/gateway.d.ts +196 -5
  145. package/lib-es/network/gateway.d.ts.map +1 -1
  146. package/lib-es/network/gateway.integ.test.js +122 -12
  147. package/lib-es/network/gateway.integ.test.js.map +1 -1
  148. package/lib-es/network/gateway.js +93 -20
  149. package/lib-es/network/gateway.js.map +1 -1
  150. package/lib-es/network/node.d.ts +2 -2
  151. package/lib-es/network/node.d.ts.map +1 -1
  152. package/lib-es/network/node.js.map +1 -1
  153. package/lib-es/network/types.d.ts +1 -1
  154. package/lib-es/network/types.d.ts.map +1 -1
  155. package/lib-es/signer/getAddress.d.ts.map +1 -1
  156. package/lib-es/signer/getAddress.js +2 -2
  157. package/lib-es/signer/getAddress.js.map +1 -1
  158. package/lib-es/test/cantonTestUtils.d.ts +33 -0
  159. package/lib-es/test/cantonTestUtils.d.ts.map +1 -0
  160. package/lib-es/test/cantonTestUtils.js +151 -0
  161. package/lib-es/test/cantonTestUtils.js.map +1 -0
  162. package/lib-es/types/bridge.d.ts +7 -1
  163. package/lib-es/types/bridge.d.ts.map +1 -1
  164. package/lib-es/types/index.d.ts +1 -10
  165. package/lib-es/types/index.d.ts.map +1 -1
  166. package/lib-es/types/index.js +1 -0
  167. package/lib-es/types/index.js.map +1 -1
  168. package/lib-es/types/onboard.d.ts +55 -0
  169. package/lib-es/types/onboard.d.ts.map +1 -0
  170. package/lib-es/types/onboard.js +19 -0
  171. package/lib-es/types/onboard.js.map +1 -0
  172. package/package.json +7 -7
  173. package/src/api/getBalance.integ.test.ts +1 -2
  174. package/src/api/index.ts +33 -26
  175. package/src/bridge/broadcast.ts +2 -3
  176. package/src/bridge/createTransaction.test.ts +1 -1
  177. package/src/bridge/index.ts +14 -4
  178. package/src/bridge/onboard.integ.test.ts +219 -0
  179. package/src/bridge/onboard.ts +220 -0
  180. package/src/bridge/prepareTransaction.ts +6 -15
  181. package/src/bridge/signOperation.ts +9 -16
  182. package/src/bridge/sync.integ.test.ts +180 -0
  183. package/src/bridge/sync.ts +61 -49
  184. package/src/bridge/updateTransaction.ts +0 -5
  185. package/src/common-logic/history/listOperations.ts +20 -31
  186. package/src/common-logic/transaction/broadcast.test.ts +3 -3
  187. package/src/common-logic/transaction/broadcast.ts +2 -1
  188. package/src/common-logic/transaction/combine.test.ts +3 -13
  189. package/src/common-logic/transaction/combine.ts +2 -4
  190. package/src/common-logic/transaction/craftTransaction.ts +15 -17
  191. package/src/network/gateway.integ.test.ts +156 -17
  192. package/src/network/gateway.ts +337 -30
  193. package/src/network/node.ts +3 -3
  194. package/src/network/types.ts +1 -1
  195. package/src/signer/getAddress.ts +3 -5
  196. package/src/test/cantonTestUtils.ts +181 -0
  197. package/src/types/bridge.ts +20 -0
  198. package/src/types/index.ts +1 -11
  199. package/src/types/onboard.ts +65 -0
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=sync.integ.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sync.integ.test.d.ts","sourceRoot":"","sources":["../../src/bridge/sync.integ.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,137 @@
1
+ import BigNumber from "bignumber.js";
2
+ import { getDerivationModesForCurrency, getDerivationScheme, runDerivationScheme, } from "@ledgerhq/coin-framework/derivation";
3
+ import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
4
+ import coinConfig from "../config";
5
+ import * as gateway from "../network/gateway";
6
+ import { getAccountShape } from "./sync";
7
+ const TEST_ADDRESS = "b6400f93ea1c74aea86be39b0ccc846fc5de01f12b2ad0d7c31848d6fb6eb6d9::1220c81315e2bf2524a9141bcc6cbf19b61c151e0dcaa95343c0ccf53aed7415c4ec";
8
+ const currency = getCryptoCurrencyById("canton_network");
9
+ const derivationMode = getDerivationModesForCurrency(currency)[0];
10
+ const derivationPath = runDerivationScheme(getDerivationScheme({ derivationMode, currency }), currency, {
11
+ account: 0,
12
+ });
13
+ const ACCOUNT_SHAPE_INFO = {
14
+ address: TEST_ADDRESS,
15
+ currency,
16
+ derivationMode,
17
+ derivationPath,
18
+ index: 0,
19
+ };
20
+ describe("sync (devnet)", () => {
21
+ beforeAll(async () => {
22
+ coinConfig.setCoinConfig(() => ({
23
+ gatewayUrl: "https://canton-gateway.api.live.ledger-test.com",
24
+ useGateway: true,
25
+ networkType: "devnet",
26
+ status: {
27
+ type: "active",
28
+ },
29
+ }));
30
+ });
31
+ describe("getAccountShape", () => {
32
+ it("should fetch account shape for a valid address", async () => {
33
+ const result = await getAccountShape(ACCOUNT_SHAPE_INFO, { paginationConfig: {} });
34
+ expect(result).toBeDefined();
35
+ expect(result.id).toBeDefined();
36
+ expect(result.xpub).toBe(TEST_ADDRESS.replace(/:/g, "_"));
37
+ expect(result.blockHeight).toBeGreaterThan(0);
38
+ expect(result.balance).toBeDefined();
39
+ expect(result.spendableBalance).toBeDefined();
40
+ expect(result.operations).toBeDefined();
41
+ expect(result.operationsCount).toBeGreaterThanOrEqual(0);
42
+ expect(result.balance).toBeInstanceOf(Object);
43
+ expect(result.balance?.toNumber).toBeDefined();
44
+ expect(result.spendableBalance).toBeInstanceOf(Object);
45
+ expect(result.spendableBalance?.toNumber).toBeDefined();
46
+ expect(result.spendableBalance?.toNumber()).toBeLessThanOrEqual(result.balance?.toNumber() || 0);
47
+ });
48
+ it("should handle address with colons correctly", async () => {
49
+ const result = await getAccountShape(ACCOUNT_SHAPE_INFO, { paginationConfig: {} });
50
+ expect(result.xpub).toBe(TEST_ADDRESS.replace(/:/g, "_"));
51
+ });
52
+ it("should merge operations correctly with initial account", async () => {
53
+ const operations = [
54
+ {
55
+ id: "test-op-1",
56
+ hash: "test-hash-1",
57
+ accountId: "test-account",
58
+ type: "OUT",
59
+ value: new BigNumber(1000000),
60
+ fee: new BigNumber(100000),
61
+ blockHash: "block-hash-1",
62
+ blockHeight: 100,
63
+ senders: [TEST_ADDRESS],
64
+ recipients: ["recipient-1"],
65
+ date: new Date("2023-01-01"),
66
+ transactionSequenceNumber: 100,
67
+ extra: { uid: "uid-1" },
68
+ },
69
+ ];
70
+ const result = await getAccountShape({
71
+ ...ACCOUNT_SHAPE_INFO,
72
+ // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
73
+ initialAccount: { operations },
74
+ }, { paginationConfig: {} });
75
+ expect(result.operations).toBeDefined();
76
+ expect(result.operationsCount).toBeGreaterThanOrEqual(1);
77
+ const initialOp = result.operations?.find(op => op.id === "test-op-1");
78
+ expect(initialOp).toBeDefined();
79
+ });
80
+ it("should take locked balance into account when calculating spendable balance", async () => {
81
+ const mockGetBalance = jest.spyOn(gateway, "getBalance");
82
+ mockGetBalance.mockResolvedValue([
83
+ {
84
+ instrument_id: "canton_network",
85
+ amount: 1000000,
86
+ locked: true,
87
+ },
88
+ ]);
89
+ const result = await getAccountShape(ACCOUNT_SHAPE_INFO, { paginationConfig: {} });
90
+ expect(result.balance?.toNumber()).toBe(1000000);
91
+ expect(result.spendableBalance?.toNumber()).toBe(0);
92
+ mockGetBalance.mockRestore();
93
+ });
94
+ it("should call getOperations with correct cursor based with initial account", async () => {
95
+ const mockGetOperations = jest.spyOn(gateway, "getOperations");
96
+ const operation = {
97
+ id: "test-op-1",
98
+ hash: "test-hash-1",
99
+ accountId: "test-account",
100
+ type: "OUT",
101
+ value: new BigNumber(1000000),
102
+ fee: new BigNumber(100000),
103
+ blockHash: "block-hash-1",
104
+ blockHeight: 100,
105
+ senders: [TEST_ADDRESS],
106
+ recipients: ["recipient-1"],
107
+ date: new Date("2023-01-01"),
108
+ transactionSequenceNumber: 100,
109
+ extra: { uid: "uid-1" },
110
+ };
111
+ // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
112
+ const initialAccount = { operations: [operation] };
113
+ const result = await getAccountShape({
114
+ ...ACCOUNT_SHAPE_INFO,
115
+ initialAccount,
116
+ }, { paginationConfig: {} });
117
+ expect(mockGetOperations).toHaveBeenCalledWith(TEST_ADDRESS, {
118
+ cursor: (operation.blockHeight || 0) + 1,
119
+ limit: 100,
120
+ });
121
+ expect(result.operations).toBeDefined();
122
+ expect(result.operationsCount).toBeGreaterThan(1);
123
+ });
124
+ it("should call getOperations with cursor 0 when no initial account", async () => {
125
+ const mockGetOperations = jest.spyOn(gateway, "getOperations");
126
+ const result = await getAccountShape(ACCOUNT_SHAPE_INFO, { paginationConfig: {} });
127
+ expect(result.operations).toBeDefined();
128
+ expect(result.operationsCount).toBeGreaterThan(1);
129
+ expect(mockGetOperations).toHaveBeenCalledWith(TEST_ADDRESS, {
130
+ cursor: 0,
131
+ limit: 100,
132
+ });
133
+ mockGetOperations.mockRestore();
134
+ });
135
+ });
136
+ });
137
+ //# sourceMappingURL=sync.integ.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sync.integ.test.js","sourceRoot":"","sources":["../../src/bridge/sync.integ.test.ts"],"names":[],"mappings":"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"}
@@ -1,73 +1,77 @@
1
1
  import BigNumber from "bignumber.js";
2
2
  import { encodeAccountId } from "@ledgerhq/coin-framework/account/index";
3
3
  import { mergeOps } from "@ledgerhq/coin-framework/bridge/jsHelpers";
4
- import { getTransactions } from "../network/indexer";
5
- import { getAccountInfo, getLedgerEnd } from "../network/node";
4
+ import { getBalance, getLedgerEnd, getOperations } from "../network/gateway";
6
5
  import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
7
6
  import coinConfig from "../config";
8
- const operationAdapter = (accountId, address) => ({ meta: { delivered_amount }, tx: { Fee, hash, inLedger, date, Account, Destination, Sequence }, }) => {
9
- const type = Account === address ? "OUT" : "IN";
10
- let value = delivered_amount && typeof delivered_amount === "string"
11
- ? new BigNumber(delivered_amount)
12
- : new BigNumber(0);
13
- const feeValue = new BigNumber(Fee);
14
- if (type === "OUT") {
15
- if (!Number.isNaN(feeValue)) {
16
- value = value.plus(feeValue);
17
- }
18
- }
7
+ const txInfoToOperationAdapter = (accountId, address) => (txInfo) => {
8
+ const { transaction_hash, uid, block: { height, hash }, senders, recipients, transaction_timestamp, fee: { value: fee }, transfers: [{ value: transferValue }], } = txInfo;
9
+ const type = senders.includes(address) ? "OUT" : "IN";
10
+ const value = new BigNumber(transferValue);
11
+ const feeValue = new BigNumber(fee);
19
12
  const op = {
20
- id: encodeOperationId(accountId, hash, type),
21
- hash: hash,
13
+ id: encodeOperationId(accountId, transaction_hash, type),
14
+ hash: transaction_hash,
22
15
  accountId,
23
16
  type,
24
17
  value,
25
18
  fee: feeValue,
26
- blockHash: null,
27
- blockHeight: inLedger,
28
- senders: [Account],
29
- recipients: [Destination],
30
- date: new Date(),
31
- transactionSequenceNumber: Sequence,
32
- extra: {},
19
+ blockHash: hash,
20
+ blockHeight: height,
21
+ senders,
22
+ recipients,
23
+ date: new Date(transaction_timestamp),
24
+ transactionSequenceNumber: height,
25
+ extra: {
26
+ uid,
27
+ },
33
28
  };
34
29
  return op;
35
30
  };
36
31
  const filterOperations = (transactions, accountId, address) => {
37
32
  return transactions
38
- .filter(({ tx, meta }) => tx.TransactionType === "Payment" && typeof meta.delivered_amount === "string")
39
- .map(operationAdapter(accountId, address))
40
- .filter((op) => Boolean(op));
33
+ .filter(tx => tx.type === "Receive" || tx.type === "Send")
34
+ .map(txInfoToOperationAdapter(accountId, address));
41
35
  };
42
36
  export const getAccountShape = async (info) => {
43
37
  const { address, initialAccount, currency, derivationMode } = info;
38
+ // TODO: we need better solution ?
39
+ const xpubOrAddress = address?.replace(/:/g, "_") || "";
44
40
  const accountId = encodeAccountId({
45
41
  type: "js",
46
42
  version: "2",
47
43
  currencyId: currency.id,
48
- xpubOrAddress: address,
49
- derivationMode,
44
+ xpubOrAddress,
45
+ derivationMode: "",
50
46
  });
51
47
  // blockheight retrieval
52
48
  const blockHeight = await getLedgerEnd();
53
49
  // Account info retrieval + spendable balance calculation
54
- const accountInfo = await getAccountInfo(address);
55
- const balance = new BigNumber(accountInfo.account_data.Balance);
50
+ // const accountInfo = await getAccountInfo(address);
51
+ const balances = await getBalance(address);
52
+ // TODO change to balance.instrument_id === "Amulet" after update on backend
53
+ const balanceData = balances.find(balance => balance.instrument_id.includes("Amulet")) || {
54
+ instrument_id: "Amulet",
55
+ amount: 0,
56
+ locked: false,
57
+ };
58
+ const balance = new BigNumber(balanceData.amount);
56
59
  const reserveMin = coinConfig.getCoinConfig().minReserve || 0;
57
- const spendableBalance = new BigNumber(accountInfo.account_data.Balance).minus(BigNumber(reserveMin));
60
+ const lockedAmount = balanceData.locked ? balance : new BigNumber(0);
61
+ const spendableBalance = BigNumber.max(0, balance.minus(lockedAmount).minus(BigNumber(reserveMin)));
58
62
  // Tx history fetching
59
63
  const oldOperations = initialAccount?.operations || [];
60
64
  const startAt = oldOperations.length ? (oldOperations[0].blockHeight || 0) + 1 : 0;
61
- const newTransactions = await getTransactions(address, {
62
- from: startAt,
63
- size: 100,
65
+ const transactionData = await getOperations(address, {
66
+ cursor: startAt,
67
+ limit: 100,
64
68
  });
65
- const newOperations = filterOperations(newTransactions, accountId, address);
69
+ const newOperations = filterOperations(transactionData.operations, accountId, address.replace(/_/g, ":"));
66
70
  const operations = mergeOps(oldOperations, newOperations);
67
71
  // We return the new account shape
68
72
  const shape = {
69
73
  id: accountId,
70
- xpub: address,
74
+ xpub: xpubOrAddress,
71
75
  blockHeight,
72
76
  balance,
73
77
  spendableBalance,
@@ -1 +1 @@
1
- {"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"updateTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/updateTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAO5C,eAAO,MAAM,iBAAiB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,mBAAmB,CAO7E,CAAC"}
1
+ {"version":3,"file":"updateTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/updateTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAO5C,eAAO,MAAM,iBAAiB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,mBAAmB,CAE7E,CAAC"}
@@ -4,10 +4,6 @@ import { updateTransaction as defaultUpdateTransaction } from "@ledgerhq/coin-fr
4
4
  // NOTE: here is an example transaction updater function
5
5
  // in this case, it resets fee to null depending on the patch content
6
6
  export const updateTransaction = (tx, patch) => {
7
- // eslint-disable-next-line no-constant-condition
8
- if (patch.recipient === "boilerplate1" || true) {
9
- patch = { ...patch, fee: null };
10
- }
11
7
  return defaultUpdateTransaction(tx, patch);
12
8
  };
13
9
  //# sourceMappingURL=updateTransaction.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"updateTransaction.js","sourceRoot":"","sources":["../../src/bridge/updateTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,IAAI,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AAI1G,8DAA8D;AAC9D,8DAA8D;AAE9D,wDAAwD;AACxD,qEAAqE;AACrE,MAAM,CAAC,MAAM,iBAAiB,GAAoD,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE;IAC9F,iDAAiD;IACjD,IAAI,KAAK,CAAC,SAAS,KAAK,cAAc,IAAI,IAAI,EAAE,CAAC;QAC/C,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;IAClC,CAAC;IAED,OAAO,wBAAwB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC,CAAC"}
1
+ {"version":3,"file":"updateTransaction.js","sourceRoot":"","sources":["../../src/bridge/updateTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,IAAI,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AAI1G,8DAA8D;AAC9D,8DAA8D;AAE9D,wDAAwD;AACxD,qEAAqE;AACrE,MAAM,CAAC,MAAM,iBAAiB,GAAoD,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE;IAC9F,OAAO,wBAAwB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"listOperations.d.ts","sourceRoot":"","sources":["../../../src/common-logic/history/listOperations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAShF;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,MAAM,CAAC,CAAC,CAmChC"}
1
+ {"version":3,"file":"listOperations.d.ts","sourceRoot":"","sources":["../../../src/common-logic/history/listOperations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAIhF;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,MAAM,CAAC,CAAC,CA6BhC"}
@@ -1,8 +1,4 @@
1
- import { getTransactions } from "../../network/gateway";
2
- import coinConfig from "../../config";
3
- const getNativeContractId = () => coinConfig.getCoinConfig().nativeInstrumentId !== undefined
4
- ? coinConfig.getCoinConfig().nativeInstrumentId?.split(".")[0]
5
- : "";
1
+ import { getOperations } from "../../network/gateway";
6
2
  /**
7
3
  * Returns list of operations associated to an account.
8
4
  * @param partyId Account partyId
@@ -11,36 +7,31 @@ const getNativeContractId = () => coinConfig.getCoinConfig().nativeInstrumentId
11
7
  * Impl to finalize when backend is ready
12
8
  */
13
9
  export async function listOperations(partyId, page) {
14
- const { transactions, next } = await getTransactions(partyId, {
10
+ const { operations, next } = await getOperations(partyId, {
15
11
  cursor: page.pagingToken !== undefined ? parseInt(page.pagingToken) : undefined,
16
12
  minOffset: page.minHeight,
17
13
  limit: page.limit,
18
14
  });
19
15
  const ops = [];
20
- for (const tx of transactions) {
21
- for (let i = 0; i < tx.events.length; i++) {
22
- const event = tx.events[i]["CantonCreatedEvent"];
23
- if (event && event.template_id.module_name === "Splice.Amulet") {
24
- ops.push({
25
- id: tx.update_id + "-" + i,
26
- type: event.signatories.includes(partyId) ? "OUT" : "IN",
27
- value: BigInt(0), // to be finalized when details are available on backend
28
- senders: event.signatories.includes(partyId) ? [partyId] : [],
29
- recipients: event.signatories.includes(partyId) ? [] : [partyId],
30
- asset: event.contract_id === getNativeContractId()
31
- ? { type: "native" }
32
- : { type: "token", assetReference: event.contract_id },
33
- tx: {
34
- hash: tx.update_id,
35
- fees: BigInt(0), // to be finalized when details are available on backend
36
- date: new Date(tx.record_time.seconds),
37
- block: {
38
- height: tx.offset,
39
- time: new Date(tx.effective_at.seconds),
40
- },
16
+ for (const tx of operations) {
17
+ if (tx.type === "Send") {
18
+ ops.push({
19
+ id: tx.uid,
20
+ type: tx.senders.includes(partyId) ? "OUT" : "IN",
21
+ value: BigInt(tx.transfers[0].value),
22
+ senders: tx.senders,
23
+ recipients: tx.recipients,
24
+ asset: tx.asset,
25
+ tx: {
26
+ hash: tx.block.hash,
27
+ fees: BigInt(tx.fee.value),
28
+ date: new Date(tx.transaction_timestamp),
29
+ block: {
30
+ height: tx.block.height,
31
+ time: new Date(tx.block.time),
41
32
  },
42
- });
43
- }
33
+ },
34
+ });
44
35
  }
45
36
  }
46
37
  return [ops, next + ""];
@@ -1 +1 @@
1
- {"version":3,"file":"listOperations.js","sourceRoot":"","sources":["../../../src/common-logic/history/listOperations.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,eAAe,EAAU,MAAM,uBAAuB,CAAC;AAC9E,OAAO,UAAU,MAAM,cAAc,CAAC;AAEtC,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAC/B,UAAU,CAAC,aAAa,EAAE,CAAC,kBAAkB,KAAK,SAAS;IACzD,CAAC,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,kBAAkB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,EAAE,CAAC;AAET;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAe,EACf,IAAgB;IAEhB,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE;QAC5D,MAAM,EAAE,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;QAC/E,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,KAAK,EAAE,IAAI,CAAC,KAAK;KAClB,CAAC,CAAC;IACH,MAAM,GAAG,GAAgB,EAAE,CAAC;IAC5B,KAAK,MAAM,EAAE,IAAI,YAAY,EAAE,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1C,MAAM,KAAK,GAAiB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAiB,CAAC;YAC/E,IAAI,KAAK,IAAI,KAAK,CAAC,WAAW,CAAC,WAAW,KAAK,eAAe,EAAE,CAAC;gBAC/D,GAAG,CAAC,IAAI,CAAC;oBACP,EAAE,EAAE,EAAE,CAAC,SAAS,GAAG,GAAG,GAAG,CAAC;oBAC1B,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;oBACxD,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,wDAAwD;oBAC1E,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE;oBAC7D,UAAU,EAAE,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;oBAChE,KAAK,EACH,KAAK,CAAC,WAAW,KAAK,mBAAmB,EAAE;wBACzC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACpB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,WAAW,EAAE;oBAC1D,EAAE,EAAE;wBACF,IAAI,EAAE,EAAE,CAAC,SAAS;wBAClB,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,wDAAwD;wBACzE,IAAI,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC;wBACtC,KAAK,EAAE;4BACL,MAAM,EAAE,EAAE,CAAC,MAAM;4BACjB,IAAI,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC;yBACxC;qBACF;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;AAC1B,CAAC"}
1
+ {"version":3,"file":"listOperations.js","sourceRoot":"","sources":["../../../src/common-logic/history/listOperations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAe,EACf,IAAgB;IAEhB,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE;QACxD,MAAM,EAAE,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;QAC/E,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,KAAK,EAAE,IAAI,CAAC,KAAK;KAClB,CAAC,CAAC;IACH,MAAM,GAAG,GAAgB,EAAE,CAAC;IAC5B,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;QAC5B,IAAI,EAAE,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACvB,GAAG,CAAC,IAAI,CAAC;gBACP,EAAE,EAAE,EAAE,CAAC,GAAG;gBACV,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;gBACjD,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBACpC,OAAO,EAAE,EAAE,CAAC,OAAO;gBACnB,UAAU,EAAE,EAAE,CAAC,UAAU;gBACzB,KAAK,EAAE,EAAE,CAAC,KAAK;gBACf,EAAE,EAAE;oBACF,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI;oBACnB,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC;oBAC1B,IAAI,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,qBAAqB,CAAC;oBACxC,KAAK,EAAE;wBACL,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM;wBACvB,IAAI,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;qBAC9B;iBACF;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;AAC1B,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"broadcast.d.ts","sourceRoot":"","sources":["../../../src/common-logic/transaction/broadcast.ts"],"names":[],"mappings":"AAKA,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIjE"}
1
+ {"version":3,"file":"broadcast.d.ts","sourceRoot":"","sources":["../../../src/common-logic/transaction/broadcast.ts"],"names":[],"mappings":"AAKA,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAKjE"}
@@ -3,8 +3,9 @@ import { submit } from "../../network/gateway";
3
3
  const useGateway = () => coinConfig.getCoinConfig().useGateway === true;
4
4
  export async function broadcast(signedTx) {
5
5
  const parsed = JSON.parse(signedTx);
6
+ const [sig, party] = parsed.signature.split("__PARTY__");
6
7
  if (useGateway())
7
- return (await submit(parsed.serialized, parsed.signature)).updateId;
8
+ return (await submit(party, parsed.serialized, sig)).update_id;
8
9
  else
9
10
  throw new Error("Not implemented");
10
11
  }
@@ -1 +1 @@
1
- {"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../../src/common-logic/transaction/broadcast.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,UAAU,KAAK,IAAI,CAAC;AAExE,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,QAAgB;IAC9C,MAAM,MAAM,GAA8C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/E,IAAI,UAAU,EAAE;QAAE,OAAO,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;;QACjF,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC"}
1
+ {"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../../src/common-logic/transaction/broadcast.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,UAAU,KAAK,IAAI,CAAC;AAExE,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,QAAgB;IAC9C,MAAM,MAAM,GAA8C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/E,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACzD,IAAI,UAAU,EAAE;QAAE,OAAO,CAAC,MAAM,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;;QAC5E,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC"}
@@ -6,7 +6,7 @@ jest.mock("../../network/gateway", () => ({
6
6
  }));
7
7
  const mockSerialized = JSON.stringify({
8
8
  serialized: "serialized-tx",
9
- signature: "signature",
9
+ signature: "signature__PARTY__alice:123",
10
10
  });
11
11
  describe("broadcast", () => {
12
12
  const mockGetCoinConfig = jest.spyOn(coinConfigModule.default, "getCoinConfig");
@@ -17,9 +17,9 @@ describe("broadcast", () => {
17
17
  mockGetCoinConfig.mockReturnValue({
18
18
  useGateway: true,
19
19
  });
20
- submit.mockResolvedValue({ updateId: "my-update-id" });
20
+ submit.mockResolvedValue({ update_id: "my-update-id" });
21
21
  const result = await broadcast(mockSerialized);
22
- expect(submit).toHaveBeenCalledWith("serialized-tx", "signature");
22
+ expect(submit).toHaveBeenCalledWith("alice:123", "serialized-tx", "signature");
23
23
  expect(result).toEqual("my-update-id");
24
24
  });
25
25
  it("should throw an error when useGateway is false (not implemented with node)", async () => {
@@ -1 +1 @@
1
- {"version":3,"file":"broadcast.test.js","sourceRoot":"","sources":["../../../src/common-logic/transaction/broadcast.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,KAAK,gBAAgB,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE;CAClB,CAAC,CAAC,CAAC;AAEJ,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC;IACpC,UAAU,EAAE,eAAe;IAC3B,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAEH,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAEhF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QAChC,iBAAiB,CAAC,eAAe,CAAC;YAChC,UAAU,EAAE,IAAI;SACV,CAAC,CAAC;QAET,MAAoB,CAAC,iBAAiB,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;QAEtE,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC,CAAC;QAE/C,MAAM,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;QAClE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;QAC1F,iBAAiB,CAAC,eAAe,CAAC;YAChC,UAAU,EAAE,KAAK;SACX,CAAC,CAAC;QAEV,MAAM,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAC3E,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACxC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"broadcast.test.js","sourceRoot":"","sources":["../../../src/common-logic/transaction/broadcast.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,KAAK,gBAAgB,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE;CAClB,CAAC,CAAC,CAAC;AAEJ,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC;IACpC,UAAU,EAAE,eAAe;IAC3B,SAAS,EAAE,6BAA6B;CACzC,CAAC,CAAC;AAEH,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAEhF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QAChC,iBAAiB,CAAC,eAAe,CAAC;YAChC,UAAU,EAAE,IAAI;SACV,CAAC,CAAC;QAET,MAAoB,CAAC,iBAAiB,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC;QAEvE,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC,CAAC;QAE/C,MAAM,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,WAAW,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;QAC/E,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;QAC1F,iBAAiB,CAAC,eAAe,CAAC;YAChC,UAAU,EAAE,KAAK;SACX,CAAC,CAAC;QAEV,MAAM,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAC3E,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACxC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -1,2 +1,2 @@
1
- export declare function combine(transaction: string, signature: string): string;
1
+ export declare function combine(serialized: string, signature: string): string;
2
2
  //# sourceMappingURL=combine.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"combine.d.ts","sourceRoot":"","sources":["../../../src/common-logic/transaction/combine.ts"],"names":[],"mappings":"AACA,wBAAgB,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAOtE"}
1
+ {"version":3,"file":"combine.d.ts","sourceRoot":"","sources":["../../../src/common-logic/transaction/combine.ts"],"names":[],"mappings":"AACA,wBAAgB,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAKrE"}
@@ -1,8 +1,7 @@
1
1
  // Combines signature with raw transaction
2
- export function combine(transaction, signature) {
3
- const tx = JSON.parse(transaction);
2
+ export function combine(serialized, signature) {
4
3
  return JSON.stringify({
5
- ...tx,
4
+ serialized,
6
5
  signature,
7
6
  });
8
7
  }
@@ -1 +1 @@
1
- {"version":3,"file":"combine.js","sourceRoot":"","sources":["../../../src/common-logic/transaction/combine.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,MAAM,UAAU,OAAO,CAAC,WAAmB,EAAE,SAAiB;IAC5D,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAEnC,OAAO,IAAI,CAAC,SAAS,CAAC;QACpB,GAAG,EAAE;QACL,SAAS;KACV,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"combine.js","sourceRoot":"","sources":["../../../src/common-logic/transaction/combine.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,MAAM,UAAU,OAAO,CAAC,UAAkB,EAAE,SAAiB;IAC3D,OAAO,IAAI,CAAC,SAAS,CAAC;QACpB,UAAU;QACV,SAAS;KACV,CAAC,CAAC;AACL,CAAC"}
@@ -2,23 +2,13 @@ import { combine } from "./combine";
2
2
  describe("combine", () => {
3
3
  it("responds with a Stringify version of the payload to broadcast", () => {
4
4
  // GIVEN
5
- const transaction = {
6
- transaction: {
7
- serialized: "SERIALIZED",
8
- json: "JSON",
9
- hash: "HASH",
10
- },
11
- };
5
+ const transaction = "0x000000001";
12
6
  const signature = "SIGNATURE";
13
7
  // WHEN
14
- const result = combine(JSON.stringify(transaction), signature);
8
+ const result = combine(transaction, signature);
15
9
  // THEN
16
10
  expect(JSON.parse(result)).toEqual({
17
- transaction: {
18
- serialized: "SERIALIZED",
19
- json: "JSON",
20
- hash: "HASH",
21
- },
11
+ serialized: "0x000000001",
22
12
  signature: "SIGNATURE",
23
13
  });
24
14
  });
@@ -1 +1 @@
1
- {"version":3,"file":"combine.test.js","sourceRoot":"","sources":["../../../src/common-logic/transaction/combine.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,QAAQ;QACR,MAAM,WAAW,GAAG;YAClB,WAAW,EAAE;gBACX,UAAU,EAAE,YAAY;gBACxB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,MAAM;aACb;SACF,CAAC;QACF,MAAM,SAAS,GAAG,WAAW,CAAC;QAE9B,OAAO;QACP,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,SAAS,CAAC,CAAC;QAE/D,OAAO;QACP,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YACjC,WAAW,EAAE;gBACX,UAAU,EAAE,YAAY;gBACxB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,MAAM;aACb;YACD,SAAS,EAAE,WAAW;SACvB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"combine.test.js","sourceRoot":"","sources":["../../../src/common-logic/transaction/combine.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,QAAQ;QACR,MAAM,WAAW,GAAG,aAAa,CAAC;QAClC,MAAM,SAAS,GAAG,WAAW,CAAC;QAE9B,OAAO;QACP,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAE/C,OAAO;QACP,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YACjC,UAAU,EAAE,aAAa;YACzB,SAAS,EAAE,WAAW;SACvB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import BigNumber from "bignumber.js";
2
- import { BoilerplateNativeTransaction } from "../../types";
2
+ import { PrepareTransferResponse } from "../../network/gateway";
3
3
  export declare function craftTransaction(account: {
4
4
  address: string;
5
5
  nextSequenceNumber?: number;
@@ -7,9 +7,11 @@ export declare function craftTransaction(account: {
7
7
  }, transaction: {
8
8
  recipient?: string;
9
9
  amount: BigNumber;
10
- fee?: BigNumber;
10
+ tokenId: string;
11
+ expireInSeconds: number;
11
12
  }): Promise<{
12
- nativeTransaction: BoilerplateNativeTransaction;
13
+ nativeTransaction: PrepareTransferResponse;
13
14
  serializedTransaction: string;
15
+ hash: string;
14
16
  }>;
15
17
  //# sourceMappingURL=craftTransaction.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"craftTransaction.d.ts","sourceRoot":"","sources":["../../../src/common-logic/transaction/craftTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAI3D,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,EACD,WAAW,EAAE;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,SAAS,CAAC;IAClB,GAAG,CAAC,EAAE,SAAS,CAAC;CACjB,GACA,OAAO,CAAC;IACT,iBAAiB,EAAE,4BAA4B,CAAC;IAChD,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAAC,CAgBD"}
1
+ {"version":3,"file":"craftTransaction.d.ts","sourceRoot":"","sources":["../../../src/common-logic/transaction/craftTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAA0B,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAExF,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,EACD,WAAW,EAAE;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;CACzB,GACA,OAAO,CAAC;IACT,iBAAiB,EAAE,uBAAuB,CAAC;IAC3C,qBAAqB,EAAE,MAAM,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CAcD"}
@@ -1,17 +1,16 @@
1
- const encodeNativeTx = (nativeTx) => JSON.stringify(nativeTx);
1
+ import { prepareTransferRequest } from "../../network/gateway";
2
2
  export async function craftTransaction(account, transaction) {
3
- const nativeTransaction = {
4
- TransactionType: "Payment",
5
- Account: account.address,
6
- Amount: transaction.amount.toString(),
7
- Destination: transaction.recipient || "",
8
- Fee: transaction.fee?.toString() || "0",
9
- Sequence: account.nextSequenceNumber || 0,
10
- };
11
- const serializedTransaction = encodeNativeTx(nativeTransaction);
3
+ const { serialized, json, hash } = await prepareTransferRequest(account.address, {
4
+ recipient: transaction.recipient || "",
5
+ amount: transaction.amount.toNumber(),
6
+ type: "token-transfer-request",
7
+ execute_before_secs: transaction.expireInSeconds,
8
+ instrument_id: transaction.tokenId,
9
+ });
12
10
  return {
13
- nativeTransaction,
14
- serializedTransaction,
11
+ nativeTransaction: json,
12
+ serializedTransaction: serialized,
13
+ hash,
15
14
  };
16
15
  }
17
16
  //# sourceMappingURL=craftTransaction.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../../src/common-logic/transaction/craftTransaction.ts"],"names":[],"mappings":"AAGA,MAAM,cAAc,GAAG,CAAC,QAAsC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;AAE5F,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAIC,EACD,WAIC;IAKD,MAAM,iBAAiB,GAAiC;QACtD,eAAe,EAAE,SAAS;QAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE;QACrC,WAAW,EAAE,WAAW,CAAC,SAAS,IAAI,EAAE;QACxC,GAAG,EAAE,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,GAAG;QACvC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,IAAI,CAAC;KAC1C,CAAC;IAEF,MAAM,qBAAqB,GAAG,cAAc,CAAC,iBAAiB,CAAC,CAAC;IAEhE,OAAO;QACL,iBAAiB;QACjB,qBAAqB;KACtB,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../../src/common-logic/transaction/craftTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAA2B,MAAM,uBAAuB,CAAC;AAExF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAIC,EACD,WAKC;IAMD,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,OAAO,EAAE;QAC/E,SAAS,EAAE,WAAW,CAAC,SAAS,IAAI,EAAE;QACtC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE;QACrC,IAAI,EAAE,wBAAwB;QAC9B,mBAAmB,EAAE,WAAW,CAAC,eAAe;QAChD,aAAa,EAAE,WAAW,CAAC,OAAO;KACnC,CAAC,CAAC;IAEH,OAAO;QACL,iBAAiB,EAAE,IAAI;QACvB,qBAAqB,EAAE,UAAU;QACjC,IAAI;KACL,CAAC;AACJ,CAAC"}