@ledgerhq/coin-cardano 0.14.0-nightly.2 → 0.14.0-nightly.20251031023756
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +18 -19
- package/lib/buildSubAccounts.d.ts +1 -1
- package/lib/buildSubAccounts.d.ts.map +1 -1
- package/lib/buildSubAccounts.js +11 -11
- package/lib/buildSubAccounts.js.map +1 -1
- package/lib/synchronisation.d.ts.map +1 -1
- package/lib/synchronisation.js +3 -8
- package/lib/synchronisation.js.map +1 -1
- package/lib-es/buildSubAccounts.d.ts +1 -1
- package/lib-es/buildSubAccounts.d.ts.map +1 -1
- package/lib-es/buildSubAccounts.js +11 -11
- package/lib-es/buildSubAccounts.js.map +1 -1
- package/lib-es/synchronisation.d.ts.map +1 -1
- package/lib-es/synchronisation.js +4 -9
- package/lib-es/synchronisation.js.map +1 -1
- package/package.json +10 -10
- package/src/buildSubAccounts.ts +13 -13
- package/src/synchronisation.ts +12 -16
- package/src/synchronisation.unit.test.ts +8 -1
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @ledgerhq/coin-cardano@0.13.
|
|
2
|
+
> @ledgerhq/coin-cardano@0.13.0 build /home/runner/work/ledger-live/ledger-live/libs/coin-modules/coin-cardano
|
|
3
3
|
> tsc && tsc -m esnext --moduleResolution bundler --outDir lib-es
|
|
4
4
|
|
package/CHANGELOG.md
CHANGED
|
@@ -1,34 +1,33 @@
|
|
|
1
1
|
# @ledgerhq/coin-cardano
|
|
2
2
|
|
|
3
|
-
## 0.14.0-nightly.
|
|
3
|
+
## 0.14.0-nightly.20251031023756
|
|
4
4
|
|
|
5
5
|
### Minor Changes
|
|
6
6
|
|
|
7
|
-
- [#
|
|
8
|
-
|
|
9
|
-
### Patch Changes
|
|
7
|
+
- [#12496](https://github.com/LedgerHQ/ledger-live/pull/12496) [`b1b8288`](https://github.com/LedgerHQ/ledger-live/commit/b1b82880f5c8d5d0d3b95888b0670c83d958aac5) Thanks [@gre-ledger](https://github.com/gre-ledger)! - Prepare cardano for async CryptoAssetsStore migration - add await to token lookups
|
|
10
8
|
|
|
11
|
-
-
|
|
12
|
-
- @ledgerhq/cryptoassets@13.32.0-nightly.1
|
|
13
|
-
- @ledgerhq/coin-framework@6.8.0-nightly.2
|
|
14
|
-
- @ledgerhq/live-network@2.1.0-nightly.0
|
|
15
|
-
- @ledgerhq/types-live@6.88.0-nightly.1
|
|
16
|
-
|
|
17
|
-
## 0.13.1-nightly.1
|
|
9
|
+
- [#12340](https://github.com/LedgerHQ/ledger-live/pull/12340) [`8d7c1f7`](https://github.com/LedgerHQ/ledger-live/commit/8d7c1f7a92489647399b0e780d4bb926508e8554) Thanks [@gre-ledger](https://github.com/gre-ledger)! - migrate getDeviceTransactionConfig to async
|
|
18
10
|
|
|
19
|
-
|
|
11
|
+
- [#12500](https://github.com/LedgerHQ/ledger-live/pull/12500) [`9f61dcf`](https://github.com/LedgerHQ/ledger-live/commit/9f61dcf6163fd66657e5be732c28bea623a40515) Thanks [@Moustafa-Koterba](https://github.com/Moustafa-Koterba)! - LIVE-21900 EVM/Hedera/Cardano/TON: sync hash calculation to not depends on listTokens()
|
|
20
12
|
|
|
21
|
-
-
|
|
22
|
-
- @ledgerhq/coin-framework@6.8.0-nightly.1
|
|
13
|
+
- [#12297](https://github.com/LedgerHQ/ledger-live/pull/12297) [`c96d73f`](https://github.com/LedgerHQ/ledger-live/commit/c96d73fed0a75a9c208f78d51c34b742703a7dda) Thanks [@Justkant](https://github.com/Justkant)! - feat(coin-framework): add postSync support to scanAccounts and apply across coins [LIVE-21755]
|
|
23
14
|
|
|
24
|
-
|
|
15
|
+
Adds optional postSync hook to makeScanAccounts (invoked after account shape build).
|
|
16
|
+
Applies postSync in bitcoin, cardano, evm, and tron currency bridges.
|
|
17
|
+
Exports tron postSync so it can be passed during scanning.
|
|
18
|
+
Ensures scanAccounts benefits from the same normalization/cleanup logic as sync without breaking existing callers (default no-op).
|
|
25
19
|
|
|
26
20
|
### Patch Changes
|
|
27
21
|
|
|
28
|
-
- Updated dependencies [[`2c6a198`](https://github.com/LedgerHQ/ledger-live/commit/2c6a198ba28391695202a0787ce168c53768ff37)]:
|
|
29
|
-
- @ledgerhq/
|
|
30
|
-
- @ledgerhq/
|
|
31
|
-
- @ledgerhq/
|
|
22
|
+
- Updated dependencies [[`b4ceaff`](https://github.com/LedgerHQ/ledger-live/commit/b4ceaff2ecf68d8a14e09801c76ab0b014c45286), [`da750a1`](https://github.com/LedgerHQ/ledger-live/commit/da750a16ee5f2c083114569b8ae3c708cceba06c), [`63e8f34`](https://github.com/LedgerHQ/ledger-live/commit/63e8f342f6b951ab77bb710b9971f033c05e579e), [`ccf788d`](https://github.com/LedgerHQ/ledger-live/commit/ccf788d7c0239ca95e76c3cc340f9a6bd09ea726), [`34b28dd`](https://github.com/LedgerHQ/ledger-live/commit/34b28dd5e819906daaa79db5fe6064674def5e7d), [`9f61dcf`](https://github.com/LedgerHQ/ledger-live/commit/9f61dcf6163fd66657e5be732c28bea623a40515), [`607e4be`](https://github.com/LedgerHQ/ledger-live/commit/607e4be33145c102debce1606224b08579888aa8), [`c96d73f`](https://github.com/LedgerHQ/ledger-live/commit/c96d73fed0a75a9c208f78d51c34b742703a7dda), [`7744980`](https://github.com/LedgerHQ/ledger-live/commit/774498090411f1a6d6c06395dda1fc7cd24adf24), [`77566c5`](https://github.com/LedgerHQ/ledger-live/commit/77566c5a3b5795f5938bd5daaa5f8d65934c56b8), [`c1a4bfd`](https://github.com/LedgerHQ/ledger-live/commit/c1a4bfd34b46c6b6587d247673cadb3c078deb1d), [`5b41dd5`](https://github.com/LedgerHQ/ledger-live/commit/5b41dd56e024a5d03ba0e49084113c04887395db), [`f8d904d`](https://github.com/LedgerHQ/ledger-live/commit/f8d904de5607c103549f247428b5a4079f28c1c0), [`eb176c2`](https://github.com/LedgerHQ/ledger-live/commit/eb176c201d711f1d28f74de831c4a6cd0c2d4a50), [`a731c4c`](https://github.com/LedgerHQ/ledger-live/commit/a731c4cd492a968eb7baa981fdd8aaddedd21f25), [`b962966`](https://github.com/LedgerHQ/ledger-live/commit/b962966525517c5cfa7f1f8826f8f2b9162189e4), [`759064d`](https://github.com/LedgerHQ/ledger-live/commit/759064d4815c636af2d73ba548a85b4f53e7b491), [`f392f69`](https://github.com/LedgerHQ/ledger-live/commit/f392f6912f445cc2f7cf4dfcfd030fa3da76f736), [`cadf2e1`](https://github.com/LedgerHQ/ledger-live/commit/cadf2e1dfb09248d3f77d96f94ae774425dbca75), [`cbc0648`](https://github.com/LedgerHQ/ledger-live/commit/cbc064885d8e0459e40d327a2e5389204b3ec705), [`36e5168`](https://github.com/LedgerHQ/ledger-live/commit/36e5168397eaec2a5f425038392a4400f60571d0), [`6ccabef`](https://github.com/LedgerHQ/ledger-live/commit/6ccabef8f3c4e8cc042299d531684595ebadcc55), [`3d4188a`](https://github.com/LedgerHQ/ledger-live/commit/3d4188a26021d33b950129d82cb55d2c2e8d4358), [`d9305e8`](https://github.com/LedgerHQ/ledger-live/commit/d9305e8a4d8364366aaba05dd698396d28b539dc), [`2c6a198`](https://github.com/LedgerHQ/ledger-live/commit/2c6a198ba28391695202a0787ce168c53768ff37)]:
|
|
23
|
+
- @ledgerhq/cryptoassets@13.32.0-nightly.20251031023756
|
|
24
|
+
- @ledgerhq/types-cryptoassets@7.30.0-nightly.20251031023756
|
|
25
|
+
- @ledgerhq/coin-framework@6.8.0-nightly.20251031023756
|
|
26
|
+
- @ledgerhq/live-network@2.1.0-nightly.20251031023756
|
|
27
|
+
- @ledgerhq/live-env@2.20.0-nightly.20251031023756
|
|
28
|
+
- @ledgerhq/types-live@6.88.0-nightly.20251031023756
|
|
29
|
+
- @ledgerhq/devices@8.7.0-nightly.20251031023756
|
|
30
|
+
- @ledgerhq/errors@6.27.0-nightly.20251031023756
|
|
32
31
|
|
|
33
32
|
## 0.13.0
|
|
34
33
|
|
|
@@ -22,5 +22,5 @@ export declare function buildSubAccounts({ initialAccount, parentAccountId, pare
|
|
|
22
22
|
newTransactions: Array<APITransaction>;
|
|
23
23
|
tokens: Array<Token>;
|
|
24
24
|
accountCredentialsMap: Record<string, PaymentCredential>;
|
|
25
|
-
}): Array<TokenAccount
|
|
25
|
+
}): Promise<Array<TokenAccount>>;
|
|
26
26
|
//# sourceMappingURL=buildSubAccounts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildSubAccounts.d.ts","sourceRoot":"","sources":["../src/buildSubAccounts.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,EAA2C,iBAAiB,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAE5F,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,eAAO,MAAM,eAAe;cAIhB,MAAM;eACL,MAAM;MACf,MAAmC,CAAC;AAExC,eAAO,MAAM,kBAAkB,OAAQ,MAAM;cAAe,MAAM;eAAa,MAAM;CAIpF,CAAC;AAKF,eAAO,MAAM,qBAAqB,OAC5B,MAAM;sBACW,MAAM;UAAQ,MAAM;aAAW,MAAM;CAO3D,CAAC;AAqEF,
|
|
1
|
+
{"version":3,"file":"buildSubAccounts.d.ts","sourceRoot":"","sources":["../src/buildSubAccounts.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,EAA2C,iBAAiB,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAE5F,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,eAAO,MAAM,eAAe;cAIhB,MAAM;eACL,MAAM;MACf,MAAmC,CAAC;AAExC,eAAO,MAAM,kBAAkB,OAAQ,MAAM;cAAe,MAAM;eAAa,MAAM;CAIpF,CAAC;AAKF,eAAO,MAAM,qBAAqB,OAC5B,MAAM;sBACW,MAAM;UAAQ,MAAM;aAAW,MAAM;CAO3D,CAAC;AAqEF,wBAAsB,gBAAgB,CAAC,EACrC,cAAc,EACd,eAAe,EACf,cAAc,EACd,eAAe,EACf,MAAM,EACN,qBAAqB,GACtB,EAAE;IACD,cAAc,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,cAAc,CAAC;IAC/B,eAAe,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACvC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;CAC1D,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CA8C/B"}
|
package/lib/buildSubAccounts.js
CHANGED
|
@@ -8,7 +8,7 @@ const index_1 = require("@ledgerhq/coin-framework/account/index");
|
|
|
8
8
|
const keyBy_1 = __importDefault(require("lodash/keyBy"));
|
|
9
9
|
const groupBy_1 = __importDefault(require("lodash/groupBy"));
|
|
10
10
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
11
|
-
const
|
|
11
|
+
const index_2 = require("@ledgerhq/coin-framework/crypto-assets/index");
|
|
12
12
|
const typhonjs_1 = require("@stricahq/typhonjs");
|
|
13
13
|
const jsHelpers_1 = require("@ledgerhq/coin-framework/bridge/jsHelpers");
|
|
14
14
|
const operation_1 = require("@ledgerhq/coin-framework/operation");
|
|
@@ -34,20 +34,20 @@ exports.decodeTokenCurrencyId = decodeTokenCurrencyId;
|
|
|
34
34
|
/**
|
|
35
35
|
* @returns operations of tokens that are defined in ledgerjs cryptoassets
|
|
36
36
|
*/
|
|
37
|
-
const mapTxToTokenAccountOperation = ({ parentAccountId, parentCurrency, newTransactions, accountCredentialsMap, }) => {
|
|
37
|
+
const mapTxToTokenAccountOperation = async ({ parentAccountId, parentCurrency, newTransactions, accountCredentialsMap, }) => {
|
|
38
38
|
const operations = [];
|
|
39
|
-
|
|
39
|
+
for (const tx of newTransactions) {
|
|
40
40
|
const accountChange = (0, logic_1.getAccountChange)(tx, accountCredentialsMap);
|
|
41
|
-
accountChange.tokens
|
|
41
|
+
for (const token of accountChange.tokens) {
|
|
42
42
|
const assetId = (0, exports.getTokenAssetId)({
|
|
43
43
|
policyId: token.policyId,
|
|
44
44
|
assetName: token.assetName,
|
|
45
45
|
});
|
|
46
46
|
const tokenCurrencyId = encodeTokenCurrencyId(parentCurrency, assetId);
|
|
47
|
-
const tokenCurrency = (0,
|
|
47
|
+
const tokenCurrency = await (0, index_2.getCryptoAssetsStore)().findTokenById(tokenCurrencyId);
|
|
48
48
|
// skip the unsupported tokens by ledger-live
|
|
49
49
|
if (tokenCurrency === null || tokenCurrency === undefined) {
|
|
50
|
-
|
|
50
|
+
continue;
|
|
51
51
|
}
|
|
52
52
|
const tokenAccountId = (0, index_1.encodeTokenAccountId)(parentAccountId, tokenCurrency);
|
|
53
53
|
const tokenOperationType = token.amount.lt(0) ? "OUT" : "IN";
|
|
@@ -75,11 +75,11 @@ const mapTxToTokenAccountOperation = ({ parentAccountId, parentCurrency, newTran
|
|
|
75
75
|
blockHash: undefined,
|
|
76
76
|
};
|
|
77
77
|
operations.push(operation);
|
|
78
|
-
}
|
|
79
|
-
}
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
80
|
return operations;
|
|
81
81
|
};
|
|
82
|
-
function buildSubAccounts({ initialAccount, parentAccountId, parentCurrency, newTransactions, tokens, accountCredentialsMap, }) {
|
|
82
|
+
async function buildSubAccounts({ initialAccount, parentAccountId, parentCurrency, newTransactions, tokens, accountCredentialsMap, }) {
|
|
83
83
|
const tokenAccountsById = {};
|
|
84
84
|
if (initialAccount && initialAccount.subAccounts) {
|
|
85
85
|
for (const existingAccount of initialAccount.subAccounts) {
|
|
@@ -88,7 +88,7 @@ function buildSubAccounts({ initialAccount, parentAccountId, parentCurrency, new
|
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
|
-
const tokenOperations = mapTxToTokenAccountOperation({
|
|
91
|
+
const tokenOperations = await mapTxToTokenAccountOperation({
|
|
92
92
|
parentAccountId,
|
|
93
93
|
parentCurrency,
|
|
94
94
|
newTransactions: newTransactions,
|
|
@@ -101,7 +101,7 @@ function buildSubAccounts({ initialAccount, parentAccountId, parentCurrency, new
|
|
|
101
101
|
const oldOperations = initialTokenAccount?.operations || [];
|
|
102
102
|
const newOperations = tokenOperationsByAccId[tokenAccountId] || [];
|
|
103
103
|
const operations = (0, jsHelpers_1.mergeOps)(oldOperations, newOperations);
|
|
104
|
-
const { token: tokenCurrency } = (0, index_1.decodeTokenAccountId)(tokenAccountId);
|
|
104
|
+
const { token: tokenCurrency } = await (0, index_1.decodeTokenAccountId)(tokenAccountId);
|
|
105
105
|
if (tokenCurrency) {
|
|
106
106
|
const accountBalance = tokensBalanceByAssetId[tokenCurrency.contractAddress]?.amount || new bignumber_js_1.default(0);
|
|
107
107
|
const tokenAccount = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildSubAccounts.js","sourceRoot":"","sources":["../src/buildSubAccounts.ts"],"names":[],"mappings":";;;;;;AAAA,kEAIgD;AAChD,yDAAiC;AACjC,6DAAqC;AACrC,gEAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"buildSubAccounts.js","sourceRoot":"","sources":["../src/buildSubAccounts.ts"],"names":[],"mappings":";;;;;;AAAA,kEAIgD;AAChD,yDAAiC;AACjC,6DAAqC;AACrC,gEAAqC;AACrC,wEAAoF;AACpF,iDAA0D;AAG1D,yEAAqE;AACrE,kEAAuE;AAEvE,mCAAuE;AAGhE,MAAM,eAAe,GAAG,CAAC,EAC9B,QAAQ,EACR,SAAS,GAIV,EAAU,EAAE,CAAC,GAAG,QAAQ,GAAG,SAAS,EAAE,CAAC;AAN3B,QAAA,eAAe,mBAMY;AAEjC,MAAM,kBAAkB,GAAG,CAAC,EAAU,EAA2C,EAAE;IACxF,MAAM,QAAQ,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACjC,MAAM,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;AACjC,CAAC,CAAC;AAJW,QAAA,kBAAkB,sBAI7B;AAEF,MAAM,qBAAqB,GAAG,CAAC,cAA8B,EAAE,OAAe,EAAU,EAAE,CACxF,GAAG,cAAc,CAAC,EAAE,WAAW,OAAO,EAAE,CAAC;AAEpC,MAAM,qBAAqB,GAAG,CACnC,EAAU,EACmD,EAAE;IAC/D,MAAM,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxD,OAAO;QACL,gBAAgB;QAChB,IAAI;QACJ,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,qBAAqB,yBAShC;AAEF;;GAEG;AACH,MAAM,4BAA4B,GAAG,KAAK,EAAE,EAC1C,eAAe,EACf,cAAc,EACd,eAAe,EACf,qBAAqB,GAMtB,EAAoC,EAAE;IACrC,MAAM,UAAU,GAA4B,EAAE,CAAC;IAE/C,KAAK,MAAM,EAAE,IAAI,eAAe,EAAE,CAAC;QACjC,MAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,EAAE,EAAE,qBAAqB,CAAC,CAAC;QAClE,KAAK,MAAM,KAAK,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YACzC,MAAM,OAAO,GAAG,IAAA,uBAAe,EAAC;gBAC9B,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,SAAS,EAAE,KAAK,CAAC,SAAS;aAC3B,CAAC,CAAC;YACH,MAAM,eAAe,GAAG,qBAAqB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YACvE,MAAM,aAAa,GAAG,MAAM,IAAA,4BAAoB,GAAE,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;YAClF,6CAA6C;YAC7C,IAAI,aAAa,KAAK,IAAI,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBAC1D,SAAS;YACX,CAAC;YAED,MAAM,cAAc,GAAG,IAAA,4BAAoB,EAAC,eAAe,EAAE,aAAa,CAAC,CAAC;YAE5E,MAAM,kBAAkB,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;YAC7D,MAAM,IAAI,GAAG,IAAA,qBAAa,EAAC,EAAE,CAAC,CAAC;YAC/B,MAAM,KAAK,GAA0B,EAAE,CAAC;YACxC,IAAI,IAAI,EAAE,CAAC;gBACT,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;YACpB,CAAC;YACD,MAAM,SAAS,GAAqB;gBAClC,SAAS,EAAE,cAAc;gBACzB,EAAE,EAAE,IAAA,6BAAiB,EAAC,cAAc,EAAE,EAAE,CAAC,IAAI,EAAE,kBAAkB,CAAC;gBAClE,IAAI,EAAE,EAAE,CAAC,IAAI;gBACb,IAAI,EAAE,kBAAkB;gBACxB,GAAG,EAAE,IAAI,sBAAS,CAAC,EAAE,CAAC,IAAI,CAAC;gBAC3B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE;gBACnC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACzB,IAAA,mBAAW,EAAC,CAAC,CAAC,OAAO,CAAC;oBACpB,CAAC,CAAC,gBAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,EAAE;oBAC1E,CAAC,CAAC,CAAC,CAAC,OAAO,CACd;gBACD,UAAU,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAC7B,IAAA,mBAAW,EAAC,CAAC,CAAC,OAAO,CAAC;oBACpB,CAAC,CAAC,gBAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,EAAE;oBAC1E,CAAC,CAAC,CAAC,CAAC,OAAO,CACd;gBACD,WAAW,EAAE,EAAE,CAAC,WAAW;gBAC3B,IAAI,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC;gBAC5B,KAAK;gBACL,SAAS,EAAE,SAAS;aACrB,CAAC;YACF,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEK,KAAK,UAAU,gBAAgB,CAAC,EACrC,cAAc,EACd,eAAe,EACf,cAAc,EACd,eAAe,EACf,MAAM,EACN,qBAAqB,GAQtB;IACC,MAAM,iBAAiB,GAAiC,EAAE,CAAC;IAE3D,IAAI,cAAc,IAAI,cAAc,CAAC,WAAW,EAAE,CAAC;QACjD,KAAK,MAAM,eAAe,IAAI,cAAc,CAAC,WAAW,EAAE,CAAC;YACzD,IAAI,eAAe,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBAC5C,iBAAiB,CAAC,eAAe,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC;YAC1D,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAA4B,MAAM,4BAA4B,CAAC;QAClF,eAAe;QACf,cAAc;QACd,eAAe,EAAE,eAAe;QAChC,qBAAqB;KACtB,CAAC,CAAC;IACH,MAAM,sBAAsB,GAAG,IAAA,iBAAO,EAAC,eAAe,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC1E,MAAM,sBAAsB,GAAG,IAAA,eAAK,EAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,IAAA,uBAAe,EAAC,CAAC,CAAC,CAAC,CAAC;IACtE,KAAK,MAAM,cAAc,IAAI,sBAAsB,EAAE,CAAC;QACpD,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAC9D,MAAM,aAAa,GAAG,mBAAmB,EAAE,UAAU,IAAI,EAAE,CAAC;QAC5D,MAAM,aAAa,GAAG,sBAAsB,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QACnE,MAAM,UAAU,GAAG,IAAA,oBAAQ,EAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QAC1D,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,IAAA,4BAAoB,EAAC,cAAc,CAAC,CAAC;QAC5E,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,cAAc,GAClB,sBAAsB,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,MAAM,IAAI,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;YACpF,MAAM,YAAY,GAAiB;gBACjC,IAAI,EAAE,cAAc;gBACpB,EAAE,EAAE,cAAc;gBAClB,QAAQ,EAAE,eAAe;gBACzB,KAAK,EAAE,aAAa;gBACpB,OAAO,EAAE,cAAc;gBACvB,gBAAgB,EAAE,cAAc;gBAChC,YAAY,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;gBACzF,eAAe,EAAE,UAAU,CAAC,MAAM;gBAClC,UAAU;gBACV,iBAAiB,EAAE,EAAE;gBACrB,mBAAmB,EAAE,yBAAiB;gBACtC,WAAW,EAAE,EAAE;aAChB,CAAC;YACF,iBAAiB,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC;QACnD,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC;AA5DD,4CA4DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,eAAe,EAEhB,MAAM,2CAA2C,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,eAAe,EAEhB,MAAM,2CAA2C,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYhE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACL,cAAc,EAOf,MAAM,SAAS,CAAC;AAajB,eAAO,MAAM,mBAAmB,kBACd,cAAc,aAAa,CAAC,KAAG,gBAAgB,cAAc,CAwJ5E,CAAC"}
|
package/lib/synchronisation.js
CHANGED
|
@@ -8,7 +8,6 @@ const uniqBy_1 = __importDefault(require("lodash/uniqBy"));
|
|
|
8
8
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
9
9
|
const jsHelpers_1 = require("@ledgerhq/coin-framework/bridge/jsHelpers");
|
|
10
10
|
const typhonjs_1 = require("@stricahq/typhonjs");
|
|
11
|
-
const cryptoassets_1 = require("@ledgerhq/cryptoassets");
|
|
12
11
|
const operation_1 = require("@ledgerhq/coin-framework/operation");
|
|
13
12
|
const index_1 = require("@ledgerhq/coin-framework/account/index");
|
|
14
13
|
const index_2 = require("@ledgerhq/coin-framework/currencies/index");
|
|
@@ -47,11 +46,7 @@ const makeGetAccountShape = (signerContext) => async (info, { blacklistedTokenId
|
|
|
47
46
|
derivationMode,
|
|
48
47
|
});
|
|
49
48
|
// when new tokens are added / blacklist changes, we need to sync again because we need to go through all operations again
|
|
50
|
-
const syncHash =
|
|
51
|
-
"_" +
|
|
52
|
-
(0, cryptoassets_1.listTokensForCryptoCurrency)(currency, {
|
|
53
|
-
withDelisted: true,
|
|
54
|
-
}).length;
|
|
49
|
+
const syncHash = await (0, index_1.getSyncHash)(currency.id, blacklistedTokenIds);
|
|
55
50
|
const outdatedSyncHash = initialAccount?.syncHash !== syncHash;
|
|
56
51
|
const requiredConfirmations = 90;
|
|
57
52
|
const oldOperations = initialAccount?.operations || [];
|
|
@@ -76,14 +71,14 @@ const makeGetAccountShape = (signerContext) => async (info, { blacklistedTokenId
|
|
|
76
71
|
const utxos = prepareUtxos(newTransactions, stableUtxos, accountCredentialsMap);
|
|
77
72
|
const utxosSum = utxos.reduce((total, u) => total.plus(u.amount), new bignumber_js_1.default(0));
|
|
78
73
|
const tokenBalance = (0, logic_1.mergeTokens)(utxos.map(u => u.tokens).flat());
|
|
79
|
-
const subAccounts = (0, buildSubAccounts_1.buildSubAccounts)({
|
|
74
|
+
const subAccounts = (await (0, buildSubAccounts_1.buildSubAccounts)({
|
|
80
75
|
initialAccount,
|
|
81
76
|
parentAccountId: accountId,
|
|
82
77
|
parentCurrency: currency,
|
|
83
78
|
newTransactions,
|
|
84
79
|
tokens: tokenBalance,
|
|
85
80
|
accountCredentialsMap,
|
|
86
|
-
}).filter(a => !blacklistedTokenIds?.includes(a.token.id));
|
|
81
|
+
})).filter(a => !blacklistedTokenIds?.includes(a.token.id));
|
|
87
82
|
const stakeCredential = (0, logic_1.getAccountStakeCredential)(xpub, accountIndex);
|
|
88
83
|
const networkParams = (0, networks_1.getNetworkParameters)(currency.id);
|
|
89
84
|
const freshAddresses = externalCredentials
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":";;;;;;AAAA,2DAAmC;AACnC,gEAAqC;AACrC,yEAImD;AACnD,iDAA0D;AAE1D,
|
|
1
|
+
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,5 +22,5 @@ export declare function buildSubAccounts({ initialAccount, parentAccountId, pare
|
|
|
22
22
|
newTransactions: Array<APITransaction>;
|
|
23
23
|
tokens: Array<Token>;
|
|
24
24
|
accountCredentialsMap: Record<string, PaymentCredential>;
|
|
25
|
-
}): Array<TokenAccount
|
|
25
|
+
}): Promise<Array<TokenAccount>>;
|
|
26
26
|
//# sourceMappingURL=buildSubAccounts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildSubAccounts.d.ts","sourceRoot":"","sources":["../src/buildSubAccounts.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,EAA2C,iBAAiB,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAE5F,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,eAAO,MAAM,eAAe;cAIhB,MAAM;eACL,MAAM;MACf,MAAmC,CAAC;AAExC,eAAO,MAAM,kBAAkB,OAAQ,MAAM;cAAe,MAAM;eAAa,MAAM;CAIpF,CAAC;AAKF,eAAO,MAAM,qBAAqB,OAC5B,MAAM;sBACW,MAAM;UAAQ,MAAM;aAAW,MAAM;CAO3D,CAAC;AAqEF,
|
|
1
|
+
{"version":3,"file":"buildSubAccounts.d.ts","sourceRoot":"","sources":["../src/buildSubAccounts.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,EAA2C,iBAAiB,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAE5F,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,eAAO,MAAM,eAAe;cAIhB,MAAM;eACL,MAAM;MACf,MAAmC,CAAC;AAExC,eAAO,MAAM,kBAAkB,OAAQ,MAAM;cAAe,MAAM;eAAa,MAAM;CAIpF,CAAC;AAKF,eAAO,MAAM,qBAAqB,OAC5B,MAAM;sBACW,MAAM;UAAQ,MAAM;aAAW,MAAM;CAO3D,CAAC;AAqEF,wBAAsB,gBAAgB,CAAC,EACrC,cAAc,EACd,eAAe,EACf,cAAc,EACd,eAAe,EACf,MAAM,EACN,qBAAqB,GACtB,EAAE;IACD,cAAc,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,cAAc,CAAC;IAC/B,eAAe,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACvC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;CAC1D,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CA8C/B"}
|
|
@@ -2,7 +2,7 @@ import { decodeTokenAccountId, emptyHistoryCache, encodeTokenAccountId, } from "
|
|
|
2
2
|
import keyBy from "lodash/keyBy";
|
|
3
3
|
import groupBy from "lodash/groupBy";
|
|
4
4
|
import BigNumber from "bignumber.js";
|
|
5
|
-
import {
|
|
5
|
+
import { getCryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/index";
|
|
6
6
|
import { utils as TyphonUtils } from "@stricahq/typhonjs";
|
|
7
7
|
import { mergeOps } from "@ledgerhq/coin-framework/bridge/jsHelpers";
|
|
8
8
|
import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
@@ -25,20 +25,20 @@ export const decodeTokenCurrencyId = (id) => {
|
|
|
25
25
|
/**
|
|
26
26
|
* @returns operations of tokens that are defined in ledgerjs cryptoassets
|
|
27
27
|
*/
|
|
28
|
-
const mapTxToTokenAccountOperation = ({ parentAccountId, parentCurrency, newTransactions, accountCredentialsMap, }) => {
|
|
28
|
+
const mapTxToTokenAccountOperation = async ({ parentAccountId, parentCurrency, newTransactions, accountCredentialsMap, }) => {
|
|
29
29
|
const operations = [];
|
|
30
|
-
|
|
30
|
+
for (const tx of newTransactions) {
|
|
31
31
|
const accountChange = getAccountChange(tx, accountCredentialsMap);
|
|
32
|
-
accountChange.tokens
|
|
32
|
+
for (const token of accountChange.tokens) {
|
|
33
33
|
const assetId = getTokenAssetId({
|
|
34
34
|
policyId: token.policyId,
|
|
35
35
|
assetName: token.assetName,
|
|
36
36
|
});
|
|
37
37
|
const tokenCurrencyId = encodeTokenCurrencyId(parentCurrency, assetId);
|
|
38
|
-
const tokenCurrency = findTokenById(tokenCurrencyId);
|
|
38
|
+
const tokenCurrency = await getCryptoAssetsStore().findTokenById(tokenCurrencyId);
|
|
39
39
|
// skip the unsupported tokens by ledger-live
|
|
40
40
|
if (tokenCurrency === null || tokenCurrency === undefined) {
|
|
41
|
-
|
|
41
|
+
continue;
|
|
42
42
|
}
|
|
43
43
|
const tokenAccountId = encodeTokenAccountId(parentAccountId, tokenCurrency);
|
|
44
44
|
const tokenOperationType = token.amount.lt(0) ? "OUT" : "IN";
|
|
@@ -66,11 +66,11 @@ const mapTxToTokenAccountOperation = ({ parentAccountId, parentCurrency, newTran
|
|
|
66
66
|
blockHash: undefined,
|
|
67
67
|
};
|
|
68
68
|
operations.push(operation);
|
|
69
|
-
}
|
|
70
|
-
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
71
|
return operations;
|
|
72
72
|
};
|
|
73
|
-
export function buildSubAccounts({ initialAccount, parentAccountId, parentCurrency, newTransactions, tokens, accountCredentialsMap, }) {
|
|
73
|
+
export async function buildSubAccounts({ initialAccount, parentAccountId, parentCurrency, newTransactions, tokens, accountCredentialsMap, }) {
|
|
74
74
|
const tokenAccountsById = {};
|
|
75
75
|
if (initialAccount && initialAccount.subAccounts) {
|
|
76
76
|
for (const existingAccount of initialAccount.subAccounts) {
|
|
@@ -79,7 +79,7 @@ export function buildSubAccounts({ initialAccount, parentAccountId, parentCurren
|
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
-
const tokenOperations = mapTxToTokenAccountOperation({
|
|
82
|
+
const tokenOperations = await mapTxToTokenAccountOperation({
|
|
83
83
|
parentAccountId,
|
|
84
84
|
parentCurrency,
|
|
85
85
|
newTransactions: newTransactions,
|
|
@@ -92,7 +92,7 @@ export function buildSubAccounts({ initialAccount, parentAccountId, parentCurren
|
|
|
92
92
|
const oldOperations = initialTokenAccount?.operations || [];
|
|
93
93
|
const newOperations = tokenOperationsByAccId[tokenAccountId] || [];
|
|
94
94
|
const operations = mergeOps(oldOperations, newOperations);
|
|
95
|
-
const { token: tokenCurrency } = decodeTokenAccountId(tokenAccountId);
|
|
95
|
+
const { token: tokenCurrency } = await decodeTokenAccountId(tokenAccountId);
|
|
96
96
|
if (tokenCurrency) {
|
|
97
97
|
const accountBalance = tokensBalanceByAssetId[tokenCurrency.contractAddress]?.amount || new BigNumber(0);
|
|
98
98
|
const tokenAccount = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildSubAccounts.js","sourceRoot":"","sources":["../src/buildSubAccounts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,MAAM,cAAc,CAAC;AACjC,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"buildSubAccounts.js","sourceRoot":"","sources":["../src/buildSubAccounts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,eAAe,EAEhB,MAAM,2CAA2C,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,eAAe,EAEhB,MAAM,2CAA2C,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYhE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACL,cAAc,EAOf,MAAM,SAAS,CAAC;AAajB,eAAO,MAAM,mBAAmB,kBACd,cAAc,aAAa,CAAC,KAAG,gBAAgB,cAAc,CAwJ5E,CAAC"}
|
|
@@ -2,9 +2,8 @@ import uniqBy from "lodash/uniqBy";
|
|
|
2
2
|
import BigNumber from "bignumber.js";
|
|
3
3
|
import { mergeOps, } from "@ledgerhq/coin-framework/bridge/jsHelpers";
|
|
4
4
|
import { utils as TyphonUtils } from "@stricahq/typhonjs";
|
|
5
|
-
import { listTokensForCryptoCurrency } from "@ledgerhq/cryptoassets";
|
|
6
5
|
import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
7
|
-
import { encodeAccountId } from "@ledgerhq/coin-framework/account/index";
|
|
6
|
+
import { encodeAccountId, getSyncHash } from "@ledgerhq/coin-framework/account/index";
|
|
8
7
|
import { formatCurrencyUnit } from "@ledgerhq/coin-framework/currencies/index";
|
|
9
8
|
import { inferSubOperations } from "@ledgerhq/coin-framework/serialization/index";
|
|
10
9
|
import { getDelegationInfo } from "./api/getDelegationInfo";
|
|
@@ -41,11 +40,7 @@ export const makeGetAccountShape = (signerContext) => async (info, { blacklisted
|
|
|
41
40
|
derivationMode,
|
|
42
41
|
});
|
|
43
42
|
// when new tokens are added / blacklist changes, we need to sync again because we need to go through all operations again
|
|
44
|
-
const syncHash =
|
|
45
|
-
"_" +
|
|
46
|
-
listTokensForCryptoCurrency(currency, {
|
|
47
|
-
withDelisted: true,
|
|
48
|
-
}).length;
|
|
43
|
+
const syncHash = await getSyncHash(currency.id, blacklistedTokenIds);
|
|
49
44
|
const outdatedSyncHash = initialAccount?.syncHash !== syncHash;
|
|
50
45
|
const requiredConfirmations = 90;
|
|
51
46
|
const oldOperations = initialAccount?.operations || [];
|
|
@@ -70,14 +65,14 @@ export const makeGetAccountShape = (signerContext) => async (info, { blacklisted
|
|
|
70
65
|
const utxos = prepareUtxos(newTransactions, stableUtxos, accountCredentialsMap);
|
|
71
66
|
const utxosSum = utxos.reduce((total, u) => total.plus(u.amount), new BigNumber(0));
|
|
72
67
|
const tokenBalance = mergeTokens(utxos.map(u => u.tokens).flat());
|
|
73
|
-
const subAccounts = buildSubAccounts({
|
|
68
|
+
const subAccounts = (await buildSubAccounts({
|
|
74
69
|
initialAccount,
|
|
75
70
|
parentAccountId: accountId,
|
|
76
71
|
parentCurrency: currency,
|
|
77
72
|
newTransactions,
|
|
78
73
|
tokens: tokenBalance,
|
|
79
74
|
accountCredentialsMap,
|
|
80
|
-
}).filter(a => !blacklistedTokenIds?.includes(a.token.id));
|
|
75
|
+
})).filter(a => !blacklistedTokenIds?.includes(a.token.id));
|
|
81
76
|
const stakeCredential = getAccountStakeCredential(xpub, accountIndex);
|
|
82
77
|
const networkParams = getNetworkParameters(currency.id);
|
|
83
78
|
const freshAddresses = externalCredentials
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,eAAe,CAAC;AACnC,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAGL,QAAQ,GACT,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAElF,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAkB,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAWlD,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EACzB,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EAChB,WAAW,EACX,WAAW,GACZ,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,CAAC,MAAM,mBAAmB,GAC9B,CAAC,aAA2C,EAAmC,EAAE,CACjF,KAAK,EAAE,IAAI,EAAE,EAAE,mBAAmB,EAAE,EAAE,EAAE;IACtC,MAAM,EACJ,QAAQ,EACR,KAAK,EAAE,YAAY,EACnB,cAAc,EACd,cAAc,EACd,cAAc,EACd,QAAQ,GACT,GAAG,IAAI,CAAC;IACT,wCAAwC;IACxC,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,GAAG,QAAQ,IAAI,YAAY,GAAG,CAAC;IAEnD,MAAM,SAAS,GAAG,cAAc,EAAE,IAAI,CAAC;IACvC,IAAI,IAAI,CAAC;IACT,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YAChD,wBAAwB;YACxB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC5D,CAAC;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAC/D,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,CACjC,CAAC;QACF,IAAI,GAAG,GAAG,iBAAiB,CAAC,YAAY,GAAG,iBAAiB,CAAC,YAAY,EAAE,CAAC;IAC9E,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,SAAS,GAAG,eAAe,CAAC;QAChC,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,GAAG;QACZ,UAAU,EAAE,QAAQ,CAAC,EAAE;QACvB,aAAa,EAAE,IAAI;QACnB,cAAc;KACf,CAAC,CAAC;IAEH,0HAA0H;IAC1H,MAAM,QAAQ,GACZ,IAAI,CAAC,SAAS,CAAC,mBAAmB,IAAI,EAAE,CAAC;QACzC,GAAG;QACH,2BAA2B,CAAC,QAAQ,EAAE;YACpC,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC,MAAM,CAAC;IACZ,MAAM,gBAAgB,GAAG,cAAc,EAAE,QAAQ,KAAK,QAAQ,CAAC;IAE/D,MAAM,qBAAqB,GAAG,EAAE,CAAC;IAEjC,MAAM,aAAa,GAAG,cAAc,EAAE,UAAU,IAAI,EAAE,CAAC;IACvD,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3F,MAAM,mBAAmB,GAAG,gBAAgB;QAC1C,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,eAAe,GAAG,qBAAqB;YACvC,CAAC,CAAC,eAAe,GAAG,qBAAqB;YACzC,CAAC,CAAC,CAAC,CAAC;IAER,MAAM,EACJ,YAAY,EAAE,eAAe,EAC7B,WAAW,EACX,mBAAmB,EACnB,mBAAmB,GACpB,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE,mBAAmB,EAAE,QAAQ,CAAC,CAAC;IAE7F,MAAM,qBAAqB,GAAG,CAAC,GAAG,mBAAmB,EAAE,GAAG,mBAAmB,CAAC,CAAC,MAAM,CACnF,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE;QACjB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;QAC1B,OAAO,QAAQ,CAAC;IAClB,CAAC,EACD,EAAuC,CACxC,CAAC;IAEF,MAAM,qBAAqB,GAA8B,EAAE,CAAC;IAC5D,CAAC,cAAc,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAC7C,IAAK,CAAC,CAAC,WAAsB,GAAG,mBAAmB,EAAE,CAAC;YACpD,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,CAAC,cAAc,EAAE,gBAAgB,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CACxE,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,CACnC,CAAC;IAEF,MAAM,KAAK,GAAG,YAAY,CAAC,eAAe,EAAE,WAAW,EAAE,qBAAqB,CAAC,CAAC;IAChF,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IACpF,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,gBAAgB,CAAC;QACnC,cAAc;QACd,eAAe,EAAE,SAAS;QAC1B,cAAc,EAAE,QAAQ;QACxB,eAAe;QACf,MAAM,EAAE,YAAY;QACpB,qBAAqB;KACtB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAE3D,MAAM,eAAe,GAAG,yBAAyB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACtE,MAAM,aAAa,GAAG,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACxD,MAAM,cAAc,GAAG,mBAAmB;SACvC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;SACtB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACT,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC;QACxC,OAAO,EAAE,cAAc,CAAC;YACtB,SAAS,EAAE,aAAa,CAAC,SAAS;YAClC,WAAW,EAAE,CAAC;YACd,SAAS,EAAE,eAAe;SAC3B,CAAC,CAAC,SAAS,EAAE;KACf,CAAC,CAAC,CAAC;IACN,MAAM,kBAAkB,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC5D,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,QAAQ,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;IAE9E,MAAM,YAAY,GAAG,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAEhG,MAAM,eAAe,GAAG,YAAY,CAAC,MAAM;QACzC,CAAC,CAAC,WAAW,CAAC,6BAA6B,CACvC;YACE,OAAO,EAAE,WAAW,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACpE,MAAM,EAAE,IAAI,SAAS,CAAC,kBAAkB,CAAC;YACzC,MAAM,EAAE,YAAY;SACrB,EACD,IAAI,SAAS,CAAC,kBAAkB,CAAC,cAAc,CAAC,eAAe,CAAC,CACjE;QACH,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;IAErB,MAAM,aAAa,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAC5C,uBAAuB,CACrB,CAAC,EACD,SAAS,EACT,qBAAqB,EACrB,eAAe,EACf,WAAW,EACX,IAAI,EACJ,kBAAkB,CAAC,cAAc,CAClC,CACF,CAAC;IAEF,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,aAAa,CAAC,CAAC;IAEjF,OAAO;QACL,EAAE,EAAE,SAAS;QACb,IAAI;QACJ,OAAO,EAAE,YAAY;QACrB,gBAAgB,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACnE,UAAU,EAAE,UAAU;QACtB,QAAQ;QACR,WAAW;QACX,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,OAAO;QACvC,gBAAgB,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc;QAClD,WAAW;QACX,gBAAgB,EAAE;YAChB,KAAK;YACL,mBAAmB;YACnB,mBAAmB;YACnB,UAAU,EAAE,cAAc;YAC1B,cAAc,EAAE,kBAAkB,CAAC,cAAc;SAClD;KACF,CAAC;AACJ,CAAC,CAAC;AAEJ,SAAS,uBAAuB,CAC9B,EAAkB,EAClB,SAAiB,EACjB,qBAAwD,EACxD,eAAgC,EAChC,WAAgC,EAChC,gBAAkC,EAClC,cAA8B;IAE9B,MAAM,aAAa,GAAG,gBAAgB,CAAC,EAAE,EAAE,qBAAqB,CAAC,CAAC;IAElE,MAAM,aAAa,GAAG,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC/D,MAAM,IAAI,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;IAC/B,MAAM,KAAK,GAA0B,EAAE,CAAC;IACxC,IAAI,IAAI,EAAE,CAAC;QACT,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,IAAI,cAAc,GAAG,aAAa,CAAC,GAAG,CAAC;IAEvC,IAAI,EAAE,CAAC,WAAW,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC;QAC7C,MAAM,kBAAkB,GAAG,EAAE,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAC/D,CAAC,CAAC,EAAE,CACF,CAAC,CAAC,eAAe,CAAC,IAAI,KAAK,QAAQ,CAAC,OAAO;YAC3C,CAAC,CAAC,eAAe,CAAC,GAAG,KAAK,eAAe,CAAC,GAAG,CAChD,CAAC;QACF,IAAI,kBAAkB,EAAE,CAAC;YACvB,KAAK,CAAC,OAAO,GAAG,kBAAkB,CAChC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAClC,IAAI,SAAS,CAAC,cAAc,CAAC,eAAe,CAAC,EAC7C;gBACE,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE,IAAI;aACtB,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,EAAE,CAAC,WAAW,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC;QAC/C,MAAM,oBAAoB,GAAG,EAAE,CAAC,WAAW,CAAC,oBAAoB,CAAC,IAAI,CACnE,CAAC,CAAC,EAAE,CACF,CAAC,CAAC,eAAe,CAAC,IAAI,KAAK,QAAQ,CAAC,OAAO;YAC3C,CAAC,CAAC,eAAe,CAAC,GAAG,KAAK,eAAe,CAAC,GAAG,CAChD,CAAC;QACF,IAAI,oBAAoB,EAAE,CAAC;YACzB,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;YACtE,KAAK,CAAC,MAAM,GAAG,kBAAkB,CAC/B,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAClC,IAAI,SAAS,CAAC,cAAc,CAAC,eAAe,CAAC,EAC7C;gBACE,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE,IAAI;aACtB,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,EAAE,CAAC,WAAW,IAAI,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CACxC,CAAC,CAAC,EAAE,CACF,CAAC,CAAC,eAAe,CAAC,IAAI,KAAK,QAAQ,CAAC,OAAO;YAC3C,CAAC,CAAC,eAAe,CAAC,GAAG,KAAK,eAAe,CAAC,GAAG,CAChD,CAAC;QACF,IAAI,cAAc,EAAE,CAAC;YACnB,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC7D,KAAK,CAAC,OAAO,GAAG,kBAAkB,CAChC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAClC,IAAI,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,EACpC;gBACE,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE,IAAI;aACtB,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,iBAAgC,CAAC;IACrC,IAAI,EAAE,CAAC,WAAW,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;QAC3C,iBAAiB,GAAG,UAAU,CAAC;IACjC,CAAC;SAAM,IACL,EAAE,CAAC,WAAW,CAAC,oBAAoB,CAAC,MAAM;QAC1C,EAAE,CAAC,WAAW,CAAC,iBAAiB,EAAE,MAAM,EACxC,CAAC;QACD,iBAAiB,GAAG,YAAY,CAAC;IACnC,CAAC;SAAM,CAAC;QACN,iBAAiB,GAAG,gBAAgB,CAAC;YACnC,WAAW,EAAE,cAAc;YAC3B,IAAI,EAAE,IAAI,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC;SAC7B,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,SAAS;QACT,EAAE,EAAE,iBAAiB,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC;QAC5D,IAAI,EAAE,EAAE,CAAC,IAAI;QACb,IAAI,EAAE,iBAAiB;QACvB,GAAG,EAAE,IAAI,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC;QAC3B,KAAK,EAAE,cAAc,CAAC,aAAa,EAAE;QACrC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACzB,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;YACpB,CAAC,CAAC,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,EAAE;YAC1E,CAAC,CAAC,CAAC,CAAC,OAAO,CACd;QACD,UAAU,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAC7B,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;YACpB,CAAC,CAAC,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,EAAE;YAC1E,CAAC,CAAC,CAAC,CAAC,OAAO,CACd;QACD,aAAa;QACb,WAAW,EAAE,EAAE,CAAC,WAAW;QAC3B,IAAI,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC;QAC5B,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,SAAS;KACrB,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CACnB,eAAsC,EACtC,WAAiC,EACjC,qBAAwD;IAExD,MAAM,QAAQ,GAAyB,EAAE,CAAC;IAC1C,4BAA4B;IAC5B,MAAM,aAAa,GAAgB,IAAI,GAAG,EAAE,CAAC;IAE7C,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAC1B,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACnB,MAAM,IAAI,GAAG,qBAAqB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;YACjD,IAAI,IAAI;gBAAE,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE;YACnC,MAAM,IAAI,GAAG,qBAAqB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;YACjD,IAAI,IAAI,EAAE,CAAC;gBACT,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,KAAK,EAAE,WAAW;oBAClB,OAAO,EAAE,CAAC,CAAC,OAAO;oBAClB,MAAM,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;oBAC9B,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;wBAC7B,SAAS,EAAE,KAAK,CAAC,SAAS;wBAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ;wBACxB,MAAM,EAAE,IAAI,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;qBACnC,CAAC,CAAC;oBACH,iBAAiB,EAAE;wBACjB,GAAG,EAAE,CAAC,CAAC,UAAU;wBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;qBAChB;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,GAAG,WAAW,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,CACrF,CAAC,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,CAChD,CAAC;IAEF,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
1
|
+
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/coin-cardano",
|
|
3
|
-
"version": "0.14.0-nightly.
|
|
3
|
+
"version": "0.14.0-nightly.20251031023756",
|
|
4
4
|
"description": "Ledger Cardano Coin integration",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger",
|
|
@@ -59,15 +59,15 @@
|
|
|
59
59
|
"invariant": "^2.2.2",
|
|
60
60
|
"lodash": "^4.17.21",
|
|
61
61
|
"rxjs": "^7.8.1",
|
|
62
|
-
"@ledgerhq/coin-framework": "^6.8.0-nightly.
|
|
63
|
-
"@ledgerhq/cryptoassets": "^13.32.0-nightly.
|
|
64
|
-
"@ledgerhq/devices": "8.
|
|
65
|
-
"@ledgerhq/errors": "^6.27.0-nightly.
|
|
66
|
-
"@ledgerhq/live-env": "^2.
|
|
67
|
-
"@ledgerhq/live-network": "^2.1.0-nightly.
|
|
62
|
+
"@ledgerhq/coin-framework": "^6.8.0-nightly.20251031023756",
|
|
63
|
+
"@ledgerhq/cryptoassets": "^13.32.0-nightly.20251031023756",
|
|
64
|
+
"@ledgerhq/devices": "8.7.0-nightly.20251031023756",
|
|
65
|
+
"@ledgerhq/errors": "^6.27.0-nightly.20251031023756",
|
|
66
|
+
"@ledgerhq/live-env": "^2.20.0-nightly.20251031023756",
|
|
67
|
+
"@ledgerhq/live-network": "^2.1.0-nightly.20251031023756",
|
|
68
68
|
"@ledgerhq/logs": "^6.13.0",
|
|
69
|
-
"@ledgerhq/types-cryptoassets": "^7.
|
|
70
|
-
"@ledgerhq/types-live": "^6.88.0-nightly.
|
|
69
|
+
"@ledgerhq/types-cryptoassets": "^7.30.0-nightly.20251031023756",
|
|
70
|
+
"@ledgerhq/types-live": "^6.88.0-nightly.20251031023756"
|
|
71
71
|
},
|
|
72
72
|
"devDependencies": {
|
|
73
73
|
"@types/invariant": "^2.2.2",
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
"@types/lodash": "^4.14.191",
|
|
76
76
|
"jest": "^29.7.0",
|
|
77
77
|
"ts-jest": "^29.1.1",
|
|
78
|
-
"@ledgerhq/disable-network-setup": "^0.1.0-nightly.
|
|
78
|
+
"@ledgerhq/disable-network-setup": "^0.1.0-nightly.20251031023756"
|
|
79
79
|
},
|
|
80
80
|
"scripts": {
|
|
81
81
|
"clean": "rimraf lib lib-es",
|
package/src/buildSubAccounts.ts
CHANGED
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
import keyBy from "lodash/keyBy";
|
|
7
7
|
import groupBy from "lodash/groupBy";
|
|
8
8
|
import BigNumber from "bignumber.js";
|
|
9
|
-
import {
|
|
9
|
+
import { getCryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/index";
|
|
10
10
|
import { utils as TyphonUtils } from "@stricahq/typhonjs";
|
|
11
11
|
import type { Account, TokenAccount } from "@ledgerhq/types-live";
|
|
12
12
|
import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
|
|
@@ -47,7 +47,7 @@ export const decodeTokenCurrencyId = (
|
|
|
47
47
|
/**
|
|
48
48
|
* @returns operations of tokens that are defined in ledgerjs cryptoassets
|
|
49
49
|
*/
|
|
50
|
-
const mapTxToTokenAccountOperation = ({
|
|
50
|
+
const mapTxToTokenAccountOperation = async ({
|
|
51
51
|
parentAccountId,
|
|
52
52
|
parentCurrency,
|
|
53
53
|
newTransactions,
|
|
@@ -57,21 +57,21 @@ const mapTxToTokenAccountOperation = ({
|
|
|
57
57
|
parentCurrency: CryptoCurrency;
|
|
58
58
|
newTransactions: Array<APITransaction>;
|
|
59
59
|
accountCredentialsMap: Record<string, PaymentCredential>;
|
|
60
|
-
}): Array<CardanoOperation
|
|
60
|
+
}): Promise<Array<CardanoOperation>> => {
|
|
61
61
|
const operations: Array<CardanoOperation> = [];
|
|
62
62
|
|
|
63
|
-
|
|
63
|
+
for (const tx of newTransactions) {
|
|
64
64
|
const accountChange = getAccountChange(tx, accountCredentialsMap);
|
|
65
|
-
accountChange.tokens
|
|
65
|
+
for (const token of accountChange.tokens) {
|
|
66
66
|
const assetId = getTokenAssetId({
|
|
67
67
|
policyId: token.policyId,
|
|
68
68
|
assetName: token.assetName,
|
|
69
69
|
});
|
|
70
70
|
const tokenCurrencyId = encodeTokenCurrencyId(parentCurrency, assetId);
|
|
71
|
-
const tokenCurrency = findTokenById(tokenCurrencyId);
|
|
71
|
+
const tokenCurrency = await getCryptoAssetsStore().findTokenById(tokenCurrencyId);
|
|
72
72
|
// skip the unsupported tokens by ledger-live
|
|
73
73
|
if (tokenCurrency === null || tokenCurrency === undefined) {
|
|
74
|
-
|
|
74
|
+
continue;
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
const tokenAccountId = encodeTokenAccountId(parentAccountId, tokenCurrency);
|
|
@@ -105,13 +105,13 @@ const mapTxToTokenAccountOperation = ({
|
|
|
105
105
|
blockHash: undefined,
|
|
106
106
|
};
|
|
107
107
|
operations.push(operation);
|
|
108
|
-
}
|
|
109
|
-
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
110
|
|
|
111
111
|
return operations;
|
|
112
112
|
};
|
|
113
113
|
|
|
114
|
-
export function buildSubAccounts({
|
|
114
|
+
export async function buildSubAccounts({
|
|
115
115
|
initialAccount,
|
|
116
116
|
parentAccountId,
|
|
117
117
|
parentCurrency,
|
|
@@ -125,7 +125,7 @@ export function buildSubAccounts({
|
|
|
125
125
|
newTransactions: Array<APITransaction>;
|
|
126
126
|
tokens: Array<Token>;
|
|
127
127
|
accountCredentialsMap: Record<string, PaymentCredential>;
|
|
128
|
-
}): Array<TokenAccount
|
|
128
|
+
}): Promise<Array<TokenAccount>> {
|
|
129
129
|
const tokenAccountsById: Record<string, TokenAccount> = {};
|
|
130
130
|
|
|
131
131
|
if (initialAccount && initialAccount.subAccounts) {
|
|
@@ -136,7 +136,7 @@ export function buildSubAccounts({
|
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
138
|
|
|
139
|
-
const tokenOperations: Array<CardanoOperation> = mapTxToTokenAccountOperation({
|
|
139
|
+
const tokenOperations: Array<CardanoOperation> = await mapTxToTokenAccountOperation({
|
|
140
140
|
parentAccountId,
|
|
141
141
|
parentCurrency,
|
|
142
142
|
newTransactions: newTransactions,
|
|
@@ -149,7 +149,7 @@ export function buildSubAccounts({
|
|
|
149
149
|
const oldOperations = initialTokenAccount?.operations || [];
|
|
150
150
|
const newOperations = tokenOperationsByAccId[tokenAccountId] || [];
|
|
151
151
|
const operations = mergeOps(oldOperations, newOperations);
|
|
152
|
-
const { token: tokenCurrency } = decodeTokenAccountId(tokenAccountId);
|
|
152
|
+
const { token: tokenCurrency } = await decodeTokenAccountId(tokenAccountId);
|
|
153
153
|
if (tokenCurrency) {
|
|
154
154
|
const accountBalance =
|
|
155
155
|
tokensBalanceByAssetId[tokenCurrency.contractAddress]?.amount || new BigNumber(0);
|
package/src/synchronisation.ts
CHANGED
|
@@ -7,9 +7,8 @@ import {
|
|
|
7
7
|
} from "@ledgerhq/coin-framework/bridge/jsHelpers";
|
|
8
8
|
import { utils as TyphonUtils } from "@stricahq/typhonjs";
|
|
9
9
|
import { SignerContext } from "@ledgerhq/coin-framework/signer";
|
|
10
|
-
import { listTokensForCryptoCurrency } from "@ledgerhq/cryptoassets";
|
|
11
10
|
import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
12
|
-
import { encodeAccountId } from "@ledgerhq/coin-framework/account/index";
|
|
11
|
+
import { encodeAccountId, getSyncHash } from "@ledgerhq/coin-framework/account/index";
|
|
13
12
|
import { formatCurrencyUnit } from "@ledgerhq/coin-framework/currencies/index";
|
|
14
13
|
import { inferSubOperations } from "@ledgerhq/coin-framework/serialization/index";
|
|
15
14
|
import type { Operation, OperationType, TokenAccount } from "@ledgerhq/types-live";
|
|
@@ -79,12 +78,7 @@ export const makeGetAccountShape =
|
|
|
79
78
|
});
|
|
80
79
|
|
|
81
80
|
// when new tokens are added / blacklist changes, we need to sync again because we need to go through all operations again
|
|
82
|
-
const syncHash =
|
|
83
|
-
JSON.stringify(blacklistedTokenIds || []) +
|
|
84
|
-
"_" +
|
|
85
|
-
listTokensForCryptoCurrency(currency, {
|
|
86
|
-
withDelisted: true,
|
|
87
|
-
}).length;
|
|
81
|
+
const syncHash = await getSyncHash(currency.id, blacklistedTokenIds);
|
|
88
82
|
const outdatedSyncHash = initialAccount?.syncHash !== syncHash;
|
|
89
83
|
|
|
90
84
|
const requiredConfirmations = 90;
|
|
@@ -127,14 +121,16 @@ export const makeGetAccountShape =
|
|
|
127
121
|
const utxos = prepareUtxos(newTransactions, stableUtxos, accountCredentialsMap);
|
|
128
122
|
const utxosSum = utxos.reduce((total, u) => total.plus(u.amount), new BigNumber(0));
|
|
129
123
|
const tokenBalance = mergeTokens(utxos.map(u => u.tokens).flat());
|
|
130
|
-
const subAccounts =
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
124
|
+
const subAccounts = (
|
|
125
|
+
await buildSubAccounts({
|
|
126
|
+
initialAccount,
|
|
127
|
+
parentAccountId: accountId,
|
|
128
|
+
parentCurrency: currency,
|
|
129
|
+
newTransactions,
|
|
130
|
+
tokens: tokenBalance,
|
|
131
|
+
accountCredentialsMap,
|
|
132
|
+
})
|
|
133
|
+
).filter(a => !blacklistedTokenIds?.includes(a.token.id));
|
|
138
134
|
|
|
139
135
|
const stakeCredential = getAccountStakeCredential(xpub, accountIndex);
|
|
140
136
|
const networkParams = getNetworkParameters(currency.id);
|
|
@@ -9,6 +9,8 @@ import { buildSubAccounts } from "./buildSubAccounts";
|
|
|
9
9
|
import { fetchNetworkInfo } from "./api/getNetworkInfo";
|
|
10
10
|
import { APINetworkInfo } from "./api/api-types";
|
|
11
11
|
import { CardanoSigner } from "./signer";
|
|
12
|
+
import { setCryptoAssetsStore } from "@ledgerhq/coin-framework/lib/crypto-assets/index";
|
|
13
|
+
import { CryptoAssetsStore } from "@ledgerhq/types-live";
|
|
12
14
|
|
|
13
15
|
jest.mock("./buildSubAccounts");
|
|
14
16
|
jest.mock("./api/getTransactions");
|
|
@@ -65,7 +67,7 @@ describe("makeGetAccountShape", () => {
|
|
|
65
67
|
deviceId: "id",
|
|
66
68
|
};
|
|
67
69
|
const buildSubAccountsMock = jest.mocked(buildSubAccounts);
|
|
68
|
-
buildSubAccountsMock.
|
|
70
|
+
buildSubAccountsMock.mockResolvedValue([]);
|
|
69
71
|
getTransactionsMock = jest.mocked(getTransactions);
|
|
70
72
|
const getNetworkInfoMock = jest.mocked(fetchNetworkInfo);
|
|
71
73
|
getNetworkInfoMock.mockReturnValue(
|
|
@@ -78,6 +80,11 @@ describe("makeGetAccountShape", () => {
|
|
|
78
80
|
});
|
|
79
81
|
|
|
80
82
|
describe("balance", () => {
|
|
83
|
+
beforeAll(() => {
|
|
84
|
+
setCryptoAssetsStore({
|
|
85
|
+
getTokensSyncHash: jest.fn().mockResolvedValue("some_random_hash"),
|
|
86
|
+
} as unknown as CryptoAssetsStore);
|
|
87
|
+
});
|
|
81
88
|
it("should return 0 balance when there is no utxos", async () => {
|
|
82
89
|
getTransactionsMock.mockReturnValue(
|
|
83
90
|
Promise.resolve({
|