@ledgerhq/coin-aptos 3.5.0-nightly.1 → 3.5.0-nightly.2
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 -0
- package/lib/bridge/deviceTransactionConfig.d.ts +1 -1
- package/lib/bridge/deviceTransactionConfig.d.ts.map +1 -1
- package/lib/bridge/deviceTransactionConfig.js +1 -1
- package/lib/bridge/deviceTransactionConfig.js.map +1 -1
- package/lib/logic/craftTransaction.d.ts.map +1 -1
- package/lib/logic/craftTransaction.js +0 -8
- package/lib/logic/craftTransaction.js.map +1 -1
- package/lib-es/bridge/deviceTransactionConfig.d.ts +1 -1
- package/lib-es/bridge/deviceTransactionConfig.d.ts.map +1 -1
- package/lib-es/bridge/deviceTransactionConfig.js +1 -1
- package/lib-es/bridge/deviceTransactionConfig.js.map +1 -1
- package/lib-es/logic/craftTransaction.d.ts.map +1 -1
- package/lib-es/logic/craftTransaction.js +0 -8
- package/lib-es/logic/craftTransaction.js.map +1 -1
- package/package.json +7 -7
- package/src/__tests__/api/craftTransaction.unit.test.ts +0 -84
- package/src/__tests__/bridge/deviceTransactionConfig.test.ts +8 -8
- package/src/bridge/deviceTransactionConfig.ts +2 -2
- package/src/logic/craftTransaction.ts +0 -12
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @ledgerhq/coin-aptos@3.
|
|
2
|
+
> @ledgerhq/coin-aptos@3.5.0-nightly.1 build /home/runner/work/ledger-live/ledger-live/libs/coin-modules/coin-aptos
|
|
3
3
|
> tsc --outDir lib --module commonjs --moduleResolution node10 && tsc -m ES6 --outDir lib-es
|
|
4
4
|
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @ledgerhq/coin-aptos
|
|
2
2
|
|
|
3
|
+
## 3.5.0-nightly.2
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#12321](https://github.com/LedgerHQ/ledger-live/pull/12321) [`63e8f34`](https://github.com/LedgerHQ/ledger-live/commit/63e8f342f6b951ab77bb710b9971f033c05e579e) Thanks [@mcayuelas-ledger](https://github.com/mcayuelas-ledger)! - Bump axios version to 1.12.2
|
|
8
|
+
|
|
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
|
|
10
|
+
|
|
11
|
+
- [#12258](https://github.com/LedgerHQ/ledger-live/pull/12258) [`4790851`](https://github.com/LedgerHQ/ledger-live/commit/4790851e0566a33f2443dd84cf756d01b022de34) Thanks [@scavassa-yld](https://github.com/scavassa-yld)! - removing amount update during craftTransaction
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- Updated dependencies [[`63e8f34`](https://github.com/LedgerHQ/ledger-live/commit/63e8f342f6b951ab77bb710b9971f033c05e579e), [`3d4188a`](https://github.com/LedgerHQ/ledger-live/commit/3d4188a26021d33b950129d82cb55d2c2e8d4358)]:
|
|
16
|
+
- @ledgerhq/cryptoassets@13.32.0-nightly.1
|
|
17
|
+
- @ledgerhq/coin-framework@6.8.0-nightly.2
|
|
18
|
+
- @ledgerhq/live-network@2.1.0-nightly.0
|
|
19
|
+
- @ledgerhq/types-live@6.88.0-nightly.1
|
|
20
|
+
|
|
3
21
|
## 3.5.0-nightly.1
|
|
4
22
|
|
|
5
23
|
### Minor Changes
|
|
@@ -5,6 +5,6 @@ declare function getDeviceTransactionConfig({ account, parentAccount, transactio
|
|
|
5
5
|
account: AccountLike;
|
|
6
6
|
parentAccount: Account | null | undefined;
|
|
7
7
|
transaction: Transaction;
|
|
8
|
-
}): Array<DeviceTransactionField
|
|
8
|
+
}): Promise<Array<DeviceTransactionField>>;
|
|
9
9
|
export default getDeviceTransactionConfig;
|
|
10
10
|
//# sourceMappingURL=deviceTransactionConfig.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceTransactionConfig.d.ts","sourceRoot":"","sources":["../../src/bridge/deviceTransactionConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,IAAI,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAC1H,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAIvC,
|
|
1
|
+
{"version":3,"file":"deviceTransactionConfig.d.ts","sourceRoot":"","sources":["../../src/bridge/deviceTransactionConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,IAAI,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAC1H,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAIvC,iBAAe,0BAA0B,CAAC,EACxC,OAAO,EACP,aAAa,EACb,WAAW,GACZ,EAAE;IACD,OAAO,EAAE,WAAW,CAAC;IACrB,aAAa,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;IAC1C,WAAW,EAAE,WAAW,CAAC;CAC1B,GAAG,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAkFzC;AAED,eAAe,0BAA0B,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const formatCurrencyUnit_1 = require("@ledgerhq/coin-framework/currencies/formatCurrencyUnit");
|
|
4
4
|
const helpers_1 = require("@ledgerhq/coin-framework/account/helpers");
|
|
5
|
-
function getDeviceTransactionConfig({ account, parentAccount, transaction, }) {
|
|
5
|
+
async function getDeviceTransactionConfig({ account, parentAccount, transaction, }) {
|
|
6
6
|
const { mode } = transaction;
|
|
7
7
|
const fields = [];
|
|
8
8
|
const mainAccount = (0, helpers_1.getMainAccount)(account, parentAccount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceTransactionConfig.js","sourceRoot":"","sources":["../../src/bridge/deviceTransactionConfig.ts"],"names":[],"mappings":";;AAGA,+FAA4F;AAC5F,sEAA8F;AAE9F,
|
|
1
|
+
{"version":3,"file":"deviceTransactionConfig.js","sourceRoot":"","sources":["../../src/bridge/deviceTransactionConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.d.ts","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAE/F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAO3C,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,QAAQ,EACrB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,kBAAkB,CAAC,
|
|
1
|
+
{"version":3,"file":"craftTransaction.d.ts","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAE/F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAO3C,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,QAAQ,EACrB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,kBAAkB,CAAC,CA6B7B"}
|
|
@@ -36,7 +36,6 @@ async function craftTransaction(aptosClient, transactionIntent) {
|
|
|
36
36
|
newTx.amount = (0, bignumber_js_1.default)(transactionIntent.amount.toString());
|
|
37
37
|
newTx.recipient = transactionIntent.recipient;
|
|
38
38
|
newTx.mode = transactionIntent.type;
|
|
39
|
-
newTx.useAllAmount = transactionIntent.amount === BigInt(0);
|
|
40
39
|
const account = {
|
|
41
40
|
freshAddress: transactionIntent.sender,
|
|
42
41
|
xpub: transactionIntent.senderPublicKey,
|
|
@@ -45,13 +44,6 @@ async function craftTransaction(aptosClient, transactionIntent) {
|
|
|
45
44
|
let tokenType;
|
|
46
45
|
const contractAddress = getContractAddress(transactionIntent);
|
|
47
46
|
let balance;
|
|
48
|
-
if (newTx.useAllAmount === true) {
|
|
49
|
-
const balances = await aptosClient.getBalances(transactionIntent.sender);
|
|
50
|
-
balance = balances?.find(b => b.contractAddress.toLowerCase() === contractAddress?.toLowerCase());
|
|
51
|
-
if (balance !== undefined) {
|
|
52
|
-
newTx.amount = (0, bignumber_js_1.default)(balance.amount.toString());
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
47
|
if (transactionIntent.asset.type !== "native") {
|
|
56
48
|
tokenType = transactionIntent.asset.type;
|
|
57
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,uEAAmE;AACnE,4EAAoD;AACpD,gEAAqC;AACrC,4CAA+D;AAGxD,KAAK,UAAU,gBAAgB,CACpC,WAAqB,EACrB,iBAAoC;IAEpC,MAAM,KAAK,GAAG,IAAA,2BAAiB,GAAE,CAAC;IAClC,KAAK,CAAC,MAAM,GAAG,IAAA,sBAAS,EAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9D,KAAK,CAAC,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC;IAC9C,KAAK,CAAC,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,uEAAmE;AACnE,4EAAoD;AACpD,gEAAqC;AACrC,4CAA+D;AAGxD,KAAK,UAAU,gBAAgB,CACpC,WAAqB,EACrB,iBAAoC;IAEpC,MAAM,KAAK,GAAG,IAAA,2BAAiB,GAAE,CAAC;IAClC,KAAK,CAAC,MAAM,GAAG,IAAA,sBAAS,EAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9D,KAAK,CAAC,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC;IAC9C,KAAK,CAAC,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC;IAEpC,MAAM,OAAO,GAAG;QACd,YAAY,EAAE,iBAAiB,CAAC,MAAM;QACtC,IAAI,EAAE,iBAAiB,CAAC,eAAe;QACvC,WAAW,EAAE,IAAI,KAAK,EAAgB;KAC5B,CAAC;IAEb,IAAI,SAAiC,CAAC;IACtC,MAAM,eAAe,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;IAC9D,IAAI,OAAiC,CAAC;IAEtC,IAAI,iBAAiB,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9C,SAAS,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAkB,CAAC;IACzD,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,0BAAgB,EACpC,OAAO,EACP,KAAK,EACL,WAAW,EACX,eAAe,EACf,SAAS,IAAI,SAAS,CACvB,CAAC;IAEF,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC;AACxD,CAAC;AAhCD,4CAgCC;AAED,SAAS,kBAAkB,CAAC,QAA2B;IACrD,IACE,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ;QAChC,IAAA,8BAAW,EAAC,QAAQ,CAAC,KAAK,CAAC,IAAc,CAAC;QAC1C,gBAAgB,IAAI,QAAQ,CAAC,KAAK,EAClC,CAAC;QACD,OAAO,QAAQ,CAAC,KAAK,CAAC,cAAwB,CAAC;IACjD,CAAC;IAED,OAAO,0BAAc,CAAC;AACxB,CAAC"}
|
|
@@ -5,6 +5,6 @@ declare function getDeviceTransactionConfig({ account, parentAccount, transactio
|
|
|
5
5
|
account: AccountLike;
|
|
6
6
|
parentAccount: Account | null | undefined;
|
|
7
7
|
transaction: Transaction;
|
|
8
|
-
}): Array<DeviceTransactionField
|
|
8
|
+
}): Promise<Array<DeviceTransactionField>>;
|
|
9
9
|
export default getDeviceTransactionConfig;
|
|
10
10
|
//# sourceMappingURL=deviceTransactionConfig.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceTransactionConfig.d.ts","sourceRoot":"","sources":["../../src/bridge/deviceTransactionConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,IAAI,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAC1H,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAIvC,
|
|
1
|
+
{"version":3,"file":"deviceTransactionConfig.d.ts","sourceRoot":"","sources":["../../src/bridge/deviceTransactionConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,IAAI,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAC1H,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAIvC,iBAAe,0BAA0B,CAAC,EACxC,OAAO,EACP,aAAa,EACb,WAAW,GACZ,EAAE;IACD,OAAO,EAAE,WAAW,CAAC;IACrB,aAAa,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;IAC1C,WAAW,EAAE,WAAW,CAAC;CAC1B,GAAG,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAkFzC;AAED,eAAe,0BAA0B,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { formatCurrencyUnit } from "@ledgerhq/coin-framework/currencies/formatCurrencyUnit";
|
|
2
2
|
import { getAccountCurrency, getMainAccount } from "@ledgerhq/coin-framework/account/helpers";
|
|
3
|
-
function getDeviceTransactionConfig({ account, parentAccount, transaction, }) {
|
|
3
|
+
async function getDeviceTransactionConfig({ account, parentAccount, transaction, }) {
|
|
4
4
|
const { mode } = transaction;
|
|
5
5
|
const fields = [];
|
|
6
6
|
const mainAccount = getMainAccount(account, parentAccount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceTransactionConfig.js","sourceRoot":"","sources":["../../src/bridge/deviceTransactionConfig.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wDAAwD,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAE9F,
|
|
1
|
+
{"version":3,"file":"deviceTransactionConfig.js","sourceRoot":"","sources":["../../src/bridge/deviceTransactionConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.d.ts","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAE/F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAO3C,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,QAAQ,EACrB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,kBAAkB,CAAC,
|
|
1
|
+
{"version":3,"file":"craftTransaction.d.ts","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAE/F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAO3C,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,QAAQ,EACrB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,kBAAkB,CAAC,CA6B7B"}
|
|
@@ -7,7 +7,6 @@ export async function craftTransaction(aptosClient, transactionIntent) {
|
|
|
7
7
|
newTx.amount = BigNumber(transactionIntent.amount.toString());
|
|
8
8
|
newTx.recipient = transactionIntent.recipient;
|
|
9
9
|
newTx.mode = transactionIntent.type;
|
|
10
|
-
newTx.useAllAmount = transactionIntent.amount === BigInt(0);
|
|
11
10
|
const account = {
|
|
12
11
|
freshAddress: transactionIntent.sender,
|
|
13
12
|
xpub: transactionIntent.senderPublicKey,
|
|
@@ -16,13 +15,6 @@ export async function craftTransaction(aptosClient, transactionIntent) {
|
|
|
16
15
|
let tokenType;
|
|
17
16
|
const contractAddress = getContractAddress(transactionIntent);
|
|
18
17
|
let balance;
|
|
19
|
-
if (newTx.useAllAmount === true) {
|
|
20
|
-
const balances = await aptosClient.getBalances(transactionIntent.sender);
|
|
21
|
-
balance = balances?.find(b => b.contractAddress.toLowerCase() === contractAddress?.toLowerCase());
|
|
22
|
-
if (balance !== undefined) {
|
|
23
|
-
newTx.amount = BigNumber(balance.amount.toString());
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
18
|
if (transactionIntent.asset.type !== "native") {
|
|
27
19
|
tokenType = transactionIntent.asset.type;
|
|
28
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AAGA,OAAO,gBAAgB,EAAE,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,cAAc,EAAmB,MAAM,cAAc,CAAC;AAG/D,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,WAAqB,EACrB,iBAAoC;IAEpC,MAAM,KAAK,GAAG,iBAAiB,EAAE,CAAC;IAClC,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9D,KAAK,CAAC,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC;IAC9C,KAAK,CAAC,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AAGA,OAAO,gBAAgB,EAAE,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,cAAc,EAAmB,MAAM,cAAc,CAAC;AAG/D,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,WAAqB,EACrB,iBAAoC;IAEpC,MAAM,KAAK,GAAG,iBAAiB,EAAE,CAAC;IAClC,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9D,KAAK,CAAC,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC;IAC9C,KAAK,CAAC,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC;IAEpC,MAAM,OAAO,GAAG;QACd,YAAY,EAAE,iBAAiB,CAAC,MAAM;QACtC,IAAI,EAAE,iBAAiB,CAAC,eAAe;QACvC,WAAW,EAAE,IAAI,KAAK,EAAgB;KAC5B,CAAC;IAEb,IAAI,SAAiC,CAAC;IACtC,MAAM,eAAe,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;IAC9D,IAAI,OAAiC,CAAC;IAEtC,IAAI,iBAAiB,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9C,SAAS,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAkB,CAAC;IACzD,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,gBAAgB,CACpC,OAAO,EACP,KAAK,EACL,WAAW,EACX,eAAe,EACf,SAAS,IAAI,SAAS,CACvB,CAAC;IAEF,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC;AACxD,CAAC;AAED,SAAS,kBAAkB,CAAC,QAA2B;IACrD,IACE,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ;QAChC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAc,CAAC;QAC1C,gBAAgB,IAAI,QAAQ,CAAC,KAAK,EAClC,CAAC;QACD,OAAO,QAAQ,CAAC,KAAK,CAAC,cAAwB,CAAC;IACjD,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/coin-aptos",
|
|
3
|
-
"version": "3.5.0-nightly.
|
|
3
|
+
"version": "3.5.0-nightly.2",
|
|
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.8.0-nightly.
|
|
99
|
-
"@ledgerhq/cryptoassets": "^13.
|
|
98
|
+
"@ledgerhq/coin-framework": "^6.8.0-nightly.2",
|
|
99
|
+
"@ledgerhq/cryptoassets": "^13.32.0-nightly.1",
|
|
100
100
|
"@ledgerhq/devices": "8.6.2-nightly.0",
|
|
101
101
|
"@ledgerhq/errors": "^6.27.0-nightly.0",
|
|
102
102
|
"@ledgerhq/live-env": "^2.19.0",
|
|
103
|
-
"@ledgerhq/live-network": "^2.0.
|
|
103
|
+
"@ledgerhq/live-network": "^2.1.0-nightly.0",
|
|
104
104
|
"@ledgerhq/logs": "^6.13.0",
|
|
105
105
|
"@ledgerhq/types-cryptoassets": "^7.29.0",
|
|
106
|
-
"@ledgerhq/types-live": "^6.88.0-nightly.
|
|
106
|
+
"@ledgerhq/types-live": "^6.88.0-nightly.1"
|
|
107
107
|
},
|
|
108
108
|
"devDependencies": {
|
|
109
109
|
"@faker-js/faker": "^9.4.0",
|
|
@@ -111,11 +111,11 @@
|
|
|
111
111
|
"@types/jest": "^29.5.14",
|
|
112
112
|
"@types/lodash": "^4.17.14",
|
|
113
113
|
"@types/semver": "^7.5.8",
|
|
114
|
-
"axios": "1.
|
|
114
|
+
"axios": "1.12.2",
|
|
115
115
|
"jest": "^29.7.0",
|
|
116
116
|
"react": "18.3.1",
|
|
117
117
|
"ts-jest": "^29.2.5",
|
|
118
|
-
"@ledgerhq/disable-network-setup": "^0.0.0",
|
|
118
|
+
"@ledgerhq/disable-network-setup": "^0.1.0-nightly.0",
|
|
119
119
|
"@ledgerhq/types-cryptoassets": "^7.29.0"
|
|
120
120
|
},
|
|
121
121
|
"scripts": {
|
|
@@ -72,48 +72,6 @@ describe("craftTransaction", () => {
|
|
|
72
72
|
);
|
|
73
73
|
});
|
|
74
74
|
|
|
75
|
-
it("creates a native coin transaction using all amount available", async () => {
|
|
76
|
-
const mockGenerateTransaction = jest.fn().mockResolvedValue(rawTxn);
|
|
77
|
-
const mockGetBalances = jest
|
|
78
|
-
.fn()
|
|
79
|
-
.mockResolvedValue([{ contractAddress: APTOS_ASSET_ID, amount: 12345 }]);
|
|
80
|
-
mockedAptosApi.mockImplementation(() => ({
|
|
81
|
-
generateTransaction: mockGenerateTransaction,
|
|
82
|
-
getBalances: mockGetBalances,
|
|
83
|
-
}));
|
|
84
|
-
|
|
85
|
-
const api = createApi({
|
|
86
|
-
aptosSettings: {},
|
|
87
|
-
});
|
|
88
|
-
|
|
89
|
-
const txArg: TransactionIntent = {
|
|
90
|
-
intentType: "transaction",
|
|
91
|
-
type: "send",
|
|
92
|
-
sender: SENDER_ADDR,
|
|
93
|
-
senderPublicKey: "public-key",
|
|
94
|
-
recipient: RECIPIENT_ADDR,
|
|
95
|
-
amount: 0n,
|
|
96
|
-
asset: { type: "native" },
|
|
97
|
-
};
|
|
98
|
-
|
|
99
|
-
const { transaction: tx } = await api.craftTransaction(txArg);
|
|
100
|
-
|
|
101
|
-
expect(tx).not.toEqual("");
|
|
102
|
-
expect(Hex.isValid(tx).valid).toBeTruthy();
|
|
103
|
-
expect(mockGetBalances).toHaveBeenCalledTimes(1);
|
|
104
|
-
expect(mockGenerateTransaction).toHaveBeenCalledTimes(1);
|
|
105
|
-
|
|
106
|
-
expect(mockGenerateTransaction).toHaveBeenCalledWith(
|
|
107
|
-
SENDER_ADDR,
|
|
108
|
-
expect.objectContaining({
|
|
109
|
-
function: "0x1::aptos_account::transfer_coins",
|
|
110
|
-
typeArguments: [APTOS_ASSET_ID],
|
|
111
|
-
functionArguments: [RECIPIENT_ADDR, "12345"],
|
|
112
|
-
}),
|
|
113
|
-
expect.anything(),
|
|
114
|
-
);
|
|
115
|
-
});
|
|
116
|
-
|
|
117
75
|
it("creates a coin token transaction", async () => {
|
|
118
76
|
const mockGenerateTransaction = jest.fn().mockResolvedValue(rawTxn);
|
|
119
77
|
const mockGetBalances = jest
|
|
@@ -156,48 +114,6 @@ describe("craftTransaction", () => {
|
|
|
156
114
|
);
|
|
157
115
|
});
|
|
158
116
|
|
|
159
|
-
it("creates a fungible_asset token transaction using all amount available", async () => {
|
|
160
|
-
const mockGenerateTransaction = jest.fn().mockResolvedValue(rawTxn);
|
|
161
|
-
const mockGetBalances = jest
|
|
162
|
-
.fn()
|
|
163
|
-
.mockResolvedValue([{ contractAddress: "0x42", amount: 12345 }]);
|
|
164
|
-
mockedAptosApi.mockImplementation(() => ({
|
|
165
|
-
generateTransaction: mockGenerateTransaction,
|
|
166
|
-
getBalances: mockGetBalances,
|
|
167
|
-
}));
|
|
168
|
-
|
|
169
|
-
const api = createApi({
|
|
170
|
-
aptosSettings: {},
|
|
171
|
-
});
|
|
172
|
-
|
|
173
|
-
const txArg: TransactionIntent = {
|
|
174
|
-
intentType: "transaction",
|
|
175
|
-
type: "send",
|
|
176
|
-
sender: SENDER_ADDR,
|
|
177
|
-
senderPublicKey: "public-key",
|
|
178
|
-
recipient: RECIPIENT_ADDR,
|
|
179
|
-
amount: 0n,
|
|
180
|
-
asset: { type: "fungible_asset", assetReference: "0x42" },
|
|
181
|
-
};
|
|
182
|
-
|
|
183
|
-
const { transaction: tx } = await api.craftTransaction(txArg);
|
|
184
|
-
|
|
185
|
-
expect(tx).not.toEqual("");
|
|
186
|
-
expect(Hex.isValid(tx).valid).toBeTruthy();
|
|
187
|
-
expect(mockGetBalances).toHaveBeenCalledTimes(1);
|
|
188
|
-
expect(mockGenerateTransaction).toHaveBeenCalledTimes(1);
|
|
189
|
-
|
|
190
|
-
expect(mockGenerateTransaction).toHaveBeenCalledWith(
|
|
191
|
-
SENDER_ADDR,
|
|
192
|
-
expect.objectContaining({
|
|
193
|
-
function: "0x1::primary_fungible_store::transfer",
|
|
194
|
-
typeArguments: ["0x1::fungible_asset::Metadata"],
|
|
195
|
-
functionArguments: ["0x42", RECIPIENT_ADDR, "12345"],
|
|
196
|
-
}),
|
|
197
|
-
expect.anything(),
|
|
198
|
-
);
|
|
199
|
-
});
|
|
200
|
-
|
|
201
117
|
it("throws an exception for invalid tokenType", async () => {
|
|
202
118
|
const mockGenerateTransaction = jest.fn().mockResolvedValue(rawTxn);
|
|
203
119
|
const mockGetBalances = jest
|
|
@@ -6,14 +6,14 @@ import { APTOS_PRECISION } from "../../constants";
|
|
|
6
6
|
const nonBreakableSpace = " ";
|
|
7
7
|
|
|
8
8
|
describe("deviceTransactionConfig", () => {
|
|
9
|
-
test("coin transfer", () => {
|
|
9
|
+
test("coin transfer", async () => {
|
|
10
10
|
const account = createFixtureAccount();
|
|
11
11
|
const parentAccount = null;
|
|
12
12
|
const transaction = createFixtureTransaction({
|
|
13
13
|
amount: BigNumber(123).shiftedBy(APTOS_PRECISION),
|
|
14
14
|
fees: BigNumber(456),
|
|
15
15
|
});
|
|
16
|
-
const fields = getDeviceTransactionConfig({
|
|
16
|
+
const fields = await getDeviceTransactionConfig({
|
|
17
17
|
account,
|
|
18
18
|
parentAccount,
|
|
19
19
|
transaction,
|
|
@@ -33,7 +33,7 @@ describe("deviceTransactionConfig", () => {
|
|
|
33
33
|
]);
|
|
34
34
|
});
|
|
35
35
|
|
|
36
|
-
test("stake", () => {
|
|
36
|
+
test("stake", async () => {
|
|
37
37
|
const account = createFixtureAccount();
|
|
38
38
|
const parentAccount = null;
|
|
39
39
|
const transaction = createFixtureTransaction({
|
|
@@ -42,7 +42,7 @@ describe("deviceTransactionConfig", () => {
|
|
|
42
42
|
recipient: "delegator id",
|
|
43
43
|
mode: "stake",
|
|
44
44
|
});
|
|
45
|
-
const fields = getDeviceTransactionConfig({
|
|
45
|
+
const fields = await getDeviceTransactionConfig({
|
|
46
46
|
account,
|
|
47
47
|
parentAccount,
|
|
48
48
|
transaction,
|
|
@@ -67,7 +67,7 @@ describe("deviceTransactionConfig", () => {
|
|
|
67
67
|
]);
|
|
68
68
|
});
|
|
69
69
|
|
|
70
|
-
test("unstake", () => {
|
|
70
|
+
test("unstake", async () => {
|
|
71
71
|
const account = createFixtureAccount();
|
|
72
72
|
const parentAccount = null;
|
|
73
73
|
const transaction = createFixtureTransaction({
|
|
@@ -76,7 +76,7 @@ describe("deviceTransactionConfig", () => {
|
|
|
76
76
|
recipient: "delegator id",
|
|
77
77
|
mode: "unstake",
|
|
78
78
|
});
|
|
79
|
-
const fields = getDeviceTransactionConfig({
|
|
79
|
+
const fields = await getDeviceTransactionConfig({
|
|
80
80
|
account,
|
|
81
81
|
parentAccount,
|
|
82
82
|
transaction,
|
|
@@ -101,7 +101,7 @@ describe("deviceTransactionConfig", () => {
|
|
|
101
101
|
]);
|
|
102
102
|
});
|
|
103
103
|
|
|
104
|
-
test("unstake", () => {
|
|
104
|
+
test("unstake", async () => {
|
|
105
105
|
const account = createFixtureAccount();
|
|
106
106
|
const parentAccount = null;
|
|
107
107
|
const transaction = createFixtureTransaction({
|
|
@@ -109,7 +109,7 @@ describe("deviceTransactionConfig", () => {
|
|
|
109
109
|
fees: BigNumber(456),
|
|
110
110
|
mode: "withdraw",
|
|
111
111
|
});
|
|
112
|
-
const fields = getDeviceTransactionConfig({
|
|
112
|
+
const fields = await getDeviceTransactionConfig({
|
|
113
113
|
account,
|
|
114
114
|
parentAccount,
|
|
115
115
|
transaction,
|
|
@@ -4,7 +4,7 @@ import { Transaction } from "../types";
|
|
|
4
4
|
import { formatCurrencyUnit } from "@ledgerhq/coin-framework/currencies/formatCurrencyUnit";
|
|
5
5
|
import { getAccountCurrency, getMainAccount } from "@ledgerhq/coin-framework/account/helpers";
|
|
6
6
|
|
|
7
|
-
function getDeviceTransactionConfig({
|
|
7
|
+
async function getDeviceTransactionConfig({
|
|
8
8
|
account,
|
|
9
9
|
parentAccount,
|
|
10
10
|
transaction,
|
|
@@ -12,7 +12,7 @@ function getDeviceTransactionConfig({
|
|
|
12
12
|
account: AccountLike;
|
|
13
13
|
parentAccount: Account | null | undefined;
|
|
14
14
|
transaction: Transaction;
|
|
15
|
-
}): Array<DeviceTransactionField
|
|
15
|
+
}): Promise<Array<DeviceTransactionField>> {
|
|
16
16
|
const { mode } = transaction;
|
|
17
17
|
const fields: DeviceTransactionField[] = [];
|
|
18
18
|
const mainAccount = getMainAccount(account, parentAccount);
|
|
@@ -15,7 +15,6 @@ export async function craftTransaction(
|
|
|
15
15
|
newTx.amount = BigNumber(transactionIntent.amount.toString());
|
|
16
16
|
newTx.recipient = transactionIntent.recipient;
|
|
17
17
|
newTx.mode = transactionIntent.type;
|
|
18
|
-
newTx.useAllAmount = transactionIntent.amount === BigInt(0);
|
|
19
18
|
|
|
20
19
|
const account = {
|
|
21
20
|
freshAddress: transactionIntent.sender,
|
|
@@ -27,17 +26,6 @@ export async function craftTransaction(
|
|
|
27
26
|
const contractAddress = getContractAddress(transactionIntent);
|
|
28
27
|
let balance: AptosBalance | undefined;
|
|
29
28
|
|
|
30
|
-
if (newTx.useAllAmount === true) {
|
|
31
|
-
const balances = await aptosClient.getBalances(transactionIntent.sender);
|
|
32
|
-
balance = balances?.find(
|
|
33
|
-
b => b.contractAddress.toLowerCase() === contractAddress?.toLowerCase(),
|
|
34
|
-
);
|
|
35
|
-
|
|
36
|
-
if (balance !== undefined) {
|
|
37
|
-
newTx.amount = BigNumber(balance.amount.toString());
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
|
|
41
29
|
if (transactionIntent.asset.type !== "native") {
|
|
42
30
|
tokenType = transactionIntent.asset.type as TOKEN_TYPE;
|
|
43
31
|
}
|