@ledgerhq/coin-tezos 6.3.0-nightly.1 → 6.3.0-nightly.3
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 +14 -0
- package/lib/bridge/prepareTransaction.test.js +2 -2
- package/lib/bridge/prepareTransaction.test.js.map +1 -1
- package/lib/bridge/signOperation.test.js +1 -1
- package/lib/bridge/signOperation.test.js.map +1 -1
- package/lib/logic/craftTransaction.js +1 -1
- package/lib/logic/craftTransaction.js.map +1 -1
- package/lib/logic/craftTransaction.test.js +1 -1
- package/lib/logic/craftTransaction.test.js.map +1 -1
- package/lib/logic/estimateFees.integ.test.js +5 -5
- package/lib/logic/estimateFees.js +4 -4
- package/lib/logic/estimateFees.js.map +1 -1
- package/lib-es/bridge/prepareTransaction.test.js +3 -3
- package/lib-es/bridge/prepareTransaction.test.js.map +1 -1
- package/lib-es/bridge/signOperation.test.js +2 -2
- package/lib-es/bridge/signOperation.test.js.map +1 -1
- package/lib-es/logic/craftTransaction.js +2 -2
- package/lib-es/logic/craftTransaction.js.map +1 -1
- package/lib-es/logic/craftTransaction.test.js +2 -2
- package/lib-es/logic/craftTransaction.test.js.map +1 -1
- package/lib-es/logic/estimateFees.integ.test.js +5 -5
- package/lib-es/logic/estimateFees.js +6 -6
- package/lib-es/logic/estimateFees.js.map +1 -1
- package/package.json +12 -12
- package/src/bridge/prepareTransaction.test.ts +7 -3
- package/src/bridge/signOperation.test.ts +2 -2
- package/src/logic/craftTransaction.test.ts +2 -2
- package/src/logic/craftTransaction.ts +2 -2
- package/src/logic/estimateFees.integ.test.ts +5 -5
- package/src/logic/estimateFees.ts +7 -7
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @ledgerhq/coin-tezos@6.
|
|
2
|
+
> @ledgerhq/coin-tezos@6.3.0-nightly.2 build /home/runner/work/ledger-live/ledger-live/libs/coin-modules/coin-tezos
|
|
3
3
|
> tsc && tsc -m esnext --moduleResolution bundler --outDir lib-es
|
|
4
4
|
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @ledgerhq/coin-tezos
|
|
2
2
|
|
|
3
|
+
## 6.3.0-nightly.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [[`80a109a`](https://github.com/LedgerHQ/ledger-live/commit/80a109a5f8ecdbb22cf6fb3ec084398a7e54dcfb), [`3489203`](https://github.com/LedgerHQ/ledger-live/commit/34892030dcfbd1a19a0eb0a8fcae9f8f01d3d2a9)]:
|
|
8
|
+
- @ledgerhq/types-live@6.83.0-nightly.1
|
|
9
|
+
- @ledgerhq/coin-framework@6.3.0-nightly.2
|
|
10
|
+
|
|
11
|
+
## 6.3.0-nightly.2
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- [#11595](https://github.com/LedgerHQ/ledger-live/pull/11595) [`c852de4`](https://github.com/LedgerHQ/ledger-live/commit/c852de40f63948ded6fb0abe6fc8104408391c5b) Thanks [@qperrot](https://github.com/qperrot)! - upgraded Taquito to v23.0.0-beta.0 to support new tezos protocol seoul
|
|
16
|
+
|
|
3
17
|
## 6.3.0-nightly.1
|
|
4
18
|
|
|
5
19
|
### Minor Changes
|
|
@@ -153,12 +153,12 @@ describe("prepareTransaction", () => {
|
|
|
153
153
|
const newTx = await (0, prepareTransaction_1.default)(account, tx);
|
|
154
154
|
// Then
|
|
155
155
|
const gasLimit = 500; // hardcoded in the function
|
|
156
|
-
const computedFees = new bignumber_js_1.default(tezosEstimate.suggestedFeeMutez + taquito_1.
|
|
156
|
+
const computedFees = new bignumber_js_1.default(tezosEstimate.suggestedFeeMutez + (0, taquito_1.getRevealFee)(account.freshAddress));
|
|
157
157
|
const maxAmount = account.balance.minus(computedFees);
|
|
158
158
|
expect(newTx).toEqual({
|
|
159
159
|
...tx,
|
|
160
160
|
fees: new bignumber_js_1.default(tezosEstimate.suggestedFeeMutez),
|
|
161
|
-
estimatedFees: new bignumber_js_1.default(tezosEstimate.suggestedFeeMutez + taquito_1.
|
|
161
|
+
estimatedFees: new bignumber_js_1.default(tezosEstimate.suggestedFeeMutez + (0, taquito_1.getRevealFee)(account.freshAddress)),
|
|
162
162
|
gasLimit: new bignumber_js_1.default(tezosEstimate.gasLimit),
|
|
163
163
|
storageLimit: new bignumber_js_1.default(tezosEstimate.storageLimit),
|
|
164
164
|
amount: maxAmount.minus(gasLimit - (tezosEstimate.opSize + gasLimit * 0.1)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.test.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.test.ts"],"names":[],"mappings":";;;;;AAAA,gEAAqC;AACrC,4DAAyF;AACzF,8EAAsD;AACtD,2CAAwC;AACxC,uDAAwD;AACxD,2CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"prepareTransaction.test.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -258,7 +258,7 @@ describe("getOperationContents - revealed account", () => {
|
|
|
258
258
|
expect(contents).toStrictEqual([
|
|
259
259
|
{
|
|
260
260
|
kind: taquito_1.OpKind.REVEAL,
|
|
261
|
-
fee: taquito_1.
|
|
261
|
+
fee: (0, taquito_1.getRevealFee)(account.freshAddress).toString(),
|
|
262
262
|
gas_limit: "100",
|
|
263
263
|
storage_limit: "200",
|
|
264
264
|
source: "pkh",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.test.js","sourceRoot":"","sources":["../../src/bridge/signOperation.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"signOperation.test.js","sourceRoot":"","sources":["../../src/bridge/signOperation.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ async function craftTransaction(account, transaction, publicKey) {
|
|
|
27
27
|
const revealGasLimit = Math.max(revealFees?.gasLimit || 0, minRevealGasLimit);
|
|
28
28
|
contents.push({
|
|
29
29
|
kind: rpc_1.OpKind.REVEAL,
|
|
30
|
-
fee: taquito_1.
|
|
30
|
+
fee: (0, taquito_1.getRevealFee)(address).toString(),
|
|
31
31
|
//TODO: use instead of previous line when this PR will be validated, as the value change (don't forget to update the test too)
|
|
32
32
|
// fee: getRevealFee(address).toString(),
|
|
33
33
|
gas_limit: revealGasLimit.toString(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":";;;;;AAaA,4CA0FC;AAKD,8BAWC;AAvHD,sCAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -112,7 +112,7 @@ describe("craftTransaction", () => {
|
|
|
112
112
|
expect(result.contents).toEqual([
|
|
113
113
|
{
|
|
114
114
|
kind: rpc_1.OpKind.REVEAL,
|
|
115
|
-
fee: taquito_1.
|
|
115
|
+
fee: (0, taquito_1.getRevealFee)(account.address).toString(),
|
|
116
116
|
gas_limit: "100",
|
|
117
117
|
storage_limit: "0",
|
|
118
118
|
source: publicKey.publicKeyHash,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.test.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.test.ts"],"names":[],"mappings":";;;;;AAAA,yDAAiE;AACjE,iDAAiD;AACjD,uDAAmC;AACnC,sCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"craftTransaction.test.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,8 +35,8 @@ describe("estimateFees", () => {
|
|
|
35
35
|
const result = await (0, estimateFees_1.estimateFees)({ account, transaction });
|
|
36
36
|
// Then
|
|
37
37
|
expect(result).toEqual({
|
|
38
|
-
estimatedFees: BigInt("
|
|
39
|
-
fees: BigInt("
|
|
38
|
+
estimatedFees: BigInt("825"),
|
|
39
|
+
fees: BigInt("491"),
|
|
40
40
|
gasLimit: BigInt("2169"),
|
|
41
41
|
storageLimit: BigInt("277"),
|
|
42
42
|
amount: BigInt("1000000"),
|
|
@@ -54,11 +54,11 @@ describe("estimateFees", () => {
|
|
|
54
54
|
const result = await (0, estimateFees_1.estimateFees)({ account, transaction });
|
|
55
55
|
// Then
|
|
56
56
|
expect(result).toEqual({
|
|
57
|
-
estimatedFees: BigInt("
|
|
58
|
-
fees: BigInt("
|
|
57
|
+
estimatedFees: BigInt("823"),
|
|
58
|
+
fees: BigInt("489"),
|
|
59
59
|
gasLimit: BigInt("2169"),
|
|
60
60
|
storageLimit: BigInt("277"),
|
|
61
|
-
amount: BigInt("
|
|
61
|
+
amount: BigInt("1934629"),
|
|
62
62
|
});
|
|
63
63
|
});
|
|
64
64
|
});
|
|
@@ -15,7 +15,7 @@ const errors_1 = require("../types/errors");
|
|
|
15
15
|
* @param {Transaction} transaction
|
|
16
16
|
*/
|
|
17
17
|
async function estimateFees({ account, transaction, }) {
|
|
18
|
-
const encodedPubKey = (0, utils_2.
|
|
18
|
+
const encodedPubKey = (0, utils_2.b58Encode)((0, utils_1.compressPublicKey)(Buffer.from(account.xpub || "", "hex"), ledger_signer_1.DerivationType.ED25519), utils_2.PrefixV2.Ed25519PublicKey);
|
|
19
19
|
const tezosToolkit = (0, tezosToolkit_1.getTezosToolkit)();
|
|
20
20
|
tezosToolkit.setProvider({
|
|
21
21
|
signer: {
|
|
@@ -47,7 +47,7 @@ async function estimateFees({ account, transaction, }) {
|
|
|
47
47
|
mutez: true,
|
|
48
48
|
to: transaction.recipient,
|
|
49
49
|
amount: Number(amount),
|
|
50
|
-
storageLimit: taquito_1.
|
|
50
|
+
storageLimit: taquito_1.ORIGINATION_SIZE, // https://github.com/TezTech/eztz/blob/master/PROTO_003_FEES.md for originating an account
|
|
51
51
|
});
|
|
52
52
|
break;
|
|
53
53
|
case "delegate":
|
|
@@ -75,7 +75,7 @@ async function estimateFees({ account, transaction, }) {
|
|
|
75
75
|
totalFees = estimate.suggestedFeeMutez;
|
|
76
76
|
}
|
|
77
77
|
const maxAmount = parseInt(account.balance.toString()) -
|
|
78
|
-
(totalFees + (account.revealed ? 0 : taquito_1.
|
|
78
|
+
(totalFees + (account.revealed ? 0 : (0, taquito_1.getRevealFee)(account.address)));
|
|
79
79
|
// NOTE: from https://github.com/ecadlabs/taquito/blob/a70c64c4b105381bb9f1d04c9c70e8ef26e9241c/integration-tests/contract-empty-implicit-account-into-new-implicit-account.spec.ts#L33
|
|
80
80
|
// Temporary fix, see https://gitlab.com/tezos/tezos/-/issues/1754
|
|
81
81
|
// we need to increase the gasLimit and fee returned by the estimation
|
|
@@ -98,7 +98,7 @@ async function estimateFees({ account, transaction, }) {
|
|
|
98
98
|
estimation.storageLimit = BigInt(estimate.storageLimit);
|
|
99
99
|
estimation.estimatedFees = estimation.fees;
|
|
100
100
|
if (!account.revealed) {
|
|
101
|
-
estimation.estimatedFees = estimation.estimatedFees + BigInt(taquito_1.
|
|
101
|
+
estimation.estimatedFees = estimation.estimatedFees + BigInt((0, taquito_1.getRevealFee)(account.address));
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
104
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateFees.js","sourceRoot":"","sources":["../../src/logic/estimateFees.ts"],"names":[],"mappings":";;AAoCA,oCAsHC;AA1JD,0DAAwD;AACxD,iEAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"estimateFees.js","sourceRoot":"","sources":["../../src/logic/estimateFees.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import prepareTransaction from "./prepareTransaction";
|
|
|
4
4
|
import { faker } from "@faker-js/faker";
|
|
5
5
|
import coinConfig from "../config";
|
|
6
6
|
import { mockConfig } from "../test/config";
|
|
7
|
-
import { COST_PER_BYTE,
|
|
7
|
+
import { COST_PER_BYTE, getRevealFee } from "@taquito/taquito";
|
|
8
8
|
const mockTezosEstimate = jest.fn();
|
|
9
9
|
jest.mock("../logic/tezosToolkit", () => ({
|
|
10
10
|
getTezosToolkit: () => ({
|
|
@@ -148,12 +148,12 @@ describe("prepareTransaction", () => {
|
|
|
148
148
|
const newTx = await prepareTransaction(account, tx);
|
|
149
149
|
// Then
|
|
150
150
|
const gasLimit = 500; // hardcoded in the function
|
|
151
|
-
const computedFees = new BigNumber(tezosEstimate.suggestedFeeMutez +
|
|
151
|
+
const computedFees = new BigNumber(tezosEstimate.suggestedFeeMutez + getRevealFee(account.freshAddress));
|
|
152
152
|
const maxAmount = account.balance.minus(computedFees);
|
|
153
153
|
expect(newTx).toEqual({
|
|
154
154
|
...tx,
|
|
155
155
|
fees: new BigNumber(tezosEstimate.suggestedFeeMutez),
|
|
156
|
-
estimatedFees: new BigNumber(tezosEstimate.suggestedFeeMutez +
|
|
156
|
+
estimatedFees: new BigNumber(tezosEstimate.suggestedFeeMutez + getRevealFee(account.freshAddress)),
|
|
157
157
|
gasLimit: new BigNumber(tezosEstimate.gasLimit),
|
|
158
158
|
storageLimit: new BigNumber(tezosEstimate.storageLimit),
|
|
159
159
|
amount: maxAmount.minus(gasLimit - (tezosEstimate.opSize + gasLimit * 0.1)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.test.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.test.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACzF,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,UAA+B,MAAM,WAAW,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"prepareTransaction.test.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import BigNumber from "bignumber.js";
|
|
2
|
-
import {
|
|
2
|
+
import { getRevealFee, OpKind } from "@taquito/taquito";
|
|
3
3
|
import buildSignOperation, { getOperationContents } from "./signOperation";
|
|
4
4
|
import config from "../config";
|
|
5
5
|
import { createFixtureAccount, createFixtureTransaction } from "../types/bridge.fixture";
|
|
@@ -230,7 +230,7 @@ describe("getOperationContents - revealed account", () => {
|
|
|
230
230
|
expect(contents).toStrictEqual([
|
|
231
231
|
{
|
|
232
232
|
kind: OpKind.REVEAL,
|
|
233
|
-
fee:
|
|
233
|
+
fee: getRevealFee(account.freshAddress).toString(),
|
|
234
234
|
gas_limit: "100",
|
|
235
235
|
storage_limit: "200",
|
|
236
236
|
source: "pkh",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.test.js","sourceRoot":"","sources":["../../src/bridge/signOperation.test.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"signOperation.test.js","sourceRoot":"","sources":["../../src/bridge/signOperation.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { OpKind } from "@taquito/rpc";
|
|
2
|
-
import {
|
|
2
|
+
import { getRevealFee } from "@taquito/taquito";
|
|
3
3
|
import coinConfig from "../config";
|
|
4
4
|
import { UnsupportedTransactionMode } from "../types/errors";
|
|
5
5
|
import { getTezosToolkit } from "./tezosToolkit";
|
|
@@ -20,7 +20,7 @@ export async function craftTransaction(account, transaction, publicKey) {
|
|
|
20
20
|
const revealGasLimit = Math.max(revealFees?.gasLimit || 0, minRevealGasLimit);
|
|
21
21
|
contents.push({
|
|
22
22
|
kind: OpKind.REVEAL,
|
|
23
|
-
fee:
|
|
23
|
+
fee: getRevealFee(address).toString(),
|
|
24
24
|
//TODO: use instead of previous line when this PR will be validated, as the value change (don't forget to update the test too)
|
|
25
25
|
// fee: getRevealFee(address).toString(),
|
|
26
26
|
gas_limit: revealGasLimit.toString(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,MAAM,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"craftTransaction.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { craftTransaction, rawEncode } from "./craftTransaction";
|
|
|
2
2
|
import { getTezosToolkit } from "./tezosToolkit";
|
|
3
3
|
import coinConfig from "../config";
|
|
4
4
|
import { OpKind } from "@taquito/rpc";
|
|
5
|
-
import {
|
|
5
|
+
import { getRevealFee } from "@taquito/taquito";
|
|
6
6
|
jest.mock("./tezosToolkit");
|
|
7
7
|
jest.mock("../config", () => ({
|
|
8
8
|
getCoinConfig: jest.fn(),
|
|
@@ -107,7 +107,7 @@ describe("craftTransaction", () => {
|
|
|
107
107
|
expect(result.contents).toEqual([
|
|
108
108
|
{
|
|
109
109
|
kind: OpKind.REVEAL,
|
|
110
|
-
fee:
|
|
110
|
+
fee: getRevealFee(account.address).toString(),
|
|
111
111
|
gas_limit: "100",
|
|
112
112
|
storage_limit: "0",
|
|
113
113
|
source: publicKey.publicKeyHash,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"craftTransaction.test.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,UAAU,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"craftTransaction.test.js","sourceRoot":"","sources":["../../src/logic/craftTransaction.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,8 +30,8 @@ describe("estimateFees", () => {
|
|
|
30
30
|
const result = await estimateFees({ account, transaction });
|
|
31
31
|
// Then
|
|
32
32
|
expect(result).toEqual({
|
|
33
|
-
estimatedFees: BigInt("
|
|
34
|
-
fees: BigInt("
|
|
33
|
+
estimatedFees: BigInt("825"),
|
|
34
|
+
fees: BigInt("491"),
|
|
35
35
|
gasLimit: BigInt("2169"),
|
|
36
36
|
storageLimit: BigInt("277"),
|
|
37
37
|
amount: BigInt("1000000"),
|
|
@@ -49,11 +49,11 @@ describe("estimateFees", () => {
|
|
|
49
49
|
const result = await estimateFees({ account, transaction });
|
|
50
50
|
// Then
|
|
51
51
|
expect(result).toEqual({
|
|
52
|
-
estimatedFees: BigInt("
|
|
53
|
-
fees: BigInt("
|
|
52
|
+
estimatedFees: BigInt("823"),
|
|
53
|
+
fees: BigInt("489"),
|
|
54
54
|
gasLimit: BigInt("2169"),
|
|
55
55
|
storageLimit: BigInt("277"),
|
|
56
|
-
amount: BigInt("
|
|
56
|
+
amount: BigInt("1934629"),
|
|
57
57
|
});
|
|
58
58
|
});
|
|
59
59
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DerivationType } from "@taquito/ledger-signer";
|
|
2
2
|
import { compressPublicKey } from "@taquito/ledger-signer/dist/lib/utils";
|
|
3
|
-
import { COST_PER_BYTE,
|
|
4
|
-
import {
|
|
3
|
+
import { COST_PER_BYTE, getRevealFee, ORIGINATION_SIZE } from "@taquito/taquito";
|
|
4
|
+
import { b58Encode, PrefixV2 } from "@taquito/utils";
|
|
5
5
|
import { log } from "@ledgerhq/logs";
|
|
6
6
|
import { getTezosToolkit } from "./tezosToolkit";
|
|
7
7
|
import { UnsupportedTransactionMode } from "../types/errors";
|
|
@@ -12,7 +12,7 @@ import { UnsupportedTransactionMode } from "../types/errors";
|
|
|
12
12
|
* @param {Transaction} transaction
|
|
13
13
|
*/
|
|
14
14
|
export async function estimateFees({ account, transaction, }) {
|
|
15
|
-
const encodedPubKey =
|
|
15
|
+
const encodedPubKey = b58Encode(compressPublicKey(Buffer.from(account.xpub || "", "hex"), DerivationType.ED25519), PrefixV2.Ed25519PublicKey);
|
|
16
16
|
const tezosToolkit = getTezosToolkit();
|
|
17
17
|
tezosToolkit.setProvider({
|
|
18
18
|
signer: {
|
|
@@ -44,7 +44,7 @@ export async function estimateFees({ account, transaction, }) {
|
|
|
44
44
|
mutez: true,
|
|
45
45
|
to: transaction.recipient,
|
|
46
46
|
amount: Number(amount),
|
|
47
|
-
storageLimit:
|
|
47
|
+
storageLimit: ORIGINATION_SIZE, // https://github.com/TezTech/eztz/blob/master/PROTO_003_FEES.md for originating an account
|
|
48
48
|
});
|
|
49
49
|
break;
|
|
50
50
|
case "delegate":
|
|
@@ -72,7 +72,7 @@ export async function estimateFees({ account, transaction, }) {
|
|
|
72
72
|
totalFees = estimate.suggestedFeeMutez;
|
|
73
73
|
}
|
|
74
74
|
const maxAmount = parseInt(account.balance.toString()) -
|
|
75
|
-
(totalFees + (account.revealed ? 0 :
|
|
75
|
+
(totalFees + (account.revealed ? 0 : getRevealFee(account.address)));
|
|
76
76
|
// NOTE: from https://github.com/ecadlabs/taquito/blob/a70c64c4b105381bb9f1d04c9c70e8ef26e9241c/integration-tests/contract-empty-implicit-account-into-new-implicit-account.spec.ts#L33
|
|
77
77
|
// Temporary fix, see https://gitlab.com/tezos/tezos/-/issues/1754
|
|
78
78
|
// we need to increase the gasLimit and fee returned by the estimation
|
|
@@ -95,7 +95,7 @@ export async function estimateFees({ account, transaction, }) {
|
|
|
95
95
|
estimation.storageLimit = BigInt(estimate.storageLimit);
|
|
96
96
|
estimation.estimatedFees = estimation.fees;
|
|
97
97
|
if (!account.revealed) {
|
|
98
|
-
estimation.estimatedFees = estimation.estimatedFees + BigInt(
|
|
98
|
+
estimation.estimatedFees = estimation.estimatedFees + BigInt(getRevealFee(account.address));
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateFees.js","sourceRoot":"","sources":["../../src/logic/estimateFees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"estimateFees.js","sourceRoot":"","sources":["../../src/logic/estimateFees.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/coin-tezos",
|
|
3
|
-
"version": "6.3.0-nightly.
|
|
3
|
+
"version": "6.3.0-nightly.3",
|
|
4
4
|
"description": "Tezos Coin integration",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger",
|
|
@@ -67,28 +67,28 @@
|
|
|
67
67
|
},
|
|
68
68
|
"license": "Apache-2.0",
|
|
69
69
|
"dependencies": {
|
|
70
|
-
"@taquito/ledger-signer": "^
|
|
71
|
-
"@taquito/rpc": "^
|
|
72
|
-
"@taquito/taquito": "^
|
|
73
|
-
"@taquito/utils": "^
|
|
70
|
+
"@taquito/ledger-signer": "^23.0.0-RC.0",
|
|
71
|
+
"@taquito/rpc": "^23.0.0-RC.0",
|
|
72
|
+
"@taquito/taquito": "^23.0.0-RC.0",
|
|
73
|
+
"@taquito/utils": "^23.0.0-RC.0",
|
|
74
74
|
"bignumber.js": "^9.1.2",
|
|
75
75
|
"blake2b": "^2.1.4",
|
|
76
76
|
"bs58check": "^3.0.1",
|
|
77
77
|
"invariant": "^2.2.4",
|
|
78
78
|
"lodash": "^4.17.21",
|
|
79
79
|
"rxjs": "^7.8.1",
|
|
80
|
-
"@ledgerhq/coin-framework": "^6.3.0-nightly.
|
|
80
|
+
"@ledgerhq/coin-framework": "^6.3.0-nightly.2",
|
|
81
81
|
"@ledgerhq/cryptoassets": "^13.27.0-nightly.0",
|
|
82
82
|
"@ledgerhq/devices": "8.5.1-nightly.0",
|
|
83
|
-
"@ledgerhq/errors": "^6.25.0-nightly.0",
|
|
84
83
|
"@ledgerhq/live-network": "^2.0.16-nightly.1",
|
|
85
|
-
"@ledgerhq/
|
|
84
|
+
"@ledgerhq/errors": "^6.25.0-nightly.0",
|
|
86
85
|
"@ledgerhq/types-cryptoassets": "^7.26.0-nightly.1",
|
|
87
|
-
"@ledgerhq/types-live": "^6.83.0-nightly.
|
|
86
|
+
"@ledgerhq/types-live": "^6.83.0-nightly.1",
|
|
87
|
+
"@ledgerhq/logs": "^6.13.0"
|
|
88
88
|
},
|
|
89
89
|
"devDependencies": {
|
|
90
90
|
"@faker-js/faker": "^8.4.1",
|
|
91
|
-
"@taquito/local-forging": "
|
|
91
|
+
"@taquito/local-forging": "^23.0.0-RC.0",
|
|
92
92
|
"@types/blake2b": "^2.1.3",
|
|
93
93
|
"@types/bs58check": "^2.1.2",
|
|
94
94
|
"@types/invariant": "^2.2.37",
|
|
@@ -118,8 +118,8 @@
|
|
|
118
118
|
"test": "jest",
|
|
119
119
|
"test-watch": "jest --watch",
|
|
120
120
|
"test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand",
|
|
121
|
-
"test-integ": "jest --config=jest.integ.config.js",
|
|
122
|
-
"test-integ:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --config=jest.integ.config.js",
|
|
121
|
+
"test-integ": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js --config=jest.integ.config.js",
|
|
122
|
+
"test-integ:debug": "node --inspect-brk --experimental-vm-modules ./node_modules/jest/bin/jest.js --runInBand --config=jest.integ.config.js",
|
|
123
123
|
"unimported": "unimported"
|
|
124
124
|
}
|
|
125
125
|
}
|
|
@@ -4,7 +4,7 @@ import prepareTransaction from "./prepareTransaction";
|
|
|
4
4
|
import { faker } from "@faker-js/faker";
|
|
5
5
|
import coinConfig, { TezosCoinConfig } from "../config";
|
|
6
6
|
import { mockConfig } from "../test/config";
|
|
7
|
-
import { COST_PER_BYTE,
|
|
7
|
+
import { COST_PER_BYTE, getRevealFee } from "@taquito/taquito";
|
|
8
8
|
|
|
9
9
|
const mockTezosEstimate = jest.fn();
|
|
10
10
|
jest.mock("../logic/tezosToolkit", () => ({
|
|
@@ -172,14 +172,18 @@ describe("prepareTransaction", () => {
|
|
|
172
172
|
|
|
173
173
|
// Then
|
|
174
174
|
const gasLimit = 500; // hardcoded in the function
|
|
175
|
-
const computedFees = new BigNumber(
|
|
175
|
+
const computedFees = new BigNumber(
|
|
176
|
+
tezosEstimate.suggestedFeeMutez + getRevealFee(account.freshAddress),
|
|
177
|
+
);
|
|
176
178
|
|
|
177
179
|
const maxAmount = account.balance.minus(computedFees);
|
|
178
180
|
|
|
179
181
|
expect(newTx).toEqual({
|
|
180
182
|
...tx,
|
|
181
183
|
fees: new BigNumber(tezosEstimate.suggestedFeeMutez),
|
|
182
|
-
estimatedFees: new BigNumber(
|
|
184
|
+
estimatedFees: new BigNumber(
|
|
185
|
+
tezosEstimate.suggestedFeeMutez + getRevealFee(account.freshAddress),
|
|
186
|
+
),
|
|
183
187
|
gasLimit: new BigNumber(tezosEstimate.gasLimit),
|
|
184
188
|
storageLimit: new BigNumber(tezosEstimate.storageLimit),
|
|
185
189
|
amount: maxAmount.minus(gasLimit - (tezosEstimate.opSize + gasLimit * 0.1)),
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import BigNumber from "bignumber.js";
|
|
2
|
-
import {
|
|
2
|
+
import { getRevealFee, OpKind } from "@taquito/taquito";
|
|
3
3
|
import { SignOperationEvent } from "@ledgerhq/types-live";
|
|
4
4
|
import buildSignOperation, { getOperationContents } from "./signOperation";
|
|
5
5
|
import config, { type TezosCoinConfig } from "../config";
|
|
@@ -260,7 +260,7 @@ describe("getOperationContents - revealed account", () => {
|
|
|
260
260
|
expect(contents).toStrictEqual([
|
|
261
261
|
{
|
|
262
262
|
kind: OpKind.REVEAL,
|
|
263
|
-
fee:
|
|
263
|
+
fee: getRevealFee(account.freshAddress).toString(),
|
|
264
264
|
gas_limit: "100",
|
|
265
265
|
storage_limit: "200",
|
|
266
266
|
source: "pkh",
|
|
@@ -2,7 +2,7 @@ import { craftTransaction, rawEncode } from "./craftTransaction";
|
|
|
2
2
|
import { getTezosToolkit } from "./tezosToolkit";
|
|
3
3
|
import coinConfig from "../config";
|
|
4
4
|
import { OpKind } from "@taquito/rpc";
|
|
5
|
-
import {
|
|
5
|
+
import { getRevealFee } from "@taquito/taquito";
|
|
6
6
|
|
|
7
7
|
type TransactionType = "send" | "delegate" | "undelegate";
|
|
8
8
|
|
|
@@ -128,7 +128,7 @@ describe("craftTransaction", () => {
|
|
|
128
128
|
expect(result.contents).toEqual([
|
|
129
129
|
{
|
|
130
130
|
kind: OpKind.REVEAL,
|
|
131
|
-
fee:
|
|
131
|
+
fee: getRevealFee(account.address).toString(),
|
|
132
132
|
gas_limit: "100",
|
|
133
133
|
storage_limit: "0",
|
|
134
134
|
source: publicKey.publicKeyHash,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type OperationContents, OpKind } from "@taquito/rpc";
|
|
2
|
-
import {
|
|
2
|
+
import { getRevealFee } from "@taquito/taquito";
|
|
3
3
|
import coinConfig from "../config";
|
|
4
4
|
import { UnsupportedTransactionMode } from "../types/errors";
|
|
5
5
|
import { getTezosToolkit } from "./tezosToolkit";
|
|
@@ -48,7 +48,7 @@ export async function craftTransaction(
|
|
|
48
48
|
const revealGasLimit = Math.max(revealFees?.gasLimit || 0, minRevealGasLimit);
|
|
49
49
|
contents.push({
|
|
50
50
|
kind: OpKind.REVEAL,
|
|
51
|
-
fee:
|
|
51
|
+
fee: getRevealFee(address).toString(),
|
|
52
52
|
//TODO: use instead of previous line when this PR will be validated, as the value change (don't forget to update the test too)
|
|
53
53
|
// fee: getRevealFee(address).toString(),
|
|
54
54
|
gas_limit: revealGasLimit.toString(),
|
|
@@ -34,8 +34,8 @@ describe("estimateFees", () => {
|
|
|
34
34
|
const result = await estimateFees({ account, transaction });
|
|
35
35
|
// Then
|
|
36
36
|
expect(result).toEqual({
|
|
37
|
-
estimatedFees: BigInt("
|
|
38
|
-
fees: BigInt("
|
|
37
|
+
estimatedFees: BigInt("825"),
|
|
38
|
+
fees: BigInt("491"),
|
|
39
39
|
gasLimit: BigInt("2169"),
|
|
40
40
|
storageLimit: BigInt("277"),
|
|
41
41
|
amount: BigInt("1000000"),
|
|
@@ -56,11 +56,11 @@ describe("estimateFees", () => {
|
|
|
56
56
|
|
|
57
57
|
// Then
|
|
58
58
|
expect(result).toEqual({
|
|
59
|
-
estimatedFees: BigInt("
|
|
60
|
-
fees: BigInt("
|
|
59
|
+
estimatedFees: BigInt("823"),
|
|
60
|
+
fees: BigInt("489"),
|
|
61
61
|
gasLimit: BigInt("2169"),
|
|
62
62
|
storageLimit: BigInt("277"),
|
|
63
|
-
amount: BigInt("
|
|
63
|
+
amount: BigInt("1934629"),
|
|
64
64
|
});
|
|
65
65
|
});
|
|
66
66
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DerivationType } from "@taquito/ledger-signer";
|
|
2
2
|
import { compressPublicKey } from "@taquito/ledger-signer/dist/lib/utils";
|
|
3
|
-
import { COST_PER_BYTE,
|
|
4
|
-
import {
|
|
3
|
+
import { COST_PER_BYTE, getRevealFee, ORIGINATION_SIZE, Estimate } from "@taquito/taquito";
|
|
4
|
+
import { b58Encode, PrefixV2 } from "@taquito/utils";
|
|
5
5
|
import { log } from "@ledgerhq/logs";
|
|
6
6
|
import { getTezosToolkit } from "./tezosToolkit";
|
|
7
7
|
import { TezosOperationMode } from "../types/model";
|
|
@@ -41,9 +41,9 @@ export async function estimateFees({
|
|
|
41
41
|
account: CoreAccountInfo;
|
|
42
42
|
transaction: CoreTransactionInfo;
|
|
43
43
|
}): Promise<EstimatedFees> {
|
|
44
|
-
const encodedPubKey =
|
|
44
|
+
const encodedPubKey = b58Encode(
|
|
45
45
|
compressPublicKey(Buffer.from(account.xpub || "", "hex"), DerivationType.ED25519),
|
|
46
|
-
|
|
46
|
+
PrefixV2.Ed25519PublicKey,
|
|
47
47
|
);
|
|
48
48
|
|
|
49
49
|
const tezosToolkit = getTezosToolkit();
|
|
@@ -81,7 +81,7 @@ export async function estimateFees({
|
|
|
81
81
|
mutez: true,
|
|
82
82
|
to: transaction.recipient,
|
|
83
83
|
amount: Number(amount),
|
|
84
|
-
storageLimit:
|
|
84
|
+
storageLimit: ORIGINATION_SIZE, // https://github.com/TezTech/eztz/blob/master/PROTO_003_FEES.md for originating an account
|
|
85
85
|
});
|
|
86
86
|
break;
|
|
87
87
|
case "delegate":
|
|
@@ -110,7 +110,7 @@ export async function estimateFees({
|
|
|
110
110
|
}
|
|
111
111
|
const maxAmount =
|
|
112
112
|
parseInt(account.balance.toString()) -
|
|
113
|
-
(totalFees + (account.revealed ? 0 :
|
|
113
|
+
(totalFees + (account.revealed ? 0 : getRevealFee(account.address)));
|
|
114
114
|
// NOTE: from https://github.com/ecadlabs/taquito/blob/a70c64c4b105381bb9f1d04c9c70e8ef26e9241c/integration-tests/contract-empty-implicit-account-into-new-implicit-account.spec.ts#L33
|
|
115
115
|
// Temporary fix, see https://gitlab.com/tezos/tezos/-/issues/1754
|
|
116
116
|
// we need to increase the gasLimit and fee returned by the estimation
|
|
@@ -134,7 +134,7 @@ export async function estimateFees({
|
|
|
134
134
|
estimation.storageLimit = BigInt(estimate.storageLimit);
|
|
135
135
|
estimation.estimatedFees = estimation.fees;
|
|
136
136
|
if (!account.revealed) {
|
|
137
|
-
estimation.estimatedFees = estimation.estimatedFees + BigInt(
|
|
137
|
+
estimation.estimatedFees = estimation.estimatedFees + BigInt(getRevealFee(account.address));
|
|
138
138
|
}
|
|
139
139
|
} catch (e) {
|
|
140
140
|
if (typeof e !== "object" || !e) throw e;
|