@ledgerhq/coin-tezos 6.9.0-nightly.20251120023735 → 6.9.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 +21 -7
- package/lib/api/index.d.ts.map +1 -1
- package/lib/api/index.js +17 -34
- package/lib/api/index.js.map +1 -1
- package/lib-es/api/index.d.ts.map +1 -1
- package/lib-es/api/index.js +17 -34
- package/lib-es/api/index.js.map +1 -1
- package/package.json +5 -5
- package/src/api/index.integ.test.ts +0 -1
- package/src/api/index.ts +17 -36
- package/src/api/index-mainnet.integ.test.ts +0 -53
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @ledgerhq/coin-tezos@6.
|
|
2
|
+
> @ledgerhq/coin-tezos@6.9.0 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,6 +1,6 @@
|
|
|
1
1
|
# @ledgerhq/coin-tezos
|
|
2
2
|
|
|
3
|
-
## 6.9.0
|
|
3
|
+
## 6.9.0
|
|
4
4
|
|
|
5
5
|
### Minor Changes
|
|
6
6
|
|
|
@@ -10,13 +10,27 @@
|
|
|
10
10
|
|
|
11
11
|
### Patch Changes
|
|
12
12
|
|
|
13
|
-
- [
|
|
13
|
+
- Updated dependencies [[`74a340b`](https://github.com/LedgerHQ/ledger-live/commit/74a340b258589c9c37476103029eb036b930616c), [`a6bc24e`](https://github.com/LedgerHQ/ledger-live/commit/a6bc24ee988b98bf82f807ac5ce731ba79813901), [`b69c97d`](https://github.com/LedgerHQ/ledger-live/commit/b69c97d979ba97154c9abfda6abfc2a36becee4f), [`544721d`](https://github.com/LedgerHQ/ledger-live/commit/544721d198454526ef83516619d59c881ba34eb9), [`1c6f5f5`](https://github.com/LedgerHQ/ledger-live/commit/1c6f5f5843349b1955f7ca466f98cbe4ffcdaddf), [`d5d838a`](https://github.com/LedgerHQ/ledger-live/commit/d5d838a23e00edd53293843781c559c41db4e854), [`9f61dcf`](https://github.com/LedgerHQ/ledger-live/commit/9f61dcf6163fd66657e5be732c28bea623a40515), [`938b970`](https://github.com/LedgerHQ/ledger-live/commit/938b970e15118dc706c759a3bec27dc01c3dd268), [`c40e9da`](https://github.com/LedgerHQ/ledger-live/commit/c40e9da68452fe9827b9435ff2d162291186be73), [`c0b5b9f`](https://github.com/LedgerHQ/ledger-live/commit/c0b5b9f4cdcb2ea3e15419cbf3d1a14f725c3e6a), [`70049be`](https://github.com/LedgerHQ/ledger-live/commit/70049bed0cd0a8c7a9e4947a63af82061dad46c0), [`5b41dd5`](https://github.com/LedgerHQ/ledger-live/commit/5b41dd56e024a5d03ba0e49084113c04887395db), [`eb5a17e`](https://github.com/LedgerHQ/ledger-live/commit/eb5a17e4db336eaa871eaeb52ffa5248e0f78bec), [`c70f6a8`](https://github.com/LedgerHQ/ledger-live/commit/c70f6a8370056b6fd8f236205471359d6f9b846f)]:
|
|
14
|
+
- @ledgerhq/types-live@6.89.0
|
|
15
|
+
- @ledgerhq/cryptoassets@13.33.0
|
|
16
|
+
- @ledgerhq/coin-framework@6.9.0
|
|
17
|
+
- @ledgerhq/live-network@2.1.1
|
|
14
18
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
## 6.9.0-next.0
|
|
20
|
+
|
|
21
|
+
### Minor Changes
|
|
22
|
+
|
|
23
|
+
- [#12402](https://github.com/LedgerHQ/ledger-live/pull/12402) [`544721d`](https://github.com/LedgerHQ/ledger-live/commit/544721d198454526ef83516619d59c881ba34eb9) Thanks [@qperrot](https://github.com/qperrot)! - Fix transactionSequenceNumber type
|
|
24
|
+
|
|
25
|
+
- [#12604](https://github.com/LedgerHQ/ledger-live/pull/12604) [`eb5a17e`](https://github.com/LedgerHQ/ledger-live/commit/eb5a17e4db336eaa871eaeb52ffa5248e0f78bec) Thanks [@jnicoulaud-ledger](https://github.com/jnicoulaud-ledger)! - coin-modules/alpaca: add transaction status to operations
|
|
26
|
+
|
|
27
|
+
### Patch Changes
|
|
28
|
+
|
|
29
|
+
- Updated dependencies [[`74a340b`](https://github.com/LedgerHQ/ledger-live/commit/74a340b258589c9c37476103029eb036b930616c), [`a6bc24e`](https://github.com/LedgerHQ/ledger-live/commit/a6bc24ee988b98bf82f807ac5ce731ba79813901), [`b69c97d`](https://github.com/LedgerHQ/ledger-live/commit/b69c97d979ba97154c9abfda6abfc2a36becee4f), [`544721d`](https://github.com/LedgerHQ/ledger-live/commit/544721d198454526ef83516619d59c881ba34eb9), [`1c6f5f5`](https://github.com/LedgerHQ/ledger-live/commit/1c6f5f5843349b1955f7ca466f98cbe4ffcdaddf), [`d5d838a`](https://github.com/LedgerHQ/ledger-live/commit/d5d838a23e00edd53293843781c559c41db4e854), [`9f61dcf`](https://github.com/LedgerHQ/ledger-live/commit/9f61dcf6163fd66657e5be732c28bea623a40515), [`938b970`](https://github.com/LedgerHQ/ledger-live/commit/938b970e15118dc706c759a3bec27dc01c3dd268), [`c40e9da`](https://github.com/LedgerHQ/ledger-live/commit/c40e9da68452fe9827b9435ff2d162291186be73), [`c0b5b9f`](https://github.com/LedgerHQ/ledger-live/commit/c0b5b9f4cdcb2ea3e15419cbf3d1a14f725c3e6a), [`70049be`](https://github.com/LedgerHQ/ledger-live/commit/70049bed0cd0a8c7a9e4947a63af82061dad46c0), [`5b41dd5`](https://github.com/LedgerHQ/ledger-live/commit/5b41dd56e024a5d03ba0e49084113c04887395db), [`eb5a17e`](https://github.com/LedgerHQ/ledger-live/commit/eb5a17e4db336eaa871eaeb52ffa5248e0f78bec), [`c70f6a8`](https://github.com/LedgerHQ/ledger-live/commit/c70f6a8370056b6fd8f236205471359d6f9b846f)]:
|
|
30
|
+
- @ledgerhq/types-live@6.89.0-next.0
|
|
31
|
+
- @ledgerhq/cryptoassets@13.33.0-next.0
|
|
32
|
+
- @ledgerhq/coin-framework@6.9.0-next.0
|
|
33
|
+
- @ledgerhq/live-network@2.1.1-next.0
|
|
20
34
|
|
|
21
35
|
## 6.8.0
|
|
22
36
|
|
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":"AAcA,OAAmB,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAezD,OAAO,KAAK,EAAE,QAAQ,EAAsB,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAcA,OAAmB,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAezD,OAAO,KAAK,EAAE,QAAQ,EAAsB,MAAM,SAAS,CAAC;AAY5D,wBAAgB,SAAS,CAAC,MAAM,EAAE,WAAW,GAAG,QAAQ,CAuCvD"}
|
package/lib/api/index.js
CHANGED
|
@@ -13,7 +13,6 @@ const errors_1 = require("@ledgerhq/errors");
|
|
|
13
13
|
const utils_1 = require("@taquito/utils");
|
|
14
14
|
const taquito_1 = require("@taquito/taquito");
|
|
15
15
|
const utils_2 = require("../utils");
|
|
16
|
-
const logs_1 = require("@ledgerhq/logs");
|
|
17
16
|
function createApi(config) {
|
|
18
17
|
config_1.default.setCoinConfig(() => ({ ...config, status: { type: "active" } }));
|
|
19
18
|
return {
|
|
@@ -198,40 +197,24 @@ async function estimate(transactionIntent) {
|
|
|
198
197
|
},
|
|
199
198
|
};
|
|
200
199
|
}
|
|
201
|
-
const accountBase = {
|
|
202
|
-
address: transactionIntent.sender,
|
|
203
|
-
revealed: senderAccountInfo.revealed,
|
|
204
|
-
balance: BigInt(senderAccountInfo.balance),
|
|
205
|
-
};
|
|
206
|
-
const transaction = {
|
|
207
|
-
mode: (0, utils_2.mapIntentTypeToTezosMode)(transactionIntent.type),
|
|
208
|
-
recipient: transactionIntent.recipient,
|
|
209
|
-
amount: transactionIntent.amount,
|
|
210
|
-
useAllAmount: !!transactionIntent.useAllAmount,
|
|
211
|
-
};
|
|
212
|
-
async function logicEstimate(xpub) {
|
|
213
|
-
// needed by the compiler (it can assume it's a "user" account with respective fields)
|
|
214
|
-
if (senderAccountInfo.type !== "user")
|
|
215
|
-
throw new Error("unexpected account type");
|
|
216
|
-
const account = xpub ? { ...accountBase, xpub } : accountBase;
|
|
217
|
-
return await (0, logic_1.estimateFees)({ account, transaction });
|
|
218
|
-
}
|
|
219
|
-
const xpub = transactionIntent.senderPublicKey ?? senderAccountInfo.publicKey;
|
|
220
200
|
try {
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
201
|
+
const estimation = await (0, logic_1.estimateFees)({
|
|
202
|
+
account: {
|
|
203
|
+
address: transactionIntent.sender,
|
|
204
|
+
revealed: senderAccountInfo.revealed,
|
|
205
|
+
balance: BigInt(senderAccountInfo.balance),
|
|
206
|
+
// try intent public key first and fallback to tzkt public key
|
|
207
|
+
xpub: transactionIntent.senderPublicKey ?? senderAccountInfo.publicKey,
|
|
208
|
+
},
|
|
209
|
+
transaction: {
|
|
210
|
+
// reuse the same mapping as craft
|
|
211
|
+
mode: (0, utils_2.mapIntentTypeToTezosMode)(transactionIntent.type),
|
|
212
|
+
recipient: transactionIntent.recipient,
|
|
213
|
+
amount: transactionIntent.amount,
|
|
214
|
+
// legacy estimator needs this flag to pre-estimate fees
|
|
215
|
+
useAllAmount: !!transactionIntent.useAllAmount,
|
|
216
|
+
},
|
|
217
|
+
});
|
|
235
218
|
if (estimation.taquitoError &&
|
|
236
219
|
!estimation.taquitoError.includes("delegate.unchanged") &&
|
|
237
220
|
!estimation.taquitoError.includes("subtraction_underflow") &&
|
package/lib/api/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAcA,OAAmB,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAezD,OAAO,KAAK,EAAE,QAAQ,EAAsB,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAcA,OAAmB,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAezD,OAAO,KAAK,EAAE,QAAQ,EAAsB,MAAM,SAAS,CAAC;AAY5D,wBAAgB,SAAS,CAAC,MAAM,EAAE,WAAW,GAAG,QAAQ,CAuCvD"}
|
package/lib-es/api/index.js
CHANGED
|
@@ -7,7 +7,6 @@ import { RecommendUndelegation } from "@ledgerhq/errors";
|
|
|
7
7
|
import { validatePublicKey, ValidationResult, getPkhfromPk } from "@taquito/utils";
|
|
8
8
|
import { getRevealFee } from "@taquito/taquito";
|
|
9
9
|
import { DUST_MARGIN_MUTEZ, hasEmptyBalance, mapIntentTypeToTezosMode, normalizePublicKeyForAddress, } from "../utils";
|
|
10
|
-
import { log } from "@ledgerhq/logs";
|
|
11
10
|
export function createApi(config) {
|
|
12
11
|
coinConfig.setCoinConfig(() => ({ ...config, status: { type: "active" } }));
|
|
13
12
|
return {
|
|
@@ -192,40 +191,24 @@ async function estimate(transactionIntent) {
|
|
|
192
191
|
},
|
|
193
192
|
};
|
|
194
193
|
}
|
|
195
|
-
const accountBase = {
|
|
196
|
-
address: transactionIntent.sender,
|
|
197
|
-
revealed: senderAccountInfo.revealed,
|
|
198
|
-
balance: BigInt(senderAccountInfo.balance),
|
|
199
|
-
};
|
|
200
|
-
const transaction = {
|
|
201
|
-
mode: mapIntentTypeToTezosMode(transactionIntent.type),
|
|
202
|
-
recipient: transactionIntent.recipient,
|
|
203
|
-
amount: transactionIntent.amount,
|
|
204
|
-
useAllAmount: !!transactionIntent.useAllAmount,
|
|
205
|
-
};
|
|
206
|
-
async function logicEstimate(xpub) {
|
|
207
|
-
// needed by the compiler (it can assume it's a "user" account with respective fields)
|
|
208
|
-
if (senderAccountInfo.type !== "user")
|
|
209
|
-
throw new Error("unexpected account type");
|
|
210
|
-
const account = xpub ? { ...accountBase, xpub } : accountBase;
|
|
211
|
-
return await estimateFees({ account, transaction });
|
|
212
|
-
}
|
|
213
|
-
const xpub = transactionIntent.senderPublicKey ?? senderAccountInfo.publicKey;
|
|
214
194
|
try {
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
195
|
+
const estimation = await estimateFees({
|
|
196
|
+
account: {
|
|
197
|
+
address: transactionIntent.sender,
|
|
198
|
+
revealed: senderAccountInfo.revealed,
|
|
199
|
+
balance: BigInt(senderAccountInfo.balance),
|
|
200
|
+
// try intent public key first and fallback to tzkt public key
|
|
201
|
+
xpub: transactionIntent.senderPublicKey ?? senderAccountInfo.publicKey,
|
|
202
|
+
},
|
|
203
|
+
transaction: {
|
|
204
|
+
// reuse the same mapping as craft
|
|
205
|
+
mode: mapIntentTypeToTezosMode(transactionIntent.type),
|
|
206
|
+
recipient: transactionIntent.recipient,
|
|
207
|
+
amount: transactionIntent.amount,
|
|
208
|
+
// legacy estimator needs this flag to pre-estimate fees
|
|
209
|
+
useAllAmount: !!transactionIntent.useAllAmount,
|
|
210
|
+
},
|
|
211
|
+
});
|
|
229
212
|
if (estimation.taquitoError &&
|
|
230
213
|
!estimation.taquitoError.includes("delegate.unchanged") &&
|
|
231
214
|
!estimation.taquitoError.includes("subtraction_underflow") &&
|
package/lib-es/api/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,kBAAkB,GAMnB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,UAAgC,MAAM,WAAW,CAAC;AACzD,OAAO,EACL,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,YAAY,EACZ,UAAU,EACV,SAAS,EACT,cAAc,EACd,SAAS,EACT,cAAc,EACd,SAAS,GACV,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAGlC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,UAAU,CAAC;AAElB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.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.9.0
|
|
3
|
+
"version": "6.9.0",
|
|
4
4
|
"description": "Tezos Coin integration",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger",
|
|
@@ -75,13 +75,13 @@
|
|
|
75
75
|
"invariant": "^2.2.4",
|
|
76
76
|
"lodash": "^4.17.21",
|
|
77
77
|
"rxjs": "^7.8.1",
|
|
78
|
-
"@ledgerhq/coin-framework": "^6.9.0
|
|
79
|
-
"@ledgerhq/cryptoassets": "^13.33.0
|
|
78
|
+
"@ledgerhq/coin-framework": "^6.9.0",
|
|
79
|
+
"@ledgerhq/cryptoassets": "^13.33.0",
|
|
80
80
|
"@ledgerhq/devices": "8.7.0",
|
|
81
81
|
"@ledgerhq/errors": "^6.27.0",
|
|
82
|
-
"@ledgerhq/live-network": "^2.1.1
|
|
82
|
+
"@ledgerhq/live-network": "^2.1.1",
|
|
83
83
|
"@ledgerhq/logs": "^6.13.0",
|
|
84
|
-
"@ledgerhq/types-live": "^6.89.0
|
|
84
|
+
"@ledgerhq/types-live": "^6.89.0"
|
|
85
85
|
},
|
|
86
86
|
"devDependencies": {
|
|
87
87
|
"@faker-js/faker": "^8.4.1",
|
|
@@ -4,7 +4,6 @@ import type { TezosApi } from "./types";
|
|
|
4
4
|
import { SendTransactionIntent } from "@ledgerhq/coin-framework/api/types";
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
|
-
* Ghostnet-specific integration tests
|
|
8
7
|
* https://teztnets.com/ghostnet-about
|
|
9
8
|
* https://api.tzkt.io/#section/Get-Started/Free-TzKT-API
|
|
10
9
|
*/
|
package/src/api/index.ts
CHANGED
|
@@ -38,8 +38,6 @@ import {
|
|
|
38
38
|
mapIntentTypeToTezosMode,
|
|
39
39
|
normalizePublicKeyForAddress,
|
|
40
40
|
} from "../utils";
|
|
41
|
-
import { CoreAccountInfo, CoreTransactionInfo, EstimatedFees } from "../logic/estimateFees";
|
|
42
|
-
import { log } from "@ledgerhq/logs";
|
|
43
41
|
|
|
44
42
|
export function createApi(config: TezosConfig): TezosApi {
|
|
45
43
|
coinConfig.setCoinConfig(() => ({ ...config, status: { type: "active" } }));
|
|
@@ -247,41 +245,24 @@ async function estimate(transactionIntent: TransactionIntent): Promise<TezosFeeE
|
|
|
247
245
|
};
|
|
248
246
|
}
|
|
249
247
|
|
|
250
|
-
const accountBase: CoreAccountInfo = {
|
|
251
|
-
address: transactionIntent.sender,
|
|
252
|
-
revealed: senderAccountInfo.revealed,
|
|
253
|
-
balance: BigInt(senderAccountInfo.balance),
|
|
254
|
-
};
|
|
255
|
-
|
|
256
|
-
const transaction: CoreTransactionInfo = {
|
|
257
|
-
mode: mapIntentTypeToTezosMode(transactionIntent.type),
|
|
258
|
-
recipient: transactionIntent.recipient,
|
|
259
|
-
amount: transactionIntent.amount,
|
|
260
|
-
useAllAmount: !!transactionIntent.useAllAmount,
|
|
261
|
-
};
|
|
262
|
-
|
|
263
|
-
async function logicEstimate(xpub?: string): Promise<EstimatedFees> {
|
|
264
|
-
// needed by the compiler (it can assume it's a "user" account with respective fields)
|
|
265
|
-
if (senderAccountInfo.type !== "user") throw new Error("unexpected account type");
|
|
266
|
-
const account = xpub ? { ...accountBase, xpub } : accountBase;
|
|
267
|
-
return await estimateFees({ account, transaction });
|
|
268
|
-
}
|
|
269
|
-
const xpub = transactionIntent.senderPublicKey ?? senderAccountInfo.publicKey;
|
|
270
|
-
|
|
271
248
|
try {
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
249
|
+
const estimation = await estimateFees({
|
|
250
|
+
account: {
|
|
251
|
+
address: transactionIntent.sender,
|
|
252
|
+
revealed: senderAccountInfo.revealed,
|
|
253
|
+
balance: BigInt(senderAccountInfo.balance),
|
|
254
|
+
// try intent public key first and fallback to tzkt public key
|
|
255
|
+
xpub: transactionIntent.senderPublicKey ?? senderAccountInfo.publicKey,
|
|
256
|
+
},
|
|
257
|
+
transaction: {
|
|
258
|
+
// reuse the same mapping as craft
|
|
259
|
+
mode: mapIntentTypeToTezosMode(transactionIntent.type),
|
|
260
|
+
recipient: transactionIntent.recipient,
|
|
261
|
+
amount: transactionIntent.amount,
|
|
262
|
+
// legacy estimator needs this flag to pre-estimate fees
|
|
263
|
+
useAllAmount: !!transactionIntent.useAllAmount,
|
|
264
|
+
},
|
|
265
|
+
});
|
|
285
266
|
|
|
286
267
|
if (
|
|
287
268
|
estimation.taquitoError &&
|
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
import { createApi } from ".";
|
|
2
|
-
import type { TezosApi } from "./types";
|
|
3
|
-
|
|
4
|
-
/**
|
|
5
|
-
* Mainnet-specific integration tests
|
|
6
|
-
* Please implement your tests in testnet-specific tests file (see index.integ.test.ts)
|
|
7
|
-
* Use this test suite in last resort
|
|
8
|
-
*/
|
|
9
|
-
describe("Tezos Api - Mainnet", () => {
|
|
10
|
-
let module: TezosApi;
|
|
11
|
-
|
|
12
|
-
beforeAll(() => {
|
|
13
|
-
module = createApi({
|
|
14
|
-
baker: {
|
|
15
|
-
url: "https://baker.example.com",
|
|
16
|
-
},
|
|
17
|
-
explorer: {
|
|
18
|
-
url: "https://xtz-tzkt-explorer.api.vault.ledger.com",
|
|
19
|
-
maxTxQuery: 100,
|
|
20
|
-
},
|
|
21
|
-
node: {
|
|
22
|
-
url: "https://xtz-node.api.vault.ledger.com",
|
|
23
|
-
},
|
|
24
|
-
fees: {
|
|
25
|
-
minGasLimit: 600,
|
|
26
|
-
minRevealGasLimit: 300,
|
|
27
|
-
minStorageLimit: 0,
|
|
28
|
-
minFees: 500,
|
|
29
|
-
minEstimatedFees: 500,
|
|
30
|
-
},
|
|
31
|
-
});
|
|
32
|
-
});
|
|
33
|
-
|
|
34
|
-
describe("estimateFees", () => {
|
|
35
|
-
it("fallback to an estimation without the public key", async () => {
|
|
36
|
-
// When
|
|
37
|
-
const result = await module.estimateFees({
|
|
38
|
-
intentType: "transaction",
|
|
39
|
-
asset: { type: "native" },
|
|
40
|
-
type: "send",
|
|
41
|
-
sender: "tz2BHzkaizWwCmhYswwTQCycgT8mXFH8QTL5",
|
|
42
|
-
senderPublicKey: "038ad002bc17d427794e148c9b9b464e977dc3cbc4d76148e97641ae86e46ec176",
|
|
43
|
-
recipient: "tz2JpHaYBjGdTq7b5mWFpG9AP3L3CckdRJcA",
|
|
44
|
-
amount: BigInt(100),
|
|
45
|
-
});
|
|
46
|
-
|
|
47
|
-
expect(result.value).toBeGreaterThanOrEqual(BigInt(0));
|
|
48
|
-
expect(result.parameters).toBeDefined();
|
|
49
|
-
expect(result.parameters?.gasLimit).toBeGreaterThanOrEqual(BigInt(0));
|
|
50
|
-
expect(result.parameters?.storageLimit).toBeGreaterThanOrEqual(BigInt(0));
|
|
51
|
-
});
|
|
52
|
-
});
|
|
53
|
-
});
|