@ledgerhq/coin-canton 0.11.0-nightly.20251206023719 → 0.11.0-nightly.20251209023841

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 (22) hide show
  1. package/CHANGELOG.md +11 -8
  2. package/lib/bridge/serialization.d.ts.map +1 -1
  3. package/lib/bridge/serialization.js +7 -3
  4. package/lib/bridge/serialization.js.map +1 -1
  5. package/lib/bridge/sync.d.ts.map +1 -1
  6. package/lib/bridge/sync.js +17 -16
  7. package/lib/bridge/sync.js.map +1 -1
  8. package/lib/types/bridge.d.ts +6 -2
  9. package/lib/types/bridge.d.ts.map +1 -1
  10. package/lib-es/bridge/serialization.d.ts.map +1 -1
  11. package/lib-es/bridge/serialization.js +7 -3
  12. package/lib-es/bridge/serialization.js.map +1 -1
  13. package/lib-es/bridge/sync.d.ts.map +1 -1
  14. package/lib-es/bridge/sync.js +17 -16
  15. package/lib-es/bridge/sync.js.map +1 -1
  16. package/lib-es/types/bridge.d.ts +6 -2
  17. package/lib-es/types/bridge.d.ts.map +1 -1
  18. package/package.json +9 -9
  19. package/src/bridge/serialization.ts +7 -3
  20. package/src/bridge/sync.test.ts +156 -1
  21. package/src/bridge/sync.ts +20 -17
  22. package/src/types/bridge.ts +6 -2
package/CHANGELOG.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # @ledgerhq/coin-canton
2
2
 
3
- ## 0.11.0-nightly.20251206023719
3
+ ## 0.11.0-nightly.20251209023841
4
4
 
5
5
  ### Minor Changes
6
6
 
@@ -10,6 +10,8 @@
10
10
 
