@ledgerhq/coin-aptos 2.2.0-next.1 → 2.2.0-nightly.1
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 +9 -15
- package/lib/__tests__/api/craftTransaction.unit.test.js +16 -31
- package/lib/__tests__/api/craftTransaction.unit.test.js.map +1 -1
- package/lib/__tests__/api/getBalance.unit.test.js +68 -28
- package/lib/__tests__/api/getBalance.unit.test.js.map +1 -1
- package/lib/__tests__/api/index.integ.test.js +30 -11
- package/lib/__tests__/api/index.integ.test.js.map +1 -1
- package/lib/__tests__/api/index.test.js.map +1 -1
- package/lib/__tests__/bridge/synchronisation.test.js +15 -6
- package/lib/__tests__/bridge/synchronisation.test.js.map +1 -1
- package/lib/__tests__/logic/getBalances.test.d.ts +2 -0
- package/lib/__tests__/logic/getBalances.test.d.ts.map +1 -0
- package/lib/__tests__/logic/getBalances.test.js +63 -0
- package/lib/__tests__/logic/getBalances.test.js.map +1 -0
- package/lib/__tests__/network/client.test.js +69 -66
- package/lib/__tests__/network/client.test.js.map +1 -1
- package/lib/api/index.d.ts +3 -3
- package/lib/api/index.d.ts.map +1 -1
- package/lib/api/index.js +2 -2
- package/lib/api/index.js.map +1 -1
- package/lib/bridge/synchronisation.d.ts.map +1 -1
- package/lib/bridge/synchronisation.js +7 -2
- package/lib/bridge/synchronisation.js.map +1 -1
- package/lib/logic/craftTransaction.d.ts +2 -2
- package/lib/logic/craftTransaction.d.ts.map +1 -1
- package/lib/logic/craftTransaction.js +3 -3
- package/lib/logic/craftTransaction.js.map +1 -1
- package/lib/logic/getBalances.d.ts +5 -0
- package/lib/logic/getBalances.d.ts.map +1 -0
- package/lib/logic/getBalances.js +21 -0
- package/lib/logic/getBalances.js.map +1 -0
- package/lib/network/client.d.ts +3 -7
- package/lib/network/client.d.ts.map +1 -1
- package/lib/network/client.js +28 -62
- package/lib/network/client.js.map +1 -1
- package/lib/types/assets.d.ts +0 -4
- package/lib/types/assets.d.ts.map +1 -1
- package/lib-es/__tests__/api/craftTransaction.unit.test.js +16 -31
- package/lib-es/__tests__/api/craftTransaction.unit.test.js.map +1 -1
- package/lib-es/__tests__/api/getBalance.unit.test.js +69 -26
- package/lib-es/__tests__/api/getBalance.unit.test.js.map +1 -1
- package/lib-es/__tests__/api/index.integ.test.js +30 -11
- package/lib-es/__tests__/api/index.integ.test.js.map +1 -1
- package/lib-es/__tests__/api/index.test.js.map +1 -1
- package/lib-es/__tests__/bridge/synchronisation.test.js +15 -6
- package/lib-es/__tests__/bridge/synchronisation.test.js.map +1 -1
- package/lib-es/__tests__/logic/getBalances.test.d.ts +2 -0
- package/lib-es/__tests__/logic/getBalances.test.d.ts.map +1 -0
- package/lib-es/__tests__/logic/getBalances.test.js +61 -0
- package/lib-es/__tests__/logic/getBalances.test.js.map +1 -0
- package/lib-es/__tests__/network/client.test.js +69 -66
- package/lib-es/__tests__/network/client.test.js.map +1 -1
- package/lib-es/api/index.d.ts +3 -3
- package/lib-es/api/index.d.ts.map +1 -1
- package/lib-es/api/index.js +2 -2
- package/lib-es/api/index.js.map +1 -1
- package/lib-es/bridge/synchronisation.d.ts.map +1 -1
- package/lib-es/bridge/synchronisation.js +4 -2
- package/lib-es/bridge/synchronisation.js.map +1 -1
- package/lib-es/logic/craftTransaction.d.ts +2 -2
- package/lib-es/logic/craftTransaction.d.ts.map +1 -1
- package/lib-es/logic/craftTransaction.js +3 -3
- package/lib-es/logic/craftTransaction.js.map +1 -1
- package/lib-es/logic/getBalances.d.ts +5 -0
- package/lib-es/logic/getBalances.d.ts.map +1 -0
- package/lib-es/logic/getBalances.js +17 -0
- package/lib-es/logic/getBalances.js.map +1 -0
- package/lib-es/network/client.d.ts +3 -7
- package/lib-es/network/client.d.ts.map +1 -1
- package/lib-es/network/client.js +28 -62
- package/lib-es/network/client.js.map +1 -1
- package/lib-es/types/assets.d.ts +0 -4
- package/lib-es/types/assets.d.ts.map +1 -1
- package/package.json +6 -6
- package/src/__tests__/api/craftTransaction.unit.test.ts +23 -38
- package/src/__tests__/api/getBalance.unit.test.ts +82 -28
- package/src/__tests__/api/index.integ.test.ts +36 -15
- package/src/__tests__/api/index.test.ts +4 -6
- package/src/__tests__/bridge/synchronisation.test.ts +21 -6
- package/src/__tests__/logic/getBalances.test.ts +80 -0
- package/src/__tests__/network/client.test.ts +83 -89
- package/src/api/index.ts +6 -8
- package/src/bridge/synchronisation.ts +4 -2
- package/src/logic/craftTransaction.ts +6 -8
- package/src/logic/getBalances.ts +27 -0
- package/src/network/client.ts +31 -74
- package/src/types/assets.ts +0 -5
- package/lib/logic/getBalance.d.ts +0 -5
- package/lib/logic/getBalance.d.ts.map +0 -1
- package/lib/logic/getBalance.js +0 -12
- package/lib/logic/getBalance.js.map +0 -1
- package/lib-es/logic/getBalance.d.ts +0 -5
- package/lib-es/logic/getBalance.d.ts.map +0 -1
- package/lib-es/logic/getBalance.js +0 -8
- package/lib-es/logic/getBalance.js.map +0 -1
- package/src/logic/getBalance.ts +0 -15
package/lib/api/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;;AAGA,uDAAmC;AAEnC,wCAAsC;AACtC,8CAA2C;AAC3C,gEAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;;AAGA,uDAAmC;AAEnC,wCAAsC;AACtC,8CAA2C;AAC3C,gEAA6D;AAC7D,sDAAmD;AAEnD,SAAgB,SAAS,CAAC,MAAsB;IAC9C,gBAAU,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IAE5E,MAAM,MAAM,GAAG,IAAI,kBAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAElD,OAAO;QACL,SAAS,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC/C,OAAO,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAU,EAAE,CAAC,IAAA,iBAAO,EAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC;QAC1E,gBAAgB,EAAE,CAAC,iBAAiB,EAAE,WAAW,EAAmB,EAAE,CACpE,IAAA,mCAAgB,EAAC,MAAM,EAAE,iBAAiB,CAAC;QAC7C,YAAY,EAAE,CAAC,iBAAgD,EAAE,EAAE,CACjE,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC;QACxC,UAAU,EAAE,CAAC,OAAO,EAAkC,EAAE,CAAC,IAAA,yBAAW,EAAC,MAAM,EAAE,OAAO,CAAC;QACrF,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE;QACtC,cAAc,EAAE,CAAC,OAAe,EAAE,UAAsB,EAAE,EAAE,CAC1D,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC;KAC7C,CAAC;AACJ,CAAC;AAjBD,8BAiBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAKjF,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAM7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAKjF,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAM7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAa7E;;GAEG;AACH,eAAO,MAAM,gBAAgB,mBACX,OAAO,GAAG,SAAS,kBACnB,YAAY,EAAE,KAC7B,MAAM,YAAY,CAwDpB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,aACnB,cAAc,WACf,MAAM,YACL,MAAM,SACT,aAAa,cACR,SAAS,EAAE,KACtB,QAAQ,YAAY,CAuBtB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,UAClB,iBAAiB,OAAO,CAAC,WACvB,MAAM,aACJ,MAAM,uBACI,SAAS,EAAE,KAC/B,QAAQ,YAAY,EAAE,CAyBxB,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,eA0D7B,CAAC"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.getAccountShape = exports.getSubAccounts = exports.getSubAccountShape = exports.mergeSubAccounts = void 0;
|
|
4
7
|
const index_1 = require("@ledgerhq/coin-framework/serialization/index");
|
|
@@ -7,6 +10,7 @@ const jsHelpers_1 = require("@ledgerhq/coin-framework/bridge/jsHelpers");
|
|
|
7
10
|
const network_1 = require("../network");
|
|
8
11
|
const logic_1 = require("./logic");
|
|
9
12
|
const index_2 = require("@ledgerhq/coin-framework/account/index");
|
|
13
|
+
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
10
14
|
/**
|
|
11
15
|
* List of properties of a sub account that can be updated when 2 "identical" accounts are found
|
|
12
16
|
*/
|
|
@@ -52,7 +56,7 @@ const mergeSubAccounts = (initialAccount, newSubAccounts) => {
|
|
|
52
56
|
}
|
|
53
57
|
else {
|
|
54
58
|
updates[name] =
|
|
55
|
-
(0, jsHelpers_1.mergeOps)(duplicatedAccount[name], newSubAccount[name])
|
|
59
|
+
(0, jsHelpers_1.mergeOps)(duplicatedAccount[name], newSubAccount[name]) ?? [];
|
|
56
60
|
}
|
|
57
61
|
}
|
|
58
62
|
// Updating the operationsCount in case the mergeOps changed it
|
|
@@ -74,7 +78,8 @@ exports.mergeSubAccounts = mergeSubAccounts;
|
|
|
74
78
|
const getSubAccountShape = async (currency, address, parentId, token, operations) => {
|
|
75
79
|
const aptosClient = new network_1.AptosAPI(currency.id);
|
|
76
80
|
const tokenAccountId = (0, index_2.encodeTokenAccountId)(parentId, token);
|
|
77
|
-
const
|
|
81
|
+
const balances = await aptosClient.getBalances(address, token.contractAddress);
|
|
82
|
+
const balance = balances.length > 0 ? balances[0].amount : (0, bignumber_js_1.default)(0);
|
|
78
83
|
const firstOperation = operations
|
|
79
84
|
.sort((a, b) => b.date.getTime() - a.date.getTime())
|
|
80
85
|
.at(operations.length - 1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { TransactionIntent } from "@ledgerhq/coin-framework/lib/api/types";
|
|
2
|
-
import type { AptosAsset
|
|
2
|
+
import type { AptosAsset } from "../types/assets";
|
|
3
3
|
import type { AptosAPI } from "../network";
|
|
4
|
-
export declare function craftTransaction(aptosClient: AptosAPI, transactionIntent: TransactionIntent<AptosAsset
|
|
4
|
+
export declare function craftTransaction(aptosClient: AptosAPI, transactionIntent: TransactionIntent<AptosAsset>): Promise<string>;
|
|
5
5
|
//# sourceMappingURL=craftTransaction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.d.ts","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"craftTransaction.d.ts","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAO3C,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,QAAQ,EACrB,iBAAiB,EAAE,iBAAiB,CAAC,UAAU,CAAC,GAC/C,OAAO,CAAC,MAAM,CAAC,CAyCjB"}
|
|
@@ -38,15 +38,15 @@ async function craftTransaction(aptosClient, transactionIntent) {
|
|
|
38
38
|
newTx.mode = transactionIntent.type;
|
|
39
39
|
newTx.useAllAmount = transactionIntent.amount === BigInt(0);
|
|
40
40
|
const account = {
|
|
41
|
-
freshAddress: transactionIntent.sender
|
|
42
|
-
xpub: transactionIntent.
|
|
41
|
+
freshAddress: transactionIntent.sender,
|
|
42
|
+
xpub: transactionIntent.senderPublicKey,
|
|
43
43
|
subAccounts: new Array(),
|
|
44
44
|
};
|
|
45
45
|
let tokenType;
|
|
46
46
|
const contractAddress = getContractAddress(transactionIntent);
|
|
47
47
|
let balance;
|
|
48
48
|
if (newTx.useAllAmount === true) {
|
|
49
|
-
const balances = await aptosClient.getBalances(transactionIntent.sender
|
|
49
|
+
const balances = await aptosClient.getBalances(transactionIntent.sender);
|
|
50
50
|
balance = balances?.find(b => b.contractAddress.toLowerCase() === contractAddress?.toLowerCase());
|
|
51
51
|
if (balance !== undefined) {
|
|
52
52
|
newTx.amount = (0, bignumber_js_1.default)(balance.amount.toString());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,uEAAmE;AACnE,4EAAoD;AACpD,gEAAqC;AACrC,4CAA+D;AAGxD,KAAK,UAAU,gBAAgB,CACpC,WAAqB,EACrB,
|
|
1
|
+
{"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,uEAAmE;AACnE,4EAAoD;AACpD,gEAAqC;AACrC,4CAA+D;AAGxD,KAAK,UAAU,gBAAgB,CACpC,WAAqB,EACrB,iBAAgD;IAEhD,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;IACpC,KAAK,CAAC,YAAY,GAAG,iBAAiB,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC;IAE5D,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,KAAK,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACzE,OAAO,GAAG,QAAQ,EAAE,IAAI,CACtB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,EAAE,KAAK,eAAe,EAAE,WAAW,EAAE,CACxE,CAAC;QAEF,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,KAAK,CAAC,MAAM,GAAG,IAAA,sBAAS,EAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAED,IAAI,iBAAiB,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC7C,SAAS,GAAG,iBAAiB,CAAC,KAAK,CAAC,QAAsB,CAAC;IAC7D,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,0BAAgB,EACpC,OAAO,EACP,KAAK,EACL,WAAW,EACX,eAAe,EACf,SAAS,IAAI,SAAS,CACvB,CAAC;IAEF,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;AACvC,CAAC;AA5CD,4CA4CC;AAED,SAAS,kBAAkB,CAAC,QAAuC;IACjE,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,IAAA,8BAAW,EAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5E,OAAO,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC;IACxC,CAAC;IAED,OAAO,0BAAc,CAAC;AACxB,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { Balance } from "@ledgerhq/coin-framework/lib/api/types";
|
|
2
|
+
import type { AptosAsset } from "../types/assets";
|
|
3
|
+
import type { AptosAPI } from "../network";
|
|
4
|
+
export declare function getBalances(aptosClient: AptosAPI, address: string, contract_address?: string): Promise<Balance<AptosAsset>[]>;
|
|
5
|
+
//# sourceMappingURL=getBalances.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getBalances.d.ts","sourceRoot":"","sources":["../../src/logic/getBalances.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wCAAwC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAG3C,wBAAsB,WAAW,CAC/B,WAAW,EAAE,QAAQ,EACrB,OAAO,EAAE,MAAM,EACf,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAiBhC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getBalances = void 0;
|
|
4
|
+
const constants_1 = require("../constants");
|
|
5
|
+
async function getBalances(aptosClient, address, contract_address) {
|
|
6
|
+
const balances = await aptosClient.getBalances(address, contract_address);
|
|
7
|
+
return balances.map(balance => {
|
|
8
|
+
const isNative = balance.contractAddress === constants_1.APTOS_ASSET_ID;
|
|
9
|
+
const standard = balance.contractAddress.split("::").length === 3
|
|
10
|
+
? constants_1.TOKEN_TYPE.COIN
|
|
11
|
+
: constants_1.TOKEN_TYPE.FUNGIBLE_ASSET;
|
|
12
|
+
return {
|
|
13
|
+
value: BigInt(balance.amount.toString()),
|
|
14
|
+
asset: isNative
|
|
15
|
+
? { type: "native" }
|
|
16
|
+
: { type: "token", contractAddress: balance.contractAddress, standard: standard },
|
|
17
|
+
};
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
exports.getBalances = getBalances;
|
|
21
|
+
//# sourceMappingURL=getBalances.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getBalances.js","sourceRoot":"","sources":["../../src/logic/getBalances.ts"],"names":[],"mappings":";;;AAGA,4CAA0D;AAEnD,KAAK,UAAU,WAAW,CAC/B,WAAqB,EACrB,OAAe,EACf,gBAAyB;IAEzB,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAE1E,OAAO,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe,KAAK,0BAAc,CAAC;QAC5D,MAAM,QAAQ,GACZ,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;YAC9C,CAAC,CAAC,sBAAU,CAAC,IAAI;YACjB,CAAC,CAAC,sBAAU,CAAC,cAAc,CAAC;QAEhC,OAAO;YACL,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACxC,KAAK,EAAE,QAAQ;gBACb,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE;gBACpB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,QAAQ,EAAE,QAAQ,EAAE;SACpF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AArBD,kCAqBC"}
|
package/lib/network/client.d.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { type AccountData, Ed25519PublicKey, type GasEstimation, type InputEntryFunctionData, type RawTransaction, type UserTransactionResponse, type AptosSettings } from "@aptos-labs/ts-sdk";
|
|
2
2
|
import BigNumber from "bignumber.js";
|
|
3
3
|
import type { AptosBalance, AptosTransaction, TransactionOptions } from "../types";
|
|
4
|
-
import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
|
|
5
4
|
import { BlockInfo, FeeEstimation, Operation, Pagination, TransactionIntent } from "@ledgerhq/coin-framework/api/types";
|
|
6
|
-
import { AptosAsset
|
|
5
|
+
import { AptosAsset } from "../types/assets";
|
|
7
6
|
export declare class AptosAPI {
|
|
8
7
|
private readonly aptosConfig;
|
|
9
8
|
private readonly aptosClient;
|
|
@@ -23,16 +22,13 @@ export declare class AptosAPI {
|
|
|
23
22
|
estimatePrioritizedGasUnitPrice: boolean;
|
|
24
23
|
}): Promise<UserTransactionResponse[]>;
|
|
25
24
|
broadcast(tx: string): Promise<string>;
|
|
26
|
-
getBalance(address: string, token: TokenCurrency): Promise<BigNumber>;
|
|
27
25
|
getLastBlock(): Promise<BlockInfo>;
|
|
28
|
-
|
|
29
|
-
getFABalance(address: string, contract_address: string): Promise<BigNumber>;
|
|
30
|
-
estimateFees(transactionIntent: TransactionIntent<AptosAsset, AptosExtra, AptosSender>): Promise<FeeEstimation<AptosFeeParameters>>;
|
|
26
|
+
estimateFees(transactionIntent: TransactionIntent<AptosAsset>): Promise<FeeEstimation>;
|
|
31
27
|
listOperations(rawAddress: string, pagination: Pagination): Promise<[Operation<AptosAsset>[], string]>;
|
|
32
28
|
private fetchTransactions;
|
|
33
29
|
private richItemByVersion;
|
|
34
30
|
private getHeight;
|
|
35
31
|
private getBlock;
|
|
36
|
-
getBalances(address: string): Promise<AptosBalance[]>;
|
|
32
|
+
getBalances(address: string, contractAddress?: string): Promise<AptosBalance[]>;
|
|
37
33
|
}
|
|
38
34
|
//# sourceMappingURL=client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/network/client.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,WAAW,EAGhB,gBAAgB,EAChB,KAAK,aAAa,EAClB,KAAK,sBAAsB,EAG3B,KAAK,cAAc,EAGnB,KAAK,uBAAuB,EAE5B,KAAK,aAAa,EAInB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,SAAS,MAAM,cAAc,CAAC;AASrC,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMnF,OAAO,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/network/client.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,WAAW,EAGhB,gBAAgB,EAChB,KAAK,aAAa,EAClB,KAAK,sBAAsB,EAG3B,KAAK,cAAc,EAGnB,KAAK,uBAAuB,EAE5B,KAAK,aAAa,EAInB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,SAAS,MAAM,cAAc,CAAC;AASrC,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMnF,OAAO,EACL,SAAS,EACT,aAAa,EACb,SAAS,EACT,UAAU,EACV,iBAAiB,EAClB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAa7C,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAuB;gBAExC,oBAAoB,EAAE,aAAa,GAAG,MAAM;IAoBlD,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAIjD,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;;;;;IAahD,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC;IAI1C,mBAAmB,CACvB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,cAAc,CAAC;IA6BpB,mBAAmB,CACvB,OAAO,EAAE,gBAAgB,EACzB,EAAE,EAAE,cAAc,EAClB,OAAO;;;;KAIN,GACA,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAQ/B,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IActC,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC;IAUlC,YAAY,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAmDtF,cAAc,CAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAQ/B,iBAAiB;YA8BjB,iBAAiB;YAkBjB,SAAS;YAQT,QAAQ;IAQhB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CA2BtF"}
|
package/lib/network/client.js
CHANGED
|
@@ -48,12 +48,12 @@ class AptosAPI {
|
|
|
48
48
|
}
|
|
49
49
|
async getAccountInfo(address, startAt) {
|
|
50
50
|
const [balance, transactions, blockHeight] = await Promise.all([
|
|
51
|
-
this.
|
|
51
|
+
this.getBalances(address, constants_1.APTOS_ASSET_ID),
|
|
52
52
|
this.fetchTransactions(address, startAt),
|
|
53
53
|
this.getHeight(),
|
|
54
54
|
]);
|
|
55
55
|
return {
|
|
56
|
-
balance,
|
|
56
|
+
balance: balance[0].amount ?? BigInt(0),
|
|
57
57
|
transactions,
|
|
58
58
|
blockHeight,
|
|
59
59
|
};
|
|
@@ -109,12 +109,6 @@ class AptosAPI {
|
|
|
109
109
|
});
|
|
110
110
|
return pendingTx.data.hash;
|
|
111
111
|
}
|
|
112
|
-
async getBalance(address, token) {
|
|
113
|
-
if (token.tokenType === "coin") {
|
|
114
|
-
return await this.getCoinBalance(address, token.contractAddress);
|
|
115
|
-
}
|
|
116
|
-
return await this.getFABalance(address, token.contractAddress);
|
|
117
|
-
}
|
|
118
112
|
async getLastBlock() {
|
|
119
113
|
const { block_height } = await this.aptosClient.getLedgerInfo();
|
|
120
114
|
const block = await this.aptosClient.getBlockByHeight({ blockHeight: Number(block_height) });
|
|
@@ -124,46 +118,8 @@ class AptosAPI {
|
|
|
124
118
|
time: new Date(Number(block.block_timestamp) / 1_000),
|
|
125
119
|
};
|
|
126
120
|
}
|
|
127
|
-
async getCoinBalance(address, contract_address) {
|
|
128
|
-
try {
|
|
129
|
-
const [balanceStr] = await this.aptosClient.view({
|
|
130
|
-
payload: {
|
|
131
|
-
function: "0x1::coin::balance",
|
|
132
|
-
typeArguments: [contract_address],
|
|
133
|
-
functionArguments: [address],
|
|
134
|
-
},
|
|
135
|
-
});
|
|
136
|
-
const balance = parseInt(balanceStr, 10);
|
|
137
|
-
return new bignumber_js_1.default(balance);
|
|
138
|
-
}
|
|
139
|
-
catch (error) {
|
|
140
|
-
(0, logs_1.log)("error", "getCoinBalance", {
|
|
141
|
-
error,
|
|
142
|
-
});
|
|
143
|
-
return new bignumber_js_1.default(0);
|
|
144
|
-
}
|
|
145
|
-
}
|
|
146
|
-
async getFABalance(address, contract_address) {
|
|
147
|
-
try {
|
|
148
|
-
const [balanceStr] = await this.aptosClient.view({
|
|
149
|
-
payload: {
|
|
150
|
-
function: "0x1::primary_fungible_store::balance",
|
|
151
|
-
typeArguments: ["0x1::object::ObjectCore"],
|
|
152
|
-
functionArguments: [address, contract_address],
|
|
153
|
-
},
|
|
154
|
-
});
|
|
155
|
-
const balance = parseInt(balanceStr, 10);
|
|
156
|
-
return new bignumber_js_1.default(balance);
|
|
157
|
-
}
|
|
158
|
-
catch (error) {
|
|
159
|
-
(0, logs_1.log)("error", "getFABalance", {
|
|
160
|
-
error,
|
|
161
|
-
});
|
|
162
|
-
return new bignumber_js_1.default(0);
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
121
|
async estimateFees(transactionIntent) {
|
|
166
|
-
const publicKeyEd = new ts_sdk_1.Ed25519PublicKey(transactionIntent
|
|
122
|
+
const publicKeyEd = new ts_sdk_1.Ed25519PublicKey(transactionIntent?.senderPublicKey ?? "");
|
|
167
123
|
const txPayload = {
|
|
168
124
|
function: "0x1::aptos_account::transfer_coins",
|
|
169
125
|
typeArguments: [constants_1.APTOS_ASSET_ID],
|
|
@@ -189,7 +145,7 @@ class AptosAPI {
|
|
|
189
145
|
maxGasAmount: constants_1.DEFAULT_GAS.toString(),
|
|
190
146
|
gasUnitPrice: constants_1.DEFAULT_GAS_PRICE.toString(),
|
|
191
147
|
};
|
|
192
|
-
const tx = await this.generateTransaction(transactionIntent.sender
|
|
148
|
+
const tx = await this.generateTransaction(transactionIntent.sender, txPayload, txOptions);
|
|
193
149
|
const simulation = await this.simulateTransaction(publicKeyEd, tx);
|
|
194
150
|
const completedTx = simulation[0];
|
|
195
151
|
const gasLimit = new bignumber_js_1.default(completedTx.gas_used).multipliedBy(constants_1.ESTIMATE_GAS_MUL);
|
|
@@ -198,6 +154,7 @@ class AptosAPI {
|
|
|
198
154
|
return {
|
|
199
155
|
value: BigInt(expectedGas.toString()),
|
|
200
156
|
parameters: {
|
|
157
|
+
storageLimit: BigInt(0),
|
|
201
158
|
gasLimit: BigInt(gasLimit.toString()),
|
|
202
159
|
gasPrice: BigInt(gasPrice.toString()),
|
|
203
160
|
},
|
|
@@ -262,21 +219,30 @@ class AptosAPI {
|
|
|
262
219
|
hash: block.block_hash,
|
|
263
220
|
};
|
|
264
221
|
}
|
|
265
|
-
async getBalances(address) {
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
222
|
+
async getBalances(address, contractAddress) {
|
|
223
|
+
try {
|
|
224
|
+
const whereCondition = {
|
|
225
|
+
owner_address: { _eq: address },
|
|
226
|
+
};
|
|
227
|
+
if (contractAddress !== undefined && contractAddress !== "") {
|
|
228
|
+
whereCondition.asset_type = { _eq: contractAddress };
|
|
229
|
+
}
|
|
230
|
+
const response = await this.aptosClient.getCurrentFungibleAssetBalances({
|
|
231
|
+
options: {
|
|
232
|
+
where: whereCondition,
|
|
273
233
|
},
|
|
274
|
-
}
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
}
|
|
234
|
+
});
|
|
235
|
+
return response.map(x => ({
|
|
236
|
+
contractAddress: x.asset_type ?? "",
|
|
237
|
+
amount: (0, bignumber_js_1.default)(x.amount),
|
|
238
|
+
}));
|
|
239
|
+
}
|
|
240
|
+
catch (error) {
|
|
241
|
+
(0, logs_1.log)("error", "getCoinBalance", {
|
|
242
|
+
error,
|
|
243
|
+
});
|
|
244
|
+
return [{ amount: (0, bignumber_js_1.default)(0), contractAddress: "" }];
|
|
245
|
+
}
|
|
280
246
|
}
|
|
281
247
|
}
|
|
282
248
|
exports.AptosAPI = AptosAPI;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/network/client.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA6D;AAE7D,+CAkB4B;AAC5B,iDAA4C;AAC5C,0EAA6C;AAC7C,gEAAqC;AACrC,qEAA6C;AAC7C,4CAMsB;AAEtB,+CAA6F;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/network/client.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA6D;AAE7D,+CAkB4B;AAC5B,iDAA4C;AAC5C,0EAA6C;AAC7C,gEAAqC;AACrC,qEAA6C;AAC7C,4CAMsB;AAEtB,+CAA6F;AAa7F,yCAAqC;AACrC,gFAA6E;AAC7E,kDAA+C;AAC/C,gEAA6D;AAE7D,MAAM,cAAc,GAAG,CAAC,UAAkB,EAAE,EAAE,CAC5C,IAAA,qBAAS,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAM,EAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAM,EAAC,oBAAoB,CAAC,CAAC;AAC9F,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAE,EAAE,CAChD,IAAA,qBAAS,EAAC,UAAU,CAAC;IACnB,CAAC,CAAC,IAAA,iBAAM,EAAC,gCAAgC,CAAC;IAC1C,CAAC,CAAC,IAAA,iBAAM,EAAC,wBAAwB,CAAC,CAAC;AAEvC,MAAa,QAAQ;IACF,WAAW,CAAc;IACzB,WAAW,CAAQ;IACnB,YAAY,CAAuB;IAEpD,YAAY,oBAA4C;QACtD,IAAI,OAAO,oBAAoB,KAAK,QAAQ,EAAE,CAAC;YAC7C,IAAI,CAAC,WAAW,GAAG,IAAI,oBAAW,CAAC;gBACjC,QAAQ,EAAE,cAAc,CAAC,oBAAoB,CAAC;gBAC9C,OAAO,EAAE,kBAAkB,CAAC,oBAAoB,CAAC;aAClD,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,WAAW,GAAG,IAAI,oBAAW,CAAC,oBAAoB,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,CAAC,WAAW,GAAG,IAAI,cAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,YAAY,GAAG,IAAI,qBAAY,CAAC;YACnC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,IAAI,EAAE;YACnC,KAAK,EAAE,IAAI,sBAAa,EAAE;YAC1B,OAAO,EAAE;gBACP,UAAU,EAAE,aAAa;aAC1B;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAe;QAC9B,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAe,EAAE,OAAgB;QACpD,MAAM,CAAC,OAAO,EAAE,YAAY,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC7D,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,0BAAc,CAAC;YACzC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC;YACxC,IAAI,CAAC,SAAS,EAAE;SACjB,CAAC,CAAC;QACH,OAAO;YACL,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC;YACvC,YAAY;YACZ,WAAW;SACZ,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,OAAO,IAAI,CAAC,WAAW,CAAC,qBAAqB,EAAE,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,OAAe,EACf,OAA+B,EAC/B,OAA2B;QAE3B,MAAM,IAAI,GAA6C,EAAE,CAAC;QAC1D,IAAI,CAAC,IAAA,qBAAW,EAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,IAAA,qBAAW,EAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,CAAC;YACH,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC;YACpE,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,gBAAgB,GAAG,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,kBAAkB;QACtG,CAAC;QAAC,MAAM,CAAC;YACP,OAAO;QACT,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK;aACtC,MAAM,CAAC;YACN,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,IAAI;SACd,CAAC;aACD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC;aAC3B,KAAK,CAAC,KAAK,CAAC,EAAE;YACb,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,OAAyB,EACzB,EAAkB,EAClB,OAAO,GAAG;QACR,oBAAoB,EAAE,IAAI;QAC1B,oBAAoB,EAAE,IAAI;QAC1B,+BAA+B,EAAE,KAAK;KACvC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC;YAClD,eAAe,EAAE,OAAO;YACxB,WAAW,EAAE,EAAE,cAAc,EAAE,EAAE,EAAuB;YACxD,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EAAU;QACxB,MAAM,OAAO,GAAG,YAAG,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,YAAY,EAAE,CAAC;QAErD,MAAM,SAAS,GAAG,MAAM,IAAA,0BAAiB,EAAyC;YAChF,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM;YACpC,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,cAAc;YACpB,YAAY,EAAE,EAAE;YAChB,WAAW,EAAE,iBAAQ,CAAC,sBAAsB;SAC7C,CAAC,CAAC;QAEH,OAAO,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC;QAChE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAC7F,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC;YAClC,IAAI,EAAE,KAAK,CAAC,UAAU;YACtB,IAAI,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC;SACtD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,iBAAgD;QACjE,MAAM,WAAW,GAAG,IAAI,yBAAgB,CAAC,iBAAiB,EAAE,eAAe,IAAI,EAAE,CAAC,CAAC;QAEnF,MAAM,SAAS,GAA2B;YACxC,QAAQ,EAAE,oCAAoC;YAC9C,aAAa,EAAE,CAAC,0BAAc,CAAC;YAC/B,iBAAiB,EAAE,CAAC,iBAAiB,CAAC,SAAS,EAAE,iBAAiB,CAAC,MAAM,CAAC;SAC3E,CAAC;QAEF,IAAI,iBAAiB,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC7C,MAAM,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC,KAAK,CAAC;YAE7C,IAAI,QAAQ,KAAK,sBAAU,CAAC,cAAc,EAAE,CAAC;gBAC3C,SAAS,CAAC,QAAQ,GAAG,uCAAuC,CAAC;gBAC7D,SAAS,CAAC,aAAa,GAAG,CAAC,+BAA+B,CAAC,CAAC;gBAC5D,SAAS,CAAC,iBAAiB,GAAG;oBAC5B,iBAAiB,CAAC,KAAK,CAAC,eAAe;oBACvC,iBAAiB,CAAC,SAAS;oBAC3B,iBAAiB,CAAC,MAAM;iBACzB,CAAC;YACJ,CAAC;iBAAM,IAAI,QAAQ,KAAK,sBAAU,CAAC,IAAI,EAAE,CAAC;gBACxC,SAAS,CAAC,QAAQ,GAAG,oCAAoC,CAAC;gBAC1D,SAAS,CAAC,aAAa,GAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAuB;YACpC,YAAY,EAAE,uBAAW,CAAC,QAAQ,EAAE;YACpC,YAAY,EAAE,6BAAiB,CAAC,QAAQ,EAAE;SAC3C,CAAC;QAEF,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QAE1F,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACnE,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAElC,MAAM,QAAQ,GAAG,IAAI,sBAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,4BAAgB,CAAC,CAAC;QACpF,MAAM,QAAQ,GAAG,IAAI,sBAAS,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QAE3D,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEpD,OAAO;YACL,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;YACrC,UAAU,EAAE;gBACV,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;gBACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACrC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;aACtC;SACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,UAAkB,EAClB,UAAsB;QAEtB,MAAM,OAAO,GAAG,IAAA,mCAAgB,EAAC,UAAU,CAAC,CAAC;QAC7C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzF,MAAM,aAAa,GAAG,IAAA,mDAAwB,EAAC,OAAO,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC;QAEnF,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,OAAe,EAAE,EAAW;QAC1D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,KAAK,GAAG,oCAA0B,CAAC;QACvC,IAAI,EAAE,EAAE,CAAC;YACP,KAAK,GAAG,sCAA4B,CAAC;QACvC,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAGjD;YACA,KAAK;YACL,SAAS,EAAE;gBACT,OAAO;gBACP,KAAK,EAAE,IAAI;gBACX,EAAE;aACH;YACD,WAAW,EAAE,cAAc;SAC5B,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,GAAG,CAChB,aAAa,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,EAAE,mBAAmB,EAAE,EAAE,EAAE;YACtE,OAAO,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QACrD,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,OAAe;QAC7C,IAAI,CAAC;YACH,MAAM,EAAE,GAAwB,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC;gBAC7E,aAAa,EAAE,OAAO;aACvB,CAAC,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC3C,OAAO;gBACL,GAAG,EAAE;gBACL,KAAK;aACc,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAA,UAAG,EAAC,OAAO,EAAE,mBAAmB,EAAE;gBAChC,KAAK;aACN,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,SAAS;QACrB,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAA,sBAAO,EAAQ;YACpC,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,IAAI,EAAE;SACrC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACrC,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,OAAe;QACpC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,CAAC;QACnF,OAAO;YACL,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC;YACpC,IAAI,EAAE,KAAK,CAAC,UAAU;SACvB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,eAAwB;QACzD,IAAI,CAAC;YACH,MAAM,cAAc,GAAQ;gBAC1B,aAAa,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE;aAChC,CAAC;YAEF,IAAI,eAAe,KAAK,SAAS,IAAI,eAAe,KAAK,EAAE,EAAE,CAAC;gBAC5D,cAAc,CAAC,UAAU,GAAG,EAAE,GAAG,EAAE,eAAe,EAAE,CAAC;YACvD,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,+BAA+B,CAAC;gBACtE,OAAO,EAAE;oBACP,KAAK,EAAE,cAAc;iBACtB;aACF,CAAC,CAAC;YAEH,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACxB,eAAe,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE;gBACnC,MAAM,EAAE,IAAA,sBAAS,EAAC,CAAC,CAAC,MAAM,CAAC;aAC5B,CAAC,CAAC,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAA,UAAG,EAAC,OAAO,EAAE,gBAAgB,EAAE;gBAC7B,KAAK;aACN,CAAC,CAAC;YACH,OAAO,CAAC,EAAE,MAAM,EAAE,IAAA,sBAAS,EAAC,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;CACF;AAhRD,4BAgRC"}
|
package/lib/types/assets.d.ts
CHANGED
|
@@ -5,10 +5,6 @@ export type AptosTokenInformation = {
|
|
|
5
5
|
contractAddress: string;
|
|
6
6
|
};
|
|
7
7
|
export type AptosExtra = Record<string, unknown>;
|
|
8
|
-
export type AptosSender = {
|
|
9
|
-
xpub: string;
|
|
10
|
-
freshAddress: string;
|
|
11
|
-
};
|
|
12
8
|
export type AptosFeeParameters = {
|
|
13
9
|
gasLimit: bigint;
|
|
14
10
|
gasPrice: bigint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/types/assets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oCAAoC,CAAC;AAEhE,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,qBAAqB,CAAC,CAAC;AAEtD,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEjD,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/types/assets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oCAAoC,CAAC;AAEhE,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,qBAAqB,CAAC,CAAC;AAEtD,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEjD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC"}
|
|
@@ -27,28 +27,25 @@ describe("craftTransaction", () => {
|
|
|
27
27
|
generateTransaction: mockGenerateTransaction,
|
|
28
28
|
getBalances: mockGetBalances,
|
|
29
29
|
}));
|
|
30
|
-
const SENDER = {
|
|
31
|
-
xpub: "public-key",
|
|
32
|
-
freshAddress: SENDER_ADDR,
|
|
33
|
-
};
|
|
34
30
|
const api = createApi({
|
|
35
31
|
aptosSettings: {},
|
|
36
32
|
});
|
|
37
33
|
const txArg = {
|
|
38
34
|
type: "send",
|
|
39
|
-
sender:
|
|
35
|
+
sender: SENDER_ADDR,
|
|
36
|
+
senderPublicKey: "public-key",
|
|
40
37
|
recipient: RECIPIENT_ADDR,
|
|
41
38
|
amount: 10n,
|
|
42
|
-
asset: { type: "
|
|
39
|
+
asset: { type: "token", standard: "coin", contractAddress: "0x42::token::Token" },
|
|
43
40
|
};
|
|
44
41
|
const tx = await api.craftTransaction(txArg);
|
|
45
42
|
expect(tx).not.toEqual("");
|
|
46
43
|
expect(Hex.isValid(tx).valid).toBeTruthy();
|
|
47
44
|
expect(mockGetBalances).toHaveBeenCalledTimes(0);
|
|
48
45
|
expect(mockGenerateTransaction).toHaveBeenCalledTimes(1);
|
|
49
|
-
expect(mockGenerateTransaction).toHaveBeenCalledWith(
|
|
46
|
+
expect(mockGenerateTransaction).toHaveBeenCalledWith(SENDER_ADDR, expect.objectContaining({
|
|
50
47
|
function: "0x1::aptos_account::transfer_coins",
|
|
51
|
-
typeArguments: [
|
|
48
|
+
typeArguments: ["0x42::token::Token"],
|
|
52
49
|
functionArguments: [RECIPIENT_ADDR, txArg.amount.toString()],
|
|
53
50
|
}), expect.anything());
|
|
54
51
|
});
|
|
@@ -61,16 +58,13 @@ describe("craftTransaction", () => {
|
|
|
61
58
|
generateTransaction: mockGenerateTransaction,
|
|
62
59
|
getBalances: mockGetBalances,
|
|
63
60
|
}));
|
|
64
|
-
const SENDER = {
|
|
65
|
-
xpub: "public-key",
|
|
66
|
-
freshAddress: SENDER_ADDR,
|
|
67
|
-
};
|
|
68
61
|
const api = createApi({
|
|
69
62
|
aptosSettings: {},
|
|
70
63
|
});
|
|
71
64
|
const txArg = {
|
|
72
65
|
type: "send",
|
|
73
|
-
sender:
|
|
66
|
+
sender: SENDER_ADDR,
|
|
67
|
+
senderPublicKey: "public-key",
|
|
74
68
|
recipient: RECIPIENT_ADDR,
|
|
75
69
|
amount: 0n,
|
|
76
70
|
asset: { type: "native" },
|
|
@@ -80,7 +74,7 @@ describe("craftTransaction", () => {
|
|
|
80
74
|
expect(Hex.isValid(tx).valid).toBeTruthy();
|
|
81
75
|
expect(mockGetBalances).toHaveBeenCalledTimes(1);
|
|
82
76
|
expect(mockGenerateTransaction).toHaveBeenCalledTimes(1);
|
|
83
|
-
expect(mockGenerateTransaction).toHaveBeenCalledWith(
|
|
77
|
+
expect(mockGenerateTransaction).toHaveBeenCalledWith(SENDER_ADDR, expect.objectContaining({
|
|
84
78
|
function: "0x1::aptos_account::transfer_coins",
|
|
85
79
|
typeArguments: [APTOS_ASSET_ID],
|
|
86
80
|
functionArguments: [RECIPIENT_ADDR, "12345"],
|
|
@@ -95,16 +89,13 @@ describe("craftTransaction", () => {
|
|
|
95
89
|
generateTransaction: mockGenerateTransaction,
|
|
96
90
|
getBalances: mockGetBalances,
|
|
97
91
|
}));
|
|
98
|
-
const SENDER = {
|
|
99
|
-
xpub: "public-key",
|
|
100
|
-
freshAddress: SENDER_ADDR,
|
|
101
|
-
};
|
|
102
92
|
const api = createApi({
|
|
103
93
|
aptosSettings: {},
|
|
104
94
|
});
|
|
105
95
|
const txArg = {
|
|
106
96
|
type: "send",
|
|
107
|
-
sender:
|
|
97
|
+
sender: SENDER_ADDR,
|
|
98
|
+
senderPublicKey: "public-key",
|
|
108
99
|
recipient: RECIPIENT_ADDR,
|
|
109
100
|
amount: 10n,
|
|
110
101
|
asset: { type: "token", standard: "coin", contractAddress: "0x42::token::Token" },
|
|
@@ -114,7 +105,7 @@ describe("craftTransaction", () => {
|
|
|
114
105
|
expect(Hex.isValid(tx).valid).toBeTruthy();
|
|
115
106
|
expect(mockGetBalances).toHaveBeenCalledTimes(0);
|
|
116
107
|
expect(mockGenerateTransaction).toHaveBeenCalledTimes(1);
|
|
117
|
-
expect(mockGenerateTransaction).toHaveBeenCalledWith(
|
|
108
|
+
expect(mockGenerateTransaction).toHaveBeenCalledWith(SENDER_ADDR, expect.objectContaining({
|
|
118
109
|
function: "0x1::aptos_account::transfer_coins",
|
|
119
110
|
typeArguments: ["0x42::token::Token"],
|
|
120
111
|
functionArguments: [RECIPIENT_ADDR, txArg.amount.toString()],
|
|
@@ -129,16 +120,13 @@ describe("craftTransaction", () => {
|
|
|
129
120
|
generateTransaction: mockGenerateTransaction,
|
|
130
121
|
getBalances: mockGetBalances,
|
|
131
122
|
}));
|
|
132
|
-
const SENDER = {
|
|
133
|
-
xpub: "public-key",
|
|
134
|
-
freshAddress: SENDER_ADDR,
|
|
135
|
-
};
|
|
136
123
|
const api = createApi({
|
|
137
124
|
aptosSettings: {},
|
|
138
125
|
});
|
|
139
126
|
const txArg = {
|
|
140
127
|
type: "send",
|
|
141
|
-
sender:
|
|
128
|
+
sender: SENDER_ADDR,
|
|
129
|
+
senderPublicKey: "public-key",
|
|
142
130
|
recipient: RECIPIENT_ADDR,
|
|
143
131
|
amount: 0n,
|
|
144
132
|
asset: { type: "token", standard: "fungible_asset", contractAddress: "0x42" },
|
|
@@ -148,7 +136,7 @@ describe("craftTransaction", () => {
|
|
|
148
136
|
expect(Hex.isValid(tx).valid).toBeTruthy();
|
|
149
137
|
expect(mockGetBalances).toHaveBeenCalledTimes(1);
|
|
150
138
|
expect(mockGenerateTransaction).toHaveBeenCalledTimes(1);
|
|
151
|
-
expect(mockGenerateTransaction).toHaveBeenCalledWith(
|
|
139
|
+
expect(mockGenerateTransaction).toHaveBeenCalledWith(SENDER_ADDR, expect.objectContaining({
|
|
152
140
|
function: "0x1::primary_fungible_store::transfer",
|
|
153
141
|
typeArguments: ["0x1::fungible_asset::Metadata"],
|
|
154
142
|
functionArguments: ["0x42", RECIPIENT_ADDR, "12345"],
|
|
@@ -163,16 +151,13 @@ describe("craftTransaction", () => {
|
|
|
163
151
|
generateTransaction: mockGenerateTransaction,
|
|
164
152
|
getBalances: mockGetBalances,
|
|
165
153
|
}));
|
|
166
|
-
const SENDER = {
|
|
167
|
-
xpub: "public-key",
|
|
168
|
-
freshAddress: SENDER_ADDR,
|
|
169
|
-
};
|
|
170
154
|
const api = createApi({
|
|
171
155
|
aptosSettings: {},
|
|
172
156
|
});
|
|
173
157
|
const txArg = {
|
|
174
158
|
type: "send",
|
|
175
|
-
sender:
|
|
159
|
+
sender: SENDER_ADDR,
|
|
160
|
+
senderPublicKey: "public-key",
|
|
176
161
|
recipient: RECIPIENT_ADDR,
|
|
177
162
|
amount: 10n,
|
|
178
163
|
asset: { type: "token", standard: "asset", contractAddress: "0x42::token::Token" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.unit.test.js","sourceRoot":"","sources":["../../../src/__tests__/api/craftTransaction.unit.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;AAC3B,IAAI,cAAgC,CAAC;AAErC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/B,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE;CACzB,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,UAAU,CAAC,GAAG,EAAE;QACd,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,iBAAiB,CAAC;IACtC,MAAM,cAAc,GAAG,iBAAiB,CAAC;IAEzC,MAAM,QAAQ,GACZ,8UAA8U,CAAC;IAEjV,MAAM,MAAM,GAAG,cAAc,CAAC,WAAW,CACvC,IAAI,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,YAAY,EAAE,CAAC,CAC7D,CAAC;IAEF,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAC1C,MAAM,uBAAuB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACpE,MAAM,eAAe,GAAG,IAAI;aACzB,EAAE,EAAE;aACJ,iBAAiB,CAAC,CAAC,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QAC3E,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;YACvC,mBAAmB,EAAE,uBAAuB;YAC5C,WAAW,EAAE,eAAe;SAC7B,CAAC,CAAC,CAAC;QAEJ,MAAM,
|
|
1
|
+
{"version":3,"file":"craftTransaction.unit.test.js","sourceRoot":"","sources":["../../../src/__tests__/api/craftTransaction.unit.test.ts"],"names":[],"mappings":"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"}
|