@ledgerhq/coin-aptos 3.6.0 → 3.6.1-nightly.20251126023856
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 +13 -0
- package/lib/bridge/estimateMaxSpendable.js +1 -1
- package/lib/bridge/estimateMaxSpendable.js.map +1 -1
- package/lib/bridge/logic.d.ts +3 -3
- package/lib/bridge/logic.d.ts.map +1 -1
- package/lib/bridge/logic.js +12 -10
- package/lib/bridge/logic.js.map +1 -1
- package/lib/bridge/prepareTransaction.d.ts.map +1 -1
- package/lib/bridge/prepareTransaction.js +4 -2
- package/lib/bridge/prepareTransaction.js.map +1 -1
- package/lib-es/bridge/estimateMaxSpendable.js +1 -1
- package/lib-es/bridge/estimateMaxSpendable.js.map +1 -1
- package/lib-es/bridge/logic.d.ts +3 -3
- package/lib-es/bridge/logic.d.ts.map +1 -1
- package/lib-es/bridge/logic.js +11 -9
- package/lib-es/bridge/logic.js.map +1 -1
- package/lib-es/bridge/prepareTransaction.d.ts.map +1 -1
- package/lib-es/bridge/prepareTransaction.js +4 -2
- package/lib-es/bridge/prepareTransaction.js.map +1 -1
- package/package.json +6 -6
- package/src/__tests__/bridge/logic.test.ts +58 -89
- package/src/__tests__/network/client.test.ts +0 -4
- package/src/bridge/estimateMaxSpendable.ts +1 -1
- package/src/bridge/logic.ts +24 -13
- package/src/bridge/prepareTransaction.ts +4 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# @ledgerhq/coin-aptos
|
|
2
2
|
|
|
3
|
+
## 3.6.1-nightly.20251126023856
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#12899](https://github.com/LedgerHQ/ledger-live/pull/12899) [`d1d3173`](https://github.com/LedgerHQ/ledger-live/commit/d1d31730a72de4cfd56743b59a11f1efdf1553a1) Thanks [@semeano](https://github.com/semeano)! - Fix Aptos bridge integration test
|
|
8
|
+
|
|
9
|
+
- Updated dependencies [[`50aeea1`](https://github.com/LedgerHQ/ledger-live/commit/50aeea1233056e9abff9568eb928927f39e76cff), [`fe81926`](https://github.com/LedgerHQ/ledger-live/commit/fe81926afeb2df8e917e6bd1e4cbab13f09647fd), [`67137eb`](https://github.com/LedgerHQ/ledger-live/commit/67137eb5d7f04dd5f3610fdaa4e463d292654105), [`49ef24c`](https://github.com/LedgerHQ/ledger-live/commit/49ef24cbd1948bfd146af0b20f2128951b2dc170), [`b4a4e16`](https://github.com/LedgerHQ/ledger-live/commit/b4a4e160aae6fd64f944ab25633f6931dc4358d3), [`927ae64`](https://github.com/LedgerHQ/ledger-live/commit/927ae64db0bb04af54e25623655a001a68e0f2d3), [`903ea9c`](https://github.com/LedgerHQ/ledger-live/commit/903ea9cdacf704a0119de2803a4f409b775391a5), [`9251b77`](https://github.com/LedgerHQ/ledger-live/commit/9251b77fcb01709723842f19220a2a41a6fc8f3b), [`02ef98f`](https://github.com/LedgerHQ/ledger-live/commit/02ef98faeb13c182ef255e06a43c39abeb55ecc7), [`6d0c6b2`](https://github.com/LedgerHQ/ledger-live/commit/6d0c6b2eda60049d8eebda5de2c54e8f0be7d009), [`0d33751`](https://github.com/LedgerHQ/ledger-live/commit/0d33751bb2ae599d0d26ce6a8efdbe01757f12fb), [`aadcec6`](https://github.com/LedgerHQ/ledger-live/commit/aadcec66847b800f79452ba1df09149e0a1cb9e8), [`b113920`](https://github.com/LedgerHQ/ledger-live/commit/b11392056bc334fc1813c473569ad3ae7be08045), [`ed8532b`](https://github.com/LedgerHQ/ledger-live/commit/ed8532bad754ca2b5f1788c6e92f4646b775ec79), [`88a5018`](https://github.com/LedgerHQ/ledger-live/commit/88a501871d58c980f18495b5b32012a3eaa9ab2c), [`9659a34`](https://github.com/LedgerHQ/ledger-live/commit/9659a34d9998d5c4dff8618bf6cef7d16403680d)]:
|
|
10
|
+
- @ledgerhq/cryptoassets@13.34.0-nightly.20251126023856
|
|
11
|
+
- @ledgerhq/types-live@6.90.0-nightly.20251126023856
|
|
12
|
+
- @ledgerhq/coin-framework@6.10.0-nightly.20251126023856
|
|
13
|
+
- @ledgerhq/live-env@2.21.1-nightly.20251126023856
|
|
14
|
+
- @ledgerhq/live-network@2.1.2-nightly.20251126023856
|
|
15
|
+
|
|
3
16
|
## 3.6.0
|
|
4
17
|
|
|
5
18
|
### Minor Changes
|
|
@@ -16,7 +16,7 @@ const estimateMaxSpendable = async ({ account, parentAccount, transaction, }) =>
|
|
|
16
16
|
maxGasAmount = (0, bignumber_js_1.BigNumber)(estimate.maxGasAmount);
|
|
17
17
|
gasUnitPrice = (0, bignumber_js_1.BigNumber)(estimate.gasUnitPrice);
|
|
18
18
|
}
|
|
19
|
-
return (0, logic_1.getMaxSendBalance)(
|
|
19
|
+
return (0, logic_1.getMaxSendBalance)(account, parentAccount, maxGasAmount, gasUnitPrice);
|
|
20
20
|
};
|
|
21
21
|
exports.default = estimateMaxSpendable;
|
|
22
22
|
//# sourceMappingURL=estimateMaxSpendable.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":";;AACA,+CAAyC;AACzC,kEAAwE;AACxE,wCAAsC;AACtC,mEAA0D;AAC1D,mCAA4C;AAC5C,4CAA8D;AAG9D,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAClC,OAAO,EACP,aAAa,EACb,WAAW,GAKZ,EAAsB,EAAE;IACvB,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAE3D,MAAM,WAAW,GAAG,IAAI,kBAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAE1D,IAAI,YAAY,GAAG,IAAI,wBAAS,CAAC,uBAAW,CAAC,CAAC;IAC9C,IAAI,YAAY,GAAG,IAAI,wBAAS,CAAC,6BAAiB,CAAC,CAAC;IAEpD,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,uCAAe,EAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAElF,YAAY,GAAG,IAAA,wBAAS,EAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAChD,YAAY,GAAG,IAAA,wBAAS,EAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,IAAA,yBAAiB,EAAC,
|
|
1
|
+
{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":";;AACA,+CAAyC;AACzC,kEAAwE;AACxE,wCAAsC;AACtC,mEAA0D;AAC1D,mCAA4C;AAC5C,4CAA8D;AAG9D,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAClC,OAAO,EACP,aAAa,EACb,WAAW,GAKZ,EAAsB,EAAE;IACvB,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAE3D,MAAM,WAAW,GAAG,IAAI,kBAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAE1D,IAAI,YAAY,GAAG,IAAI,wBAAS,CAAC,uBAAW,CAAC,CAAC;IAC9C,IAAI,YAAY,GAAG,IAAI,wBAAS,CAAC,6BAAiB,CAAC,CAAC;IAEpD,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,uCAAe,EAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAElF,YAAY,GAAG,IAAA,wBAAS,EAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAChD,YAAY,GAAG,IAAA,wBAAS,EAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,IAAA,yBAAiB,EAAC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;AAC/E,CAAC,CAAC;AAEF,kBAAe,oBAAoB,CAAC"}
|
package/lib/bridge/logic.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import BigNumber from "bignumber.js";
|
|
2
|
-
import type { Account, Operation, TokenAccount } from "@ledgerhq/types-live";
|
|
3
|
-
import type { AptosTransaction, Transaction } from "../types";
|
|
4
|
-
export declare const getMaxSendBalance: (account:
|
|
2
|
+
import type { Account, AccountLike, Operation, TokenAccount } from "@ledgerhq/types-live";
|
|
3
|
+
import type { AptosAccount, AptosTransaction, Transaction } from "../types";
|
|
4
|
+
export declare const getMaxSendBalance: (account: AccountLike<AptosAccount>, parentAccount?: AptosAccount, gas?: BigNumber, gasPrice?: BigNumber) => BigNumber;
|
|
5
5
|
export declare const getBlankOperation: (tx: AptosTransaction, id: string) => Operation<Record<string, string>>;
|
|
6
6
|
export declare const txsToOps: (info: {
|
|
7
7
|
address: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../src/bridge/logic.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../src/bridge/logic.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,KAAK,EACV,OAAO,EACP,WAAW,EACX,SAAS,EAET,YAAY,EACb,MAAM,sBAAsB,CAAC;AAe9B,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAO5E,eAAO,MAAM,iBAAiB,YACnB,YAAY,YAAY,CAAC,kBAClB,YAAY,QACtB,SAAS,aACJ,SAAS,KACnB,SASF,CAAC;AAYF,eAAO,MAAM,iBAAiB,OACxB,gBAAgB,MAChB,MAAM,KACT,UAAU,OAAO,MAAM,EAAE,MAAM,CAAC,CAejC,CAAC;AAEH,eAAO,MAAM,QAAQ,SACb;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,MACrB,MAAM,OACL,CAAC,gBAAgB,GAAG,IAAI,CAAC,EAAE,KAC/B,QAAQ,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,CA8EjD,CAAC;AAEF,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,GACvB,YAAY,GAAG,SAAS,CAI1B"}
|
package/lib/bridge/logic.js
CHANGED
|
@@ -7,26 +7,28 @@ 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");
|
|
14
14
|
const calculateAmount_1 = require("../logic/calculateAmount");
|
|
15
15
|
const processRecipients_1 = require("../logic/processRecipients");
|
|
16
16
|
const getFunctionAddress_1 = require("../logic/getFunctionAddress");
|
|
17
|
-
const getMaxSendBalance = (account,
|
|
18
|
-
const tokenAccount = (0, index_1.findSubAccountById)(account, transaction?.subAccountId ?? "");
|
|
19
|
-
const fromTokenAccount = tokenAccount && (0, index_1.isTokenAccount)(tokenAccount);
|
|
17
|
+
const getMaxSendBalance = (account, parentAccount, gas, gasPrice) => {
|
|
20
18
|
gas = gas ?? (0, bignumber_js_1.default)(constants_1.DEFAULT_GAS);
|
|
21
19
|
gasPrice = gasPrice ?? (0, bignumber_js_1.default)(constants_1.DEFAULT_GAS_PRICE);
|
|
22
20
|
const totalGas = gas.multipliedBy(gasPrice);
|
|
23
|
-
return
|
|
24
|
-
?
|
|
25
|
-
: account
|
|
26
|
-
? account.spendableBalance.minus(totalGas)
|
|
27
|
-
: new bignumber_js_1.default(0);
|
|
21
|
+
return parentAccount
|
|
22
|
+
? getMaxSendBalanceFromTokenAccount(account, totalGas)
|
|
23
|
+
: getMaxSendBalanceFromAccount(account, totalGas);
|
|
28
24
|
};
|
|
29
25
|
exports.getMaxSendBalance = getMaxSendBalance;
|
|
26
|
+
const getMaxSendBalanceFromTokenAccount = (tokenAccount, totalGas) => tokenAccount.spendableBalance.gt(totalGas)
|
|
27
|
+
? tokenAccount.spendableBalance.minus(totalGas)
|
|
28
|
+
: new bignumber_js_1.default(0);
|
|
29
|
+
const getMaxSendBalanceFromAccount = (account, totalGas) => account.spendableBalance.gt(totalGas)
|
|
30
|
+
? account.spendableBalance.minus(totalGas)
|
|
31
|
+
: new bignumber_js_1.default(0);
|
|
30
32
|
const getBlankOperation = (tx, id) => ({
|
|
31
33
|
id: "",
|
|
32
34
|
hash: tx.hash,
|
|
@@ -85,7 +87,7 @@ const txsToOps = async (info, id, txs) => {
|
|
|
85
87
|
ops.push(op);
|
|
86
88
|
}
|
|
87
89
|
else {
|
|
88
|
-
const token = await (0,
|
|
90
|
+
const token = await (0, state_1.getCryptoAssetsStore)().findTokenByAddressInCurrency(coin_id.toLowerCase(), "aptos");
|
|
89
91
|
if (token !== undefined) {
|
|
90
92
|
const tokenAccountId = (0, index_1.encodeTokenAccountId)(id, token);
|
|
91
93
|
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;
|
|
1
|
+
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../src/bridge/logic.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AA8C1D,QAAA,MAAM,kBAAkB,YACb,YAAY,eACR,WAAW,KACvB,QAAQ,WAAW,CAoDrB,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|
|
@@ -9,6 +9,7 @@ const getFeesForTransaction_1 = require("./getFeesForTransaction");
|
|
|
9
9
|
const logic_1 = require("./logic");
|
|
10
10
|
const constants_1 = require("./../constants");
|
|
11
11
|
const staking_1 = require("../logic/staking");
|
|
12
|
+
const index_1 = require("@ledgerhq/coin-framework/account/index");
|
|
12
13
|
const checkSendConditions = (transaction, account) => transaction.mode === "send" && transaction.amount.gt(account.spendableBalance);
|
|
13
14
|
const checkStakeConditions = (transaction, account) => {
|
|
14
15
|
const txAmount = transaction.useAllAmount ? account.spendableBalance : transaction.amount;
|
|
@@ -50,9 +51,10 @@ const prepareTransaction = async (account, transaction) => {
|
|
|
50
51
|
};
|
|
51
52
|
}
|
|
52
53
|
const aptosClient = new network_1.AptosAPI(account.currency.id);
|
|
54
|
+
const tokenAccount = (0, index_1.findSubAccountById)(account, transaction?.subAccountId ?? "");
|
|
53
55
|
if (transaction.useAllAmount) {
|
|
54
56
|
if (transaction.mode === "send") {
|
|
55
|
-
transaction.amount = (0, logic_1.getMaxSendBalance)(account,
|
|
57
|
+
transaction.amount = (0, logic_1.getMaxSendBalance)(tokenAccount || account, account);
|
|
56
58
|
}
|
|
57
59
|
else if (transaction.mode === "restake" ||
|
|
58
60
|
transaction.mode === "unstake" ||
|
|
@@ -62,7 +64,7 @@ const prepareTransaction = async (account, transaction) => {
|
|
|
62
64
|
}
|
|
63
65
|
else if (transaction.mode === "stake") {
|
|
64
66
|
// Reserve a certain amount to cover future network fees to deactivate and withdraw
|
|
65
|
-
transaction.amount = (0, logic_1.getMaxSendBalance)(account,
|
|
67
|
+
transaction.amount = (0, logic_1.getMaxSendBalance)(tokenAccount || account, account).minus(constants_1.APTOS_DELEGATION_RESERVE_IN_OCTAS);
|
|
66
68
|
}
|
|
67
69
|
}
|
|
68
70
|
const { fees, estimate, errors } = await (0, getFeesForTransaction_1.getEstimatedGas)(account, transaction, aptosClient);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":";;;;;AAAA,gEAAqC;AAErC,wCAAsC;AACtC,mEAA0D;AAE1D,mCAA4C;AAC5C,8CAIwB;AACxB,8CAAgF;
|
|
1
|
+
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ const estimateMaxSpendable = async ({ account, parentAccount, transaction, }) =>
|
|
|
14
14
|
maxGasAmount = BigNumber(estimate.maxGasAmount);
|
|
15
15
|
gasUnitPrice = BigNumber(estimate.gasUnitPrice);
|
|
16
16
|
}
|
|
17
|
-
return getMaxSendBalance(
|
|
17
|
+
return getMaxSendBalance(account, parentAccount, maxGasAmount, gasUnitPrice);
|
|
18
18
|
};
|
|
19
19
|
export default estimateMaxSpendable;
|
|
20
20
|
//# sourceMappingURL=estimateMaxSpendable.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAG9D,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAClC,OAAO,EACP,aAAa,EACb,WAAW,GAKZ,EAAsB,EAAE;IACvB,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAE3D,MAAM,WAAW,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAE1D,IAAI,YAAY,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAC;IAC9C,IAAI,YAAY,GAAG,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAEpD,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAElF,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAChD,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAG9D,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAClC,OAAO,EACP,aAAa,EACb,WAAW,GAKZ,EAAsB,EAAE;IACvB,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAE3D,MAAM,WAAW,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAE1D,IAAI,YAAY,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAC;IAC9C,IAAI,YAAY,GAAG,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAEpD,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAElF,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAChD,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,iBAAiB,CAAC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;AAC/E,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
package/lib-es/bridge/logic.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import BigNumber from "bignumber.js";
|
|
2
|
-
import type { Account, Operation, TokenAccount } from "@ledgerhq/types-live";
|
|
3
|
-
import type { AptosTransaction, Transaction } from "../types";
|
|
4
|
-
export declare const getMaxSendBalance: (account:
|
|
2
|
+
import type { Account, AccountLike, Operation, TokenAccount } from "@ledgerhq/types-live";
|
|
3
|
+
import type { AptosAccount, AptosTransaction, Transaction } from "../types";
|
|
4
|
+
export declare const getMaxSendBalance: (account: AccountLike<AptosAccount>, parentAccount?: AptosAccount, gas?: BigNumber, gasPrice?: BigNumber) => BigNumber;
|
|
5
5
|
export declare const getBlankOperation: (tx: AptosTransaction, id: string) => Operation<Record<string, string>>;
|
|
6
6
|
export declare const txsToOps: (info: {
|
|
7
7
|
address: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../src/bridge/logic.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../src/bridge/logic.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,KAAK,EACV,OAAO,EACP,WAAW,EACX,SAAS,EAET,YAAY,EACb,MAAM,sBAAsB,CAAC;AAe9B,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAO5E,eAAO,MAAM,iBAAiB,YACnB,YAAY,YAAY,CAAC,kBAClB,YAAY,QACtB,SAAS,aACJ,SAAS,KACnB,SASF,CAAC;AAYF,eAAO,MAAM,iBAAiB,OACxB,gBAAgB,MAChB,MAAM,KACT,UAAU,OAAO,MAAM,EAAE,MAAM,CAAC,CAejC,CAAC;AAEH,eAAO,MAAM,QAAQ,SACb;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,MACrB,MAAM,OACL,CAAC,gBAAgB,GAAG,IAAI,CAAC,EAAE,KAC/B,QAAQ,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,CA8EjD,CAAC;AAEF,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,GACvB,YAAY,GAAG,SAAS,CAI1B"}
|
package/lib-es/bridge/logic.js
CHANGED
|
@@ -1,25 +1,27 @@
|
|
|
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";
|
|
8
8
|
import { calculateAmount } from "../logic/calculateAmount";
|
|
9
9
|
import { processRecipients } from "../logic/processRecipients";
|
|
10
10
|
import { getFunctionAddress } from "../logic/getFunctionAddress";
|
|
11
|
-
export const getMaxSendBalance = (account,
|
|
12
|
-
const tokenAccount = findSubAccountById(account, transaction?.subAccountId ?? "");
|
|
13
|
-
const fromTokenAccount = tokenAccount && isTokenAccount(tokenAccount);
|
|
11
|
+
export const getMaxSendBalance = (account, parentAccount, gas, gasPrice) => {
|
|
14
12
|
gas = gas ?? BigNumber(DEFAULT_GAS);
|
|
15
13
|
gasPrice = gasPrice ?? BigNumber(DEFAULT_GAS_PRICE);
|
|
16
14
|
const totalGas = gas.multipliedBy(gasPrice);
|
|
17
|
-
return
|
|
18
|
-
?
|
|
19
|
-
: account
|
|
20
|
-
? account.spendableBalance.minus(totalGas)
|
|
21
|
-
: new BigNumber(0);
|
|
15
|
+
return parentAccount
|
|
16
|
+
? getMaxSendBalanceFromTokenAccount(account, totalGas)
|
|
17
|
+
: getMaxSendBalanceFromAccount(account, totalGas);
|
|
22
18
|
};
|
|
19
|
+
const getMaxSendBalanceFromTokenAccount = (tokenAccount, totalGas) => tokenAccount.spendableBalance.gt(totalGas)
|
|
20
|
+
? tokenAccount.spendableBalance.minus(totalGas)
|
|
21
|
+
: new BigNumber(0);
|
|
22
|
+
const getMaxSendBalanceFromAccount = (account, totalGas) => account.spendableBalance.gt(totalGas)
|
|
23
|
+
? account.spendableBalance.minus(totalGas)
|
|
24
|
+
: new BigNumber(0);
|
|
23
25
|
export const getBlankOperation = (tx, id) => ({
|
|
24
26
|
id: "",
|
|
25
27
|
hash: tx.hash,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../src/bridge/logic.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../src/bridge/logic.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AASrC,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,OAAkC,EAClC,aAA4B,EAC5B,GAAe,EACf,QAAoB,EACT,EAAE;IACb,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,aAAa;QAClB,CAAC,CAAC,iCAAiC,CAAC,OAAuB,EAAE,QAAQ,CAAC;QACtE,CAAC,CAAC,4BAA4B,CAAC,OAAkB,EAAE,QAAQ,CAAC,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,iCAAiC,GAAG,CAAC,YAA0B,EAAE,QAAmB,EAAE,EAAE,CAC5F,YAAY,CAAC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,CAAC;IACxC,CAAC,CAAC,YAAY,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC/C,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;AAEvB,MAAM,4BAA4B,GAAG,CAAC,OAAgB,EAAE,QAAmB,EAAE,EAAE,CAC7E,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,CAAC;IACnC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC1C,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;AAEvB,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AA8C1D,QAAA,MAAM,kBAAkB,YACb,YAAY,eACR,WAAW,KACvB,QAAQ,WAAW,CAoDrB,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { getEstimatedGas } from "./getFeesForTransaction";
|
|
|
4
4
|
import { getMaxSendBalance } from "./logic";
|
|
5
5
|
import { APTOS_DELEGATION_RESERVE_IN_OCTAS, APTOS_MINIMUM_RESTAKE_IN_OCTAS, MIN_COINS_ON_SHARES_POOL_IN_OCTAS, } from "./../constants";
|
|
6
6
|
import { getDelegationOpMaxAmount, getStakingPosition } from "../logic/staking";
|
|
7
|
+
import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
|
|
7
8
|
const checkSendConditions = (transaction, account) => transaction.mode === "send" && transaction.amount.gt(account.spendableBalance);
|
|
8
9
|
const checkStakeConditions = (transaction, account) => {
|
|
9
10
|
const txAmount = transaction.useAllAmount ? account.spendableBalance : transaction.amount;
|
|
@@ -45,9 +46,10 @@ const prepareTransaction = async (account, transaction) => {
|
|
|
45
46
|
};
|
|
46
47
|
}
|
|
47
48
|
const aptosClient = new AptosAPI(account.currency.id);
|
|
49
|
+
const tokenAccount = findSubAccountById(account, transaction?.subAccountId ?? "");
|
|
48
50
|
if (transaction.useAllAmount) {
|
|
49
51
|
if (transaction.mode === "send") {
|
|
50
|
-
transaction.amount = getMaxSendBalance(account,
|
|
52
|
+
transaction.amount = getMaxSendBalance(tokenAccount || account, account);
|
|
51
53
|
}
|
|
52
54
|
else if (transaction.mode === "restake" ||
|
|
53
55
|
transaction.mode === "unstake" ||
|
|
@@ -57,7 +59,7 @@ const prepareTransaction = async (account, transaction) => {
|
|
|
57
59
|
}
|
|
58
60
|
else if (transaction.mode === "stake") {
|
|
59
61
|
// Reserve a certain amount to cover future network fees to deactivate and withdraw
|
|
60
|
-
transaction.amount = getMaxSendBalance(account,
|
|
62
|
+
transaction.amount = getMaxSendBalance(tokenAccount || account, account).minus(APTOS_DELEGATION_RESERVE_IN_OCTAS);
|
|
61
63
|
}
|
|
62
64
|
}
|
|
63
65
|
const { fees, estimate, errors } = await getEstimatedGas(account, transaction, aptosClient);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EACL,iCAAiC,EACjC,8BAA8B,EAC9B,iCAAiC,GAClC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EACL,iCAAiC,EACjC,8BAA8B,EAC9B,iCAAiC,GAClC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAE5E,MAAM,mBAAmB,GAAG,CAAC,WAAwB,EAAE,OAAqB,EAAE,EAAE,CAC9E,WAAW,CAAC,IAAI,KAAK,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAEjF,MAAM,oBAAoB,GAAG,CAAC,WAAwB,EAAE,OAAqB,EAAE,EAAE;IAC/E,MAAM,QAAQ,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;IAC1F,MAAM,eAAe,GAAG,OAAO,CAAC,cAAc,EAAE,gBAAgB;QAC9D,EAAE,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC,WAAW,KAAK,WAAW,CAAC,SAAS,CAAC;QAChF,EAAE,MAAM,CAAC,EAAE,CAAC,iCAAiC,CAAC,CAAC;IACjD,MAAM,cAAc,GAAG,eAAe;QACpC,CAAC,CAAC,8BAA8B;QAChC,CAAC,CAAC,iCAAiC,CAAC;IAEtC,OAAO,CACL,WAAW,CAAC,IAAI,KAAK,OAAO;QAC5B,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,QAAQ,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CACvE,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,WAAwB,EAAE,OAAqB,EAAE,EAAE;IACjF,MAAM,eAAe,GAAG,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,EAAE,eAAe,IAAI,CAAC,CAAC;IAEjG,OAAO,WAAW,CAAC,IAAI,KAAK,SAAS,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;AAClF,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,WAAwB,EAAE,OAAqB,EAAE,EAAE;IACjF,MAAM,eAAe,GAAG,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC;IAExF,OAAO,WAAW,CAAC,IAAI,KAAK,SAAS,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;AAClF,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,WAAwB,EAAE,OAAqB,EAAE,EAAE;IAClF,MAAM,eAAe,GAAG,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,EAAE,QAAQ,IAAI,CAAC,CAAC;IAE1F,OAAO,WAAW,CAAC,IAAI,KAAK,UAAU,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;AACnF,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,KAAK,EAC9B,OAAqB,EACrB,WAAwB,EACF,EAAE;IACxB,IACE,CAAC,WAAW,CAAC,SAAS;QACtB,mBAAmB,CAAC,WAAW,EAAE,OAAO,CAAC;QACzC,oBAAoB,CAAC,WAAW,EAAE,OAAO,CAAC;QAC1C,sBAAsB,CAAC,WAAW,EAAE,OAAO,CAAC;QAC5C,sBAAsB,CAAC,WAAW,EAAE,OAAO,CAAC;QAC5C,uBAAuB,CAAC,WAAW,EAAE,OAAO,CAAC;QAE7C,OAAO,WAAW,CAAC;IAErB,iFAAiF;IACjF,gGAAgG;IAChG,IAAI,CAAC,WAAW,CAAC,YAAY,IAAI,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QAC7D,OAAO;YACL,GAAG,WAAW;YACd,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC;IAElF,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7B,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAChC,WAAW,CAAC,MAAM,GAAG,iBAAiB,CAAC,YAAY,IAAI,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3E,CAAC;aAAM,IACL,WAAW,CAAC,IAAI,KAAK,SAAS;YAC9B,WAAW,CAAC,IAAI,KAAK,SAAS;YAC9B,WAAW,CAAC,IAAI,KAAK,UAAU,EAC/B,CAAC;YACD,mFAAmF;YACnF,WAAW,CAAC,MAAM,GAAG,wBAAwB,CAC3C,OAAO,EACP,WAAW,CAAC,SAAS,EACrB,WAAW,CAAC,IAAI,CACjB,CAAC;QACJ,CAAC;aAAM,IAAI,WAAW,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACxC,mFAAmF;YACnF,WAAW,CAAC,MAAM,GAAG,iBAAiB,CAAC,YAAY,IAAI,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAC5E,iCAAiC,CAClC,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAE5F,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC;IACxB,WAAW,CAAC,OAAO,GAAG,QAAQ,CAAC;IAC/B,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC;IAE5B,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/coin-aptos",
|
|
3
|
-
"version": "3.6.
|
|
3
|
+
"version": "3.6.1-nightly.20251126023856",
|
|
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.
|
|
99
|
-
"@ledgerhq/cryptoassets": "^13.
|
|
98
|
+
"@ledgerhq/coin-framework": "^6.10.0-nightly.20251126023856",
|
|
99
|
+
"@ledgerhq/cryptoassets": "^13.34.0-nightly.20251126023856",
|
|
100
100
|
"@ledgerhq/devices": "8.7.0",
|
|
101
101
|
"@ledgerhq/errors": "^6.27.0",
|
|
102
|
-
"@ledgerhq/live-env": "^2.21.
|
|
103
|
-
"@ledgerhq/live-network": "^2.1.
|
|
102
|
+
"@ledgerhq/live-env": "^2.21.1-nightly.20251126023856",
|
|
103
|
+
"@ledgerhq/live-network": "^2.1.2-nightly.20251126023856",
|
|
104
104
|
"@ledgerhq/logs": "^6.13.0",
|
|
105
105
|
"@ledgerhq/types-cryptoassets": "^7.30.0",
|
|
106
|
-
"@ledgerhq/types-live": "^6.
|
|
106
|
+
"@ledgerhq/types-live": "^6.90.0-nightly.20251126023856"
|
|
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", () => {
|
|
@@ -20,7 +22,7 @@ describe("Aptos logic ", () => {
|
|
|
20
22
|
const transaction = createFixtureTransaction();
|
|
21
23
|
const gas = new BigNumber(200);
|
|
22
24
|
const gasPrice = new BigNumber(100);
|
|
23
|
-
const result = getMaxSendBalance(account,
|
|
25
|
+
const result = getMaxSendBalance(account, undefined, gas, gasPrice);
|
|
24
26
|
expect(result.isEqualTo(amount.minus(gas.multipliedBy(gasPrice)))).toBe(true);
|
|
25
27
|
});
|
|
26
28
|
|
|
@@ -29,7 +31,7 @@ describe("Aptos logic ", () => {
|
|
|
29
31
|
const transaction = createFixtureTransaction();
|
|
30
32
|
const gas = new BigNumber(200);
|
|
31
33
|
const gasPrice = new BigNumber(100);
|
|
32
|
-
const result = getMaxSendBalance(account,
|
|
34
|
+
const result = getMaxSendBalance(account, undefined, gas, gasPrice);
|
|
33
35
|
expect(result.isEqualTo(new BigNumber(0))).toBe(true);
|
|
34
36
|
});
|
|
35
37
|
|
|
@@ -38,7 +40,7 @@ describe("Aptos logic ", () => {
|
|
|
38
40
|
const transaction = createFixtureTransaction();
|
|
39
41
|
const gas = new BigNumber(200);
|
|
40
42
|
const gasPrice = new BigNumber(100);
|
|
41
|
-
const result = getMaxSendBalance(account,
|
|
43
|
+
const result = getMaxSendBalance(account, undefined, gas, gasPrice);
|
|
42
44
|
expect(result.isEqualTo(new BigNumber(0))).toBe(true);
|
|
43
45
|
});
|
|
44
46
|
|
|
@@ -47,7 +49,7 @@ describe("Aptos logic ", () => {
|
|
|
47
49
|
const transaction = createFixtureTransaction();
|
|
48
50
|
const gas = new BigNumber(200);
|
|
49
51
|
const gasPrice = new BigNumber(100);
|
|
50
|
-
const result = getMaxSendBalance(account,
|
|
52
|
+
const result = getMaxSendBalance(account, undefined, gas, gasPrice);
|
|
51
53
|
expect(result.isEqualTo(new BigNumber(0))).toBe(true);
|
|
52
54
|
});
|
|
53
55
|
|
|
@@ -57,7 +59,7 @@ describe("Aptos logic ", () => {
|
|
|
57
59
|
const transaction = createFixtureTransaction();
|
|
58
60
|
const gas = new BigNumber(0);
|
|
59
61
|
const gasPrice = new BigNumber(0);
|
|
60
|
-
const result = getMaxSendBalance(account,
|
|
62
|
+
const result = getMaxSendBalance(account, undefined, gas, gasPrice);
|
|
61
63
|
expect(result.isEqualTo(amount)).toBe(true);
|
|
62
64
|
});
|
|
63
65
|
});
|
|
@@ -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);
|
|
@@ -30,7 +30,7 @@ const estimateMaxSpendable = async ({
|
|
|
30
30
|
gasUnitPrice = BigNumber(estimate.gasUnitPrice);
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
return getMaxSendBalance(
|
|
33
|
+
return getMaxSendBalance(account, parentAccount, maxGasAmount, gasUnitPrice);
|
|
34
34
|
};
|
|
35
35
|
|
|
36
36
|
export default estimateMaxSpendable;
|
package/src/bridge/logic.ts
CHANGED
|
@@ -1,13 +1,19 @@
|
|
|
1
1
|
import BigNumber from "bignumber.js";
|
|
2
2
|
import { EntryFunctionPayloadResponse } from "@aptos-labs/ts-sdk";
|
|
3
|
-
import type {
|
|
3
|
+
import type {
|
|
4
|
+
Account,
|
|
5
|
+
AccountLike,
|
|
6
|
+
Operation,
|
|
7
|
+
OperationType,
|
|
8
|
+
TokenAccount,
|
|
9
|
+
} from "@ledgerhq/types-live";
|
|
4
10
|
import {
|
|
5
11
|
encodeTokenAccountId,
|
|
6
12
|
findSubAccountById,
|
|
7
13
|
isTokenAccount,
|
|
8
14
|
} from "@ledgerhq/coin-framework/account/index";
|
|
9
15
|
import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
10
|
-
import { getCryptoAssetsStore } from "@ledgerhq/
|
|
16
|
+
import { getCryptoAssetsStore } from "@ledgerhq/cryptoassets/state";
|
|
11
17
|
import {
|
|
12
18
|
APTOS_ASSET_ID,
|
|
13
19
|
OP_TYPE,
|
|
@@ -15,7 +21,7 @@ import {
|
|
|
15
21
|
DEFAULT_GAS_PRICE,
|
|
16
22
|
APTOS_ASSET_FUNGIBLE_ID,
|
|
17
23
|
} from "../constants";
|
|
18
|
-
import type { AptosTransaction, Transaction } from "../types";
|
|
24
|
+
import type { AptosAccount, AptosTransaction, Transaction } from "../types";
|
|
19
25
|
import { convertFunctionPayloadResponseToInputEntryFunctionData } from "../logic/transactionsToOperations";
|
|
20
26
|
import { compareAddress, getCoinAndAmounts } from "../logic/getCoinAndAmounts";
|
|
21
27
|
import { calculateAmount } from "../logic/calculateAmount";
|
|
@@ -23,26 +29,31 @@ import { processRecipients } from "../logic/processRecipients";
|
|
|
23
29
|
import { getFunctionAddress } from "../logic/getFunctionAddress";
|
|
24
30
|
|
|
25
31
|
export const getMaxSendBalance = (
|
|
26
|
-
account:
|
|
27
|
-
|
|
32
|
+
account: AccountLike<AptosAccount>,
|
|
33
|
+
parentAccount?: AptosAccount,
|
|
28
34
|
gas?: BigNumber,
|
|
29
35
|
gasPrice?: BigNumber,
|
|
30
36
|
): BigNumber => {
|
|
31
|
-
const tokenAccount = findSubAccountById(account, transaction?.subAccountId ?? "");
|
|
32
|
-
const fromTokenAccount = tokenAccount && isTokenAccount(tokenAccount);
|
|
33
|
-
|
|
34
37
|
gas = gas ?? BigNumber(DEFAULT_GAS);
|
|
35
38
|
gasPrice = gasPrice ?? BigNumber(DEFAULT_GAS_PRICE);
|
|
36
39
|
|
|
37
40
|
const totalGas = gas.multipliedBy(gasPrice);
|
|
38
41
|
|
|
39
|
-
return
|
|
40
|
-
?
|
|
41
|
-
: account
|
|
42
|
-
? account.spendableBalance.minus(totalGas)
|
|
43
|
-
: new BigNumber(0);
|
|
42
|
+
return parentAccount
|
|
43
|
+
? getMaxSendBalanceFromTokenAccount(account as TokenAccount, totalGas)
|
|
44
|
+
: getMaxSendBalanceFromAccount(account as Account, totalGas);
|
|
44
45
|
};
|
|
45
46
|
|
|
47
|
+
const getMaxSendBalanceFromTokenAccount = (tokenAccount: TokenAccount, totalGas: BigNumber) =>
|
|
48
|
+
tokenAccount.spendableBalance.gt(totalGas)
|
|
49
|
+
? tokenAccount.spendableBalance.minus(totalGas)
|
|
50
|
+
: new BigNumber(0);
|
|
51
|
+
|
|
52
|
+
const getMaxSendBalanceFromAccount = (account: Account, totalGas: BigNumber) =>
|
|
53
|
+
account.spendableBalance.gt(totalGas)
|
|
54
|
+
? account.spendableBalance.minus(totalGas)
|
|
55
|
+
: new BigNumber(0);
|
|
56
|
+
|
|
46
57
|
export const getBlankOperation = (
|
|
47
58
|
tx: AptosTransaction,
|
|
48
59
|
id: string,
|
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
MIN_COINS_ON_SHARES_POOL_IN_OCTAS,
|
|
11
11
|
} from "./../constants";
|
|
12
12
|
import { getDelegationOpMaxAmount, getStakingPosition } from "../logic/staking";
|
|
13
|
+
import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
|
|
13
14
|
|
|
14
15
|
const checkSendConditions = (transaction: Transaction, account: AptosAccount) =>
|
|
15
16
|
transaction.mode === "send" && transaction.amount.gt(account.spendableBalance);
|
|
@@ -71,10 +72,11 @@ const prepareTransaction = async (
|
|
|
71
72
|
}
|
|
72
73
|
|
|
73
74
|
const aptosClient = new AptosAPI(account.currency.id);
|
|
75
|
+
const tokenAccount = findSubAccountById(account, transaction?.subAccountId ?? "");
|
|
74
76
|
|
|
75
77
|
if (transaction.useAllAmount) {
|
|
76
78
|
if (transaction.mode === "send") {
|
|
77
|
-
transaction.amount = getMaxSendBalance(account,
|
|
79
|
+
transaction.amount = getMaxSendBalance(tokenAccount || account, account);
|
|
78
80
|
} else if (
|
|
79
81
|
transaction.mode === "restake" ||
|
|
80
82
|
transaction.mode === "unstake" ||
|
|
@@ -88,7 +90,7 @@ const prepareTransaction = async (
|
|
|
88
90
|
);
|
|
89
91
|
} else if (transaction.mode === "stake") {
|
|
90
92
|
// Reserve a certain amount to cover future network fees to deactivate and withdraw
|
|
91
|
-
transaction.amount = getMaxSendBalance(account,
|
|
93
|
+
transaction.amount = getMaxSendBalance(tokenAccount || account, account).minus(
|
|
92
94
|
APTOS_DELEGATION_RESERVE_IN_OCTAS,
|
|
93
95
|
);
|
|
94
96
|
}
|