11
11
  - [#12894](https://github.com/LedgerHQ/ledger-live/pull/12894) [`364d4ed`](https://github.com/LedgerHQ/ledger-live/commit/364d4ed5099087eea580399b4e8e6a83aa761f16) Thanks [@jonezque](https://github.com/jonezque)! - feat: canton updated logic to check if account is empty or not
12
12
 
13
+ - [#13186](https://github.com/LedgerHQ/ledger-live/pull/13186) [`6e33be1`](https://github.com/LedgerHQ/ledger-live/commit/6e33be1e52c90369e96d8dd56caf762ba24286ae) Thanks [@ishaba](https://github.com/ishaba)! - fix canton accounts sync for onboarded accounts
14
+
13
15
  - [#12745](https://github.com/LedgerHQ/ledger-live/pull/12745) [`aadcec6`](https://github.com/LedgerHQ/ledger-live/commit/aadcec66847b800f79452ba1df09149e0a1cb9e8) Thanks [@jonezque](https://github.com/jonezque)! - feat: pending offers to show, accept, cancel for canton network
14
16
 
15
17
  ### Patch Changes
@@ -20,13 +22,14 @@
20
22
 
21
23
  - [#13016](https://github.com/LedgerHQ/ledger-live/pull/13016) [`50db851`](https://github.com/LedgerHQ/ledger-live/commit/50db851e152a0fc7ca78fea8a4f34e2de1ce9bc5) Thanks [@jonezque](https://github.com/jonezque)! - fix: canton balance new instrument_id
22
24
 
23
- - Updated dependencies [[`50aeea1`](https://github.com/LedgerHQ/ledger-live/commit/50aeea1233056e9abff9568eb928927f39e76cff), [`fd031d7`](https://github.com/LedgerHQ/ledger-live/commit/fd031d77ca7ed011ec492700fd4d7bc86c518907), [`480a08a`](https://github.com/LedgerHQ/ledger-live/commit/480a08ae190119829910b46ecc6d2a9fb11bb7c2), [`19a54fd`](https://github.com/LedgerHQ/ledger-live/commit/19a54fd89a2d3c7481aebc28817870875f9d44dc), [`a2ecb55`](https://github.com/LedgerHQ/ledger-live/commit/a2ecb55df9d383dc282f5fe489cb14386208215e), [`7ae71b6`](https://github.com/LedgerHQ/ledger-live/commit/7ae71b64161424b398b63f77da5127085143fcdc), [`c5da2ce`](https://github.com/LedgerHQ/ledger-live/commit/c5da2cef7cded2b53c1af9aa3174cd27e5c92e0a), [`fe81926`](https://github.com/LedgerHQ/ledger-live/commit/fe81926afeb2df8e917e6bd1e4cbab13f09647fd), [`67137eb`](https://github.com/LedgerHQ/ledger-live/commit/67137eb5d7f04dd5f3610fdaa4e463d292654105), [`49ef24c`](https://github.com/LedgerHQ/ledger-live/commit/49ef24cbd1948bfd146af0b20f2128951b2dc170), [`30be235`](https://github.com/LedgerHQ/ledger-live/commit/30be2354822b3497c69322294ff1dab43375be50), [`b4a4e16`](https://github.com/LedgerHQ/ledger-live/commit/b4a4e160aae6fd64f944ab25633f6931dc4358d3), [`927ae64`](https://github.com/LedgerHQ/ledger-live/commit/927ae64db0bb04af54e25623655a001a68e0f2d3), [`903ea9c`](https://github.com/LedgerHQ/ledger-live/commit/903ea9cdacf704a0119de2803a4f409b775391a5), [`768718d`](https://github.com/LedgerHQ/ledger-live/commit/768718df029bc8799b88c0299925dc56302b0c53), [`9251b77`](https://github.com/LedgerHQ/ledger-live/commit/9251b77fcb01709723842f19220a2a41a6fc8f3b), [`a5ad7d4`](https://github.com/LedgerHQ/ledger-live/commit/a5ad7d4578c06db3e40f260451b644c27e20cb62), [`02ef98f`](https://github.com/LedgerHQ/ledger-live/commit/02ef98faeb13c182ef255e06a43c39abeb55ecc7), [`3e70677`](https://github.com/LedgerHQ/ledger-live/commit/3e706774f8c4e9b768ab18b67abc3471cf61b6b6), [`6d0c6b2`](https://github.com/LedgerHQ/ledger-live/commit/6d0c6b2eda60049d8eebda5de2c54e8f0be7d009), [`aadb3d5`](https://github.com/LedgerHQ/ledger-live/commit/aadb3d57f5719cc2cc397975eafec8094b160afe), [`d4bad44`](https://github.com/LedgerHQ/ledger-live/commit/d4bad4433c3fb083d95820d2927a9e8beeaf244f), [`8d8e1b7`](https://github.com/LedgerHQ/ledger-live/commit/8d8e1b7bb26305af326ea21710248223d1e8653b), [`38d5880`](https://github.com/LedgerHQ/ledger-live/commit/38d5880ca6c3cc8808182e9d0f046b204914d34a), [`0d33751`](https://github.com/LedgerHQ/ledger-live/commit/0d33751bb2ae599d0d26ce6a8efdbe01757f12fb), [`d37fa4b`](https://github.com/LedgerHQ/ledger-live/commit/d37fa4baf4534161bffe5033ce44fc7780c79d89), [`aadcec6`](https://github.com/LedgerHQ/ledger-live/commit/aadcec66847b800f79452ba1df09149e0a1cb9e8), [`bce6610`](https://github.com/LedgerHQ/ledger-live/commit/bce6610ca8554a85f8f17b6014e921fdecd3fa4f), [`2a60165`](https://github.com/LedgerHQ/ledger-live/commit/2a601656b7a23a424a29f006ec53090648fdae4f), [`b113920`](https://github.com/LedgerHQ/ledger-live/commit/b11392056bc334fc1813c473569ad3ae7be08045), [`ed8532b`](https://github.com/LedgerHQ/ledger-live/commit/ed8532bad754ca2b5f1788c6e92f4646b775ec79), [`88a5018`](https://github.com/LedgerHQ/ledger-live/commit/88a501871d58c980f18495b5b32012a3eaa9ab2c), [`c56ab86`](https://github.com/LedgerHQ/ledger-live/commit/c56ab86ab65597caf87a09b7596faa54f3104bd4), [`9659a34`](https://github.com/LedgerHQ/ledger-live/commit/9659a34d9998d5c4dff8618bf6cef7d16403680d)]:
24
- - @ledgerhq/cryptoassets@13.34.0-nightly.20251206023719
25
- - @ledgerhq/types-live@6.90.0-nightly.20251206023719
26
- - @ledgerhq/coin-framework@6.10.0-nightly.20251206023719
27
- - @ledgerhq/live-env@2.22.0-nightly.20251206023719
28
- - @ledgerhq/devices@8.8.0-nightly.20251206023719
29
- - @ledgerhq/live-network@2.1.2-nightly.20251206023719
25
+ - Updated dependencies [[`50aeea1`](https://github.com/LedgerHQ/ledger-live/commit/50aeea1233056e9abff9568eb928927f39e76cff), [`fd031d7`](https://github.com/LedgerHQ/ledger-live/commit/fd031d77ca7ed011ec492700fd4d7bc86c518907), [`480a08a`](https://github.com/LedgerHQ/ledger-live/commit/480a08ae190119829910b46ecc6d2a9fb11bb7c2), [`19a54fd`](https://github.com/LedgerHQ/ledger-live/commit/19a54fd89a2d3c7481aebc28817870875f9d44dc), [`a2ecb55`](https://github.com/LedgerHQ/ledger-live/commit/a2ecb55df9d383dc282f5fe489cb14386208215e), [`7ae71b6`](https://github.com/LedgerHQ/ledger-live/commit/7ae71b64161424b398b63f77da5127085143fcdc), [`5fa83e4`](https://github.com/LedgerHQ/ledger-live/commit/5fa83e49c5fb103da7ecf0777b7e75bb35d5ed61), [`c5da2ce`](https://github.com/LedgerHQ/ledger-live/commit/c5da2cef7cded2b53c1af9aa3174cd27e5c92e0a), [`fe81926`](https://github.com/LedgerHQ/ledger-live/commit/fe81926afeb2df8e917e6bd1e4cbab13f09647fd), [`67137eb`](https://github.com/LedgerHQ/ledger-live/commit/67137eb5d7f04dd5f3610fdaa4e463d292654105), [`49ef24c`](https://github.com/LedgerHQ/ledger-live/commit/49ef24cbd1948bfd146af0b20f2128951b2dc170), [`30be235`](https://github.com/LedgerHQ/ledger-live/commit/30be2354822b3497c69322294ff1dab43375be50), [`bdacedf`](https://github.com/LedgerHQ/ledger-live/commit/bdacedfe32bea8ffce96ab675a44c0d7cf395143), [`b4a4e16`](https://github.com/LedgerHQ/ledger-live/commit/b4a4e160aae6fd64f944ab25633f6931dc4358d3), [`927ae64`](https://github.com/LedgerHQ/ledger-live/commit/927ae64db0bb04af54e25623655a001a68e0f2d3), [`903ea9c`](https://github.com/LedgerHQ/ledger-live/commit/903ea9cdacf704a0119de2803a4f409b775391a5), [`768718d`](https://github.com/LedgerHQ/ledger-live/commit/768718df029bc8799b88c0299925dc56302b0c53), [`9251b77`](https://github.com/LedgerHQ/ledger-live/commit/9251b77fcb01709723842f19220a2a41a6fc8f3b), [`a5ad7d4`](https://github.com/LedgerHQ/ledger-live/commit/a5ad7d4578c06db3e40f260451b644c27e20cb62), [`02ef98f`](https://github.com/LedgerHQ/ledger-live/commit/02ef98faeb13c182ef255e06a43c39abeb55ecc7), [`3e70677`](https://github.com/LedgerHQ/ledger-live/commit/3e706774f8c4e9b768ab18b67abc3471cf61b6b6), [`6d0c6b2`](https://github.com/LedgerHQ/ledger-live/commit/6d0c6b2eda60049d8eebda5de2c54e8f0be7d009), [`aadb3d5`](https://github.com/LedgerHQ/ledger-live/commit/aadb3d57f5719cc2cc397975eafec8094b160afe), [`d4bad44`](https://github.com/LedgerHQ/ledger-live/commit/d4bad4433c3fb083d95820d2927a9e8beeaf244f), [`8d8e1b7`](https://github.com/LedgerHQ/ledger-live/commit/8d8e1b7bb26305af326ea21710248223d1e8653b), [`38d5880`](https://github.com/LedgerHQ/ledger-live/commit/38d5880ca6c3cc8808182e9d0f046b204914d34a), [`0d33751`](https://github.com/LedgerHQ/ledger-live/commit/0d33751bb2ae599d0d26ce6a8efdbe01757f12fb), [`07de7a8`](https://github.com/LedgerHQ/ledger-live/commit/07de7a87415ae4d1126e751d6a4d521ced3065e3), [`d37fa4b`](https://github.com/LedgerHQ/ledger-live/commit/d37fa4baf4534161bffe5033ce44fc7780c79d89), [`5e0556a`](https://github.com/LedgerHQ/ledger-live/commit/5e0556a3bd0ea60277462eed10c997b17b09d299), [`aadcec6`](https://github.com/LedgerHQ/ledger-live/commit/aadcec66847b800f79452ba1df09149e0a1cb9e8), [`bce6610`](https://github.com/LedgerHQ/ledger-live/commit/bce6610ca8554a85f8f17b6014e921fdecd3fa4f), [`2a60165`](https://github.com/LedgerHQ/ledger-live/commit/2a601656b7a23a424a29f006ec53090648fdae4f), [`b113920`](https://github.com/LedgerHQ/ledger-live/commit/b11392056bc334fc1813c473569ad3ae7be08045), [`ed8532b`](https://github.com/LedgerHQ/ledger-live/commit/ed8532bad754ca2b5f1788c6e92f4646b775ec79), [`88a5018`](https://github.com/LedgerHQ/ledger-live/commit/88a501871d58c980f18495b5b32012a3eaa9ab2c), [`c56ab86`](https://github.com/LedgerHQ/ledger-live/commit/c56ab86ab65597caf87a09b7596faa54f3104bd4), [`9659a34`](https://github.com/LedgerHQ/ledger-live/commit/9659a34d9998d5c4dff8618bf6cef7d16403680d)]:
26
+ - @ledgerhq/cryptoassets@13.34.0-nightly.20251209023841
27
+ - @ledgerhq/types-live@6.90.0-nightly.20251209023841
28
+ - @ledgerhq/coin-framework@6.10.0-nightly.20251209023841
29
+ - @ledgerhq/live-env@2.22.0-nightly.20251209023841
30
+ - @ledgerhq/errors@6.28.0-nightly.20251209023841
31
+ - @ledgerhq/devices@8.8.0-nightly.20251209023841
32
+ - @ledgerhq/live-network@2.1.2-nightly.20251209023841
30
33
 
31
34
  ## 0.10.0
32
35
 
package/lib/bridge/serialization.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"serialization.d.ts","sourceRoot":"","sources":["../../src/bridge/serialization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EACL,KAAK,aAAa,EAInB,MAAM,UAAU,CAAC;AAElB,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,aAAa,CAE1E;AAuBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAMjF;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAMnF"}
1
+ {"version":3,"file":"serialization.d.ts","sourceRoot":"","sources":["../../src/bridge/serialization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EACL,KAAK,aAAa,EAInB,MAAM,UAAU,CAAC;AAElB,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,aAAa,CAE1E;AA2BD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAMjF;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAMnF"}
package/lib/bridge/serialization.js CHANGED
@@ -10,18 +10,22 @@ function isCantonAccountRaw(accountRaw) {
10
10
  return "cantonResources" in accountRaw;
11
11
  }
12
12
  function toResourcesRaw(r) {
13
- const { instrumentUtxoCounts, pendingTransferProposals, publicKey } = r;
13
+ const { isOnboarded, instrumentUtxoCounts, pendingTransferProposals, publicKey, xpub } = r;
14
14
  return {
15
+ isOnboarded: isOnboarded,
15
16
  instrumentUtxoCounts,
16
17
  pendingTransferProposals,
17
- publicKey,
18
+ ...(publicKey !== undefined && { publicKey }),
19
+ ...(xpub !== undefined && { xpub }),
18
20
  };
19
21
  }
20
22
  function fromResourcesRaw(r) {
21
23
  return {
24
+ isOnboarded: r.isOnboarded,
22
25
  instrumentUtxoCounts: r.instrumentUtxoCounts,
23
26
  pendingTransferProposals: r.pendingTransferProposals,
24
- publicKey: r.publicKey,
27
+ ...(r.publicKey !== undefined && { publicKey: r.publicKey }),
28
+ ...(r.xpub !== undefined && { xpub: r.xpub }),
25
29
  };
26
30
  }
27
31
  function assignToAccountRaw(account, accountRaw) {
package/lib/bridge/serialization.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"serialization.js","sourceRoot":"","sources":["../../src/bridge/serialization.ts"],"names":[],"mappings":";;AAQA,0CAEC;AAuBD,gDAMC;AAED,oDAMC;AAvCD,SAAgB,eAAe,CAAC,OAAgB;IAC9C,OAAO,iBAAiB,IAAI,OAAO,CAAC;AACtC,CAAC;AAED,SAAS,kBAAkB,CAAC,UAAsB;IAChD,OAAO,iBAAiB,IAAI,UAAU,CAAC;AACzC,CAAC;AAED,SAAS,cAAc,CAAC,CAAkB;IACxC,MAAM,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;IACxE,OAAO;QACL,oBAAoB;QACpB,wBAAwB;QACxB,SAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAqB;IAC7C,OAAO;QACL,oBAAoB,EAAE,CAAC,CAAC,oBAAoB;QAC5C,wBAAwB,EAAE,CAAC,CAAC,wBAAwB;QACpD,SAAS,EAAE,CAAC,CAAC,SAAS;KACvB,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAAC,OAAgB,EAAE,UAAsB;IACzE,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/D,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;YAC5B,UAAU,CAAC,eAAe,GAAG,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,UAAsB,EAAE,OAAgB;IAC3E,IAAI,kBAAkB,CAAC,UAAU,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/D,IAAI,UAAU,CAAC,eAAe,EAAE,CAAC;YAC/B,OAAO,CAAC,eAAe,GAAG,gBAAgB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"serialization.js","sourceRoot":"","sources":["../../src/bridge/serialization.ts"],"names":[],"mappings":";;AAQA,0CAEC;AA2BD,gDAMC;AAED,oDAMC;AA3CD,SAAgB,eAAe,CAAC,OAAgB;IAC9C,OAAO,iBAAiB,IAAI,OAAO,CAAC;AACtC,CAAC;AAED,SAAS,kBAAkB,CAAC,UAAsB;IAChD,OAAO,iBAAiB,IAAI,UAAU,CAAC;AACzC,CAAC;AAED,SAAS,cAAc,CAAC,CAAkB;IACxC,MAAM,EAAE,WAAW,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IAC3F,OAAO;QACL,WAAW,EAAE,WAAW;QACxB,oBAAoB;QACpB,wBAAwB;QACxB,GAAG,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7C,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAqB;IAC7C,OAAO;QACL,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,oBAAoB,EAAE,CAAC,CAAC,oBAAoB;QAC5C,wBAAwB,EAAE,CAAC,CAAC,wBAAwB;QACpD,GAAG,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;QAC5D,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;KAC9C,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAAC,OAAgB,EAAE,UAAsB;IACzE,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/D,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;YAC5B,UAAU,CAAC,eAAe,GAAG,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,UAAsB,EAAE,OAAgB;IAC3E,IAAI,kBAAkB,CAAC,UAAU,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/D,IAAI,UAAU,CAAC,eAAe,EAAE,CAAC;YAC/B,OAAO,CAAC,eAAe,GAAG,gBAAgB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;AACH,CAAC"}
package/lib/bridge/sync.d.ts.map CHANGED
@@ -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;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAUhE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AA0EvD,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,GACzC,eAAe,CAAC,aAAa,CAAC,CAmHhC"}
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;AAUhE,OAAO,EAAE,aAAa,EAAmB,YAAY,EAAE,MAAM,UAAU,CAAC;AA0ExE,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,GACzC,eAAe,CAAC,aAAa,CAAC,CAsHhC"}
package/lib/bridge/sync.js CHANGED
@@ -71,20 +71,22 @@ const filterOperations = (transactions, accountId, partyId) => {
71
71
  function makeGetAccountShape(signerContext) {
72
72
  return async (info) => {
73
73
  const { address, currency, derivationMode, derivationPath, initialAccount } = info;
74
- let xpubOrAddress = initialAccount?.xpub || "";
74
+ let isOnboarded = initialAccount?.cantonResources?.isOnboarded ?? false;
75
+ let xpubOrAddress = (initialAccount?.xpub || initialAccount?.cantonResources?.xpub) ?? "";
75
76
  let publicKey = initialAccount?.cantonResources?.publicKey;
76
- if (!xpubOrAddress || !publicKey) {
77
+ if (!xpubOrAddress && !publicKey) {
77
78
  const getAddress = (0, signer_1.default)(signerContext);
78
- const addressResult = await getAddress(info.deviceId || "", {
79
+ const addressResult = await getAddress(info.deviceId ?? "", {
79
80
  path: derivationPath,
80
81
  currency: currency,
81
82
  derivationMode: derivationMode,
82
83
  verify: false,
83
84
  });
84
85
  publicKey = addressResult.publicKey;
85
- const { isOnboarded, partyId } = await (0, onboard_1.isAccountOnboarded)(currency, publicKey);
86
- if (isOnboarded && partyId) {
87
- xpubOrAddress = partyId;
86
+ const result = await (0, onboard_1.isAccountOnboarded)(currency, publicKey);
87
+ isOnboarded = result.isOnboarded;
88
+ if (isOnboarded && result.partyId) {
89
+ xpubOrAddress = result.partyId;
88
90
  }
89
91
  }
90
92
  const accountId = (0, index_1.encodeAccountId)({
@@ -128,15 +130,18 @@ function makeGetAccountShape(signerContext) {
128
130
  const newOperations = filterOperations(transactionData.operations, accountId, xpubOrAddress);
129
131
  operations = (0, jsHelpers_1.mergeOps)(oldOperations, newOperations);
130
132
  }
133
+ const cantonResources = {
134
+ isOnboarded,
135
+ instrumentUtxoCounts,
136
+ pendingTransferProposals,
137
+ ...(publicKey && { publicKey }),
138
+ xpub: xpubOrAddress,
139
+ };
131
140
  const used = !(0, helpers_1.isCantonAccountEmpty)({
132
141
  operationsCount: operations.length,
133
142
  balance: totalBalance,
134
143
  subAccounts: initialAccount?.subAccounts ?? [],
135
- cantonResources: {
136
- instrumentUtxoCounts,
137
- pendingTransferProposals,
138
- publicKey,
139
- },
144
+ cantonResources,
140
145
  });
141
146
  const blockHeight = await (0, gateway_1.getLedgerEnd)(currency);
142
147
  const creationDate = operations.length > 0
@@ -156,11 +161,7 @@ function makeGetAccountShape(signerContext) {
156
161
  spendableBalance,
157
162
  xpub: xpubOrAddress,
158
163
  used,
159
- cantonResources: {
160
- instrumentUtxoCounts,
161
- pendingTransferProposals,
162
- publicKey,
163
- },
164
+ cantonResources,
164
165
  };
165
166
  return shape;
166
167
  };
package/lib/bridge/sync.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":";;;;;AAyFA,kDAqHC;AA9MD,gEAAqC;AAErC,kEAAyE;AACzE,yEAAsF;AACtF,kEAAuE;AAEvE,gDAK4B;AAC5B,mEAAoF;AACpF,uDAAmC;AACnC,uDAAiC;AAEjC,uCAA+C;AAC/C,wCAAkD;AAElD,MAAM,wBAAwB,GAC5B,CAAC,SAAiB,EAAE,OAAe,EAAE,EAAE,CACvC,CAAC,MAAqB,EAAa,EAAE;IACnC,MAAM,EACJ,gBAAgB,EAChB,GAAG,EACH,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EACvB,OAAO,EACP,UAAU,EACV,qBAAqB,EACrB,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EACnB,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,GAC/C,GAAG,MAAM,CAAC;IAEX,IAAI,IAAI,GAAkB,SAAS,CAAC;IACpC,IAAI,OAAO,CAAC,aAAa,KAAK,mBAAmB,EAAE,CAAC;QAClD,IAAI,GAAG,mBAAmB,CAAC;IAC7B,CAAC;SAAM,IAAI,OAAO,CAAC,aAAa,KAAK,mBAAmB,EAAE,CAAC;QACzD,IAAI,GAAG,mBAAmB,CAAC;IAC7B,CAAC;SAAM,IAAI,OAAO,CAAC,aAAa,KAAK,oBAAoB,EAAE,CAAC;QAC1D,IAAI,GAAG,oBAAoB,CAAC;IAC9B,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,IAAI,aAAa,KAAK,GAAG,EAAE,CAAC;QAC3D,IAAI,GAAG,MAAM,CAAC;IAChB,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAClC,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAClD,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACrC,IAAI,GAAG,IAAI,CAAC;IACd,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QACxC,IAAI,GAAG,cAAc,CAAC;IACxB,CAAC;IACD,IAAI,KAAK,GAAG,IAAI,sBAAS,CAAC,aAAa,CAAC,CAAC;IAEzC,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACtC,2EAA2E;QAC3E,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,sBAAS,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAErC,MAAM,EAAE,GAAc;QACpB,EAAE,EAAE,IAAA,6BAAiB,EAAC,SAAS,EAAE,gBAAgB,EAAE,IAAI,CAAC;QACxD,IAAI,EAAE,gBAAgB;QACtB,SAAS;QACT,IAAI;QACJ,KAAK;QACL,GAAG,EAAE,QAAQ;QACb,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,MAAM;QACnB,OAAO;QACP,UAAU;QACV,IAAI,EAAE,IAAI,IAAI,CAAC,qBAAqB,CAAC;QACrC,yBAAyB,EAAE,IAAI,sBAAS,CAAC,MAAM,CAAC;QAChD,KAAK,EAAE;YACL,GAAG;YACH,IAAI;SACL;KACF,CAAC;IAEF,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEJ,MAAM,gBAAgB,GAAG,CACvB,YAA6B,EAC7B,SAAiB,EACjB,OAAe,EACF,EAAE;IACf,OAAO,YAAY,CAAC,GAAG,CAAC,wBAAwB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;AACxE,CAAC,CAAC;AAEF,SAAgB,mBAAmB,CACjC,aAA0C;IAE1C,OAAO,KAAK,EAAC,IAAI,EAAC,EAAE;QAClB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;QAEnF,IAAI,aAAa,GAAG,cAAc,EAAE,IAAI,IAAI,EAAE,CAAC;QAC/C,IAAI,SAAS,GAAuB,cAAc,EAAE,eAAe,EAAE,SAAS,CAAC;QAE/E,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,IAAA,gBAAQ,EAAC,aAAa,CAAC,CAAC;YAC3C,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;gBAC1D,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,QAAQ;gBAClB,cAAc,EAAE,cAAc;gBAC9B,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;YACH,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;YAEpC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,4BAAkB,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAC/E,IAAI,WAAW,IAAI,OAAO,EAAE,CAAC;gBAC3B,aAAa,GAAG,OAAO,CAAC;YAC1B,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,IAAA,uBAAe,EAAC;YAChC,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,GAAG;YACZ,UAAU,EAAE,QAAQ,CAAC,EAAE;YACvB,aAAa,EAAE,aAAa;YAC5B,cAAc;SACf,CAAC,CAAC;QAEH,MAAM,EAAE,kBAAkB,EAAE,GAAG,gBAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,IAAA,uBAAU,EAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChF,MAAM,wBAAwB,GAAG,aAAa;YAC5C,CAAC,CAAC,MAAM,IAAA,qCAA2B,EAAC,QAAQ,EAAE,aAAa,CAAC;YAC5D,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,YAAY,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAC1C,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;YACf,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,GAAG,CAAC,SAAS,OAAO,CAAC,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC;YACjD,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC;YACtC,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAmC,CACpC,CAAC;QAEF,MAAM,cAAc,GAAG,IAAI,sBAAS,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,IAAI,GAAG,CAAC,CAAC;QAChG,MAAM,YAAY,GAAG,IAAI,sBAAS,CAChC,YAAY,CAAC,SAAS,kBAAkB,EAAE,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,IAAI,GAAG,CACrE,CAAC;QACF,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,IAAI,sBAAS,CAAC,gBAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC;QACrF,MAAM,gBAAgB,GAAG,sBAAS,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;QAE1E,MAAM,oBAAoB,GAA2B,EAAE,CAAC;QACxD,KAAK,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACnE,oBAAoB,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC;QACzD,CAAC;QAED,IAAI,UAAU,GAAgB,EAAE,CAAC;QACjC,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,aAAa,GAAG,cAAc,EAAE,UAAU,IAAI,EAAE,CAAC;YACvD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACnF,MAAM,eAAe,GAAG,MAAM,IAAA,uBAAa,EAAC,QAAQ,EAAE,aAAa,EAAE;gBACnE,MAAM,EAAE,OAAO;gBACf,KAAK,EAAE,GAAG;aACX,CAAC,CAAC;YACH,MAAM,aAAa,GAAG,gBAAgB,CAAC,eAAe,CAAC,UAAU,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;YAC7F,UAAU,GAAG,IAAA,oBAAQ,EAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,IAAA,8BAAoB,EAAC;YACjC,eAAe,EAAE,UAAU,CAAC,MAAM;YAClC,OAAO,EAAE,YAAY;YACrB,WAAW,EAAE,cAAc,EAAE,WAAW,IAAI,EAAE;YAC9C,eAAe,EAAE;gBACf,oBAAoB;gBACpB,wBAAwB;gBACxB,SAAS;aACV;SACF,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,MAAM,IAAA,sBAAY,EAAC,QAAQ,CAAC,CAAC;QAEjD,MAAM,YAAY,GAChB,UAAU,CAAC,MAAM,GAAG,CAAC;YACnB,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAChE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QAEjB,MAAM,KAAK,GAAG;YACZ,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,SAAkB;YACxB,OAAO,EAAE,YAAY;YACrB,WAAW;YACX,YAAY;YACZ,YAAY,EAAE,IAAI,IAAI,EAAE;YACxB,YAAY,EAAE,OAAO;YACrB,cAAc,EAAE,OAAO;YACvB,UAAU;YACV,eAAe,EAAE,UAAU,CAAC,MAAM;YAClC,gBAAgB;YAChB,IAAI,EAAE,aAAa;YACnB,IAAI;YACJ,eAAe,EAAE;gBACf,oBAAoB;gBACpB,wBAAwB;gBACxB,SAAS;aACV;SACF,CAAC;QAEF,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"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"}
package/lib/types/bridge.d.ts CHANGED
@@ -36,14 +36,18 @@ export type TransactionRaw = TransactionCommonRaw & {
36
36
  export type TransactionStatus = TransactionStatusCommon;
37
37
  export type TransactionStatusRaw = TransactionStatusCommonRaw;
38
38
  export type CantonResources = {
39
+ isOnboarded: boolean;
39
40
  instrumentUtxoCounts: Record<string, number>;
40
41
  pendingTransferProposals: TransferProposal[];
41
- publicKey: string;
42
+ publicKey?: string;
43
+ xpub?: string;
42
44
  };
43
45
  export type CantonResourcesRaw = {
46
+ isOnboarded: boolean;
44
47
  instrumentUtxoCounts: Record<string, number>;
45
48
  pendingTransferProposals: TransferProposal[];
46
- publicKey: string;
49
+ publicKey?: string;
50
+ xpub?: string;
47
51
  };
48
52
  export type CantonAccount = Account & {
49
53
  cantonResources: CantonResources;
package/lib/types/bridge.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../src/types/bridge.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../src/types/bridge.ts"],"names":[],"mappings":"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"}
package/lib-es/bridge/serialization.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"serialization.d.ts","sourceRoot":"","sources":["../../src/bridge/serialization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EACL,KAAK,aAAa,EAInB,MAAM,UAAU,CAAC;AAElB,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,aAAa,CAE1E;AAuBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAMjF;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAMnF"}
1
+ {"version":3,"file":"serialization.d.ts","sourceRoot":"","sources":["../../src/bridge/serialization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EACL,KAAK,aAAa,EAInB,MAAM,UAAU,CAAC;AAElB,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,aAAa,CAE1E;AA2BD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAMjF;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAMnF"}
package/lib-es/bridge/serialization.js CHANGED
@@ -5,18 +5,22 @@ function isCantonAccountRaw(accountRaw) {
5
5
  return "cantonResources" in accountRaw;
6
6
  }
7
7
  function toResourcesRaw(r) {
8
- const { instrumentUtxoCounts, pendingTransferProposals, publicKey } = r;
8
+ const { isOnboarded, instrumentUtxoCounts, pendingTransferProposals, publicKey, xpub } = r;
9
9
  return {
10
+ isOnboarded: isOnboarded,
10
11
  instrumentUtxoCounts,
11
12
  pendingTransferProposals,
12
- publicKey,
13
+ ...(publicKey !== undefined && { publicKey }),
14
+ ...(xpub !== undefined && { xpub }),
13
15
  };
14
16
  }
15
17
  function fromResourcesRaw(r) {
16
18
  return {
19
+ isOnboarded: r.isOnboarded,
17
20
  instrumentUtxoCounts: r.instrumentUtxoCounts,
18
21
  pendingTransferProposals: r.pendingTransferProposals,
19
- publicKey: r.publicKey,
22
+ ...(r.publicKey !== undefined && { publicKey: r.publicKey }),
23
+ ...(r.xpub !== undefined && { xpub: r.xpub }),
20
24
  };
21
25
  }
22
26
  export function assignToAccountRaw(account, accountRaw) {
package/lib-es/bridge/serialization.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"serialization.js","sourceRoot":"","sources":["../../src/bridge/serialization.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,eAAe,CAAC,OAAgB;IAC9C,OAAO,iBAAiB,IAAI,OAAO,CAAC;AACtC,CAAC;AAED,SAAS,kBAAkB,CAAC,UAAsB;IAChD,OAAO,iBAAiB,IAAI,UAAU,CAAC;AACzC,CAAC;AAED,SAAS,cAAc,CAAC,CAAkB;IACxC,MAAM,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;IACxE,OAAO;QACL,oBAAoB;QACpB,wBAAwB;QACxB,SAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAqB;IAC7C,OAAO;QACL,oBAAoB,EAAE,CAAC,CAAC,oBAAoB;QAC5C,wBAAwB,EAAE,CAAC,CAAC,wBAAwB;QACpD,SAAS,EAAE,CAAC,CAAC,SAAS;KACvB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAgB,EAAE,UAAsB;IACzE,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/D,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;YAC5B,UAAU,CAAC,eAAe,GAAG,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,UAAsB,EAAE,OAAgB;IAC3E,IAAI,kBAAkB,CAAC,UAAU,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/D,IAAI,UAAU,CAAC,eAAe,EAAE,CAAC;YAC/B,OAAO,CAAC,eAAe,GAAG,gBAAgB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"serialization.js","sourceRoot":"","sources":["../../src/bridge/serialization.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,eAAe,CAAC,OAAgB;IAC9C,OAAO,iBAAiB,IAAI,OAAO,CAAC;AACtC,CAAC;AAED,SAAS,kBAAkB,CAAC,UAAsB;IAChD,OAAO,iBAAiB,IAAI,UAAU,CAAC;AACzC,CAAC;AAED,SAAS,cAAc,CAAC,CAAkB;IACxC,MAAM,EAAE,WAAW,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IAC3F,OAAO;QACL,WAAW,EAAE,WAAW;QACxB,oBAAoB;QACpB,wBAAwB;QACxB,GAAG,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7C,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAqB;IAC7C,OAAO;QACL,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,oBAAoB,EAAE,CAAC,CAAC,oBAAoB;QAC5C,wBAAwB,EAAE,CAAC,CAAC,wBAAwB;QACpD,GAAG,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;QAC5D,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;KAC9C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAgB,EAAE,UAAsB;IACzE,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/D,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;YAC5B,UAAU,CAAC,eAAe,GAAG,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,UAAsB,EAAE,OAAgB;IAC3E,IAAI,kBAAkB,CAAC,UAAU,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/D,IAAI,UAAU,CAAC,eAAe,EAAE,CAAC;YAC/B,OAAO,CAAC,eAAe,GAAG,gBAAgB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;AACH,CAAC"}
package/lib-es/bridge/sync.d.ts.map CHANGED
@@ -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;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAUhE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AA0EvD,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,GACzC,eAAe,CAAC,aAAa,CAAC,CAmHhC"}
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;AAUhE,OAAO,EAAE,aAAa,EAAmB,YAAY,EAAE,MAAM,UAAU,CAAC;AA0ExE,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,GACzC,eAAe,CAAC,aAAa,CAAC,CAsHhC"}
package/lib-es/bridge/sync.js CHANGED
@@ -65,20 +65,22 @@ const filterOperations = (transactions, accountId, partyId) => {
65
65
  export function makeGetAccountShape(signerContext) {
66
66
  return async (info) => {
67
67
  const { address, currency, derivationMode, derivationPath, initialAccount } = info;
68
- let xpubOrAddress = initialAccount?.xpub || "";
68
+ let isOnboarded = initialAccount?.cantonResources?.isOnboarded ?? false;
69
+ let xpubOrAddress = (initialAccount?.xpub || initialAccount?.cantonResources?.xpub) ?? "";
69
70
  let publicKey = initialAccount?.cantonResources?.publicKey;
70
- if (!xpubOrAddress || !publicKey) {
71
+ if (!xpubOrAddress && !publicKey) {
71
72
  const getAddress = resolver(signerContext);
72
- const addressResult = await getAddress(info.deviceId || "", {
73
+ const addressResult = await getAddress(info.deviceId ?? "", {
73
74
  path: derivationPath,
74
75
  currency: currency,
75
76
  derivationMode: derivationMode,
76
77
  verify: false,
77
78
  });
78
79
  publicKey = addressResult.publicKey;
79
- const { isOnboarded, partyId } = await isAccountOnboarded(currency, publicKey);
80
- if (isOnboarded && partyId) {
81
- xpubOrAddress = partyId;
80
+ const result = await isAccountOnboarded(currency, publicKey);
81
+ isOnboarded = result.isOnboarded;
82
+ if (isOnboarded && result.partyId) {
83
+ xpubOrAddress = result.partyId;
82
84
  }
83
85
  }
84
86
  const accountId = encodeAccountId({
@@ -122,15 +124,18 @@ export function makeGetAccountShape(signerContext) {
122
124
  const newOperations = filterOperations(transactionData.operations, accountId, xpubOrAddress);
123
125
  operations = mergeOps(oldOperations, newOperations);
124
126
  }
127
+ const cantonResources = {
128
+ isOnboarded,
129
+ instrumentUtxoCounts,
130
+ pendingTransferProposals,
131
+ ...(publicKey && { publicKey }),
132
+ xpub: xpubOrAddress,
133
+ };
125
134
  const used = !isCantonAccountEmpty({
126
135
  operationsCount: operations.length,
127
136
  balance: totalBalance,
128
137
  subAccounts: initialAccount?.subAccounts ?? [],
129
- cantonResources: {
130
- instrumentUtxoCounts,
131
- pendingTransferProposals,
132
- publicKey,
133
- },
138
+ cantonResources,
134
139
  });
135
140
  const blockHeight = await getLedgerEnd(currency);
136
141
  const creationDate = operations.length > 0
@@ -150,11 +155,7 @@ export function makeGetAccountShape(signerContext) {
150
155
  spendableBalance,
151
156
  xpub: xpubOrAddress,
152
157
  used,
153
- cantonResources: {
154
- instrumentUtxoCounts,
155
- pendingTransferProposals,
156
- publicKey,
157
- },
158
+ cantonResources,
158
159
  };
159
160
  return shape;
160
161
  };
package/lib-es/bridge/sync.js.map CHANGED
@@ -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":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAmB,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EACL,YAAY,EACZ,aAAa,EAEb,2BAA2B,GAC5B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAsB,MAAM,oCAAoC,CAAC;AACpF,OAAO,UAAU,MAAM,WAAW,CAAC;AACnC,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,wBAAwB,GAC5B,CAAC,SAAiB,EAAE,OAAe,EAAE,EAAE,CACvC,CAAC,MAAqB,EAAa,EAAE;IACnC,MAAM,EACJ,gBAAgB,EAChB,GAAG,EACH,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EACvB,OAAO,EACP,UAAU,EACV,qBAAqB,EACrB,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EACnB,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,GAC/C,GAAG,MAAM,CAAC;IAEX,IAAI,IAAI,GAAkB,SAAS,CAAC;IACpC,IAAI,OAAO,CAAC,aAAa,KAAK,mBAAmB,EAAE,CAAC;QAClD,IAAI,GAAG,mBAAmB,CAAC;IAC7B,CAAC;SAAM,IAAI,OAAO,CAAC,aAAa,KAAK,mBAAmB,EAAE,CAAC;QACzD,IAAI,GAAG,mBAAmB,CAAC;IAC7B,CAAC;SAAM,IAAI,OAAO,CAAC,aAAa,KAAK,oBAAoB,EAAE,CAAC;QAC1D,IAAI,GAAG,oBAAoB,CAAC;IAC9B,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,IAAI,aAAa,KAAK,GAAG,EAAE,CAAC;QAC3D,IAAI,GAAG,MAAM,CAAC;IAChB,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAClC,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAClD,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACrC,IAAI,GAAG,IAAI,CAAC;IACd,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QACxC,IAAI,GAAG,cAAc,CAAC;IACxB,CAAC;IACD,IAAI,KAAK,GAAG,IAAI,SAAS,CAAC,aAAa,CAAC,CAAC;IAEzC,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACtC,2EAA2E;QAC3E,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAErC,MAAM,EAAE,GAAc;QACpB,EAAE,EAAE,iBAAiB,CAAC,SAAS,EAAE,gBAAgB,EAAE,IAAI,CAAC;QACxD,IAAI,EAAE,gBAAgB;QACtB,SAAS;QACT,IAAI;QACJ,KAAK;QACL,GAAG,EAAE,QAAQ;QACb,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,MAAM;QACnB,OAAO;QACP,UAAU;QACV,IAAI,EAAE,IAAI,IAAI,CAAC,qBAAqB,CAAC;QACrC,yBAAyB,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC;QAChD,KAAK,EAAE;YACL,GAAG;YACH,IAAI;SACL;KACF,CAAC;IAEF,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEJ,MAAM,gBAAgB,GAAG,CACvB,YAA6B,EAC7B,SAAiB,EACjB,OAAe,EACF,EAAE;IACf,OAAO,YAAY,CAAC,GAAG,CAAC,wBAAwB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;AACxE,CAAC,CAAC;AAEF,MAAM,UAAU,mBAAmB,CACjC,aAA0C;IAE1C,OAAO,KAAK,EAAC,IAAI,EAAC,EAAE;QAClB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;QAEnF,IAAI,WAAW,GAAG,cAAc,EAAE,eAAe,EAAE,WAAW,IAAI,KAAK,CAAC;QACxE,IAAI,aAAa,GAAG,CAAC,cAAc,EAAE,IAAI,IAAI,cAAc,EAAE,eAAe,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QAC1F,IAAI,SAAS,GAAuB,cAAc,EAAE,eAAe,EAAE,SAAS,CAAC;QAE/E,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;YAC3C,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;gBAC1D,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,QAAQ;gBAClB,cAAc,EAAE,cAAc;gBAC9B,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;YACH,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;YAEpC,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAC7D,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;YAEjC,IAAI,WAAW,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBAClC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;YACjC,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,eAAe,CAAC;YAChC,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,GAAG;YACZ,UAAU,EAAE,QAAQ,CAAC,EAAE;YACvB,aAAa,EAAE,aAAa;YAC5B,cAAc;SACf,CAAC,CAAC;QAEH,MAAM,EAAE,kBAAkB,EAAE,GAAG,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,UAAU,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChF,MAAM,wBAAwB,GAAG,aAAa;YAC5C,CAAC,CAAC,MAAM,2BAA2B,CAAC,QAAQ,EAAE,aAAa,CAAC;YAC5D,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,YAAY,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAC1C,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;YACf,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,GAAG,CAAC,SAAS,OAAO,CAAC,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC;YACjD,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC;YACtC,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAmC,CACpC,CAAC;QAEF,MAAM,cAAc,GAAG,IAAI,SAAS,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,IAAI,GAAG,CAAC,CAAC;QAChG,MAAM,YAAY,GAAG,IAAI,SAAS,CAChC,YAAY,CAAC,SAAS,kBAAkB,EAAE,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,IAAI,GAAG,CACrE,CAAC;QACF,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,IAAI,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC;QACrF,MAAM,gBAAgB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;QAE1E,MAAM,oBAAoB,GAA2B,EAAE,CAAC;QACxD,KAAK,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACnE,oBAAoB,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC;QACzD,CAAC;QAED,IAAI,UAAU,GAAgB,EAAE,CAAC;QACjC,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,aAAa,GAAG,cAAc,EAAE,UAAU,IAAI,EAAE,CAAC;YACvD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACnF,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,aAAa,EAAE;gBACnE,MAAM,EAAE,OAAO;gBACf,KAAK,EAAE,GAAG;aACX,CAAC,CAAC;YACH,MAAM,aAAa,GAAG,gBAAgB,CAAC,eAAe,CAAC,UAAU,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;YAC7F,UAAU,GAAG,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,eAAe,GAAoB;YACvC,WAAW;YACX,oBAAoB;YACpB,wBAAwB;YACxB,GAAG,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,CAAC;YAC/B,IAAI,EAAE,aAAa;SACpB,CAAC;QAEF,MAAM,IAAI,GAAG,CAAC,oBAAoB,CAAC;YACjC,eAAe,EAAE,UAAU,CAAC,MAAM;YAClC,OAAO,EAAE,YAAY;YACrB,WAAW,EAAE,cAAc,EAAE,WAAW,IAAI,EAAE;YAC9C,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEjD,MAAM,YAAY,GAChB,UAAU,CAAC,MAAM,GAAG,CAAC;YACnB,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAChE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QAEjB,MAAM,KAAK,GAAG;YACZ,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,SAAkB;YACxB,OAAO,EAAE,YAAY;YACrB,WAAW;YACX,YAAY;YACZ,YAAY,EAAE,IAAI,IAAI,EAAE;YACxB,YAAY,EAAE,OAAO;YACrB,cAAc,EAAE,OAAO;YACvB,UAAU;YACV,eAAe,EAAE,UAAU,CAAC,MAAM;YAClC,gBAAgB;YAChB,IAAI,EAAE,aAAa;YACnB,IAAI;YACJ,eAAe;SAChB,CAAC;QAEF,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
package/lib-es/types/bridge.d.ts CHANGED
@@ -36,14 +36,18 @@ export type TransactionRaw = TransactionCommonRaw & {
36
36
  export type TransactionStatus = TransactionStatusCommon;
37
37
  export type TransactionStatusRaw = TransactionStatusCommonRaw;
38
38
  export type CantonResources = {
39
+ isOnboarded: boolean;
39
40
  instrumentUtxoCounts: Record<string, number>;
40
41
  pendingTransferProposals: TransferProposal[];
41
- publicKey: string;
42
+ publicKey?: string;
43
+ xpub?: string;
42
44
  };
43
45
  export type CantonResourcesRaw = {
46
+ isOnboarded: boolean;
44
47
  instrumentUtxoCounts: Record<string, number>;
45
48
  pendingTransferProposals: TransferProposal[];
46
- publicKey: string;
49
+ publicKey?: string;
50
+ xpub?: string;
47
51
  };
48
52
  export type CantonAccount = Account & {
49
53
  cantonResources: CantonResources;
package/lib-es/types/bridge.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../src/types/bridge.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../src/types/bridge.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ledgerhq/coin-canton",
3
- "version": "0.11.0-nightly.20251206023719",
3
+ "version": "0.11.0-nightly.20251209023841",
4
4
  "description": "Canton coin integration",
5
5
  "keywords": [
6
6
  "Ledger",
@@ -102,14 +102,14 @@
102
102
  "invariant": "^2.2.4",
103
103
  "protobufjs": "7.5.4",
104
104
  "rxjs": "7.8.2",
105
- "@ledgerhq/coin-framework": "^6.10.0-nightly.20251206023719",
106
- "@ledgerhq/cryptoassets": "^13.34.0-nightly.20251206023719",
107
- "@ledgerhq/devices": "8.8.0-nightly.20251206023719",
108
- "@ledgerhq/errors": "^6.27.0",
109
- "@ledgerhq/live-env": "^2.22.0-nightly.20251206023719",
110
- "@ledgerhq/live-network": "^2.1.2-nightly.20251206023719",
105
+ "@ledgerhq/coin-framework": "^6.10.0-nightly.20251209023841",
106
+ "@ledgerhq/cryptoassets": "^13.34.0-nightly.20251209023841",
107
+ "@ledgerhq/devices": "8.8.0-nightly.20251209023841",
108
+ "@ledgerhq/errors": "^6.28.0-nightly.20251209023841",
109
+ "@ledgerhq/live-env": "^2.22.0-nightly.20251209023841",
110
+ "@ledgerhq/live-network": "^2.1.2-nightly.20251209023841",
111
111
  "@ledgerhq/logs": "^6.13.0",
112
- "@ledgerhq/types-live": "^6.90.0-nightly.20251206023719"
112
+ "@ledgerhq/types-live": "^6.90.0-nightly.20251209023841"
113
113
  },
114
114
  "devDependencies": {
115
115
  "@types/invariant": "^2.2.37",
@@ -121,7 +121,7 @@
121
121
  "ts-jest": "^29.1.1",
122
122
  "typescript": "^5.4.5",
123
123
  "@ledgerhq/disable-network-setup": "^0.1.0",
124
- "@ledgerhq/types-cryptoassets": "^7.30.0"
124
+ "@ledgerhq/types-cryptoassets": "^7.31.0-nightly.20251209023841"
125
125
  },
126
126
  "scripts": {
127
127
  "clean": "rimraf lib lib-es",
package/src/bridge/serialization.ts CHANGED
@@ -15,19 +15,23 @@ function isCantonAccountRaw(accountRaw: AccountRaw): accountRaw is CantonAccount
15
15
  }
16
16
 
17
17
  function toResourcesRaw(r: CantonResources): CantonResourcesRaw {
18
- const { instrumentUtxoCounts, pendingTransferProposals, publicKey } = r;
18
+ const { isOnboarded, instrumentUtxoCounts, pendingTransferProposals, publicKey, xpub } = r;
19
19
  return {
20
+ isOnboarded: isOnboarded,
20
21
  instrumentUtxoCounts,
21
22
  pendingTransferProposals,
22
- publicKey,
23
+ ...(publicKey !== undefined && { publicKey }),
24
+ ...(xpub !== undefined && { xpub }),
23
25
  };
24
26
  }
25
27
 
26
28
  function fromResourcesRaw(r: CantonResourcesRaw): CantonResources {
27
29
  return {
30
+ isOnboarded: r.isOnboarded,
28
31
  instrumentUtxoCounts: r.instrumentUtxoCounts,
29
32
  pendingTransferProposals: r.pendingTransferProposals,
30
- publicKey: r.publicKey,
33
+ ...(r.publicKey !== undefined && { publicKey: r.publicKey }),
34
+ ...(r.xpub !== undefined && { xpub: r.xpub }),
31
35
  };
32
36
  }
33
37
 
package/src/bridge/sync.test.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { makeGetAccountShape } from "./sync";
2
- import { OperationInfo } from "../network/gateway";
2
+ import { OperationInfo, type InstrumentBalance } from "../network/gateway";
3
3
  import * as gateway from "../network/gateway";
4
4
  import * as onboard from "./onboard";
5
5
  import * as config from "../config";
@@ -7,6 +7,8 @@ import resolver from "../signer";
7
7
  import { AccountShapeInfo } from "@ledgerhq/coin-framework/bridge/jsHelpers";
8
8
  import { Account } from "@ledgerhq/types-live";
9
9
  import BigNumber from "bignumber.js";
10
+ import { CantonAccount } from "../types";
11
+ import { createMockCantonCurrency } from "../test/fixtures";
10
12
 
11
13
  jest.mock("../network/gateway");
12
14
  jest.mock("../signer");
@@ -25,6 +27,79 @@ const sampleCurrency = {
25
27
  id: "testcoin",
26
28
  };
27
29
 
30
+ const createMockInstrumentBalances = (): InstrumentBalance[] => [
31
+ {
32
+ instrument_id: "Native",
33
+ amount: "1000",
34
+ locked: false,
35
+ utxo_count: 1,
36
+ admin_id: "admin1",
37
+ },
38
+ ];
39
+
40
+ const createMockOperationView = (): OperationInfo =>
41
+ ({
42
+ transaction_hash: "tx-test",
43
+ uid: "uid-test",
44
+ type: "Send",
45
+ status: "Success",
46
+ fee: {
47
+ value: "5",
48
+ asset: {
49
+ type: "native",
50
+ issuer: null,
51
+ },
52
+ details: {
53
+ type: "fee",
54
+ },
55
+ },
56
+ transfers: [
57
+ {
58
+ address: "party123",
59
+ type: "Send",
60
+ value: "100",
61
+ asset: "Native",
62
+ details: {
63
+ operationType: "transfer",
64
+ metadata: {
65
+ reason: "test transfer",
66
+ },
67
+ },
68
+ },
69
+ ],
70
+ transaction_timestamp: new Date().toISOString(),
71
+ senders: ["party123"],
72
+ recipients: ["party456"],
73
+ block: {
74
+ height: 1,
75
+ time: new Date().toISOString(),
76
+ hash: "blockhash1",
77
+ },
78
+ asset: {
79
+ type: "native",
80
+ issuer: null,
81
+ },
82
+ details: {
83
+ operationType: "transfer",
84
+ },
85
+ }) as OperationInfo;
86
+
87
+ const createMockCantonAccountShapeInfo = (
88
+ overrides: Partial<AccountShapeInfo<CantonAccount>> = {},
89
+ ): AccountShapeInfo<CantonAccount> => {
90
+ const currency = createMockCantonCurrency();
91
+ return {
92
+ address: "addr1",
93
+ currency,
94
+ derivationMode: "",
95
+ derivationPath: "44'/0'/0'/0/0",
96
+ deviceId: "fakeDevice",
97
+ index: 0,
98
+ initialAccount: undefined,
99
+ ...overrides,
100
+ };
101
+ };
102
+
28
103
  describe("makeGetAccountShape", () => {
29
104
  const fakeSignerContext = {} as any;
30
105
 
@@ -335,4 +410,84 @@ describe("makeGetAccountShape", () => {
335
410
  expect(shape.operations[0].type).toBe("TRANSFER_WITHDRAWN");
336
411
  expect(shape.operations[0].value).toEqual(BigNumber(50)); // transfer value only, fees not added for TRANSFER_WITHDRAWN
337
412
  });
413
+
414
+ it("should sync without device when account has xpub but no publicKey", async () => {
415
+ mockedGetBalance.mockResolvedValue(createMockInstrumentBalances());
416
+ mockedGetOperations.mockResolvedValue({
417
+ operations: [createMockOperationView()],
418
+ });
419
+
420
+ const infoWithXpub = createMockCantonAccountShapeInfo({
421
+ deviceId: undefined, // No device
422
+ initialAccount: {
423
+ xpub: "test-party-id",
424
+ cantonResources: {
425
+ publicKey: undefined, // Missing publicKey
426
+ instrumentUtxoCounts: {},
427
+ pendingTransferProposals: [],
428
+ },
429
+ } as unknown as CantonAccount,
430
+ });
431
+
432
+ const getAccountShape = makeGetAccountShape(fakeSignerContext);
433
+ const shape = await getAccountShape(infoWithXpub, { paginationConfig: {} });
434
+
435
+ expect(shape).toHaveProperty("id");
436
+ expect(shape.xpub).toBe("test-party-id");
437
+ // Should not call getAddress since we have xpub
438
+ expect(mockedResolver).not.toHaveBeenCalled();
439
+ });
440
+
441
+ it("should sync without device when account has publicKey but no xpub", async () => {
442
+ mockedGetBalance.mockResolvedValue([]); // Empty balances since no xpub
443
+ mockedGetOperations.mockResolvedValue({
444
+ operations: [],
445
+ });
446
+
447
+ const infoWithPublicKey = createMockCantonAccountShapeInfo({
448
+ deviceId: undefined, // No device
449
+ initialAccount: {
450
+ xpub: "", // Missing xpub
451
+ cantonResources: {
452
+ publicKey: "test-public-key",
453
+ instrumentUtxoCounts: {},
454
+ pendingTransferProposals: [],
455
+ },
456
+ } as unknown as CantonAccount,
457
+ });
458
+
459
+ const getAccountShape = makeGetAccountShape(fakeSignerContext);
460
+ const shape = await getAccountShape(infoWithPublicKey, { paginationConfig: {} });
461
+
462
+ expect(shape).toHaveProperty("id");
463
+ // Should not call getAddress since we have publicKey (even though xpub is missing)
464
+ expect(mockedResolver).not.toHaveBeenCalled();
465
+ });
466
+
467
+ it("should sync without device when account has both xpub and publicKey", async () => {
468
+ mockedGetBalance.mockResolvedValue(createMockInstrumentBalances());
469
+ mockedGetOperations.mockResolvedValue({
470
+ operations: [createMockOperationView()],
471
+ });
472
+
473
+ const infoWithBoth = createMockCantonAccountShapeInfo({
474
+ deviceId: undefined, // No device
475
+ initialAccount: {
476
+ xpub: "test-party-id",
477
+ cantonResources: {
478
+ publicKey: "test-public-key",
479
+ instrumentUtxoCounts: {},
480
+ pendingTransferProposals: [],
481
+ },
482
+ } as unknown as CantonAccount,
483
+ });
484
+
485
+ const getAccountShape = makeGetAccountShape(fakeSignerContext);
486
+ const shape = await getAccountShape(infoWithBoth, { paginationConfig: {} });
487
+
488
+ expect(shape).toHaveProperty("id");
489
+ expect(shape.xpub).toBe("test-party-id");
490
+ // Should not call getAddress since we have both values
491
+ expect(mockedResolver).not.toHaveBeenCalled();
492
+ });
338
493
  });
package/src/bridge/sync.ts CHANGED
@@ -13,7 +13,7 @@ import {
13
13
  import { getBalance, type CantonBalance } from "../common-logic/account/getBalance";
14
14
  import coinConfig from "../config";
15
15
  import resolver from "../signer";
16
- import { CantonAccount, CantonSigner } from "../types";
16
+ import { CantonAccount, CantonResources, CantonSigner } from "../types";
17
17
  import { isAccountOnboarded } from "./onboard";
18
18
  import { isCantonAccountEmpty } from "../helpers";
19
19
 
@@ -93,12 +93,13 @@ export function makeGetAccountShape(
93
93
  return async info => {
94
94
  const { address, currency, derivationMode, derivationPath, initialAccount } = info;
95
95
 
96
- let xpubOrAddress = initialAccount?.xpub || "";
96
+ let isOnboarded = initialAccount?.cantonResources?.isOnboarded ?? false;
97
+ let xpubOrAddress = (initialAccount?.xpub || initialAccount?.cantonResources?.xpub) ?? "";
97
98
  let publicKey: string | undefined = initialAccount?.cantonResources?.publicKey;
98
99
 
99
- if (!xpubOrAddress || !publicKey) {
100
+ if (!xpubOrAddress && !publicKey) {
100
101
  const getAddress = resolver(signerContext);
101
- const addressResult = await getAddress(info.deviceId || "", {
102
+ const addressResult = await getAddress(info.deviceId ?? "", {
102
103
  path: derivationPath,
103
104
  currency: currency,
104
105
  derivationMode: derivationMode,
@@ -106,9 +107,11 @@ export function makeGetAccountShape(
106
107
  });
107
108
  publicKey = addressResult.publicKey;
108
109
 
109
- const { isOnboarded, partyId } = await isAccountOnboarded(currency, publicKey);
110
- if (isOnboarded && partyId) {
111
- xpubOrAddress = partyId;
110
+ const result = await isAccountOnboarded(currency, publicKey);
111
+ isOnboarded = result.isOnboarded;
112
+
113
+ if (isOnboarded && result.partyId) {
114
+ xpubOrAddress = result.partyId;
112
115
  }
113
116
  }
114
117
 
@@ -163,15 +166,19 @@ export function makeGetAccountShape(
163
166
  operations = mergeOps(oldOperations, newOperations);
164
167
  }
165
168
 
169
+ const cantonResources: CantonResources = {
170
+ isOnboarded,
171
+ instrumentUtxoCounts,
172
+ pendingTransferProposals,
173
+ ...(publicKey && { publicKey }),
174
+ xpub: xpubOrAddress,
175
+ };
176
+
166
177
  const used = !isCantonAccountEmpty({
167
178
  operationsCount: operations.length,
168
179
  balance: totalBalance,
169
180
  subAccounts: initialAccount?.subAccounts ?? [],
170
- cantonResources: {
171
- instrumentUtxoCounts,
172
- pendingTransferProposals,
173
- publicKey,
174
- },
181
+ cantonResources,
175
182
  });
176
183
 
177
184
  const blockHeight = await getLedgerEnd(currency);
@@ -195,11 +202,7 @@ export function makeGetAccountShape(
195
202
  spendableBalance,
196
203
  xpub: xpubOrAddress,
197
204
  used,
198
- cantonResources: {
199
- instrumentUtxoCounts,
200
- pendingTransferProposals,
201
- publicKey,
202
- },
205
+ cantonResources,
203
206
  };
204
207
 
205
208
  return shape;
package/src/types/bridge.ts CHANGED
@@ -76,14 +76,18 @@ export type TransactionStatus = TransactionStatusCommon;
76
76
  export type TransactionStatusRaw = TransactionStatusCommonRaw;
77
77
 
78
78
  export type CantonResources = {
79
+ isOnboarded: boolean;
79
80
  instrumentUtxoCounts: Record<string, number>;
80
81
  pendingTransferProposals: TransferProposal[];
81
- publicKey: string;
82
+ publicKey?: string;
83
+ xpub?: string;
82
84
  };
83
85
  export type CantonResourcesRaw = {
86
+ isOnboarded: boolean;
84
87
  instrumentUtxoCounts: Record<string, number>;
85
88
  pendingTransferProposals: TransferProposal[];
86
- publicKey: string;
89
+ publicKey?: string;
90
+ xpub?: string;
87
91
  };
88
92
 
89
93
  export type CantonAccount = Account & {