@ledgerhq/coin-tron 4.1.2-nightly.0 → 4.1.3-nightly.0
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 +46 -4
- package/jest.config.js +2 -5
- package/lib/api/index.d.ts +3 -3
- package/lib/api/index.d.ts.map +1 -1
- package/lib/api/index.integ.test.js +1 -1
- package/lib/api/index.integ.test.js.map +1 -1
- package/lib/api/index.js.map +1 -1
- package/lib/api/index.test.js.map +1 -1
- package/lib/bridge/getEstimateFees.js +2 -2
- package/lib/logic/constants.d.ts.map +1 -1
- package/lib/logic/constants.js +1 -1
- package/lib/logic/constants.js.map +1 -1
- package/lib/logic/craftTransaction.d.ts +2 -9
- package/lib/logic/craftTransaction.d.ts.map +1 -1
- package/lib/logic/craftTransaction.integ.test.js +10 -2
- package/lib/logic/craftTransaction.integ.test.js.map +1 -1
- package/lib/logic/craftTransaction.js +3 -1
- package/lib/logic/craftTransaction.js.map +1 -1
- package/lib/logic/estimateFees.d.ts +2 -2
- package/lib/logic/estimateFees.d.ts.map +1 -1
- package/lib/logic/estimateFees.js.map +1 -1
- package/lib/types/assets.d.ts +3 -1
- package/lib/types/assets.d.ts.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.integ.test.js +1 -1
- package/lib-es/api/index.integ.test.js.map +1 -1
- package/lib-es/api/index.js.map +1 -1
- package/lib-es/api/index.test.js.map +1 -1
- package/lib-es/bridge/getEstimateFees.js +2 -2
- package/lib-es/logic/constants.d.ts.map +1 -1
- package/lib-es/logic/constants.js +1 -1
- package/lib-es/logic/constants.js.map +1 -1
- package/lib-es/logic/craftTransaction.d.ts +2 -9
- package/lib-es/logic/craftTransaction.d.ts.map +1 -1
- package/lib-es/logic/craftTransaction.integ.test.js +10 -2
- package/lib-es/logic/craftTransaction.integ.test.js.map +1 -1
- package/lib-es/logic/craftTransaction.js +3 -1
- package/lib-es/logic/craftTransaction.js.map +1 -1
- package/lib-es/logic/estimateFees.d.ts +2 -2
- package/lib-es/logic/estimateFees.d.ts.map +1 -1
- package/lib-es/logic/estimateFees.js.map +1 -1
- package/lib-es/types/assets.d.ts +3 -1
- package/lib-es/types/assets.d.ts.map +1 -1
- package/package.json +8 -9
- package/src/api/index.integ.test.ts +3 -3
- package/src/api/index.test.ts +2 -2
- package/src/api/index.ts +6 -4
- package/src/bridge/getEstimateFees.ts +2 -2
- package/src/logic/constants.ts +1 -1
- package/src/logic/craftTransaction.integ.test.ts +10 -2
- package/src/logic/craftTransaction.ts +6 -11
- package/src/logic/estimateFees.ts +2 -2
- package/src/types/assets.ts +5 -1
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @ledgerhq/coin-tron@4.1.
|
|
2
|
+
> @ledgerhq/coin-tron@4.1.2 build /home/runner/work/ledger-live/ledger-live/libs/coin-modules/coin-tron
|
|
3
3
|
> tsc && tsc -m esnext --moduleResolution bundler --outDir lib-es
|
|
4
4
|
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,54 @@
|
|
|
1
1
|
# @ledgerhq/coin-tron
|
|
2
2
|
|
|
3
|
-
## 4.1.
|
|
3
|
+
## 4.1.3-nightly.0
|
|
4
4
|
|
|
5
5
|
### Patch Changes
|
|
6
6
|
|
|
7
|
-
- Updated dependencies [[`
|
|
8
|
-
- @ledgerhq/types-live@6.
|
|
9
|
-
- @ledgerhq/coin-framework@5.
|
|
7
|
+
- Updated dependencies [[`9ceee03`](https://github.com/LedgerHQ/ledger-live/commit/9ceee03c33c41bb035fe64f9303acd36872536b6)]:
|
|
8
|
+
- @ledgerhq/types-live@6.73.0-nightly.0
|
|
9
|
+
- @ledgerhq/coin-framework@5.2.1-nightly.0
|
|
10
|
+
|
|
11
|
+
## 4.1.2
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- Updated dependencies [[`4ddfe60`](https://github.com/LedgerHQ/ledger-live/commit/4ddfe6060ab8e4e5c0bb89da91e08a02d8ca50e6), [`f42f353`](https://github.com/LedgerHQ/ledger-live/commit/f42f353a593d0a1cd0a237648765080c85d0eea7), [`ebbbd47`](https://github.com/LedgerHQ/ledger-live/commit/ebbbd47efe76d82047a956cb5849be5831f58772), [`f29e4ba`](https://github.com/LedgerHQ/ledger-live/commit/f29e4bae00a4bf470a0c1ca143e505b731543f95), [`1a4e5e5`](https://github.com/LedgerHQ/ledger-live/commit/1a4e5e5913fe5e12d6127b36f3849e4c81e5e50e)]:
|
|
16
|
+
- @ledgerhq/types-live@6.72.0
|
|
17
|
+
- @ledgerhq/coin-framework@5.2.0
|
|
18
|
+
- @ledgerhq/logs@6.13.0
|
|
19
|
+
- @ledgerhq/devices@8.4.6
|
|
20
|
+
- @ledgerhq/live-network@2.0.9
|
|
21
|
+
- @ledgerhq/live-promise@0.1.1
|
|
22
|
+
|
|
23
|
+
## 4.1.2-next.2
|
|
24
|
+
|
|
25
|
+
### Patch Changes
|
|
26
|
+
|
|
27
|
+
- Updated dependencies [[`ebbbd47`](https://github.com/LedgerHQ/ledger-live/commit/ebbbd47efe76d82047a956cb5849be5831f58772)]:
|
|
28
|
+
- @ledgerhq/logs@6.13.0-next.1
|
|
29
|
+
- @ledgerhq/coin-framework@5.2.0-next.2
|
|
30
|
+
- @ledgerhq/devices@8.4.6-next.1
|
|
31
|
+
- @ledgerhq/live-network@2.0.9-next.1
|
|
32
|
+
- @ledgerhq/live-promise@0.1.1-next.1
|
|
33
|
+
|
|
34
|
+
## 4.1.2-next.1
|
|
35
|
+
|
|
36
|
+
### Patch Changes
|
|
37
|
+
|
|
38
|
+
- Updated dependencies [[`f29e4ba`](https://github.com/LedgerHQ/ledger-live/commit/f29e4bae00a4bf470a0c1ca143e505b731543f95)]:
|
|
39
|
+
- @ledgerhq/logs@6.13.0-next.0
|
|
40
|
+
- @ledgerhq/coin-framework@5.2.0-next.1
|
|
41
|
+
- @ledgerhq/devices@8.4.6-next.0
|
|
42
|
+
- @ledgerhq/live-network@2.0.9-next.0
|
|
43
|
+
- @ledgerhq/live-promise@0.1.1-next.0
|
|
44
|
+
|
|
45
|
+
## 4.1.2-next.0
|
|
46
|
+
|
|
47
|
+
### Patch Changes
|
|
48
|
+
|
|
49
|
+
- Updated dependencies [[`4ddfe60`](https://github.com/LedgerHQ/ledger-live/commit/4ddfe6060ab8e4e5c0bb89da91e08a02d8ca50e6), [`f42f353`](https://github.com/LedgerHQ/ledger-live/commit/f42f353a593d0a1cd0a237648765080c85d0eea7), [`1a4e5e5`](https://github.com/LedgerHQ/ledger-live/commit/1a4e5e5913fe5e12d6127b36f3849e4c81e5e50e)]:
|
|
50
|
+
- @ledgerhq/types-live@6.72.0-next.0
|
|
51
|
+
- @ledgerhq/coin-framework@5.2.0-next.0
|
|
10
52
|
|
|
11
53
|
## 4.1.1
|
|
12
54
|
|
package/jest.config.js
CHANGED
|
@@ -8,15 +8,12 @@ module.exports = {
|
|
|
8
8
|
"!src/**/*.spec.ts",
|
|
9
9
|
"!src/test/**/*.ts",
|
|
10
10
|
],
|
|
11
|
-
coverageReporters: ["json", ["lcov", { file: "
|
|
11
|
+
coverageReporters: ["json", ["lcov", { file: "lcov.info", projectRoot: "../../../" }], "text"],
|
|
12
12
|
testEnvironment: "node",
|
|
13
13
|
testPathIgnorePatterns: ["lib/", "lib-es/", ".*\\.(integ|integration)\\.test\\.[tj]s"],
|
|
14
14
|
reporters: [
|
|
15
15
|
"default",
|
|
16
|
-
[
|
|
17
|
-
"jest-sonar",
|
|
18
|
-
{ outputName: "tron-sonar-executionTests-report.xml", reportedFilePath: "absolute" },
|
|
19
|
-
],
|
|
16
|
+
["jest-sonar", { outputName: "sonar-executionTests-report.xml", reportedFilePath: "absolute" }],
|
|
20
17
|
],
|
|
21
18
|
// setupFilesAfterEnv: ["@ledgerhq/disable-network-setup"],
|
|
22
19
|
};
|
package/lib/api/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AlpacaApi } from "@ledgerhq/coin-framework/api/index";
|
|
2
2
|
import { type TronConfig } from "../config";
|
|
3
|
-
import type { TronAsset } from "../types";
|
|
4
|
-
export declare function createApi(config: TronConfig):
|
|
3
|
+
import type { TronAsset, TronMemo } from "../types";
|
|
4
|
+
export declare function createApi(config: TronConfig): AlpacaApi<TronAsset, TronMemo>;
|
|
5
5
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/api/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EAKV,MAAM,oCAAoC,CAAC;AAC5C,OAAmB,EAAE,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAWxD,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpD,wBAAgB,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC,CAY5E"}
|
|
@@ -42,7 +42,7 @@ describe("API", () => {
|
|
|
42
42
|
const unsignedTx = await tronWeb.transactionBuilder.sendTrx(recipient, amount, wallet.address.base58);
|
|
43
43
|
const signedTrx = await tronWeb.trx.sign(unsignedTx, wallet.privateKey);
|
|
44
44
|
// WHEN
|
|
45
|
-
const result = module.combine(signedTrx.raw_data_hex, signedTrx.signature[0]);
|
|
45
|
+
const result = await module.combine(signedTrx.raw_data_hex, signedTrx.signature[0]);
|
|
46
46
|
const txId = await module.broadcast(result);
|
|
47
47
|
// THEN
|
|
48
48
|
expect(txId).toEqual(expect.any(String));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.integ.test.js","sourceRoot":"","sources":["../../src/api/index.integ.test.ts"],"names":[],"mappings":";;;;;AACA,mCAAqC;AACrC,oDAA4B;AAC5B,sDAA8B;AAC9B,wBAA8B;AAC9B,0CAA+C;AAG/C,MAAM,YAAY,GAAG,gCAAgC,CAAC;AACtD,gBAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,MAAM,MAAM,GAAG;IACb,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IACzC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IACrC,OAAO,EAAE;QACP,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QACzC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;KACpC;CACF,CAAC;AAEF;;;;;GAKG;AACH,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE;IACnB,IAAI,
|
|
1
|
+
{"version":3,"file":"index.integ.test.js","sourceRoot":"","sources":["../../src/api/index.integ.test.ts"],"names":[],"mappings":";;;;;AACA,mCAAqC;AACrC,oDAA4B;AAC5B,sDAA8B;AAC9B,wBAA8B;AAC9B,0CAA+C;AAG/C,MAAM,YAAY,GAAG,gCAAgC,CAAC;AACtD,gBAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,MAAM,MAAM,GAAG;IACb,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IACzC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IACrC,OAAO,EAAE;QACP,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QACzC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;KACpC;CACF,CAAC;AAEF;;;;;GAKG;AACH,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE;IACnB,IAAI,MAA4B,CAAC;IACjC,IAAI,OAAgB,CAAC;IAErB,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,GAAG,IAAA,YAAS,EAAC;YACjB,QAAQ,EAAE;gBACR,GAAG,EAAE,YAAY;aAClB;SACF,CAAC,CAAC;QAEH,OAAO,GAAG,IAAA,qBAAa,GAAE,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QAC1E,QAAQ;QACR,MAAM,MAAM,GAAG,GAAG,CAAC;QACnB,MAAM,SAAS,GAAG,oCAAoC,CAAC;QACvD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CACzD,SAAS,EACT,MAAM,EACN,MAAM,CAAC,OAAO,CAAC,MAAM,CACtB,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAExE,OAAO;QACP,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,SAAS,CAAC,SAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACrF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE5C,OAAO;QACP,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,6DAA6D;AAC7D,KAAK,UAAU,kBAAkB,CAAC,WAAmB;IACnD,MAAM,UAAU,GAAG,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEnD,MAAM,YAAY,GAAG,iBAAO,CAAC,SAAS,CAAC,YAAY,CAAC;IACpD,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;IACnD,MAAM,WAAW,GAAG,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IAE7E,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC;IAC7C,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAC;AAClD,CAAC"}
|
package/lib/api/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;AAoBA,8BAYC;AAzBD,uDAAwD;AACxD,oCASkB;AAGlB,SAAgB,SAAS,CAAC,MAAkB;IAC1C,gBAAU,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IAE5E,OAAO;QACL,SAAS,EAAT,iBAAS;QACT,OAAO,EAAP,eAAO;QACP,gBAAgB,EAAhB,wBAAgB;QAChB,YAAY,EAAE,QAAQ;QACtB,UAAU,EAAV,kBAAU;QACV,SAAS,EAAT,iBAAS;QACT,cAAc;KACf,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;AAoBA,8BAYC;AAzBD,uDAAwD;AACxD,oCASkB;AAGlB,SAAgB,SAAS,CAAC,MAAkB;IAC1C,gBAAU,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IAE5E,OAAO;QACL,SAAS,EAAT,iBAAS;QACT,OAAO,EAAP,eAAO;QACP,gBAAgB,EAAhB,wBAAgB;QAChB,YAAY,EAAE,QAAQ;QACtB,UAAU,EAAV,kBAAU;QACV,SAAS,EAAT,iBAAS;QACT,cAAc;KACf,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,QAAQ,CACrB,iBAAyD;IAEzD,MAAM,IAAI,GAAG,MAAM,IAAA,oBAAY,EAAC,iBAAiB,CAAC,CAAC;IACnD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACzB,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,OAAe,EACf,UAAsB;IAEtB,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;IACjC,MAAM,OAAO,GAAY;QACvB,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,SAAS;QACpB,KAAK,EAAE,KAAK;KACJ,CAAC;IACX,OAAO,IAAA,sBAAmB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC/C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/api/index.test.ts"],"names":[],"mappings":";;;;;AAAA,oCAQkB;AAClB,uDAAmC;AAGnC,wBAA8B;AAG9B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5B,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE;CACzB,CAAC,CAAC,CAAC;AAEJ,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3B,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;IACpB,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE;IAClB,gBAAgB,EAAE,IAAI,CAAC,EAAE,EAAE;IAC3B,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE;IACvB,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE;IACrB,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;IACzB,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;CACrB,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,MAAM,cAAc,GAAe,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAgB,CAAC;IAClF,IAAI,gBAAkC,CAAC;IAEvC,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAU,EAAE,eAAe,CAAC,CAAC;QAE3D,IAAA,YAAS,EAAC,cAAc,CAAC,CAAC;QAE1B,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEnD,MAAM,CAAC,gBAAgB,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAE5C,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CACpB,MAAM,CAAC,gBAAgB,CAAC;YACtB,GAAG,cAAc;YACjB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC3B,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/api/index.test.ts"],"names":[],"mappings":";;;;;AAAA,oCAQkB;AAClB,uDAAmC;AAGnC,wBAA8B;AAG9B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5B,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE;CACzB,CAAC,CAAC,CAAC;AAEJ,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3B,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;IACpB,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE;IAClB,gBAAgB,EAAE,IAAI,CAAC,EAAE,EAAE;IAC3B,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE;IACvB,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE;IACrB,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;IACzB,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;CACrB,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,MAAM,cAAc,GAAe,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAgB,CAAC;IAClF,IAAI,gBAAkC,CAAC;IAEvC,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAU,EAAE,eAAe,CAAC,CAAC;QAE3D,IAAA,YAAS,EAAC,cAAc,CAAC,CAAC;QAE1B,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEnD,MAAM,CAAC,gBAAgB,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAE5C,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CACpB,MAAM,CAAC,gBAAgB,CAAC;YACtB,GAAG,cAAc;YACjB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC3B,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,GAAG,GAAyB,IAAA,YAAS,EAAC,cAAc,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAiC;YAC3C,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,QAAQ;YAChB,SAAS,EAAE,WAAW;YACtB,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;YAClB,KAAK,EAAE;gBACL,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,SAAS;aACnB;SACF,CAAC;QACF,+BAA+B;QAC/B,MAAM,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QACnC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QACzC,MAAM,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC/B,MAAM,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAChC,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC;QACtB,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,MAAM,GAAG,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,SAAS,EAAgB,CAAC,CAAC;QAE5E,kEAAkE;QAClE,MAAM,CAAC,iBAAS,CAAC,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC;QACtD,MAAM,CAAC,eAAO,CAAC,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAClE,MAAM,CAAC,oBAAY,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,CAAC,wBAAgB,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,CAAC,kBAAU,CAAC,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,CAAC,iBAAS,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACrC,MAAM,CAAC,sBAAc,CAAC,CAAC,oBAAoB,CAAC,SAAS,EAAE;YACrD,SAAS,EAAE,SAAS;YACpB,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,GAAG;SACf,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -10,13 +10,13 @@ const logic_1 = require("../logic");
|
|
|
10
10
|
// see : https://developers.tron.network/docs/bandwith#section-bandwidth-points-consumption
|
|
11
11
|
// 1. cost around 200 Bandwidth, if not enough check Free Bandwidth
|
|
12
12
|
// 2. If not enough, will cost some TRX
|
|
13
|
-
// 3. normal transfert cost around 0.
|
|
13
|
+
// 3. normal transfert cost around 0.270 TRX
|
|
14
14
|
const getFeesFromBandwidth = (account, transaction) => {
|
|
15
15
|
const { freeUsed, freeLimit, gainedUsed, gainedLimit } = (0, utils_1.extractBandwidthInfo)(transaction.networkInfo);
|
|
16
16
|
const available = freeLimit.minus(freeUsed).plus(gainedLimit).minus(gainedUsed);
|
|
17
17
|
const estimatedBandwidthCost = (0, utils_1.getEstimatedBlockSize)(account, transaction);
|
|
18
18
|
if (available.lt(estimatedBandwidthCost)) {
|
|
19
|
-
return constants_1.STANDARD_FEES_NATIVE; // cost is around 0.
|
|
19
|
+
return constants_1.STANDARD_FEES_NATIVE; // cost is around 0.270 TRX
|
|
20
20
|
}
|
|
21
21
|
return new bignumber_js_1.default(0); // no fee
|
|
22
22
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/logic/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,eAAO,MAAM,OAAO,WAAyB,CAAC;AAC9C,eAAO,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/logic/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,eAAO,MAAM,OAAO,WAAyB,CAAC;AAC9C,eAAO,MAAM,oBAAoB,WAAwB,CAAC;AAC1D,eAAO,MAAM,eAAe,WAA4B,CAAC;AACzD,eAAO,MAAM,sBAAsB,WAAgC,CAAC;AACpE,eAAO,MAAM,oBAAoB,WAAgC,CAAC"}
|
package/lib/logic/constants.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.STANDARD_FEES_TRC_20 = exports.ACTIVATION_FEES_TRC_20 = exports.ACTIVATION_FEES = exports.STANDARD_FEES_NATIVE = exports.ONE_TRX = void 0;
|
|
4
4
|
const bignumber_js_1 = require("bignumber.js");
|
|
5
5
|
exports.ONE_TRX = new bignumber_js_1.BigNumber(1000000);
|
|
6
|
-
exports.STANDARD_FEES_NATIVE = new bignumber_js_1.BigNumber(
|
|
6
|
+
exports.STANDARD_FEES_NATIVE = new bignumber_js_1.BigNumber(270000);
|
|
7
7
|
exports.ACTIVATION_FEES = exports.ONE_TRX.multipliedBy(1.1); // ONE TRX fee + 0.1 TRX activation cost
|
|
8
8
|
exports.ACTIVATION_FEES_TRC_20 = exports.ONE_TRX.multipliedBy(27.6009);
|
|
9
9
|
exports.STANDARD_FEES_TRC_20 = exports.ONE_TRX.multipliedBy(13.7409);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/logic/constants.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAE5B,QAAA,OAAO,GAAG,IAAI,wBAAS,CAAC,OAAO,CAAC,CAAC;AACjC,QAAA,oBAAoB,GAAG,IAAI,wBAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/logic/constants.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAE5B,QAAA,OAAO,GAAG,IAAI,wBAAS,CAAC,OAAO,CAAC,CAAC;AACjC,QAAA,oBAAoB,GAAG,IAAI,wBAAS,CAAC,MAAM,CAAC,CAAC;AAC7C,QAAA,eAAe,GAAG,eAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,wCAAwC;AACrF,QAAA,sBAAsB,GAAG,eAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;AACvD,QAAA,oBAAoB,GAAG,eAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC"}
|
|
@@ -1,11 +1,4 @@
|
|
|
1
1
|
import { TransactionIntent } from "@ledgerhq/coin-framework/api/index";
|
|
2
|
-
import { TronAsset } from "../types";
|
|
3
|
-
|
|
4
|
-
/** Memo value. */
|
|
5
|
-
memo?: string;
|
|
6
|
-
/** Expiration in seconds after crafting time. */
|
|
7
|
-
expiration?: number;
|
|
8
|
-
};
|
|
9
|
-
export declare function craftTransaction(transactionIntent: TransactionIntent<TronAsset, TransactionIntentExtra>, customFees?: bigint): Promise<string>;
|
|
10
|
-
export {};
|
|
2
|
+
import { TronAsset, TronMemo } from "../types";
|
|
3
|
+
export declare function craftTransaction(transactionIntent: TransactionIntent<TronAsset, TronMemo>, customFees?: bigint): Promise<string>;
|
|
11
4
|
//# sourceMappingURL=craftTransaction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.d.ts","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAIvE,OAAO,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"craftTransaction.d.ts","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAIvE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAG/C,wBAAsB,gBAAgB,CACpC,iBAAiB,EAAE,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,EACzD,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CA2CjB"}
|
|
@@ -177,7 +177,11 @@ describe("Testing craftTransaction function", () => {
|
|
|
177
177
|
sender,
|
|
178
178
|
recipient,
|
|
179
179
|
amount,
|
|
180
|
-
memo:
|
|
180
|
+
memo: {
|
|
181
|
+
type: "string",
|
|
182
|
+
kind: "memo",
|
|
183
|
+
value: "this is a test",
|
|
184
|
+
},
|
|
181
185
|
});
|
|
182
186
|
const decodeResult = await (0, utils_1.decodeTransaction)(result);
|
|
183
187
|
expect(decodeResult).toEqual(expect.objectContaining({
|
|
@@ -200,7 +204,11 @@ describe("Testing craftTransaction function", () => {
|
|
|
200
204
|
sender,
|
|
201
205
|
recipient,
|
|
202
206
|
amount,
|
|
203
|
-
memo:
|
|
207
|
+
memo: {
|
|
208
|
+
type: "string",
|
|
209
|
+
kind: "memo",
|
|
210
|
+
value: "test",
|
|
211
|
+
},
|
|
204
212
|
})).rejects.toThrow("Memo cannot be used with smart contract transactions");
|
|
205
213
|
});
|
|
206
214
|
it("should set an expiration of 10 minutes by default when setting is not provided", async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.integ.test.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.integ.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"craftTransaction.integ.test.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.integ.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,9 @@ const network_1 = require("../network");
|
|
|
9
9
|
const format_1 = require("../network/format");
|
|
10
10
|
const utils_1 = require("./utils");
|
|
11
11
|
async function craftTransaction(transactionIntent, customFees) {
|
|
12
|
-
const { asset, recipient, sender, amount,
|
|
12
|
+
const { asset, recipient, sender, amount, expiration } = transactionIntent;
|
|
13
|
+
const rawMemo = "memo" in transactionIntent ? transactionIntent.memo : undefined;
|
|
14
|
+
const memo = rawMemo?.type === "string" && rawMemo.kind === "memo" ? rawMemo.value : undefined;
|
|
13
15
|
const recipientAddress = (0, format_1.decode58Check)(recipient);
|
|
14
16
|
const senderAddress = (0, format_1.decode58Check)(sender);
|
|
15
17
|
if (asset.type === "token" && asset.standard === "trc20" && asset.contractAddress) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":";;;;;AAOA,4CA8CC;AApDD,gEAAqC;AACrC,wCAA6E;AAC7E,8CAAkD;AAElD,mCAAuC;AAEhC,KAAK,UAAU,gBAAgB,CACpC,iBAAyD,EACzD,UAAmB;IAEnB,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,iBAAiB,CAAC;IAC3E,MAAM,OAAO,GAAG,MAAM,IAAI,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAEjF,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/F,MAAM,gBAAgB,GAAG,IAAA,sBAAa,EAAC,SAAS,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,IAAA,sBAAa,EAAC,MAAM,CAAC,CAAC;IAE5C,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;QAClF,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,UAAU,GAAG,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC1F,MAAM,IAAI,KAAK,CACb,8BAA8B,MAAM,CAAC,gBAAgB,uCAAuC,CAC7F,CAAC;QACJ,CAAC;QAED,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,+BAAqB,EAC9D,KAAK,CAAC,eAAe,EACrB,gBAAgB,EAChB,aAAa,EACb,IAAI,sBAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAChC,IAAA,oBAAY,EAAC,UAAU,CAAC,EACxB,UAAU,CACX,CAAC;QACF,OAAO,UAAoB,CAAC;IAC9B,CAAC;SAAM,CAAC;QACN,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,CAAC;QAC7E,MAAM,OAAO,GACX,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QACnF,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,kCAAwB,EACjE,OAAO,EACP,gBAAgB,EAChB,aAAa,EACb,IAAI,sBAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAChC,eAAe,EACf,IAAI,EACJ,UAAU,CACX,CAAC;QACF,OAAO,UAAoB,CAAC;IAC9B,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TronAsset } from "../types";
|
|
1
|
+
import { TronAsset, TronMemo } from "../types";
|
|
2
2
|
import type { TransactionIntent } from "@ledgerhq/coin-framework/api/index";
|
|
3
|
-
export declare function estimateFees(transactionIntent: TransactionIntent<TronAsset>): Promise<bigint>;
|
|
3
|
+
export declare function estimateFees(transactionIntent: TransactionIntent<TronAsset, TronMemo>): Promise<bigint>;
|
|
4
4
|
//# sourceMappingURL=estimateFees.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateFees.d.ts","sourceRoot":"","sources":["../../src/logic/estimateFees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"estimateFees.d.ts","sourceRoot":"","sources":["../../src/logic/estimateFees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,wBAAsB,YAAY,CAChC,iBAAiB,EAAE,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,GACxD,OAAO,CAAC,MAAM,CAAC,CAMjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateFees.js","sourceRoot":"","sources":["../../src/logic/estimateFees.ts"],"names":[],"mappings":";;AAIA,oCAQC;AAXD,2CAA2E;AAGpE,KAAK,UAAU,YAAY,CAChC,
|
|
1
|
+
{"version":3,"file":"estimateFees.js","sourceRoot":"","sources":["../../src/logic/estimateFees.ts"],"names":[],"mappings":";;AAIA,oCAQC;AAXD,2CAA2E;AAGpE,KAAK,UAAU,YAAY,CAChC,iBAAyD;IAEzD,IAAI,iBAAiB,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,iBAAiB,CAAC,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAC7F,OAAO,MAAM,CAAC,kCAAsB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnD,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CAAC,gCAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjD,CAAC;AACH,CAAC"}
|
package/lib/types/assets.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Asset } from "@ledgerhq/coin-framework/api/types";
|
|
1
|
+
import { Asset, StringMemo } from "@ledgerhq/coin-framework/api/types";
|
|
2
|
+
import { MemoNotSupported } from "@ledgerhq/coin-framework/lib-es/api/types";
|
|
2
3
|
export type TronToken = Trc10Token | Trc20Token;
|
|
3
4
|
export type TronAsset = Asset<TronToken>;
|
|
4
5
|
export type Trc10Token = {
|
|
@@ -9,4 +10,5 @@ export type Trc20Token = {
|
|
|
9
10
|
standard: "trc20";
|
|
10
11
|
contractAddress: string;
|
|
11
12
|
};
|
|
13
|
+
export type TronMemo = MemoNotSupported | StringMemo<"memo">;
|
|
12
14
|
//# sourceMappingURL=assets.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/types/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/types/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,UAAU,CAAC;AAChD,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAczC,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAWF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAGF,MAAM,MAAM,QAAQ,GAAG,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC"}
|
package/lib-es/api/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AlpacaApi } from "@ledgerhq/coin-framework/api/index";
|
|
2
2
|
import { type TronConfig } from "../config";
|
|
3
|
-
import type { TronAsset } from "../types";
|
|
4
|
-
export declare function createApi(config: TronConfig):
|
|
3
|
+
import type { TronAsset, TronMemo } from "../types";
|
|
4
|
+
export declare function createApi(config: TronConfig): AlpacaApi<TronAsset, TronMemo>;
|
|
5
5
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EAKV,MAAM,oCAAoC,CAAC;AAC5C,OAAmB,EAAE,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAWxD,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpD,wBAAgB,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC,CAY5E"}
|
|
@@ -37,7 +37,7 @@ describe("API", () => {
|
|
|
37
37
|
const unsignedTx = await tronWeb.transactionBuilder.sendTrx(recipient, amount, wallet.address.base58);
|
|
38
38
|
const signedTrx = await tronWeb.trx.sign(unsignedTx, wallet.privateKey);
|
|
39
39
|
// WHEN
|
|
40
|
-
const result = module.combine(signedTrx.raw_data_hex, signedTrx.signature[0]);
|
|
40
|
+
const result = await module.combine(signedTrx.raw_data_hex, signedTrx.signature[0]);
|
|
41
41
|
const txId = await module.broadcast(result);
|
|
42
42
|
// THEN
|
|
43
43
|
expect(txId).toEqual(expect.any(String));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.integ.test.js","sourceRoot":"","sources":["../../src/api/index.integ.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,MAAM,YAAY,GAAG,gCAAgC,CAAC;AACtD,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,MAAM,MAAM,GAAG;IACb,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IACzC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IACrC,OAAO,EAAE;QACP,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QACzC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;KACpC;CACF,CAAC;AAEF;;;;;GAKG;AACH,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE;IACnB,IAAI,
|
|
1
|
+
{"version":3,"file":"index.integ.test.js","sourceRoot":"","sources":["../../src/api/index.integ.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,MAAM,YAAY,GAAG,gCAAgC,CAAC;AACtD,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,MAAM,MAAM,GAAG;IACb,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IACzC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IACrC,OAAO,EAAE;QACP,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QACzC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;KACpC;CACF,CAAC;AAEF;;;;;GAKG;AACH,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE;IACnB,IAAI,MAA4B,CAAC;IACjC,IAAI,OAAgB,CAAC;IAErB,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,GAAG,SAAS,CAAC;YACjB,QAAQ,EAAE;gBACR,GAAG,EAAE,YAAY;aAClB;SACF,CAAC,CAAC;QAEH,OAAO,GAAG,aAAa,EAAE,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QAC1E,QAAQ;QACR,MAAM,MAAM,GAAG,GAAG,CAAC;QACnB,MAAM,SAAS,GAAG,oCAAoC,CAAC;QACvD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CACzD,SAAS,EACT,MAAM,EACN,MAAM,CAAC,OAAO,CAAC,MAAM,CACtB,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAExE,OAAO;QACP,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,SAAS,CAAC,SAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACrF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE5C,OAAO;QACP,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,6DAA6D;AAC7D,KAAK,UAAU,kBAAkB,CAAC,WAAmB;IACnD,MAAM,UAAU,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEnD,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC;IACpD,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;IACnD,MAAM,WAAW,GAAG,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IAE7E,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC;IAC7C,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAC;AAClD,CAAC"}
|
package/lib-es/api/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAOA,OAAO,UAA+B,MAAM,WAAW,CAAC;AACxD,OAAO,EACL,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,YAAY,EACZ,UAAU,EACV,cAAc,IAAI,mBAAmB,EACrC,SAAS,GAEV,MAAM,UAAU,CAAC;AAGlB,MAAM,UAAU,SAAS,CAAC,MAAkB;IAC1C,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IAE5E,OAAO;QACL,SAAS;QACT,OAAO;QACP,gBAAgB;QAChB,YAAY,EAAE,QAAQ;QACtB,UAAU;QACV,SAAS;QACT,cAAc;KACf,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAOA,OAAO,UAA+B,MAAM,WAAW,CAAC;AACxD,OAAO,EACL,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,YAAY,EACZ,UAAU,EACV,cAAc,IAAI,mBAAmB,EACrC,SAAS,GAEV,MAAM,UAAU,CAAC;AAGlB,MAAM,UAAU,SAAS,CAAC,MAAkB;IAC1C,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IAE5E,OAAO;QACL,SAAS;QACT,OAAO;QACP,gBAAgB;QAChB,YAAY,EAAE,QAAQ;QACtB,UAAU;QACV,SAAS;QACT,cAAc;KACf,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,QAAQ,CACrB,iBAAyD;IAEzD,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,iBAAiB,CAAC,CAAC;IACnD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACzB,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,OAAe,EACf,UAAsB;IAEtB,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;IACjC,MAAM,OAAO,GAAY;QACvB,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,SAAS;QACpB,KAAK,EAAE,KAAK;KACJ,CAAC;IACX,OAAO,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC/C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/api/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,YAAY,EACZ,UAAU,EACV,cAAc,EACd,SAAS,GACV,MAAM,UAAU,CAAC;AAClB,OAAO,UAAU,MAAM,WAAW,CAAC;AAGnC,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC;AAG9B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5B,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE;CACzB,CAAC,CAAC,CAAC;AAEJ,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3B,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;IACpB,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE;IAClB,gBAAgB,EAAE,IAAI,CAAC,EAAE,EAAE;IAC3B,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE;IACvB,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE;IACrB,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;IACzB,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;CACrB,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,MAAM,cAAc,GAAe,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAgB,CAAC;IAClF,IAAI,gBAAkC,CAAC;IAEvC,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;QAE3D,SAAS,CAAC,cAAc,CAAC,CAAC;QAE1B,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEnD,MAAM,CAAC,gBAAgB,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAE5C,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CACpB,MAAM,CAAC,gBAAgB,CAAC;YACtB,GAAG,cAAc;YACjB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC3B,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/api/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,13 @@ import { estimateFees, getAccount } from "../logic";
|
|
|
5
5
|
// see : https://developers.tron.network/docs/bandwith#section-bandwidth-points-consumption
|
|
6
6
|
// 1. cost around 200 Bandwidth, if not enough check Free Bandwidth
|
|
7
7
|
// 2. If not enough, will cost some TRX
|
|
8
|
-
// 3. normal transfert cost around 0.
|
|
8
|
+
// 3. normal transfert cost around 0.270 TRX
|
|
9
9
|
const getFeesFromBandwidth = (account, transaction) => {
|
|
10
10
|
const { freeUsed, freeLimit, gainedUsed, gainedLimit } = extractBandwidthInfo(transaction.networkInfo);
|
|
11
11
|
const available = freeLimit.minus(freeUsed).plus(gainedLimit).minus(gainedUsed);
|
|
12
12
|
const estimatedBandwidthCost = getEstimatedBlockSize(account, transaction);
|
|
13
13
|
if (available.lt(estimatedBandwidthCost)) {
|
|
14
|
-
return STANDARD_FEES_NATIVE; // cost is around 0.
|
|
14
|
+
return STANDARD_FEES_NATIVE; // cost is around 0.270 TRX
|
|
15
15
|
}
|
|
16
16
|
return new BigNumber(0); // no fee
|
|
17
17
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/logic/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,eAAO,MAAM,OAAO,WAAyB,CAAC;AAC9C,eAAO,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/logic/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,eAAO,MAAM,OAAO,WAAyB,CAAC;AAC9C,eAAO,MAAM,oBAAoB,WAAwB,CAAC;AAC1D,eAAO,MAAM,eAAe,WAA4B,CAAC;AACzD,eAAO,MAAM,sBAAsB,WAAgC,CAAC;AACpE,eAAO,MAAM,oBAAoB,WAAgC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BigNumber } from "bignumber.js";
|
|
2
2
|
export const ONE_TRX = new BigNumber(1000000);
|
|
3
|
-
export const STANDARD_FEES_NATIVE = new BigNumber(
|
|
3
|
+
export const STANDARD_FEES_NATIVE = new BigNumber(270000);
|
|
4
4
|
export const ACTIVATION_FEES = ONE_TRX.multipliedBy(1.1); // ONE TRX fee + 0.1 TRX activation cost
|
|
5
5
|
export const ACTIVATION_FEES_TRC_20 = ONE_TRX.multipliedBy(27.6009);
|
|
6
6
|
export const STANDARD_FEES_TRC_20 = ONE_TRX.multipliedBy(13.7409);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/logic/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;AAC9C,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/logic/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;AAC9C,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,wCAAwC;AAClG,MAAM,CAAC,MAAM,sBAAsB,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;AACpE,MAAM,CAAC,MAAM,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC"}
|
|
@@ -1,11 +1,4 @@
|
|
|
1
1
|
import { TransactionIntent } from "@ledgerhq/coin-framework/api/index";
|
|
2
|
-
import { TronAsset } from "../types";
|
|
3
|
-
|
|
4
|
-
/** Memo value. */
|
|
5
|
-
memo?: string;
|
|
6
|
-
/** Expiration in seconds after crafting time. */
|
|
7
|
-
expiration?: number;
|
|
8
|
-
};
|
|
9
|
-
export declare function craftTransaction(transactionIntent: TransactionIntent<TronAsset, TransactionIntentExtra>, customFees?: bigint): Promise<string>;
|
|
10
|
-
export {};
|
|
2
|
+
import { TronAsset, TronMemo } from "../types";
|
|
3
|
+
export declare function craftTransaction(transactionIntent: TransactionIntent<TronAsset, TronMemo>, customFees?: bigint): Promise<string>;
|
|
11
4
|
//# sourceMappingURL=craftTransaction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.d.ts","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAIvE,OAAO,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"craftTransaction.d.ts","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAIvE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAG/C,wBAAsB,gBAAgB,CACpC,iBAAiB,EAAE,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,EACzD,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CA2CjB"}
|
|
@@ -172,7 +172,11 @@ describe("Testing craftTransaction function", () => {
|
|
|
172
172
|
sender,
|
|
173
173
|
recipient,
|
|
174
174
|
amount,
|
|
175
|
-
memo:
|
|
175
|
+
memo: {
|
|
176
|
+
type: "string",
|
|
177
|
+
kind: "memo",
|
|
178
|
+
value: "this is a test",
|
|
179
|
+
},
|
|
176
180
|
});
|
|
177
181
|
const decodeResult = await decodeTransaction(result);
|
|
178
182
|
expect(decodeResult).toEqual(expect.objectContaining({
|
|
@@ -195,7 +199,11 @@ describe("Testing craftTransaction function", () => {
|
|
|
195
199
|
sender,
|
|
196
200
|
recipient,
|
|
197
201
|
amount,
|
|
198
|
-
memo:
|
|
202
|
+
memo: {
|
|
203
|
+
type: "string",
|
|
204
|
+
kind: "memo",
|
|
205
|
+
value: "test",
|
|
206
|
+
},
|
|
199
207
|
})).rejects.toThrow("Memo cannot be used with smart contract transactions");
|
|
200
208
|
});
|
|
201
209
|
it("should set an expiration of 10 minutes by default when setting is not provided", async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.integ.test.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.integ.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"craftTransaction.integ.test.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.integ.test.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;IACjD,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC;YAC9B,MAAM,EAAE;gBACN,IAAI,EAAE,QAAQ;aACf;YACD,QAAQ,EAAE;gBACR,GAAG,EAAE,8BAA8B;aACpC;SACF,CAAC,CAAC,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACzB,MAAM,MAAM,GAAG,oCAAoC,CAAC;QACpD,MAAM,SAAS,GAAG,oCAAoC,CAAC;QAEvD,OAAO;QACP,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC;YACpC,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE;gBACL,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,SAAS;aACnB;YACD,MAAM;YACN,SAAS;YACT,MAAM;SACP,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAErD,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAC1B,MAAM,CAAC,gBAAgB,CAAC;YACtB,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC;gBAChC,QAAQ,EAAE;oBACR,MAAM,CAAC,gBAAgB,CAAC;wBACtB,IAAI,EAAE,uBAAuB;wBAC7B,SAAS,EAAE,MAAM,CAAC,gBAAgB,CAAC;4BACjC,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC;gCAC7B,MAAM,EAAE,CAAC;gCACT,UAAU,EAAE,SAAS;gCACrB,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC;gCACpC,UAAU,EAAE,aAAa,CAAC,SAAS,CAAC;6BACrC,CAAC;4BACF,QAAQ,EAAE,oDAAoD;yBAC/D,CAAC;qBACH,CAAC;iBACH;aACF,CAAC;SACH,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1B,MAAM,MAAM,GAAG,oCAAoC,CAAC;QACpD,MAAM,SAAS,GAAG,oCAAoC,CAAC;QAEvD,OAAO;QACP,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC;YACpC,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE;gBACL,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,OAAO;gBACjB,eAAe,EAAE,oCAAoC;aACtD;YACD,MAAM;YACN,SAAS;YACT,MAAM;SACP,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAErD,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAC1B,MAAM,CAAC,gBAAgB,CAAC;YACtB,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC;gBAChC,QAAQ,EAAE;oBACR,MAAM,CAAC,gBAAgB,CAAC;wBACtB,IAAI,EAAE,sBAAsB;wBAC5B,SAAS,EAAE,MAAM,CAAC,gBAAgB,CAAC;4BACjC,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC;gCAC7B,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;gCACxB,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC;gCACpC,gBAAgB,EAAE,aAAa,CAAC,oCAAoC,CAAC;6BACtE,CAAC;4BACF,QAAQ,EAAE,mDAAmD;yBAC9D,CAAC;qBACH,CAAC;iBACH;aACF,CAAC;SACH,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wFAAwF,EAAE,KAAK,IAAI,EAAE;QACtG,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1B,MAAM,MAAM,GAAG,oCAAoC,CAAC;QACpD,MAAM,SAAS,GAAG,oCAAoC,CAAC;QAEvD,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC;YACpC,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE;gBACL,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,OAAO;gBACjB,eAAe,EAAE,oCAAoC;aACtD;YACD,MAAM;YACN,SAAS;YACT,MAAM;SACP,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACrD,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAC1B,MAAM,CAAC,gBAAgB,CAAC;YACtB,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC;gBAChC,SAAS,EAAE,wBAAwB;aACpC,CAAC;SACH,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;QACzF,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1B,MAAM,MAAM,GAAG,oCAAoC,CAAC;QACpD,MAAM,SAAS,GAAG,oCAAoC,CAAC;QAEvD,MAAM,UAAU,GAAG,GAAG,CAAC;QACvB,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC;YACE,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE;gBACL,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,OAAO;gBACjB,eAAe,EAAE,oCAAoC;aACtD;YACD,MAAM;YACN,SAAS;YACT,MAAM;SACP,EACD,UAAU,CACX,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACrD,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAC1B,MAAM,CAAC,gBAAgB,CAAC;YACtB,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC;gBAChC,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC;aAC9B,CAAC;SACH,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1B,MAAM,MAAM,GAAG,oCAAoC,CAAC;QACpD,MAAM,SAAS,GAAG,oCAAoC,CAAC;QAEvD,OAAO;QACP,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC;YACpC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,IAAI,EAAE,MAAM;YACZ,MAAM;YACN,SAAS;YACT,MAAM;SACP,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAErD,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAC1B,MAAM,CAAC,gBAAgB,CAAC;YACtB,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC;gBAChC,QAAQ,EAAE;oBACR,MAAM,CAAC,gBAAgB,CAAC;wBACtB,IAAI,EAAE,kBAAkB;wBACxB,SAAS,EAAE,MAAM,CAAC,gBAAgB,CAAC;4BACjC,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC;gCAC7B,MAAM,EAAE,EAAE;gCACV,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC;gCACpC,UAAU,EAAE,aAAa,CAAC,SAAS,CAAC;6BACrC,CAAC;4BACF,QAAQ,EAAE,+CAA+C;yBAC1D,CAAC;qBACH,CAAC;iBACH;aACF,CAAC;SACH,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1B,MAAM,MAAM,GAAG,oCAAoC,CAAC;QACpD,MAAM,SAAS,GAAG,oCAAoC,CAAC;QAEvD,OAAO;QACP,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC;YACpC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,IAAI,EAAE,MAAM;YACZ,MAAM;YACN,SAAS;YACT,MAAM;YACN,IAAI,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,gBAAgB;aACxB;SACF,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAErD,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAC1B,MAAM,CAAC,gBAAgB,CAAC;YACtB,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC;gBAChC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC;aACpC,CAAC;SACH,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0EAA0E,EAAE,KAAK,IAAI,EAAE;QACxF,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1B,MAAM,MAAM,GAAG,oCAAoC,CAAC;QACpD,MAAM,SAAS,GAAG,oCAAoC,CAAC;QAEvD,MAAM,MAAM,CACV,gBAAgB,CAAC;YACf,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE;gBACL,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,OAAO;gBACjB,eAAe,EAAE,oCAAoC;aACtD;YACD,MAAM;YACN,SAAS;YACT,MAAM;YACN,IAAI,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,MAAM;aACd;SACF,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,sDAAsD,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gFAAgF,EAAE,KAAK,IAAI,EAAE;QAC9F,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1B,MAAM,MAAM,GAAG,oCAAoC,CAAC;QACpD,MAAM,SAAS,GAAG,oCAAoC,CAAC;QAEvD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE1B,OAAO;QACP,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC;YACpC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,IAAI,EAAE,MAAM;YACZ,MAAM;YACN,SAAS;YACT,MAAM;SACP,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEzB,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAErD,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAC1B,MAAM,CAAC,gBAAgB,CAAC;YACtB,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC;gBAChC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;aAC/B,CAAC;SACH,CAAC,CACH,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,sBAAsB,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QACzF,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,mBAAmB,CAAC,KAAK,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;QAClF,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1B,MAAM,MAAM,GAAG,oCAAoC,CAAC;QACpD,MAAM,SAAS,GAAG,oCAAoC,CAAC;QACvD,MAAM,UAAU,GAAG,EAAE,GAAG,IAAI,CAAC;QAE7B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE1B,OAAO;QACP,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC;YACpC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,IAAI,EAAE,MAAM;YACZ,MAAM;YACN,SAAS;YACT,MAAM;YACN,UAAU;SACX,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEzB,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAErD,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAC1B,MAAM,CAAC,gBAAgB,CAAC;YACtB,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC;gBAChC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;aAC/B,CAAC;SACH,CAAC,CACH,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,sBAAsB,CAAC,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC,CAAC;QAC5F,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,mBAAmB,CAAC,KAAK,GAAG,CAAC,UAAU,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;IACjG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -3,7 +3,9 @@ import { craftStandardTransaction, craftTrc20Transaction } from "../network";
|
|
|
3
3
|
import { decode58Check } from "../network/format";
|
|
4
4
|
import { feesToNumber } from "./utils";
|
|
5
5
|
export async function craftTransaction(transactionIntent, customFees) {
|
|
6
|
-
const { asset, recipient, sender, amount,
|
|
6
|
+
const { asset, recipient, sender, amount, expiration } = transactionIntent;
|
|
7
|
+
const rawMemo = "memo" in transactionIntent ? transactionIntent.memo : undefined;
|
|
8
|
+
const memo = rawMemo?.type === "string" && rawMemo.kind === "memo" ? rawMemo.value : undefined;
|
|
7
9
|
const recipientAddress = decode58Check(recipient);
|
|
8
10
|
const senderAddress = decode58Check(sender);
|
|
9
11
|
if (asset.type === "token" && asset.standard === "trc20" && asset.contractAddress) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,iBAAyD,EACzD,UAAmB;IAEnB,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,iBAAiB,CAAC;IAC3E,MAAM,OAAO,GAAG,MAAM,IAAI,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAEjF,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/F,MAAM,gBAAgB,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IAE5C,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;QAClF,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,UAAU,GAAG,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC1F,MAAM,IAAI,KAAK,CACb,8BAA8B,MAAM,CAAC,gBAAgB,uCAAuC,CAC7F,CAAC;QACJ,CAAC;QAED,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,MAAM,qBAAqB,CAC9D,KAAK,CAAC,eAAe,EACrB,gBAAgB,EAChB,aAAa,EACb,IAAI,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAChC,YAAY,CAAC,UAAU,CAAC,EACxB,UAAU,CACX,CAAC;QACF,OAAO,UAAoB,CAAC;IAC9B,CAAC;SAAM,CAAC;QACN,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,CAAC;QAC7E,MAAM,OAAO,GACX,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QACnF,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,MAAM,wBAAwB,CACjE,OAAO,EACP,gBAAgB,EAChB,aAAa,EACb,IAAI,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAChC,eAAe,EACf,IAAI,EACJ,UAAU,CACX,CAAC;QACF,OAAO,UAAoB,CAAC;IAC9B,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TronAsset } from "../types";
|
|
1
|
+
import { TronAsset, TronMemo } from "../types";
|
|
2
2
|
import type { TransactionIntent } from "@ledgerhq/coin-framework/api/index";
|
|
3
|
-
export declare function estimateFees(transactionIntent: TransactionIntent<TronAsset>): Promise<bigint>;
|
|
3
|
+
export declare function estimateFees(transactionIntent: TransactionIntent<TronAsset, TronMemo>): Promise<bigint>;
|
|
4
4
|
//# sourceMappingURL=estimateFees.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateFees.d.ts","sourceRoot":"","sources":["../../src/logic/estimateFees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"estimateFees.d.ts","sourceRoot":"","sources":["../../src/logic/estimateFees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,wBAAsB,YAAY,CAChC,iBAAiB,EAAE,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,GACxD,OAAO,CAAC,MAAM,CAAC,CAMjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateFees.js","sourceRoot":"","sources":["../../src/logic/estimateFees.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAG3E,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,
|
|
1
|
+
{"version":3,"file":"estimateFees.js","sourceRoot":"","sources":["../../src/logic/estimateFees.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAG3E,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,iBAAyD;IAEzD,IAAI,iBAAiB,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,iBAAiB,CAAC,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAC7F,OAAO,MAAM,CAAC,sBAAsB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnD,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjD,CAAC;AACH,CAAC"}
|
package/lib-es/types/assets.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Asset } from "@ledgerhq/coin-framework/api/types";
|
|
1
|
+
import { Asset, StringMemo } from "@ledgerhq/coin-framework/api/types";
|
|
2
|
+
import { MemoNotSupported } from "@ledgerhq/coin-framework/lib-es/api/types";
|
|
2
3
|
export type TronToken = Trc10Token | Trc20Token;
|
|
3
4
|
export type TronAsset = Asset<TronToken>;
|
|
4
5
|
export type Trc10Token = {
|
|
@@ -9,4 +10,5 @@ export type Trc20Token = {
|
|
|
9
10
|
standard: "trc20";
|
|
10
11
|
contractAddress: string;
|
|
11
12
|
};
|
|
13
|
+
export type TronMemo = MemoNotSupported | StringMemo<"memo">;
|
|
12
14
|
//# sourceMappingURL=assets.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/types/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/types/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,UAAU,CAAC;AAChD,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAczC,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAWF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAGF,MAAM,MAAM,QAAQ,GAAG,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/coin-tron",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.3-nightly.0",
|
|
4
4
|
"description": "Ledger Tron Coin integration",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger",
|
|
@@ -96,15 +96,15 @@
|
|
|
96
96
|
"lodash": "^4.17.21",
|
|
97
97
|
"rxjs": "^7.8.1",
|
|
98
98
|
"tronweb": "^5.3.2",
|
|
99
|
-
"@ledgerhq/coin-framework": "^5.
|
|
100
|
-
"@ledgerhq/cryptoassets": "^13.18.0",
|
|
101
|
-
"@ledgerhq/devices": "8.4.
|
|
99
|
+
"@ledgerhq/coin-framework": "^5.2.1-nightly.0",
|
|
100
|
+
"@ledgerhq/cryptoassets": "^13.18.1-nightly.0",
|
|
101
|
+
"@ledgerhq/devices": "8.4.6",
|
|
102
102
|
"@ledgerhq/errors": "^6.21.0",
|
|
103
|
-
"@ledgerhq/live-network": "^2.0.
|
|
104
|
-
"@ledgerhq/live-promise": "^0.1.
|
|
105
|
-
"@ledgerhq/logs": "^6.
|
|
103
|
+
"@ledgerhq/live-network": "^2.0.9",
|
|
104
|
+
"@ledgerhq/live-promise": "^0.1.1",
|
|
105
|
+
"@ledgerhq/logs": "^6.13.0",
|
|
106
106
|
"@ledgerhq/types-cryptoassets": "^7.23.0",
|
|
107
|
-
"@ledgerhq/types-live": "^6.
|
|
107
|
+
"@ledgerhq/types-live": "^6.73.0-nightly.0"
|
|
108
108
|
},
|
|
109
109
|
"devDependencies": {
|
|
110
110
|
"@agrozyme/types-tronweb": "^5.3.2",
|
|
@@ -116,7 +116,6 @@
|
|
|
116
116
|
"jest": "^29.7.0",
|
|
117
117
|
"msw": "^2.2.13",
|
|
118
118
|
"ts-jest": "^29.1.1",
|
|
119
|
-
"jest-sonar": "0.2.16",
|
|
120
119
|
"typescript": "^5.4.5",
|
|
121
120
|
"@ledgerhq/disable-network-setup": "^0.0.0",
|
|
122
121
|
"@ledgerhq/types-cryptoassets": "^7.23.0"
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AlpacaApi } from "@ledgerhq/coin-framework/api/index";
|
|
2
2
|
import { randomBytes } from "crypto";
|
|
3
3
|
import dotenv from "dotenv";
|
|
4
4
|
import TronWeb from "tronweb";
|
|
@@ -25,7 +25,7 @@ const wallet = {
|
|
|
25
25
|
* Testnet faucet: https://shasta.tronex.io/
|
|
26
26
|
*/
|
|
27
27
|
describe("API", () => {
|
|
28
|
-
let module:
|
|
28
|
+
let module: AlpacaApi<TronAsset>;
|
|
29
29
|
let tronWeb: TronWeb;
|
|
30
30
|
|
|
31
31
|
beforeAll(() => {
|
|
@@ -51,7 +51,7 @@ describe("API", () => {
|
|
|
51
51
|
const signedTrx = await tronWeb.trx.sign(unsignedTx, wallet.privateKey);
|
|
52
52
|
|
|
53
53
|
// WHEN
|
|
54
|
-
const result = module.combine(signedTrx.raw_data_hex, signedTrx.signature![0]);
|
|
54
|
+
const result = await module.combine(signedTrx.raw_data_hex, signedTrx.signature![0]);
|
|
55
55
|
const txId = await module.broadcast(result);
|
|
56
56
|
|
|
57
57
|
// THEN
|
package/src/api/index.test.ts
CHANGED
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
} from "../logic";
|
|
10
10
|
import coinConfig from "../config";
|
|
11
11
|
import { TronConfig } from "../config";
|
|
12
|
-
import {
|
|
12
|
+
import { AlpacaApi, Pagination, TransactionIntent } from "@ledgerhq/coin-framework/api/types";
|
|
13
13
|
import { createApi } from ".";
|
|
14
14
|
import { TronAsset } from "../types";
|
|
15
15
|
|
|
@@ -49,7 +49,7 @@ describe("createApi", () => {
|
|
|
49
49
|
});
|
|
50
50
|
|
|
51
51
|
it("should pass parameters correctly", async () => {
|
|
52
|
-
const api:
|
|
52
|
+
const api: AlpacaApi<TronAsset> = createApi(mockTronConfig);
|
|
53
53
|
const intent: TransactionIntent<TronAsset> = {
|
|
54
54
|
type: "send",
|
|
55
55
|
sender: "sender",
|
package/src/api/index.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type {
|
|
2
|
-
|
|
2
|
+
AlpacaApi,
|
|
3
3
|
FeeEstimation,
|
|
4
4
|
Operation,
|
|
5
5
|
Pagination,
|
|
@@ -16,9 +16,9 @@ import {
|
|
|
16
16
|
lastBlock,
|
|
17
17
|
Options,
|
|
18
18
|
} from "../logic";
|
|
19
|
-
import type { TronAsset } from "../types";
|
|
19
|
+
import type { TronAsset, TronMemo } from "../types";
|
|
20
20
|
|
|
21
|
-
export function createApi(config: TronConfig):
|
|
21
|
+
export function createApi(config: TronConfig): AlpacaApi<TronAsset, TronMemo> {
|
|
22
22
|
coinConfig.setCoinConfig(() => ({ ...config, status: { type: "active" } }));
|
|
23
23
|
|
|
24
24
|
return {
|
|
@@ -32,7 +32,9 @@ export function createApi(config: TronConfig): Api<TronAsset> {
|
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
async function estimate(
|
|
35
|
+
async function estimate(
|
|
36
|
+
transactionIntent: TransactionIntent<TronAsset, TronMemo>,
|
|
37
|
+
): Promise<FeeEstimation> {
|
|
36
38
|
const fees = await estimateFees(transactionIntent);
|
|
37
39
|
return { value: fees };
|
|
38
40
|
}
|
|
@@ -10,7 +10,7 @@ import type { TransactionIntent } from "@ledgerhq/coin-framework/api/index";
|
|
|
10
10
|
// see : https://developers.tron.network/docs/bandwith#section-bandwidth-points-consumption
|
|
11
11
|
// 1. cost around 200 Bandwidth, if not enough check Free Bandwidth
|
|
12
12
|
// 2. If not enough, will cost some TRX
|
|
13
|
-
// 3. normal transfert cost around 0.
|
|
13
|
+
// 3. normal transfert cost around 0.270 TRX
|
|
14
14
|
const getFeesFromBandwidth = (account: Account, transaction: Transaction): BigNumber => {
|
|
15
15
|
const { freeUsed, freeLimit, gainedUsed, gainedLimit } = extractBandwidthInfo(
|
|
16
16
|
transaction.networkInfo,
|
|
@@ -19,7 +19,7 @@ const getFeesFromBandwidth = (account: Account, transaction: Transaction): BigNu
|
|
|
19
19
|
const estimatedBandwidthCost = getEstimatedBlockSize(account, transaction);
|
|
20
20
|
|
|
21
21
|
if (available.lt(estimatedBandwidthCost)) {
|
|
22
|
-
return STANDARD_FEES_NATIVE; // cost is around 0.
|
|
22
|
+
return STANDARD_FEES_NATIVE; // cost is around 0.270 TRX
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
return new BigNumber(0); // no fee
|
package/src/logic/constants.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { BigNumber } from "bignumber.js";
|
|
2
2
|
|
|
3
3
|
export const ONE_TRX = new BigNumber(1000000);
|
|
4
|
-
export const STANDARD_FEES_NATIVE = new BigNumber(
|
|
4
|
+
export const STANDARD_FEES_NATIVE = new BigNumber(270000);
|
|
5
5
|
export const ACTIVATION_FEES = ONE_TRX.multipliedBy(1.1); // ONE TRX fee + 0.1 TRX activation cost
|
|
6
6
|
export const ACTIVATION_FEES_TRC_20 = ONE_TRX.multipliedBy(27.6009);
|
|
7
7
|
export const STANDARD_FEES_TRC_20 = ONE_TRX.multipliedBy(13.7409);
|
|
@@ -206,7 +206,11 @@ describe("Testing craftTransaction function", () => {
|
|
|
206
206
|
sender,
|
|
207
207
|
recipient,
|
|
208
208
|
amount,
|
|
209
|
-
memo:
|
|
209
|
+
memo: {
|
|
210
|
+
type: "string",
|
|
211
|
+
kind: "memo",
|
|
212
|
+
value: "this is a test",
|
|
213
|
+
},
|
|
210
214
|
});
|
|
211
215
|
|
|
212
216
|
const decodeResult = await decodeTransaction(result);
|
|
@@ -236,7 +240,11 @@ describe("Testing craftTransaction function", () => {
|
|
|
236
240
|
sender,
|
|
237
241
|
recipient,
|
|
238
242
|
amount,
|
|
239
|
-
memo:
|
|
243
|
+
memo: {
|
|
244
|
+
type: "string",
|
|
245
|
+
kind: "memo",
|
|
246
|
+
value: "test",
|
|
247
|
+
},
|
|
240
248
|
}),
|
|
241
249
|
).rejects.toThrow("Memo cannot be used with smart contract transactions");
|
|
242
250
|
});
|
|
@@ -2,22 +2,17 @@ import { TransactionIntent } from "@ledgerhq/coin-framework/api/index";
|
|
|
2
2
|
import BigNumber from "bignumber.js";
|
|
3
3
|
import { craftStandardTransaction, craftTrc20Transaction } from "../network";
|
|
4
4
|
import { decode58Check } from "../network/format";
|
|
5
|
-
import { TronAsset } from "../types";
|
|
5
|
+
import { TronAsset, TronMemo } from "../types";
|
|
6
6
|
import { feesToNumber } from "./utils";
|
|
7
7
|
|
|
8
|
-
type TransactionIntentExtra = {
|
|
9
|
-
/** Memo value. */
|
|
10
|
-
memo?: string;
|
|
11
|
-
|
|
12
|
-
/** Expiration in seconds after crafting time. */
|
|
13
|
-
expiration?: number;
|
|
14
|
-
};
|
|
15
|
-
|
|
16
8
|
export async function craftTransaction(
|
|
17
|
-
transactionIntent: TransactionIntent<TronAsset,
|
|
9
|
+
transactionIntent: TransactionIntent<TronAsset, TronMemo>,
|
|
18
10
|
customFees?: bigint,
|
|
19
11
|
): Promise<string> {
|
|
20
|
-
const { asset, recipient, sender, amount,
|
|
12
|
+
const { asset, recipient, sender, amount, expiration } = transactionIntent;
|
|
13
|
+
const rawMemo = "memo" in transactionIntent ? transactionIntent.memo : undefined;
|
|
14
|
+
|
|
15
|
+
const memo = rawMemo?.type === "string" && rawMemo.kind === "memo" ? rawMemo.value : undefined;
|
|
21
16
|
const recipientAddress = decode58Check(recipient);
|
|
22
17
|
const senderAddress = decode58Check(sender);
|
|
23
18
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { TronAsset } from "../types";
|
|
1
|
+
import { TronAsset, TronMemo } from "../types";
|
|
2
2
|
import { ACTIVATION_FEES_TRC_20, STANDARD_FEES_NATIVE } from "./constants";
|
|
3
3
|
import type { TransactionIntent } from "@ledgerhq/coin-framework/api/index";
|
|
4
4
|
|
|
5
5
|
export async function estimateFees(
|
|
6
|
-
transactionIntent: TransactionIntent<TronAsset>,
|
|
6
|
+
transactionIntent: TransactionIntent<TronAsset, TronMemo>,
|
|
7
7
|
): Promise<bigint> {
|
|
8
8
|
if (transactionIntent.asset.type === "token" && transactionIntent.asset.standard === "trc20") {
|
|
9
9
|
return BigInt(ACTIVATION_FEES_TRC_20.toString());
|
package/src/types/assets.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Asset } from "@ledgerhq/coin-framework/api/types";
|
|
1
|
+
import { Asset, StringMemo } from "@ledgerhq/coin-framework/api/types";
|
|
2
|
+
import { MemoNotSupported } from "@ledgerhq/coin-framework/lib-es/api/types";
|
|
2
3
|
|
|
3
4
|
export type TronToken = Trc10Token | Trc20Token;
|
|
4
5
|
export type TronAsset = Asset<TronToken>;
|
|
@@ -33,3 +34,6 @@ export type Trc20Token = {
|
|
|
33
34
|
standard: "trc20";
|
|
34
35
|
contractAddress: string;
|
|
35
36
|
};
|
|
37
|
+
|
|
38
|
+
// Since memo is not always present and depends on transaction type (e.g. not allowed for TRC20):
|
|
39
|
+
export type TronMemo = MemoNotSupported | StringMemo<"memo">;
|