@ledgerhq/coin-canton 0.7.0-nightly.2 → 0.7.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 (102) hide show
  1. package/.turbo/turbo-build.log +1 -1
  2. package/CHANGELOG.md +17 -0
  3. package/lib/api/lastBlock.integ.test.js +0 -15
  4. package/lib/api/lastBlock.integ.test.js.map +1 -1
  5. package/lib/bridge/index.d.ts.map +1 -1
  6. package/lib/bridge/index.js +2 -5
  7. package/lib/bridge/index.js.map +1 -1
  8. package/lib/bridge/onboard.d.ts +11 -6
  9. package/lib/bridge/onboard.d.ts.map +1 -1
  10. package/lib/bridge/onboard.integ.test.js +49 -27
  11. package/lib/bridge/onboard.integ.test.js.map +1 -1
  12. package/lib/bridge/onboard.js +45 -152
  13. package/lib/bridge/onboard.js.map +1 -1
  14. package/lib/bridge/signOperation.d.ts.map +1 -1
  15. package/lib/bridge/signOperation.js +5 -5
  16. package/lib/bridge/signOperation.js.map +1 -1
  17. package/lib/bridge/sync.d.ts +3 -2
  18. package/lib/bridge/sync.d.ts.map +1 -1
  19. package/lib/bridge/sync.integ.test.js +31 -14
  20. package/lib/bridge/sync.integ.test.js.map +1 -1
  21. package/lib/bridge/sync.js +71 -57
  22. package/lib/bridge/sync.js.map +1 -1
  23. package/lib/common-logic/utils.js +2 -2
  24. package/lib/common-logic/utils.js.map +1 -1
  25. package/lib/common-logic/utils.test.js +21 -6
  26. package/lib/common-logic/utils.test.js.map +1 -1
  27. package/lib/config.d.ts +1 -1
  28. package/lib/config.d.ts.map +1 -1
  29. package/lib/network/gateway.d.ts +9 -9
  30. package/lib/network/gateway.d.ts.map +1 -1
  31. package/lib/network/gateway.integ.test.js +31 -17
  32. package/lib/network/gateway.integ.test.js.map +1 -1
  33. package/lib/network/gateway.js +33 -15
  34. package/lib/network/gateway.js.map +1 -1
  35. package/lib/types/bridge.d.ts +6 -16
  36. package/lib/types/bridge.d.ts.map +1 -1
  37. package/lib/types/onboard.d.ts +5 -5
  38. package/lib/types/onboard.d.ts.map +1 -1
  39. package/lib/types/onboard.js +10 -10
  40. package/lib/types/onboard.js.map +1 -1
  41. package/lib-es/api/lastBlock.integ.test.js +0 -15
  42. package/lib-es/api/lastBlock.integ.test.js.map +1 -1
  43. package/lib-es/bridge/index.d.ts.map +1 -1
  44. package/lib-es/bridge/index.js +3 -6
  45. package/lib-es/bridge/index.js.map +1 -1
  46. package/lib-es/bridge/onboard.d.ts +11 -6
  47. package/lib-es/bridge/onboard.d.ts.map +1 -1
  48. package/lib-es/bridge/onboard.integ.test.js +37 -15
  49. package/lib-es/bridge/onboard.integ.test.js.map +1 -1
  50. package/lib-es/bridge/onboard.js +44 -152
  51. package/lib-es/bridge/onboard.js.map +1 -1
  52. package/lib-es/bridge/signOperation.d.ts.map +1 -1
  53. package/lib-es/bridge/signOperation.js +5 -5
  54. package/lib-es/bridge/signOperation.js.map +1 -1
  55. package/lib-es/bridge/sync.d.ts +3 -2
  56. package/lib-es/bridge/sync.d.ts.map +1 -1
  57. package/lib-es/bridge/sync.integ.test.js +26 -9
  58. package/lib-es/bridge/sync.integ.test.js.map +1 -1
  59. package/lib-es/bridge/sync.js +71 -56
  60. package/lib-es/bridge/sync.js.map +1 -1
  61. package/lib-es/common-logic/utils.js +2 -2
  62. package/lib-es/common-logic/utils.js.map +1 -1
  63. package/lib-es/common-logic/utils.test.js +21 -6
  64. package/lib-es/common-logic/utils.test.js.map +1 -1
  65. package/lib-es/config.d.ts +1 -1
  66. package/lib-es/config.d.ts.map +1 -1
  67. package/lib-es/network/gateway.d.ts +9 -9
  68. package/lib-es/network/gateway.d.ts.map +1 -1
  69. package/lib-es/network/gateway.integ.test.js +31 -17
  70. package/lib-es/network/gateway.integ.test.js.map +1 -1
  71. package/lib-es/network/gateway.js +33 -15
  72. package/lib-es/network/gateway.js.map +1 -1
  73. package/lib-es/types/bridge.d.ts +6 -16
  74. package/lib-es/types/bridge.d.ts.map +1 -1
  75. package/lib-es/types/onboard.d.ts +5 -5
  76. package/lib-es/types/onboard.d.ts.map +1 -1
  77. package/lib-es/types/onboard.js +9 -9
  78. package/lib-es/types/onboard.js.map +1 -1
  79. package/package.json +5 -4
  80. package/src/api/lastBlock.integ.test.ts +0 -18
  81. package/src/bridge/index.ts +3 -6
  82. package/src/bridge/onboard.integ.test.ts +44 -31
  83. package/src/bridge/onboard.ts +61 -209
  84. package/src/bridge/signOperation.ts +5 -6
  85. package/src/bridge/sync.integ.test.ts +30 -10
  86. package/src/bridge/sync.ts +87 -72
  87. package/src/common-logic/utils.test.ts +21 -6
  88. package/src/common-logic/utils.ts +2 -2
  89. package/src/config.ts +1 -1
  90. package/src/network/gateway.integ.test.ts +48 -21
  91. package/src/network/gateway.ts +49 -34
  92. package/src/types/bridge.ts +8 -19
  93. package/src/types/onboard.ts +5 -5
  94. package/lib/bridge/serialization.d.ts +0 -4
  95. package/lib/bridge/serialization.d.ts.map +0 -1
  96. package/lib/bridge/serialization.js +0 -31
  97. package/lib/bridge/serialization.js.map +0 -1
  98. package/lib-es/bridge/serialization.d.ts +0 -4
  99. package/lib-es/bridge/serialization.d.ts.map +0 -1
  100. package/lib-es/bridge/serialization.js +0 -27
  101. package/lib-es/bridge/serialization.js.map +0 -1
  102. package/src/bridge/serialization.ts +0 -36
