@ledgerhq/coin-aptos 3.6.0-nightly.20251119110540 → 3.6.0-nightly.20251120135143
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/CHANGELOG.md +7 -7
- package/lib/bridge/logic.js +2 -2
- package/lib/bridge/logic.js.map +1 -1
- package/lib-es/bridge/logic.js +1 -1
- package/lib-es/bridge/logic.js.map +1 -1
- package/package.json +6 -6
- package/src/__tests__/bridge/logic.test.ts +53 -84
- package/src/__tests__/network/client.test.ts +0 -4
- package/src/bridge/logic.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# @ledgerhq/coin-aptos
|
|
2
2
|
|
|
3
|
-
## 3.6.0-nightly.
|
|
3
|
+
## 3.6.0-nightly.20251120135143
|
|
4
4
|
|
|
5
5
|
### Minor Changes
|
|
6
6
|
|
|
@@ -12,12 +12,12 @@
|
|
|
12
12
|
|
|
13
13
|
- [#12386](https://github.com/LedgerHQ/ledger-live/pull/12386) [`d9a2770`](https://github.com/LedgerHQ/ledger-live/commit/d9a27706c620f7fd7efb59f232daf929bd5cd040) Thanks [@acewf](https://github.com/acewf)! - include aptos fungible token in the list of operations
|
|
14
14
|
|
|
15
|
-
- Updated dependencies [[`74a340b`](https://github.com/LedgerHQ/ledger-live/commit/74a340b258589c9c37476103029eb036b930616c), [`a6bc24e`](https://github.com/LedgerHQ/ledger-live/commit/a6bc24ee988b98bf82f807ac5ce731ba79813901), [`b69c97d`](https://github.com/LedgerHQ/ledger-live/commit/b69c97d979ba97154c9abfda6abfc2a36becee4f), [`544721d`](https://github.com/LedgerHQ/ledger-live/commit/544721d198454526ef83516619d59c881ba34eb9), [`fe81926`](https://github.com/LedgerHQ/ledger-live/commit/fe81926afeb2df8e917e6bd1e4cbab13f09647fd), [`1c6f5f5`](https://github.com/LedgerHQ/ledger-live/commit/1c6f5f5843349b1955f7ca466f98cbe4ffcdaddf), [`d5d838a`](https://github.com/LedgerHQ/ledger-live/commit/d5d838a23e00edd53293843781c559c41db4e854), [`9f61dcf`](https://github.com/LedgerHQ/ledger-live/commit/9f61dcf6163fd66657e5be732c28bea623a40515), [`903ea9c`](https://github.com/LedgerHQ/ledger-live/commit/903ea9cdacf704a0119de2803a4f409b775391a5), [`938b970`](https://github.com/LedgerHQ/ledger-live/commit/938b970e15118dc706c759a3bec27dc01c3dd268), [`c40e9da`](https://github.com/LedgerHQ/ledger-live/commit/c40e9da68452fe9827b9435ff2d162291186be73), [`02ef98f`](https://github.com/LedgerHQ/ledger-live/commit/02ef98faeb13c182ef255e06a43c39abeb55ecc7), [`c0b5b9f`](https://github.com/LedgerHQ/ledger-live/commit/c0b5b9f4cdcb2ea3e15419cbf3d1a14f725c3e6a), [`6d0c6b2`](https://github.com/LedgerHQ/ledger-live/commit/6d0c6b2eda60049d8eebda5de2c54e8f0be7d009), [`70049be`](https://github.com/LedgerHQ/ledger-live/commit/70049bed0cd0a8c7a9e4947a63af82061dad46c0), [`0d33751`](https://github.com/LedgerHQ/ledger-live/commit/0d33751bb2ae599d0d26ce6a8efdbe01757f12fb), [`5b41dd5`](https://github.com/LedgerHQ/ledger-live/commit/5b41dd56e024a5d03ba0e49084113c04887395db), [`eb5a17e`](https://github.com/LedgerHQ/ledger-live/commit/eb5a17e4db336eaa871eaeb52ffa5248e0f78bec), [`9659a34`](https://github.com/LedgerHQ/ledger-live/commit/9659a34d9998d5c4dff8618bf6cef7d16403680d), [`c70f6a8`](https://github.com/LedgerHQ/ledger-live/commit/c70f6a8370056b6fd8f236205471359d6f9b846f)]:
|
|
16
|
-
- @ledgerhq/types-live@6.89.0-nightly.
|
|
17
|
-
- @ledgerhq/cryptoassets@13.33.0-nightly.
|
|
18
|
-
- @ledgerhq/coin-framework@6.9.0-nightly.
|
|
19
|
-
- @ledgerhq/live-env@2.21.0-nightly.
|
|
20
|
-
- @ledgerhq/live-network@2.1.1-nightly.
|
|
15
|
+
- Updated dependencies [[`74a340b`](https://github.com/LedgerHQ/ledger-live/commit/74a340b258589c9c37476103029eb036b930616c), [`a6bc24e`](https://github.com/LedgerHQ/ledger-live/commit/a6bc24ee988b98bf82f807ac5ce731ba79813901), [`b69c97d`](https://github.com/LedgerHQ/ledger-live/commit/b69c97d979ba97154c9abfda6abfc2a36becee4f), [`544721d`](https://github.com/LedgerHQ/ledger-live/commit/544721d198454526ef83516619d59c881ba34eb9), [`fe81926`](https://github.com/LedgerHQ/ledger-live/commit/fe81926afeb2df8e917e6bd1e4cbab13f09647fd), [`1c6f5f5`](https://github.com/LedgerHQ/ledger-live/commit/1c6f5f5843349b1955f7ca466f98cbe4ffcdaddf), [`b4a4e16`](https://github.com/LedgerHQ/ledger-live/commit/b4a4e160aae6fd64f944ab25633f6931dc4358d3), [`927ae64`](https://github.com/LedgerHQ/ledger-live/commit/927ae64db0bb04af54e25623655a001a68e0f2d3), [`d5d838a`](https://github.com/LedgerHQ/ledger-live/commit/d5d838a23e00edd53293843781c559c41db4e854), [`9f61dcf`](https://github.com/LedgerHQ/ledger-live/commit/9f61dcf6163fd66657e5be732c28bea623a40515), [`903ea9c`](https://github.com/LedgerHQ/ledger-live/commit/903ea9cdacf704a0119de2803a4f409b775391a5), [`938b970`](https://github.com/LedgerHQ/ledger-live/commit/938b970e15118dc706c759a3bec27dc01c3dd268), [`c40e9da`](https://github.com/LedgerHQ/ledger-live/commit/c40e9da68452fe9827b9435ff2d162291186be73), [`02ef98f`](https://github.com/LedgerHQ/ledger-live/commit/02ef98faeb13c182ef255e06a43c39abeb55ecc7), [`c0b5b9f`](https://github.com/LedgerHQ/ledger-live/commit/c0b5b9f4cdcb2ea3e15419cbf3d1a14f725c3e6a), [`6d0c6b2`](https://github.com/LedgerHQ/ledger-live/commit/6d0c6b2eda60049d8eebda5de2c54e8f0be7d009), [`70049be`](https://github.com/LedgerHQ/ledger-live/commit/70049bed0cd0a8c7a9e4947a63af82061dad46c0), [`0d33751`](https://github.com/LedgerHQ/ledger-live/commit/0d33751bb2ae599d0d26ce6a8efdbe01757f12fb), [`5b41dd5`](https://github.com/LedgerHQ/ledger-live/commit/5b41dd56e024a5d03ba0e49084113c04887395db), [`aadcec6`](https://github.com/LedgerHQ/ledger-live/commit/aadcec66847b800f79452ba1df09149e0a1cb9e8), [`eb5a17e`](https://github.com/LedgerHQ/ledger-live/commit/eb5a17e4db336eaa871eaeb52ffa5248e0f78bec), [`ed8532b`](https://github.com/LedgerHQ/ledger-live/commit/ed8532bad754ca2b5f1788c6e92f4646b775ec79), [`9659a34`](https://github.com/LedgerHQ/ledger-live/commit/9659a34d9998d5c4dff8618bf6cef7d16403680d), [`c70f6a8`](https://github.com/LedgerHQ/ledger-live/commit/c70f6a8370056b6fd8f236205471359d6f9b846f)]:
|
|
16
|
+
- @ledgerhq/types-live@6.89.0-nightly.20251120135143
|
|
17
|
+
- @ledgerhq/cryptoassets@13.33.0-nightly.20251120135143
|
|
18
|
+
- @ledgerhq/coin-framework@6.9.0-nightly.20251120135143
|
|
19
|
+
- @ledgerhq/live-env@2.21.0-nightly.20251120135143
|
|
20
|
+
- @ledgerhq/live-network@2.1.1-nightly.20251120135143
|
|
21
21
|
|
|
22
22
|
## 3.5.0
|
|
23
23
|
|
package/lib/bridge/logic.js
CHANGED
|
@@ -7,7 +7,7 @@ exports.getTokenAccount = exports.txsToOps = exports.getBlankOperation = exports
|
|
|
7
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
8
|
const index_1 = require("@ledgerhq/coin-framework/account/index");
|
|
9
9
|
const operation_1 = require("@ledgerhq/coin-framework/operation");
|
|
10
|
-
const
|
|
10
|
+
const state_1 = require("@ledgerhq/cryptoassets/state");
|
|
11
11
|
const constants_1 = require("../constants");
|
|
12
12
|
const transactionsToOperations_1 = require("../logic/transactionsToOperations");
|
|
13
13
|
const getCoinAndAmounts_1 = require("../logic/getCoinAndAmounts");
|
|
@@ -85,7 +85,7 @@ const txsToOps = async (info, id, txs) => {
|
|
|
85
85
|
ops.push(op);
|
|
86
86
|
}
|
|
87
87
|
else {
|
|
88
|
-
const token = await (0,
|
|
88
|
+
const token = await (0, state_1.getCryptoAssetsStore)().findTokenByAddressInCurrency(coin_id.toLowerCase(), "aptos");
|
|
89
89
|
if (token !== undefined) {
|
|
90
90
|
const tokenAccountId = (0, index_1.encodeTokenAccountId)(id, token);
|
|
91
91
|
op.accountId = tokenAccountId;
|
package/lib/bridge/logic.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../src/bridge/logic.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAGrC,kEAIgD;AAChD,kEAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../src/bridge/logic.ts"],"names":[],"mappings":"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"}
|
package/lib-es/bridge/logic.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import BigNumber from "bignumber.js";
|
|
2
2
|
import { encodeTokenAccountId, findSubAccountById, isTokenAccount, } from "@ledgerhq/coin-framework/account/index";
|
|
3
3
|
import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
4
|
-
import { getCryptoAssetsStore } from "@ledgerhq/
|
|
4
|
+
import { getCryptoAssetsStore } from "@ledgerhq/cryptoassets/state";
|
|
5
5
|
import { APTOS_ASSET_ID, OP_TYPE, DEFAULT_GAS, DEFAULT_GAS_PRICE, APTOS_ASSET_FUNGIBLE_ID, } from "../constants";
|
|
6
6
|
import { convertFunctionPayloadResponseToInputEntryFunctionData } from "../logic/transactionsToOperations";
|
|
7
7
|
import { compareAddress, getCoinAndAmounts } from "../logic/getCoinAndAmounts";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../src/bridge/logic.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAGrC,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,cAAc,GACf,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../src/bridge/logic.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAGrC,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,cAAc,GACf,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EACL,cAAc,EACd,OAAO,EACP,WAAW,EACX,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,sDAAsD,EAAE,MAAM,mCAAmC,CAAC;AAC3G,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,OAAgB,EAChB,WAAyB,EACzB,GAAe,EACf,QAAoB,EACT,EAAE;IACb,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC;IAClF,MAAM,gBAAgB,GAAG,YAAY,IAAI,cAAc,CAAC,YAAY,CAAC,CAAC;IAEtE,GAAG,GAAG,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAC;IACpC,QAAQ,GAAG,QAAQ,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAEpD,MAAM,QAAQ,GAAG,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAE5C,OAAO,gBAAgB;QACrB,CAAC,CAAC,YAAY,CAAC,gBAAgB;QAC/B,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,CAAC;YACrC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC;YAC1C,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,EAAoB,EACpB,EAAU,EACyB,EAAE,CAAC,CAAC;IACvC,EAAE,EAAE,EAAE;IACN,IAAI,EAAE,EAAE,CAAC,IAAI;IACb,IAAI,EAAE,EAAmB;IACzB,KAAK,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC;IACvB,GAAG,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC;IACrB,SAAS,EAAE,EAAE,CAAC,KAAK,EAAE,IAAI;IACzB,WAAW,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM;IAC7B,OAAO,EAAE,EAAc;IACvB,UAAU,EAAE,EAAc;IAC1B,SAAS,EAAE,EAAE;IACb,IAAI,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IAC7C,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE;IAC9B,yBAAyB,EAAE,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;IACtE,SAAS,EAAE,KAAK;CACjB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAC3B,IAAyB,EACzB,EAAU,EACV,GAAgC,EACkB,EAAE;IACpD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACzB,MAAM,GAAG,GAAgB,EAAE,CAAC;IAC5B,MAAM,SAAS,GAAgB,EAAE,CAAC;IAClC,MAAM,UAAU,GAAgB,EAAE,CAAC;IAEnC,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;QACrB,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAChB,MAAM,EAAE,GAAc,iBAAiB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAChD,EAAE,CAAC,GAAG,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;YAEnF,MAAM,OAAO,GAAG,sDAAsD,CACpE,EAAE,CAAC,OAAuC,CAC3C,CAAC;YAEF,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;YAErD,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,SAAS,CAAC,gDAAgD;YAC5D,CAAC;YAED,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,iBAAiB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAChF,EAAE,CAAC,KAAK,GAAG,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;YACtE,EAAE,CAAC,IAAI;gBACL,IAAI,KAAK,OAAO,CAAC,OAAO;oBACtB,CAAC,CAAC,IAAI;oBACN,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;wBAClC,CAAC,CAAC,OAAO,CAAC,GAAG;wBACb,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;YACnB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;YAC3B,EAAE,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC;YAC3B,EAAE,CAAC,EAAE,GAAG,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;YAE1D,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,gBAAgB,CAAC,CAAC;YAE1D,IAAI,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;gBACtB,+CAA+C;gBAC/C,EAAE,CAAC,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;YAC5B,CAAC;YAED,IACE,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,KAAK;gBACzB,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO;gBAC3B,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,QAAQ,EAC5B,CAAC;gBACD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACb,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtB,CAAC;iBAAM,IAAI,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBAC3D,IAAI,OAAO,KAAK,cAAc,IAAI,OAAO,KAAK,uBAAuB,EAAE,CAAC;oBACtE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACf,CAAC;qBAAM,CAAC;oBACN,MAAM,KAAK,GAAG,MAAM,oBAAoB,EAAE,CAAC,4BAA4B,CACrE,OAAO,CAAC,WAAW,EAAE,EACrB,OAAO,CACR,CAAC;oBACF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;wBACxB,MAAM,cAAc,GAAG,oBAAoB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;wBACvD,EAAE,CAAC,SAAS,GAAG,cAAc,CAAC;wBAC9B,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;wBAEnB,IAAI,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC;4BAC5B,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;4BAC/C,qDAAqD;4BACrD,MAAM,MAAM,GAAG;gCACb,GAAG,EAAE;gCACL,SAAS;gCACT,KAAK,EAAE,EAAE,CAAC,GAAG;gCACb,IAAI,EAAE,MAAe;6BACtB,CAAC;4BACF,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;wBACnB,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF,MAAM,UAAU,eAAe,CAC7B,OAAgB,EAChB,WAAwB;IAExB,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IACjF,MAAM,gBAAgB,GAAG,YAAY,IAAI,cAAc,CAAC,YAAY,CAAC,CAAC;IACtE,OAAO,gBAAgB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;AACrD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/coin-aptos",
|
|
3
|
-
"version": "3.6.0-nightly.
|
|
3
|
+
"version": "3.6.0-nightly.20251120135143",
|
|
4
4
|
"description": "Ledger Aptos Coin integration",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger",
|
|
@@ -95,15 +95,15 @@
|
|
|
95
95
|
"invariant": "^2.2.4",
|
|
96
96
|
"lodash": "^4.17.21",
|
|
97
97
|
"rxjs": "^7.8.1",
|
|
98
|
-
"@ledgerhq/coin-framework": "^6.9.0-nightly.
|
|
99
|
-
"@ledgerhq/cryptoassets": "^13.33.0-nightly.
|
|
98
|
+
"@ledgerhq/coin-framework": "^6.9.0-nightly.20251120135143",
|
|
99
|
+
"@ledgerhq/cryptoassets": "^13.33.0-nightly.20251120135143",
|
|
100
100
|
"@ledgerhq/devices": "8.7.0",
|
|
101
101
|
"@ledgerhq/errors": "^6.27.0",
|
|
102
|
-
"@ledgerhq/live-env": "^2.21.0-nightly.
|
|
103
|
-
"@ledgerhq/live-network": "^2.1.1-nightly.
|
|
102
|
+
"@ledgerhq/live-env": "^2.21.0-nightly.20251120135143",
|
|
103
|
+
"@ledgerhq/live-network": "^2.1.1-nightly.20251120135143",
|
|
104
104
|
"@ledgerhq/logs": "^6.13.0",
|
|
105
105
|
"@ledgerhq/types-cryptoassets": "^7.30.0",
|
|
106
|
-
"@ledgerhq/types-live": "^6.89.0-nightly.
|
|
106
|
+
"@ledgerhq/types-live": "^6.89.0-nightly.20251120135143"
|
|
107
107
|
},
|
|
108
108
|
"devDependencies": {
|
|
109
109
|
"@faker-js/faker": "^9.4.0",
|
|
@@ -4,13 +4,15 @@ import { APTOS_COIN_CHANGE, OP_TYPE } from "../../constants";
|
|
|
4
4
|
import { getMaxSendBalance, getBlankOperation, txsToOps } from "../../bridge/logic";
|
|
5
5
|
import type { AptosTransaction, TransactionOptions } from "../../types";
|
|
6
6
|
import { createFixtureAccount, createFixtureTransaction } from "../../bridge/bridge.fixture";
|
|
7
|
-
import { getCryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/index";
|
|
8
7
|
import { decodeTokenAccountId, encodeTokenAccountId } from "@ledgerhq/coin-framework/account/index";
|
|
9
8
|
import { normalizeTransactionOptions } from "../../logic/normalizeTransactionOptions";
|
|
9
|
+
import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
|
|
10
10
|
|
|
11
11
|
jest.mock("@ledgerhq/cryptoassets");
|
|
12
12
|
jest.mock("@ledgerhq/coin-framework/account/index");
|
|
13
|
-
|
|
13
|
+
import { setupMockCryptoAssetsStore } from "@ledgerhq/cryptoassets/cal-client/test-helpers";
|
|
14
|
+
|
|
15
|
+
setupMockCryptoAssetsStore();
|
|
14
16
|
|
|
15
17
|
describe("Aptos logic ", () => {
|
|
16
18
|
describe("getMaxSendBalance", () => {
|
|
@@ -442,48 +444,32 @@ describe("Aptos sync logic ", () => {
|
|
|
442
444
|
|
|
443
445
|
it("should convert Aptos token transactions to operations correctly", async () => {
|
|
444
446
|
(encodeTokenAccountId as jest.Mock).mockReturnValue("token_account_id");
|
|
445
|
-
(
|
|
446
|
-
findTokenByAddressInCurrency:
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
name: "Aptos",
|
|
455
|
-
managerAppName: "Aptos",
|
|
456
|
-
ticker: "APT",
|
|
457
|
-
scheme: "aptos",
|
|
458
|
-
color: "#231F20",
|
|
459
|
-
family: "aptos",
|
|
460
|
-
units: [
|
|
461
|
-
{
|
|
462
|
-
name: "APT",
|
|
463
|
-
code: "APT",
|
|
464
|
-
magnitude: 8,
|
|
465
|
-
},
|
|
466
|
-
],
|
|
467
|
-
explorerViews: [
|
|
468
|
-
{
|
|
469
|
-
address: "https://explorer.aptoslabs.com/account/$address?network=mainnet",
|
|
470
|
-
tx: "https://explorer.aptoslabs.com/txn/$hash?network=mainnet",
|
|
471
|
-
},
|
|
472
|
-
],
|
|
473
|
-
},
|
|
474
|
-
name: "dstAPT",
|
|
475
|
-
tokenType: "coin",
|
|
476
|
-
ticker: "dstAPT",
|
|
477
|
-
disableCountervalue: false,
|
|
478
|
-
delisted: false,
|
|
479
|
-
units: [
|
|
480
|
-
{
|
|
447
|
+
setupMockCryptoAssetsStore({
|
|
448
|
+
findTokenByAddressInCurrency: async (address: string, _currencyId: string) => {
|
|
449
|
+
// coin_id is converted to lowercase in txsToOps
|
|
450
|
+
if (address === "0xd111::staked_coin::stakedaptos") {
|
|
451
|
+
return {
|
|
452
|
+
type: "TokenCurrency" as const,
|
|
453
|
+
id: "aptos/coin/dstapt::staked_coin::stakedaptos",
|
|
454
|
+
contractAddress: "0xd111::staked_coin::StakedAptos",
|
|
455
|
+
parentCurrency: getCryptoCurrencyById("aptos"),
|
|
481
456
|
name: "dstAPT",
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
457
|
+
tokenType: "coin",
|
|
458
|
+
ticker: "dstAPT",
|
|
459
|
+
disableCountervalue: false,
|
|
460
|
+
delisted: false,
|
|
461
|
+
units: [
|
|
462
|
+
{
|
|
463
|
+
name: "dstAPT",
|
|
464
|
+
code: "dstAPT",
|
|
465
|
+
magnitude: 8,
|
|
466
|
+
},
|
|
467
|
+
],
|
|
468
|
+
};
|
|
469
|
+
}
|
|
470
|
+
return undefined;
|
|
471
|
+
},
|
|
472
|
+
getTokensSyncHash: async () => "0",
|
|
487
473
|
});
|
|
488
474
|
|
|
489
475
|
jest.mock("../../bridge/logic", () => ({
|
|
@@ -742,48 +728,31 @@ describe("Aptos sync logic ", () => {
|
|
|
742
728
|
});
|
|
743
729
|
|
|
744
730
|
it("should convert Aptos token transactions to operations correctly", async () => {
|
|
745
|
-
(
|
|
746
|
-
findTokenByAddressInCurrency:
|
|
747
|
-
|
|
748
|
-
|
|
749
|
-
|
|
750
|
-
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
coinType: 637,
|
|
754
|
-
name: "Aptos",
|
|
755
|
-
managerAppName: "Aptos",
|
|
756
|
-
ticker: "APT",
|
|
757
|
-
scheme: "aptos",
|
|
758
|
-
color: "#231F20",
|
|
759
|
-
family: "aptos",
|
|
760
|
-
units: [
|
|
761
|
-
{
|
|
762
|
-
name: "APT",
|
|
763
|
-
code: "APT",
|
|
764
|
-
magnitude: 8,
|
|
765
|
-
},
|
|
766
|
-
],
|
|
767
|
-
explorerViews: [
|
|
768
|
-
{
|
|
769
|
-
address: "https://explorer.aptoslabs.com/account/$address?network=mainnet",
|
|
770
|
-
tx: "https://explorer.aptoslabs.com/txn/$hash?network=mainnet",
|
|
771
|
-
},
|
|
772
|
-
],
|
|
773
|
-
},
|
|
774
|
-
name: "CELLANA",
|
|
775
|
-
tokenType: "fungible_asset",
|
|
776
|
-
ticker: "CELL",
|
|
777
|
-
disableCountervalue: false,
|
|
778
|
-
delisted: false,
|
|
779
|
-
units: [
|
|
780
|
-
{
|
|
731
|
+
setupMockCryptoAssetsStore({
|
|
732
|
+
findTokenByAddressInCurrency: async (address: string, _currencyId: string) => {
|
|
733
|
+
if (address === "0x2ebb") {
|
|
734
|
+
return {
|
|
735
|
+
type: "TokenCurrency" as const,
|
|
736
|
+
id: "aptos/fungible_asset/cellana_0x2ebb2ccac5e027a87fa0e2e5f656a3a4238d6a48d93ec9b610d570fc0aa0df12",
|
|
737
|
+
contractAddress: "0x2ebb",
|
|
738
|
+
parentCurrency: getCryptoCurrencyById("aptos"),
|
|
781
739
|
name: "CELLANA",
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
|
|
740
|
+
tokenType: "fungible_asset",
|
|
741
|
+
ticker: "CELL",
|
|
742
|
+
disableCountervalue: false,
|
|
743
|
+
delisted: false,
|
|
744
|
+
units: [
|
|
745
|
+
{
|
|
746
|
+
name: "CELLANA",
|
|
747
|
+
code: "CELL",
|
|
748
|
+
magnitude: 8,
|
|
749
|
+
},
|
|
750
|
+
],
|
|
751
|
+
};
|
|
752
|
+
}
|
|
753
|
+
return undefined;
|
|
754
|
+
},
|
|
755
|
+
getTokensSyncHash: async () => "0",
|
|
787
756
|
});
|
|
788
757
|
|
|
789
758
|
jest.mock("../../bridge/logic", () => ({
|
|
@@ -28,10 +28,6 @@ let mockedHex: jest.Mocked<any>;
|
|
|
28
28
|
jest.mock("@ledgerhq/live-network/network");
|
|
29
29
|
const mockedNetwork = jest.mocked(network);
|
|
30
30
|
|
|
31
|
-
jest.mock("@ledgerhq/cryptoassets/tokens", () => ({
|
|
32
|
-
findTokenByAddressInCurrency: jest.fn().mockReturnValue("token-name"),
|
|
33
|
-
}));
|
|
34
|
-
|
|
35
31
|
describe("Aptos API", () => {
|
|
36
32
|
beforeEach(() => {
|
|
37
33
|
mockedAptos = jest.mocked(Aptos);
|
package/src/bridge/logic.ts
CHANGED
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
isTokenAccount,
|
|
8
8
|
} from "@ledgerhq/coin-framework/account/index";
|
|
9
9
|
import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
10
|
-
import { getCryptoAssetsStore } from "@ledgerhq/
|
|
10
|
+
import { getCryptoAssetsStore } from "@ledgerhq/cryptoassets/state";
|
|
11
11
|
import {
|
|
12
12
|
APTOS_ASSET_ID,
|
|
13
13
|
OP_TYPE,
|