@@ -1,14 +1,36 @@
1
+ import BigNumber from "bignumber.js";
1
2
  import { firstValueFrom, toArray } from "rxjs";
3
+ import { emptyHistoryCache } from "@ledgerhq/coin-framework/account/index";
2
4
  import { generateMockKeyPair, createMockSigner } from "../test/cantonTestUtils";
3
- import { buildOnboardAccount, isAccountOnboarded, buildAuthorizePreapproval } from "./onboard";
4
- import { OnboardStatus, PreApprovalStatus, } from "../types/onboard";
5
+ import { AuthorizeStatus, OnboardStatus, } from "../types/onboard";
5
6
  import coinConfig from "../config";
7
+ import { buildOnboardAccount, isAccountOnboarded, buildAuthorizePreapproval } from "./onboard";
6
8
  describe("onboard (devnet)", () => {
7
9
  const mockDeviceId = "test-device-id";
8
- const mockDerivationPath = "44'/6767'/0'/0'/0'";
9
10
  const mockCurrency = {
10
11
  id: "canton_network",
11
12
  };
13
+ const mockAccount = {
14
+ type: "Account",
15
+ id: "js:2:canton_network:canton_3f5c9d9a:canton",
16
+ seedIdentifier: "canton_3f5c9d9a",
17
+ derivationMode: "canton",
18
+ index: 0,
19
+ freshAddress: "canton_3f5c9d9a",
20
+ freshAddressPath: "44'/6767'/0'/0'/0'",
21
+ used: false,
22
+ balance: BigNumber(10000),
23
+ spendableBalance: BigNumber(10000),
24
+ creationDate: new Date(),
25
+ blockHeight: 1,
26
+ currency: mockCurrency,
27
+ operationsCount: 0,
28
+ operations: [],
29
+ pendingOperations: [],
30
+ lastSyncDate: new Date(),
31
+ balanceHistoryCache: emptyHistoryCache,
32
+ swapHistory: [],
33
+ };
12
34
  let onboardedAccount = null;
13
35
  beforeAll(() => {
14
36
  coinConfig.setCoinConfig(() => ({
@@ -36,7 +58,7 @@ describe("onboard (devnet)", () => {
36
58
  return callback(mockSigner);
37
59
  });
38
60
  const onboardObservable = buildOnboardAccount(mockSignerContext);
39
- const onboardValues = await firstValueFrom(onboardObservable(mockCurrency, mockDeviceId, mockDerivationPath).pipe(toArray()));
61
+ const onboardValues = await firstValueFrom(onboardObservable(mockCurrency, mockDeviceId, mockAccount).pipe(toArray()));
40
62
  const onboardResult = onboardValues.find((value) => "partyId" in value);
41
63
  if (!onboardResult) {
42
64
  throw new Error("Failed to onboard account for shared test data");
@@ -53,10 +75,10 @@ describe("onboard (devnet)", () => {
53
75
  // THEN
54
76
  expect(result).not.toBe(false);
55
77
  if (typeof result === "object") {
56
- expect(result.party_id).toBeDefined();
57
- expect(result.party_id).toBe(onboardResult.partyId);
78
+ expect(result.partyId).toBeDefined();
79
+ expect(result.partyId).toBe(onboardResult.partyId);
58
80
  }
59
- }, 30000);
81
+ }, 40000);
60
82
  it("should return false for non-onboarded account with fresh keypair", async () => {
61
83
  // GIVEN
62
84
  const keyPair = generateMockKeyPair();
@@ -84,7 +106,7 @@ describe("onboard (devnet)", () => {
84
106
  });
85
107
  const onboardObservable = buildOnboardAccount(mockSignerContext);
86
108
  // WHEN
87
- const allValues = await firstValueFrom(onboardObservable(mockCurrency, mockDeviceId, mockDerivationPath).pipe(toArray()));
109
+ const allValues = await firstValueFrom(onboardObservable(mockCurrency, mockDeviceId, mockAccount).pipe(toArray()));
88
110
  const progressValues = allValues.filter((value) => "status" in value && !("partyId" in value));
89
111
  const resultValues = allValues.filter((value) => "partyId" in value);
90
112
  // THEN
@@ -102,10 +124,10 @@ describe("onboard (devnet)", () => {
102
124
  }, 30000);
103
125
  it("should complete full onboarding flow with already onboarded account", async () => {
104
126
  // GIVEN
105
- const { keyPair, mockSignerContext, onboardResult: firstResult } = getOnboardedAccount();
127
+ const { mockSignerContext, onboardResult: firstResult } = getOnboardedAccount();
106
128
  const secondOnboardObservable = buildOnboardAccount(mockSignerContext);
107
129
  // WHEN
108
- const secondOnboardValues = await firstValueFrom(secondOnboardObservable(mockCurrency, mockDeviceId, mockDerivationPath).pipe(toArray()));
130
+ const secondOnboardValues = await firstValueFrom(secondOnboardObservable(mockCurrency, mockDeviceId, mockAccount).pipe(toArray()));
109
131
  const secondResult = secondOnboardValues.find((value) => "partyId" in value);
110
132
  // THEN
111
133
  expect(secondResult).toBeDefined();
@@ -119,14 +141,14 @@ describe("onboard (devnet)", () => {
119
141
  const { mockSignerContext, onboardResult } = getOnboardedAccount();
120
142
  const preapprovalObservable = buildAuthorizePreapproval(mockSignerContext);
121
143
  // WHEN
122
- const preapprovalValues = await firstValueFrom(preapprovalObservable(mockCurrency, mockDeviceId, mockDerivationPath, onboardResult.partyId).pipe(toArray()));
144
+ const preapprovalValues = await firstValueFrom(preapprovalObservable(mockCurrency, mockDeviceId, mockAccount, onboardResult.partyId).pipe(toArray()));
123
145
  const progressValues = preapprovalValues.filter((value) => "status" in value && !("isApproved" in value));
124
146
  const resultValues = preapprovalValues.filter((value) => "isApproved" in value);
125
147
  // THEN
126
148
  // Check expected status progression
127
- expect(progressValues.some(p => p.status === PreApprovalStatus.PREPARE)).toBe(true);
128
- expect(progressValues.some(p => p.status === PreApprovalStatus.SIGN)).toBe(true);
129
- expect(progressValues.some(p => p.status === PreApprovalStatus.SUBMIT)).toBe(true);
149
+ expect(progressValues.some(p => p.status === AuthorizeStatus.PREPARE)).toBe(true);
150
+ expect(progressValues.some(p => p.status === AuthorizeStatus.SIGN)).toBe(true);
151
+ expect(progressValues.some(p => p.status === AuthorizeStatus.SUBMIT)).toBe(true);
130
152
  // Check final result (should be approved)
131
153
  expect(resultValues.length).toBeGreaterThan(0);
132
154
  const finalResult = resultValues[resultValues.length - 1];
@@ -143,7 +165,7 @@ describe("onboard (devnet)", () => {
143
165
  const preapprovalObservable = buildAuthorizePreapproval(mockSignerContext);
144
166
  // WHEN & THEN
145
167
  try {
146
- await firstValueFrom(preapprovalObservable(mockCurrency, mockDeviceId, mockDerivationPath, "invalid-party-id-123"));
168
+ await firstValueFrom(preapprovalObservable(mockCurrency, mockDeviceId, mockAccount, "invalid-party-id-123"));
147
169
  expect(true).toBe(true);
148
170
  }
149
171
  catch (error) {
@@ -1 +1 @@
1
- {"version":3,"file":"onboard.integ.test.js","sourceRoot":"","sources":["../../src/bridge/onboard.integ.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"onboard.integ.test.js","sourceRoot":"","sources":["../../src/bridge/onboard.integ.test.ts"],"names":[],"mappings":"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"}
@@ -1,151 +1,79 @@
1
1
  import { Observable } from "rxjs";
2
- import { emptyHistoryCache } from "@ledgerhq/coin-framework/account/index";
3
- import { getDerivationModesForCurrency } from "@ledgerhq/coin-framework/derivation";
4
- import { getAccountShape } from "./sync";
2
+ import { log } from "@ledgerhq/logs";
5
3
  import { prepareOnboarding, submitOnboarding, getPartyByPubKey, preparePreApprovalTransaction, submitPreApprovalTransaction, prepareTapRequest, submitTapRequest, } from "../network/gateway";
6
- import { OnboardStatus, PreApprovalStatus, } from "../types/onboard";
4
+ import { OnboardStatus, AuthorizeStatus, } from "../types/onboard";
7
5
  import resolver from "../signer";
8
- async function _getKeypair(signerContext, deviceId, derivationPath) {
9
- return signerContext(deviceId, async (signer) => {
10
- const { publicKey, address } = await signer.getAddress(derivationPath);
11
- return { signer, publicKey: publicKey.replace("0x", ""), address };
12
- });
13
- }
14
6
  export const isAccountOnboarded = async (currency, publicKey) => {
15
7
  try {
16
8
  const { party_id } = await getPartyByPubKey(currency, publicKey);
17
9
  if (party_id) {
18
- return { isOnboarded: true, party_id };
10
+ return { isOnboarded: true, partyId: party_id };
19
11
  }
20
12
  else {
21
13
  return { isOnboarded: false };
22
14
  }
23
15
  }
24
16
  catch (err) {
25
- log("[isAccountOnboarded] Error checking party status (likely not onboarded):", err);
26
17
  return { isOnboarded: false };
27
18
  }
28
19
  };
29
- export const buildOnboardAccount = (signerContext) => (currency, deviceId, derivationPath) => new Observable(observer => {
20
+ export const isAccountAuthorized = async (operations, partyId) => {
21
+ // temporary solution to check if the account is authorized
22
+ return operations.some(operation => operation.senders.includes(partyId));
23
+ };
24
+ export const buildOnboardAccount = (signerContext) => (currency, deviceId, account) => new Observable(o => {
30
25
  async function main() {
31
- observer.next({
32
- status: OnboardStatus.INIT,
33
- });
34
- const derivationMode = getDerivationModesForCurrency(currency)[0];
26
+ o.next({ status: OnboardStatus.INIT });
35
27
  const getAddress = resolver(signerContext);
36
- const { address, publicKey } = await getAddress(deviceId, {
37
- path: derivationPath,
28
+ const { publicKey } = await getAddress(deviceId, {
29
+ path: account.freshAddressPath,
38
30
  currency,
39
- derivationMode: derivationMode || "",
31
+ derivationMode: account.derivationMode,
40
32
  });
41
- observer.next({
42
- status: OnboardStatus.PREPARE,
43
- });
44
- const { party_id: partyId } = await isAccountOnboarded(currency, publicKey);
33
+ o.next({ status: OnboardStatus.PREPARE });
34
+ let { partyId } = await isAccountOnboarded(currency, publicKey);
45
35
  if (partyId) {
46
- const account = await createAccount({
47
- address,
48
- derivationPath,
49
- partyId,
50
- currency,
51
- derivationMode,
52
- });
53
- observer.next({
54
- partyId,
55
- account,
56
- });
57
- observer.complete();
36
+ o.next({ partyId, account }); // success
58
37
  return;
59
38
  }
60
- const preparedTransaction = await prepareOnboarding(currency, publicKey, "ed25519");
61
- observer.next({
62
- status: OnboardStatus.SIGN,
63
- });
64
- const signature = await signerContext(deviceId, signer => signer.signTransaction(derivationPath, preparedTransaction.transactions.combined_hash));
65
- observer.next({
66
- status: OnboardStatus.SUBMIT,
67
- });
68
- const result = await submitOnboarding(currency, { public_key: publicKey, public_key_type: "ed25519" }, preparedTransaction, signature).catch(async (err) => {
69
- if (err.type === "PARTY_ALREADY_EXISTS") {
70
- const account = await createAccount({
71
- address,
72
- derivationPath,
73
- partyId: preparedTransaction.party_id,
74
- currency,
75
- derivationMode,
76
- });
77
- observer.next({
78
- partyId: preparedTransaction.party_id,
79
- account,
80
- });
81
- return observer.complete();
82
- }
83
- throw err;
84
- });
85
- if (result) {
86
- observer.next({
87
- status: OnboardStatus.SUCCESS,
88
- });
89
- const account = await createAccount({
90
- address,
91
- derivationPath,
92
- partyId: result.party.party_id,
93
- currency,
94
- derivationMode,
95
- });
96
- observer.next({
97
- partyId: result.party.party_id,
98
- account,
99
- });
100
- }
101
- observer.complete();
39
+ const preparedTransaction = await prepareOnboarding(currency, publicKey);
40
+ partyId = preparedTransaction.party_id;
41
+ o.next({ status: OnboardStatus.SIGN });
42
+ const signature = await signerContext(deviceId, signer => signer.signTransaction(account.freshAddressPath, preparedTransaction.transactions.combined_hash));
43
+ o.next({ status: OnboardStatus.SUBMIT });
44
+ await submitOnboarding(currency, publicKey, preparedTransaction, signature);
45
+ o.next({ partyId, account }); // success
102
46
  }
103
- main().then(() => observer.complete(), error => {
104
- log("[onboardAccount] Error:", error);
105
- observer.error(error);
47
+ main().then(() => o.complete(), error => {
48
+ log("[canton:onboard] onboardAccount failed:", error);
49
+ o.error(error);
106
50
  });
107
51
  });
108
- export const buildAuthorizePreapproval = (signerContext) => (currency, deviceId, derivationPath, partyId) => new Observable(observer => {
52
+ export const buildAuthorizePreapproval = (signerContext) => (currency, deviceId, account, partyId) => new Observable(o => {
109
53
  async function main() {
110
- observer.next({
111
- status: PreApprovalStatus.PREPARE,
112
- });
113
- const preparedTransaction = await preparePreApprovalTransaction(currency, partyId);
114
- observer.next({
115
- status: PreApprovalStatus.SIGN,
116
- });
117
- const signature = await signerContext(deviceId, signer => signer.signTransaction(derivationPath, preparedTransaction.hash));
118
- observer.next({
119
- status: PreApprovalStatus.SUBMIT,
120
- });
121
- const { isApproved } = await submitPreApprovalTransaction(currency, partyId, preparedTransaction, signature);
122
- observer.next({
123
- status: PreApprovalStatus.SUCCESS,
124
- });
125
- observer.next({
126
- isApproved,
127
- });
54
+ o.next({ status: AuthorizeStatus.INIT });
55
+ const isAuthorized = await isAccountAuthorized(account.operations, partyId);
56
+ if (!isAuthorized) {
57
+ o.next({ status: AuthorizeStatus.PREPARE });
58
+ const preparedTransaction = await preparePreApprovalTransaction(currency, partyId);
59
+ o.next({ status: AuthorizeStatus.SIGN });
60
+ const signature = await signerContext(deviceId, signer => signer.signTransaction(account.freshAddressPath, preparedTransaction.hash));
61
+ o.next({ status: AuthorizeStatus.SUBMIT });
62
+ await submitPreApprovalTransaction(currency, partyId, preparedTransaction, signature);
63
+ }
64
+ o.next({ isApproved: true }); // success
128
65
  const handleTapRequest = async () => {
129
66
  try {
130
- const { serialized, hash } = await prepareTapRequest(currency, {
131
- partyId,
132
- });
67
+ const { serialized, hash } = await prepareTapRequest(currency, { partyId });
133
68
  if (serialized && hash) {
134
- observer.next({
135
- status: PreApprovalStatus.SIGN,
136
- });
137
- const signature = await signerContext(deviceId, signer => signer.signTransaction(derivationPath, hash));
138
- observer.next({
139
- status: PreApprovalStatus.SUBMIT,
140
- });
69
+ o.next({ status: AuthorizeStatus.SIGN });
70
+ const signature = await signerContext(deviceId, signer => signer.signTransaction(account.freshAddressPath, hash));
71
+ o.next({ status: AuthorizeStatus.SUBMIT });
141
72
  await submitTapRequest(currency, {
142
73
  partyId,
143
74
  serialized,
144
75
  signature,
145
76
  });
146
- observer.next({
147
- status: PreApprovalStatus.SUCCESS,
148
- });
149
77
  }
150
78
  }
151
79
  catch (err) {
@@ -153,46 +81,10 @@ export const buildAuthorizePreapproval = (signerContext) => (currency, deviceId,
153
81
  }
154
82
  };
155
83
  await handleTapRequest();
156
- observer.complete();
157
84
  }
158
- main().then(() => observer.complete(), error => {
159
- log("[buildAuthorizePreapproval] Error:", error);
160
- observer.error(error);
85
+ main().then(() => o.complete(), error => {
86
+ log("[canton:onboard] authorizePreapproval failed:", error);
87
+ o.error(error);
161
88
  });
162
89
  });
163
- const createAccount = async ({ address, partyId, derivationPath, currency, derivationMode, index = 0, }) => {
164
- const accountShape = await getAccountShape({
165
- address,
166
- currency,
167
- derivationMode,
168
- derivationPath,
169
- index,
170
- rest: {
171
- cantonResources: {
172
- partyId,
173
- },
174
- },
175
- }, { paginationConfig: {} });
176
- const account = {
177
- ...accountShape,
178
- type: "Account",
179
- xpub: partyId.replace(/:/g, "_"),
180
- index,
181
- // operations: [],
182
- currency,
183
- derivationMode,
184
- lastSyncDate: new Date(),
185
- pendingOperations: [],
186
- seedIdentifier: address,
187
- balanceHistoryCache: emptyHistoryCache,
188
- cantonResources: {
189
- partyId,
190
- },
191
- };
192
- return account;
193
- };
194
- const log = (message, ...rest) => {
195
- // eslint-disable-next-line no-console
196
- console.log(message, ...rest);
197
- };
198
90
  //# sourceMappingURL=onboard.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAa,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAGhE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAErD,eAAO,MAAM,kBAAkB,GAC5B,eAAe,aAAa,CAAC,YAAY,CAAC,KAAG,aAAa,CAAC,WAAW,CAAC,CAAC,eAAe,CAyFpF,CAAC"}
1
+ {"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAa,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAIhE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAErD,eAAO,MAAM,kBAAkB,GAC5B,eAAe,aAAa,CAAC,YAAY,CAAC,KAAG,aAAa,CAAC,WAAW,CAAC,CAAC,eAAe,CAuFpF,CAAC"}
@@ -1,6 +1,7 @@
1
1
  import { Observable } from "rxjs";
2
2
  import { FeeNotLoaded } from "@ledgerhq/errors";
3
3
  import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
4
+ import { decodeAccountId } from "@ledgerhq/coin-framework/account";
4
5
  import { combine, craftTransaction } from "../common-logic";
5
6
  export const buildSignOperation = (signerContext) => ({ account, deviceId, transaction }) => new Observable(o => {
6
7
  async function main() {
@@ -13,9 +14,8 @@ export const buildSignOperation = (signerContext) => ({ account, deviceId, trans
13
14
  type: "device-signature-requested",
14
15
  });
15
16
  const signature = await signerContext(deviceId, async (signer) => {
16
- const { freshAddressPath: derivationPath } = account;
17
- const partyId = account
18
- .cantonResources.partyId;
17
+ const { id, freshAddressPath: derivationPath, xpub } = account;
18
+ const address = xpub ?? decodeAccountId(id).xpubOrAddress;
19
19
  const params = {
20
20
  recipient: transaction.recipient,
21
21
  amount: transaction.amount,
@@ -26,10 +26,10 @@ export const buildSignOperation = (signerContext) => ({ account, deviceId, trans
26
26
  params.memo = transaction.memo;
27
27
  }
28
28
  const { hash, serializedTransaction } = await craftTransaction(account.currency, {
29
- address: partyId,
29
+ address,
30
30
  }, params);
31
31
  const transactionSignature = await signer.signTransaction(derivationPath, hash);
32
- return combine(serializedTransaction, `${transactionSignature}__PARTY__${partyId}`);
32
+ return combine(serializedTransaction, `${transactionSignature}__PARTY__${address}`);
33
33
  });
34
34
  o.next({
35
35
  type: "device-signature-granted",
@@ -1 +1 @@
1
- {"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAG5D,MAAM,CAAC,MAAM,kBAAkB,GAC7B,CAAC,aAA0C,EAA+C,EAAE,CAC5F,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EAAE,CACrC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE;IACjB,KAAK,UAAU,IAAI;QACjB,MAAM,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;QAC5B,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,YAAY,EAAE,CAAC;QAEnC,IAAI,CAAC;YACH,8EAA8E;YAC9E,CAAC,CAAC,IAAI,CAAC;gBACL,IAAI,EAAE,4BAA4B;aACnC,CAAC,CAAC;YAEH,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;gBAC7D,MAAM,EAAE,EAAE,EAAE,gBAAgB,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;gBAC/D,MAAM,OAAO,GAAG,IAAI,IAAI,eAAe,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC;gBAC1D,MAAM,MAAM,GAMR;oBACF,SAAS,EAAE,WAAW,CAAC,SAAS;oBAChC,MAAM,EAAE,WAAW,CAAC,MAAM;oBAC1B,eAAe,EAAE,EAAE,GAAG,EAAE;oBACxB,OAAO,EAAE,WAAW,CAAC,OAAO;iBAC7B,CAAC;gBACF,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;oBACrB,MAAM,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;gBACjC,CAAC;gBAED,MAAM,EAAE,IAAI,EAAE,qBAAqB,EAAE,GAAG,MAAM,gBAAgB,CAC5D,OAAO,CAAC,QAAQ,EAChB;oBACE,OAAO;iBACR,EACD,MAAM,CACP,CAAC;gBACF,MAAM,oBAAoB,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;gBAEhF,OAAO,OAAO,CAAC,qBAAqB,EAAE,GAAG,oBAAoB,YAAY,OAAO,EAAE,CAAC,CAAC;YACtF,CAAC,CAAC,CAAC;YAEH,CAAC,CAAC,IAAI,CAAC;gBACL,IAAI,EAAE,0BAA0B;aACjC,CAAC,CAAC;YAEH,gIAAgI;YAChI,MAAM,IAAI,GAAG,EAAE,CAAC;YAChB,MAAM,SAAS,GAAc;gBAC3B,EAAE,EAAE,iBAAiB,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC;gBAC9C,IAAI;gBACJ,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,WAAW,CAAC,MAAM;gBACzB,GAAG;gBACH,SAAS,EAAE,IAAI;gBACf,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC;gBAC/B,UAAU,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC;gBACnC,IAAI,EAAE,IAAI,IAAI,EAAE;gBAChB,KAAK,EAAE,EAAE;aACV,CAAC;YAEF,CAAC,CAAC,IAAI,CAAC;gBACL,IAAI,EAAE,QAAQ;gBACd,eAAe,EAAE;oBACf,SAAS;oBACT,SAAS;iBACV;aACF,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CACZ,CAAmD,EAAE,IAAI,EAAE,aAAa,CAC1E,CAAC;YACJ,CAAC;YAED,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;IAED,IAAI,EAAE,CAAC,IAAI,CACT,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,EAClB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAChB,CAAC;AACJ,CAAC,CAAC,CAAC"}
@@ -1,4 +1,5 @@
1
1
  import { GetAccountShape } from "@ledgerhq/coin-framework/bridge/jsHelpers";
2
- import { CantonAccount } from "../types";
3
- export declare const getAccountShape: GetAccountShape<CantonAccount>;
2
+ import { SignerContext } from "@ledgerhq/coin-framework/signer";
3
+ import { CantonAccount, CantonSigner } from "../types";
4
+ export declare function makeGetAccountShape(signerContext: SignerContext<CantonSigner>): GetAccountShape<CantonAccount>;
4
5
  //# sourceMappingURL=sync.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAGtF,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AA6DzC,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,aAAa,CAwE1D,CAAC"}
1
+ {"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAIhE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AA4DvD,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,GACzC,eAAe,CAAC,aAAa,CAAC,CAmFhC"}
@@ -3,20 +3,31 @@ import { getDerivationModesForCurrency, getDerivationScheme, runDerivationScheme
3
3
  import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
4
4
  import coinConfig from "../config";
5
5
  import * as gateway from "../network/gateway";
6
- import { getAccountShape } from "./sync";
6
+ import { generateMockKeyPair, createMockSigner } from "../test/cantonTestUtils";
7
+ import { makeGetAccountShape } from "./sync";
7
8
  const TEST_ADDRESS = "b6400f93ea1c74aea86be39b0ccc846fc5de01f12b2ad0d7c31848d6fb6eb6d9::1220c81315e2bf2524a9141bcc6cbf19b61c151e0dcaa95343c0ccf53aed7415c4ec";
8
9
  const currency = getCryptoCurrencyById("canton_network");
9
10
  const derivationMode = getDerivationModesForCurrency(currency)[0];
10
11
  const derivationPath = runDerivationScheme(getDerivationScheme({ derivationMode, currency }), currency, {
11
12
  account: 0,
12
13
  });
14
+ const xpub = TEST_ADDRESS;
13
15
  const ACCOUNT_SHAPE_INFO = {
14
16
  address: TEST_ADDRESS,
15
17
  currency,
16
18
  derivationMode,
17
19
  derivationPath,
18
20
  index: 0,
21
+ initialAccount: {
22
+ xpub,
23
+ },
19
24
  };
25
+ // Mock signer context for testing
26
+ const keyPair = generateMockKeyPair();
27
+ const mockSigner = createMockSigner(keyPair);
28
+ const mockSignerContext = jest.fn().mockImplementation((deviceId, callback) => {
29
+ return callback(mockSigner);
30
+ });
20
31
  describe("sync (devnet)", () => {
21
32
  beforeAll(async () => {
22
33
  coinConfig.setCoinConfig(() => ({
@@ -29,12 +40,13 @@ describe("sync (devnet)", () => {
29
40
  },
30
41
  }));
31
42
  });
32
- describe("getAccountShape", () => {
43
+ describe("makeGetAccountShape", () => {
33
44
  it("should fetch account shape for a valid address", async () => {
45
+ const getAccountShape = makeGetAccountShape(mockSignerContext);
34
46
  const result = await getAccountShape(ACCOUNT_SHAPE_INFO, { paginationConfig: {} });
35
47
  expect(result).toBeDefined();
36
48
  expect(result.id).toBeDefined();
37
- expect(result.xpub).toBe(TEST_ADDRESS.replace(/:/g, "_"));
49
+ expect(result.xpub).toBe(TEST_ADDRESS);
38
50
  expect(result.blockHeight).toBeGreaterThan(0);
39
51
  expect(result.balance).toBeDefined();
40
52
  expect(result.spendableBalance).toBeDefined();
@@ -47,10 +59,12 @@ describe("sync (devnet)", () => {
47
59
  expect(result.spendableBalance?.toNumber()).toBeLessThanOrEqual(result.balance?.toNumber() || 0);
48
60
  });
49
61
  it("should handle address with colons correctly", async () => {
62
+ const getAccountShape = makeGetAccountShape(mockSignerContext);
50
63
  const result = await getAccountShape(ACCOUNT_SHAPE_INFO, { paginationConfig: {} });
51
- expect(result.xpub).toBe(TEST_ADDRESS.replace(/:/g, "_"));
64
+ expect(result.xpub).toContain("::");
52
65
  });
53
66
  it("should merge operations correctly with initial account", async () => {
67
+ const getAccountShape = makeGetAccountShape(mockSignerContext);
54
68
  const operations = [
55
69
  {
56
70
  id: "test-op-1",
@@ -71,7 +85,7 @@ describe("sync (devnet)", () => {
71
85
  const result = await getAccountShape({
72
86
  ...ACCOUNT_SHAPE_INFO,
73
87
  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
74
- initialAccount: { operations },
88
+ initialAccount: { xpub, operations },
75
89
  }, { paginationConfig: {} });
76
90
  expect(result.operations).toBeDefined();
77
91
  expect(result.operationsCount).toBeGreaterThanOrEqual(1);
@@ -87,12 +101,13 @@ describe("sync (devnet)", () => {
87
101
  locked: true,
88
102
  },
89
103
  ]);
104
+ const getAccountShape = makeGetAccountShape(mockSignerContext);
90
105
  const result = await getAccountShape(ACCOUNT_SHAPE_INFO, { paginationConfig: {} });
91
106
  expect(result.balance?.toNumber()).toBe(1000000);
92
107
  expect(result.spendableBalance?.toNumber()).toBe(0);
93
108
  mockGetBalance.mockRestore();
94
109
  });
95
- it("should call getOperations with correct cursor based with initial account", async () => {
110
+ it("should call getOperations with correct cursor based on initial account", async () => {
96
111
  const mockGetOperations = jest.spyOn(gateway, "getOperations");
97
112
  const operation = {
98
113
  id: "test-op-1",
@@ -110,12 +125,13 @@ describe("sync (devnet)", () => {
110
125
  extra: { uid: "uid-1" },
111
126
  };
112
127
  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
113
- const initialAccount = { operations: [operation] };
128
+ const initialAccount = { xpub, operations: [operation] };
129
+ const getAccountShape = makeGetAccountShape(mockSignerContext);
114
130
  const result = await getAccountShape({
115
131
  ...ACCOUNT_SHAPE_INFO,
116
132
  initialAccount,
117
133
  }, { paginationConfig: {} });
118
- expect(mockGetOperations).toHaveBeenCalledWith(TEST_ADDRESS, {
134
+ expect(mockGetOperations).toHaveBeenCalledWith(currency, TEST_ADDRESS, {
119
135
  cursor: (operation.blockHeight || 0) + 1,
120
136
  limit: 100,
121
137
  });
@@ -124,10 +140,11 @@ describe("sync (devnet)", () => {
124
140
  });
125
141
  it("should call getOperations with cursor 0 when no initial account", async () => {
126
142
  const mockGetOperations = jest.spyOn(gateway, "getOperations");
143
+ const getAccountShape = makeGetAccountShape(mockSignerContext);
127
144
  const result = await getAccountShape(ACCOUNT_SHAPE_INFO, { paginationConfig: {} });
128
145
  expect(result.operations).toBeDefined();
129
146
  expect(result.operationsCount).toBeGreaterThanOrEqual(1);
130
- expect(mockGetOperations).toHaveBeenCalledWith(TEST_ADDRESS, {
147
+ expect(mockGetOperations).toHaveBeenCalledWith(currency, TEST_ADDRESS, {
131
148
  cursor: 0,
132
149
  limit: 100,
133
150
  });