@ledgerhq/coin-tezos 6.7.0-nightly.9 → 6.7.1-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 +35 -67
- package/lib/logic/listOperations.js +1 -1
- package/lib/logic/listOperations.js.map +1 -1
- package/lib/logic/validateIntent.d.ts.map +1 -1
- package/lib/logic/validateIntent.js +6 -5
- package/lib/logic/validateIntent.js.map +1 -1
- package/lib-es/logic/listOperations.js +1 -1
- package/lib-es/logic/listOperations.js.map +1 -1
- package/lib-es/logic/validateIntent.d.ts.map +1 -1
- package/lib-es/logic/validateIntent.js +6 -5
- package/lib-es/logic/validateIntent.js.map +1 -1
- package/package.json +6 -6
- package/src/logic/listOperations.test.ts +5 -5
- package/src/logic/listOperations.ts +2 -1
- package/src/logic/validateIntent.test.ts +23 -0
- package/src/logic/validateIntent.ts +6 -4
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @ledgerhq/coin-tezos@6.7.0
|
|
2
|
+
> @ledgerhq/coin-tezos@6.7.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,102 +1,70 @@
|
|
|
1
1
|
# @ledgerhq/coin-tezos
|
|
2
2
|
|
|
3
|
-
## 6.7.
|
|
3
|
+
## 6.7.1-nightly.0
|
|
4
4
|
|
|
5
5
|
### Patch Changes
|
|
6
6
|
|
|
7
|
-
- Updated dependencies [[`
|
|
8
|
-
- @ledgerhq/
|
|
9
|
-
- @ledgerhq/coin-framework@6.7.
|
|
10
|
-
- @ledgerhq/
|
|
7
|
+
- Updated dependencies [[`2c6a198`](https://github.com/LedgerHQ/ledger-live/commit/2c6a198ba28391695202a0787ce168c53768ff37)]:
|
|
8
|
+
- @ledgerhq/types-live@6.88.0-nightly.0
|
|
9
|
+
- @ledgerhq/coin-framework@6.7.1-nightly.0
|
|
10
|
+
- @ledgerhq/cryptoassets@13.31.1-nightly.0
|
|
11
11
|
|
|
12
|
-
## 6.7.0
|
|
12
|
+
## 6.7.0
|
|
13
13
|
|
|
14
|
-
###
|
|
15
|
-
|
|
16
|
-
- Updated dependencies [[`c96d73f`](https://github.com/LedgerHQ/ledger-live/commit/c96d73fed0a75a9c208f78d51c34b742703a7dda)]:
|
|
17
|
-
- @ledgerhq/coin-framework@6.7.0-nightly.8
|
|
18
|
-
|
|
19
|
-
## 6.7.0-nightly.7
|
|
20
|
-
|
|
21
|
-
### Patch Changes
|
|
22
|
-
|
|
23
|
-
- Updated dependencies [[`b4ceaff`](https://github.com/LedgerHQ/ledger-live/commit/b4ceaff2ecf68d8a14e09801c76ab0b014c45286), [`f392f69`](https://github.com/LedgerHQ/ledger-live/commit/f392f6912f445cc2f7cf4dfcfd030fa3da76f736)]:
|
|
24
|
-
- @ledgerhq/cryptoassets@13.31.0-nightly.7
|
|
25
|
-
- @ledgerhq/types-live@6.87.0-nightly.5
|
|
26
|
-
- @ledgerhq/coin-framework@6.7.0-nightly.7
|
|
27
|
-
- @ledgerhq/live-network@2.0.20-nightly.3
|
|
28
|
-
|
|
29
|
-
## 6.7.0-nightly.6
|
|
30
|
-
|
|
31
|
-
### Patch Changes
|
|
32
|
-
|
|
33
|
-
- Updated dependencies [[`51995e9`](https://github.com/LedgerHQ/ledger-live/commit/51995e96a9e1fafe14c7cbe45ce0b1ec8ebd106b)]:
|
|
34
|
-
- @ledgerhq/types-live@6.87.0-nightly.4
|
|
35
|
-
- @ledgerhq/coin-framework@6.7.0-nightly.6
|
|
36
|
-
- @ledgerhq/cryptoassets@13.31.0-nightly.6
|
|
37
|
-
|
|
38
|
-
## 6.7.0-nightly.5
|
|
39
|
-
|
|
40
|
-
### Patch Changes
|
|
14
|
+
### Minor Changes
|
|
41
15
|
|
|
42
|
-
-
|
|
43
|
-
- @ledgerhq/coin-framework@6.7.0-nightly.5
|
|
44
|
-
- @ledgerhq/cryptoassets@13.31.0-nightly.5
|
|
45
|
-
- @ledgerhq/live-network@2.0.20-nightly.2
|
|
16
|
+
- [#12291](https://github.com/LedgerHQ/ledger-live/pull/12291) [`5098fd4`](https://github.com/LedgerHQ/ledger-live/commit/5098fd44f8c8aa883cabefe691c090f83ca936d5) Thanks [@francois-guerin-ledger](https://github.com/francois-guerin-ledger)! - fix(coin-tezos): use 0 amount within delegate and undelegate operations
|
|
46
17
|
|
|
47
|
-
|
|
18
|
+
- [#12091](https://github.com/LedgerHQ/ledger-live/pull/12091) [`04fc7da`](https://github.com/LedgerHQ/ledger-live/commit/04fc7daed03fde65ac8c1ec4c0e28d784e16337a) Thanks [@dilaouid](https://github.com/dilaouid)! - fix: shows "delegate/undelegate" instead of "sent" in the drawer
|
|
48
19
|
|
|
49
|
-
|
|
20
|
+
- [#12015](https://github.com/LedgerHQ/ledger-live/pull/12015) [`03af552`](https://github.com/LedgerHQ/ledger-live/commit/03af552b621e19e31747a65b1870dfe8d3bb005b) Thanks [@Justkant](https://github.com/Justkant)! - feat: new signRawTransaction to support any XRP transaction with wallet-api
|
|
50
21
|
|
|
51
|
-
-
|
|
52
|
-
- @ledgerhq/types-live@6.87.0-nightly.3
|
|
53
|
-
- @ledgerhq/errors@6.27.0-nightly.0
|
|
54
|
-
- @ledgerhq/coin-framework@6.7.0-nightly.4
|
|
55
|
-
- @ledgerhq/cryptoassets@13.31.0-nightly.4
|
|
56
|
-
- @ledgerhq/devices@8.6.2-nightly.0
|
|
57
|
-
- @ledgerhq/live-network@2.0.20-nightly.1
|
|
22
|
+
- [#12062](https://github.com/LedgerHQ/ledger-live/pull/12062) [`d2b12e7`](https://github.com/LedgerHQ/ledger-live/commit/d2b12e70bba9e772d078d1fe4d9c537b8d316a87) Thanks [@qperrot](https://github.com/qperrot)! - feat: estimateFees and craftTransaction for evm staking and new Intent type
|
|
58
23
|
|
|
59
|
-
|
|
24
|
+
- [#12139](https://github.com/LedgerHQ/ledger-live/pull/12139) [`246b070`](https://github.com/LedgerHQ/ledger-live/commit/246b0701c1f375f3cdd847c5d2a8fe3c2060ef28) Thanks [@dilaouid](https://github.com/dilaouid)! - feat: staking generic bridge support (tezos)
|
|
60
25
|
|
|
61
26
|
### Patch Changes
|
|
62
27
|
|
|
63
|
-
- Updated dependencies [[`8645f01`](https://github.com/LedgerHQ/ledger-live/commit/8645f016191d29a55f6b0ca6e4b1d1909fd35445)]:
|
|
64
|
-
- @ledgerhq/
|
|
65
|
-
- @ledgerhq/
|
|
66
|
-
- @ledgerhq/
|
|
28
|
+
- Updated dependencies [[`ea16f59`](https://github.com/LedgerHQ/ledger-live/commit/ea16f592e85019a1b77287a7f2b975c6fcffc74c), [`b88faa1`](https://github.com/LedgerHQ/ledger-live/commit/b88faa18e2f5cd309b54fc3157a44db606846cc5), [`cfe65ca`](https://github.com/LedgerHQ/ledger-live/commit/cfe65cafa268be4e53197ee163ce78f28ed72592), [`a9aacdb`](https://github.com/LedgerHQ/ledger-live/commit/a9aacdb330700f0a294833f7d77de17f179229b2), [`3979c07`](https://github.com/LedgerHQ/ledger-live/commit/3979c0715e4f54165c89d00ebe1441e064e1a110), [`c6a676f`](https://github.com/LedgerHQ/ledger-live/commit/c6a676ff80581ac19b896adf44d54812983b72da), [`b5fc1bd`](https://github.com/LedgerHQ/ledger-live/commit/b5fc1bd28fff091241905fec5ff8dc8af4c99b79), [`03af552`](https://github.com/LedgerHQ/ledger-live/commit/03af552b621e19e31747a65b1870dfe8d3bb005b), [`89ac0ed`](https://github.com/LedgerHQ/ledger-live/commit/89ac0eddc145dcf5c7cf240aa8be4301372c8f33), [`565da80`](https://github.com/LedgerHQ/ledger-live/commit/565da807b1ebbfc830fd0e47b3d8856f88d410a6), [`8645f01`](https://github.com/LedgerHQ/ledger-live/commit/8645f016191d29a55f6b0ca6e4b1d1909fd35445), [`1d9860c`](https://github.com/LedgerHQ/ledger-live/commit/1d9860cd1688131d391579955b40c6710b667db8), [`d2b12e7`](https://github.com/LedgerHQ/ledger-live/commit/d2b12e70bba9e772d078d1fe4d9c537b8d316a87), [`db25e21`](https://github.com/LedgerHQ/ledger-live/commit/db25e212b87dea426b153c6f1d988cead63c8c46), [`c8dbf40`](https://github.com/LedgerHQ/ledger-live/commit/c8dbf402268359e225a94782420111e786f875fa), [`cab7d97`](https://github.com/LedgerHQ/ledger-live/commit/cab7d9794e7babb8220c6d339fb08e618e3d4202)]:
|
|
29
|
+
- @ledgerhq/cryptoassets@13.31.0
|
|
30
|
+
- @ledgerhq/types-live@6.87.0
|
|
31
|
+
- @ledgerhq/coin-framework@6.7.0
|
|
32
|
+
- @ledgerhq/live-network@2.0.20
|
|
67
33
|
|
|
68
|
-
## 6.7.0-
|
|
34
|
+
## 6.7.0-next.2
|
|
69
35
|
|
|
70
|
-
###
|
|
36
|
+
### Minor Changes
|
|
71
37
|
|
|
72
|
-
-
|
|
73
|
-
- @ledgerhq/coin-framework@6.7.0-nightly.2
|
|
74
|
-
- @ledgerhq/cryptoassets@13.31.0-nightly.2
|
|
38
|
+
- [#12291](https://github.com/LedgerHQ/ledger-live/pull/12291) [`5098fd4`](https://github.com/LedgerHQ/ledger-live/commit/5098fd44f8c8aa883cabefe691c090f83ca936d5) Thanks [@francois-guerin-ledger](https://github.com/francois-guerin-ledger)! - fix(coin-tezos): use 0 amount within delegate and undelegate operations
|
|
75
39
|
|
|
76
|
-
## 6.7.0-
|
|
40
|
+
## 6.7.0-next.1
|
|
77
41
|
|
|
78
42
|
### Patch Changes
|
|
79
43
|
|
|
80
|
-
- Updated dependencies [[`
|
|
81
|
-
- @ledgerhq/
|
|
82
|
-
- @ledgerhq/
|
|
83
|
-
- @ledgerhq/
|
|
84
|
-
- @ledgerhq/live-network@2.0.20-nightly.0
|
|
44
|
+
- Updated dependencies [[`b88faa1`](https://github.com/LedgerHQ/ledger-live/commit/b88faa18e2f5cd309b54fc3157a44db606846cc5)]:
|
|
45
|
+
- @ledgerhq/types-live@6.87.0-next.1
|
|
46
|
+
- @ledgerhq/coin-framework@6.7.0-next.1
|
|
47
|
+
- @ledgerhq/cryptoassets@13.31.0-next.1
|
|
85
48
|
|
|
86
|
-
## 6.7.0-
|
|
49
|
+
## 6.7.0-next.0
|
|
87
50
|
|
|
88
51
|
### Minor Changes
|
|
89
52
|
|
|
53
|
+
- [#12091](https://github.com/LedgerHQ/ledger-live/pull/12091) [`04fc7da`](https://github.com/LedgerHQ/ledger-live/commit/04fc7daed03fde65ac8c1ec4c0e28d784e16337a) Thanks [@dilaouid](https://github.com/dilaouid)! - fix: shows "delegate/undelegate" instead of "sent" in the drawer
|
|
54
|
+
|
|
90
55
|
- [#12015](https://github.com/LedgerHQ/ledger-live/pull/12015) [`03af552`](https://github.com/LedgerHQ/ledger-live/commit/03af552b621e19e31747a65b1870dfe8d3bb005b) Thanks [@Justkant](https://github.com/Justkant)! - feat: new signRawTransaction to support any XRP transaction with wallet-api
|
|
91
56
|
|
|
92
57
|
- [#12062](https://github.com/LedgerHQ/ledger-live/pull/12062) [`d2b12e7`](https://github.com/LedgerHQ/ledger-live/commit/d2b12e70bba9e772d078d1fe4d9c537b8d316a87) Thanks [@qperrot](https://github.com/qperrot)! - feat: estimateFees and craftTransaction for evm staking and new Intent type
|
|
93
58
|
|
|
59
|
+
- [#12139](https://github.com/LedgerHQ/ledger-live/pull/12139) [`246b070`](https://github.com/LedgerHQ/ledger-live/commit/246b0701c1f375f3cdd847c5d2a8fe3c2060ef28) Thanks [@dilaouid](https://github.com/dilaouid)! - feat: staking generic bridge support (tezos)
|
|
60
|
+
|
|
94
61
|
### Patch Changes
|
|
95
62
|
|
|
96
|
-
- Updated dependencies [[`cfe65ca`](https://github.com/LedgerHQ/ledger-live/commit/cfe65cafa268be4e53197ee163ce78f28ed72592), [`b5fc1bd`](https://github.com/LedgerHQ/ledger-live/commit/b5fc1bd28fff091241905fec5ff8dc8af4c99b79), [`03af552`](https://github.com/LedgerHQ/ledger-live/commit/03af552b621e19e31747a65b1870dfe8d3bb005b), [`d2b12e7`](https://github.com/LedgerHQ/ledger-live/commit/d2b12e70bba9e772d078d1fe4d9c537b8d316a87), [`cab7d97`](https://github.com/LedgerHQ/ledger-live/commit/cab7d9794e7babb8220c6d339fb08e618e3d4202)]:
|
|
97
|
-
- @ledgerhq/cryptoassets@13.31.0-
|
|
98
|
-
- @ledgerhq/types-live@6.87.0-
|
|
99
|
-
- @ledgerhq/coin-framework@6.7.0-
|
|
63
|
+
- Updated dependencies [[`ea16f59`](https://github.com/LedgerHQ/ledger-live/commit/ea16f592e85019a1b77287a7f2b975c6fcffc74c), [`cfe65ca`](https://github.com/LedgerHQ/ledger-live/commit/cfe65cafa268be4e53197ee163ce78f28ed72592), [`a9aacdb`](https://github.com/LedgerHQ/ledger-live/commit/a9aacdb330700f0a294833f7d77de17f179229b2), [`3979c07`](https://github.com/LedgerHQ/ledger-live/commit/3979c0715e4f54165c89d00ebe1441e064e1a110), [`c6a676f`](https://github.com/LedgerHQ/ledger-live/commit/c6a676ff80581ac19b896adf44d54812983b72da), [`b5fc1bd`](https://github.com/LedgerHQ/ledger-live/commit/b5fc1bd28fff091241905fec5ff8dc8af4c99b79), [`03af552`](https://github.com/LedgerHQ/ledger-live/commit/03af552b621e19e31747a65b1870dfe8d3bb005b), [`89ac0ed`](https://github.com/LedgerHQ/ledger-live/commit/89ac0eddc145dcf5c7cf240aa8be4301372c8f33), [`565da80`](https://github.com/LedgerHQ/ledger-live/commit/565da807b1ebbfc830fd0e47b3d8856f88d410a6), [`8645f01`](https://github.com/LedgerHQ/ledger-live/commit/8645f016191d29a55f6b0ca6e4b1d1909fd35445), [`1d9860c`](https://github.com/LedgerHQ/ledger-live/commit/1d9860cd1688131d391579955b40c6710b667db8), [`d2b12e7`](https://github.com/LedgerHQ/ledger-live/commit/d2b12e70bba9e772d078d1fe4d9c537b8d316a87), [`db25e21`](https://github.com/LedgerHQ/ledger-live/commit/db25e212b87dea426b153c6f1d988cead63c8c46), [`c8dbf40`](https://github.com/LedgerHQ/ledger-live/commit/c8dbf402268359e225a94782420111e786f875fa), [`cab7d97`](https://github.com/LedgerHQ/ledger-live/commit/cab7d9794e7babb8220c6d339fb08e618e3d4202)]:
|
|
64
|
+
- @ledgerhq/cryptoassets@13.31.0-next.0
|
|
65
|
+
- @ledgerhq/types-live@6.87.0-next.0
|
|
66
|
+
- @ledgerhq/coin-framework@6.7.0-next.0
|
|
67
|
+
- @ledgerhq/live-network@2.0.20-next.0
|
|
100
68
|
|
|
101
69
|
## 6.6.0
|
|
102
70
|
|
|
@@ -77,7 +77,7 @@ function convertOperation(address, operation) {
|
|
|
77
77
|
(0, logs_1.log)("coin:tezos", "(logic/operations): No target address found for operation", operation);
|
|
78
78
|
}
|
|
79
79
|
const senders = sender?.address ? [sender.address] : [];
|
|
80
|
-
const amount = (0, types_1.isAPIRevealType)(operation) ? 0n : BigInt(operation.amount);
|
|
80
|
+
const amount = (0, types_1.isAPIRevealType)(operation) || (0, types_1.isAPIDelegationType)(operation) ? 0n : BigInt(operation.amount);
|
|
81
81
|
const fee = BigInt(operation.storageFee ?? 0) +
|
|
82
82
|
BigInt(operation.bakerFee ?? 0) +
|
|
83
83
|
BigInt(operation.allocationFee ?? 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listOperations.js","sourceRoot":"","sources":["../../src/logic/listOperations.ts"],"names":[],"mappings":";;AAyBA,wCAyCC;AAlED,wCAAkC;AAClC,yCAAqC;AACrC,4CAQ0B;AAG1B;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,cAAc,CAClC,OAAe,EACf,EACE,KAAK,EACL,KAAK,EACL,IAAI,EACJ,SAAS,GAC+E;IAE1F,IAAI,OAAO,GAAiC,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;IACnF,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;IACtD,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,cAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAErE,kFAAkF;IAClF,MAAM,iBAAiB,GAAG,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAE1E,MAAM,aAAa,GAAG,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,2EAA2E;IAC3E,qCAAqC;IACrC,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzE,MAAM,kBAAkB,GAAG,iBAAiB;SACzC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,4BAAoB,EAAC,EAAE,CAAC,IAAI,IAAA,2BAAmB,EAAC,EAAE,CAAC,IAAI,IAAA,uBAAe,EAAC,EAAE,CAAC,CAAC;SACxF,MAAM,CAAC,EAAE,CAAC,EAAE;QACX,gCAAgC;QAChC,MAAM,SAAS,GAAG,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC;QAC1C,IAAI,SAAS,IAAI,IAAA,4BAAoB,EAAC,EAAE,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,GAAG,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC;YAC5C,IAAI,IAAI,EAAE,CAAC;gBACT,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;SACD,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;SACxC,IAAI,EAAE,CAAC;IACV,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,IAAI,CAC9C,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CACpD,CAAC;IACF,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;AACvC,CAAC;AAED;;GAEG;AACH,SAAS,eAAe,CACtB,SAAiE,EACjE,cAAiC;IAEjC,IAAI,IAAA,2BAAmB,EAAC,SAAS,CAAC,EAAE,CAAC;QACnC,OAAO,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC;IACpE,CAAC;SAAM,IAAI,IAAA,uBAAe,EAAC,SAAS,CAAC,EAAE,CAAC;QACtC,OAAO,QAAQ,CAAC;IAClB,CAAC;SAAM,IAAI,cAAc,KAAK,MAAM,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,8EAA8E;AAC9E,SAAS,gBAAgB,CACvB,OAAe,EACf,SAAiE;IAEjE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC;IAEvC,IAAI,aAAa,GAAG,SAAS,CAAC;IAC9B,IAAI,IAAA,4BAAoB,EAAC,SAAS,CAAC,EAAE,CAAC;QACpC,aAAa,GAAG,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC;IAC7C,CAAC;SAAM,IAAI,IAAA,2BAAmB,EAAC,SAAS,CAAC,EAAE,CAAC;QAC1C,iFAAiF;QACjF,aAAa,GAAG,SAAS,EAAE,WAAW,EAAE,OAAO,IAAI,SAAS,EAAE,YAAY,EAAE,OAAO,CAAC;IACtF,CAAC;IAED,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,IAAA,UAAG,EAAC,YAAY,EAAE,2DAA2D,EAAE,SAAS,CAAC,CAAC;IAC5F,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAExD,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"listOperations.js","sourceRoot":"","sources":["../../src/logic/listOperations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateIntent.d.ts","sourceRoot":"","sources":["../../src/logic/validateIntent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAuInG,wBAAsB,cAAc,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,qBAAqB,CAAC,
|
|
1
|
+
{"version":3,"file":"validateIntent.d.ts","sourceRoot":"","sources":["../../src/logic/validateIntent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAuInG,wBAAsB,cAAc,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAyE9F"}
|
|
@@ -82,15 +82,14 @@ function mapTaquitoErrors(taquitoError, intentType) {
|
|
|
82
82
|
/**
|
|
83
83
|
* Calculates final amounts based on transaction type
|
|
84
84
|
*/
|
|
85
|
-
function calculateAmounts(intent, senderInfo, estimatedFees) {
|
|
85
|
+
function calculateAmounts(intent, senderInfo, estimatedFees, estimatedAmount) {
|
|
86
86
|
if (intent.type === "stake" || intent.type === "unstake") {
|
|
87
|
-
|
|
88
|
-
return { amount, totalSpent: estimatedFees };
|
|
87
|
+
return { amount: 0n, totalSpent: estimatedFees };
|
|
89
88
|
}
|
|
90
89
|
if (intent.type === "send" && intent.useAllAmount) {
|
|
91
90
|
if (senderInfo.type === "user") {
|
|
92
91
|
const balance = BigInt(senderInfo.balance);
|
|
93
|
-
const amount = balance > estimatedFees ? balance - estimatedFees : 0n;
|
|
92
|
+
const amount = estimatedAmount ?? (balance > estimatedFees ? balance - estimatedFees : 0n);
|
|
94
93
|
return { amount, totalSpent: amount + estimatedFees };
|
|
95
94
|
}
|
|
96
95
|
return { amount: 0n, totalSpent: 0n };
|
|
@@ -115,6 +114,7 @@ async function validateIntent(intent) {
|
|
|
115
114
|
const errors = {};
|
|
116
115
|
const warnings = {};
|
|
117
116
|
let estimatedFees;
|
|
117
|
+
let estimatedAmount;
|
|
118
118
|
let amount;
|
|
119
119
|
let totalSpent;
|
|
120
120
|
// Basic validation for send transactions
|
|
@@ -151,6 +151,7 @@ async function validateIntent(intent) {
|
|
|
151
151
|
},
|
|
152
152
|
});
|
|
153
153
|
estimatedFees = estimation.estimatedFees;
|
|
154
|
+
estimatedAmount = estimation.amount;
|
|
154
155
|
// Handle Taquito errors
|
|
155
156
|
if (estimation.taquitoError) {
|
|
156
157
|
const taquitoErrors = mapTaquitoErrors(estimation.taquitoError, intent.type);
|
|
@@ -161,7 +162,7 @@ async function validateIntent(intent) {
|
|
|
161
162
|
estimatedFees = 2000n;
|
|
162
163
|
}
|
|
163
164
|
// Calculate final amounts
|
|
164
|
-
const amounts = calculateAmounts(intent, senderInfo, estimatedFees);
|
|
165
|
+
const amounts = calculateAmounts(intent, senderInfo, estimatedFees, estimatedAmount);
|
|
165
166
|
amount = amounts.amount;
|
|
166
167
|
totalSpent = amounts.totalSpent;
|
|
167
168
|
// Final balance validation
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateIntent.js","sourceRoot":"","sources":["../../src/logic/validateIntent.ts"],"names":[],"mappings":";;;;;AAuIA,
|
|
1
|
+
{"version":3,"file":"validateIntent.js","sourceRoot":"","sources":["../../src/logic/validateIntent.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,7 +74,7 @@ function convertOperation(address, operation) {
|
|
|
74
74
|
log("coin:tezos", "(logic/operations): No target address found for operation", operation);
|
|
75
75
|
}
|
|
76
76
|
const senders = sender?.address ? [sender.address] : [];
|
|
77
|
-
const amount = isAPIRevealType(operation) ? 0n : BigInt(operation.amount);
|
|
77
|
+
const amount = isAPIRevealType(operation) || isAPIDelegationType(operation) ? 0n : BigInt(operation.amount);
|
|
78
78
|
const fee = BigInt(operation.storageFee ?? 0) +
|
|
79
79
|
BigInt(operation.bakerFee ?? 0) +
|
|
80
80
|
BigInt(operation.allocationFee ?? 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listOperations.js","sourceRoot":"","sources":["../../src/logic/listOperations.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"listOperations.js","sourceRoot":"","sources":["../../src/logic/listOperations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateIntent.d.ts","sourceRoot":"","sources":["../../src/logic/validateIntent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAuInG,wBAAsB,cAAc,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,qBAAqB,CAAC,
|
|
1
|
+
{"version":3,"file":"validateIntent.d.ts","sourceRoot":"","sources":["../../src/logic/validateIntent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAuInG,wBAAsB,cAAc,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAyE9F"}
|
|
@@ -76,15 +76,14 @@ function mapTaquitoErrors(taquitoError, intentType) {
|
|
|
76
76
|
/**
|
|
77
77
|
* Calculates final amounts based on transaction type
|
|
78
78
|
*/
|
|
79
|
-
function calculateAmounts(intent, senderInfo, estimatedFees) {
|
|
79
|
+
function calculateAmounts(intent, senderInfo, estimatedFees, estimatedAmount) {
|
|
80
80
|
if (intent.type === "stake" || intent.type === "unstake") {
|
|
81
|
-
|
|
82
|
-
return { amount, totalSpent: estimatedFees };
|
|
81
|
+
return { amount: 0n, totalSpent: estimatedFees };
|
|
83
82
|
}
|
|
84
83
|
if (intent.type === "send" && intent.useAllAmount) {
|
|
85
84
|
if (senderInfo.type === "user") {
|
|
86
85
|
const balance = BigInt(senderInfo.balance);
|
|
87
|
-
const amount = balance > estimatedFees ? balance - estimatedFees : 0n;
|
|
86
|
+
const amount = estimatedAmount ?? (balance > estimatedFees ? balance - estimatedFees : 0n);
|
|
88
87
|
return { amount, totalSpent: amount + estimatedFees };
|
|
89
88
|
}
|
|
90
89
|
return { amount: 0n, totalSpent: 0n };
|
|
@@ -109,6 +108,7 @@ export async function validateIntent(intent) {
|
|
|
109
108
|
const errors = {};
|
|
110
109
|
const warnings = {};
|
|
111
110
|
let estimatedFees;
|
|
111
|
+
let estimatedAmount;
|
|
112
112
|
let amount;
|
|
113
113
|
let totalSpent;
|
|
114
114
|
// Basic validation for send transactions
|
|
@@ -145,6 +145,7 @@ export async function validateIntent(intent) {
|
|
|
145
145
|
},
|
|
146
146
|
});
|
|
147
147
|
estimatedFees = estimation.estimatedFees;
|
|
148
|
+
estimatedAmount = estimation.amount;
|
|
148
149
|
// Handle Taquito errors
|
|
149
150
|
if (estimation.taquitoError) {
|
|
150
151
|
const taquitoErrors = mapTaquitoErrors(estimation.taquitoError, intent.type);
|
|
@@ -155,7 +156,7 @@ export async function validateIntent(intent) {
|
|
|
155
156
|
estimatedFees = 2000n;
|
|
156
157
|
}
|
|
157
158
|
// Calculate final amounts
|
|
158
|
-
const amounts = calculateAmounts(intent, senderInfo, estimatedFees);
|
|
159
|
+
const amounts = calculateAmounts(intent, senderInfo, estimatedFees, estimatedAmount);
|
|
159
160
|
amount = amounts.amount;
|
|
160
161
|
totalSpent = amounts.totalSpent;
|
|
161
162
|
// Final balance validation
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateIntent.js","sourceRoot":"","sources":["../../src/logic/validateIntent.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validateIntent.js","sourceRoot":"","sources":["../../src/logic/validateIntent.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.7.
|
|
3
|
+
"version": "6.7.1-nightly.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/
|
|
78
|
+
"@ledgerhq/coin-framework": "^6.7.1-nightly.0",
|
|
79
|
+
"@ledgerhq/cryptoassets": "^13.31.1-nightly.0",
|
|
79
80
|
"@ledgerhq/devices": "8.6.2-nightly.0",
|
|
80
81
|
"@ledgerhq/errors": "^6.27.0-nightly.0",
|
|
81
|
-
"@ledgerhq/
|
|
82
|
-
"@ledgerhq/live-network": "^2.0.20-nightly.3",
|
|
82
|
+
"@ledgerhq/live-network": "^2.0.20",
|
|
83
83
|
"@ledgerhq/logs": "^6.13.0",
|
|
84
|
-
"@ledgerhq/types-live": "^6.
|
|
84
|
+
"@ledgerhq/types-live": "^6.88.0-nightly.0"
|
|
85
85
|
},
|
|
86
86
|
"devDependencies": {
|
|
87
87
|
"@faker-js/faker": "^8.4.1",
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
"ts-jest": "^29.1.4",
|
|
95
95
|
"typescript": "^5.4.5",
|
|
96
96
|
"@ledgerhq/disable-network-setup": "^0.0.0",
|
|
97
|
-
"@ledgerhq/types-cryptoassets": "^7.29.0
|
|
97
|
+
"@ledgerhq/types-cryptoassets": "^7.29.0"
|
|
98
98
|
},
|
|
99
99
|
"overrides": {
|
|
100
100
|
"@taquito/ledger-signer": {
|
|
@@ -83,12 +83,12 @@ describe("listOperations", () => {
|
|
|
83
83
|
};
|
|
84
84
|
|
|
85
85
|
it.each([
|
|
86
|
-
["undelegate", undelegate, "DELEGATE", "DELEGATE"],
|
|
87
|
-
["delegate", delegate, "UNDELEGATE", "UNDELEGATE"],
|
|
88
|
-
["transfer", transfer, "OUT", undefined],
|
|
86
|
+
["undelegate", undelegate, "DELEGATE", "DELEGATE", 0n],
|
|
87
|
+
["delegate", delegate, "UNDELEGATE", "UNDELEGATE", 0n],
|
|
88
|
+
["transfer", transfer, "OUT", undefined, 724846n],
|
|
89
89
|
])(
|
|
90
90
|
"should return %s operation with proper recipient list",
|
|
91
|
-
async (_label, operation, expectedType, expectedLedgerOpType) => {
|
|
91
|
+
async (_label, operation, expectedType, expectedLedgerOpType, expectedAmount) => {
|
|
92
92
|
// Given
|
|
93
93
|
mockNetworkGetTransactions.mockResolvedValue([operation]);
|
|
94
94
|
// When
|
|
@@ -122,7 +122,7 @@ describe("listOperations", () => {
|
|
|
122
122
|
),
|
|
123
123
|
},
|
|
124
124
|
type: expectedType,
|
|
125
|
-
value:
|
|
125
|
+
value: expectedAmount,
|
|
126
126
|
},
|
|
127
127
|
]);
|
|
128
128
|
},
|
|
@@ -105,7 +105,8 @@ function convertOperation(
|
|
|
105
105
|
|
|
106
106
|
const senders = sender?.address ? [sender.address] : [];
|
|
107
107
|
|
|
108
|
-
const amount =
|
|
108
|
+
const amount =
|
|
109
|
+
isAPIRevealType(operation) || isAPIDelegationType(operation) ? 0n : BigInt(operation.amount);
|
|
109
110
|
|
|
110
111
|
const fee =
|
|
111
112
|
BigInt(operation.storageFee ?? 0) +
|
|
@@ -124,6 +124,29 @@ describe("validateIntent", () => {
|
|
|
124
124
|
|
|
125
125
|
expect(result.errors.amount).toBeUndefined();
|
|
126
126
|
});
|
|
127
|
+
|
|
128
|
+
it.each([["stake"], ["unstake"]])(
|
|
129
|
+
"returns 0 as amount when the transaction intent is '%s'",
|
|
130
|
+
async intentType => {
|
|
131
|
+
const result = await validateIntent({
|
|
132
|
+
intentType: "transaction",
|
|
133
|
+
asset: { type: "native" },
|
|
134
|
+
type: intentType,
|
|
135
|
+
sender: "tz1TzrmTBSuiVHV2VfMnGRMYvTEPCP42oSM8",
|
|
136
|
+
recipient: "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx",
|
|
137
|
+
amount: BigInt(0),
|
|
138
|
+
useAllAmount: true,
|
|
139
|
+
});
|
|
140
|
+
|
|
141
|
+
expect(result).toEqual({
|
|
142
|
+
errors: {},
|
|
143
|
+
warnings: {},
|
|
144
|
+
estimatedFees: 1000n,
|
|
145
|
+
amount: 0n,
|
|
146
|
+
totalSpent: 1000n,
|
|
147
|
+
});
|
|
148
|
+
},
|
|
149
|
+
);
|
|
127
150
|
});
|
|
128
151
|
|
|
129
152
|
describe("balance validation", () => {
|
|
@@ -98,16 +98,16 @@ function calculateAmounts(
|
|
|
98
98
|
intent: TransactionIntent,
|
|
99
99
|
senderInfo: any,
|
|
100
100
|
estimatedFees: bigint,
|
|
101
|
+
estimatedAmount: bigint | undefined,
|
|
101
102
|
): { amount: bigint; totalSpent: bigint } {
|
|
102
103
|
if (intent.type === "stake" || intent.type === "unstake") {
|
|
103
|
-
|
|
104
|
-
return { amount, totalSpent: estimatedFees };
|
|
104
|
+
return { amount: 0n, totalSpent: estimatedFees };
|
|
105
105
|
}
|
|
106
106
|
|
|
107
107
|
if (intent.type === "send" && intent.useAllAmount) {
|
|
108
108
|
if (senderInfo.type === "user") {
|
|
109
109
|
const balance = BigInt(senderInfo.balance);
|
|
110
|
-
const amount = balance > estimatedFees ? balance - estimatedFees : 0n;
|
|
110
|
+
const amount = estimatedAmount ?? (balance > estimatedFees ? balance - estimatedFees : 0n);
|
|
111
111
|
return { amount, totalSpent: amount + estimatedFees };
|
|
112
112
|
}
|
|
113
113
|
return { amount: 0n, totalSpent: 0n };
|
|
@@ -137,6 +137,7 @@ export async function validateIntent(intent: TransactionIntent): Promise<Transac
|
|
|
137
137
|
const errors: Record<string, Error> = {};
|
|
138
138
|
const warnings: Record<string, Error> = {};
|
|
139
139
|
let estimatedFees: bigint;
|
|
140
|
+
let estimatedAmount: bigint | undefined;
|
|
140
141
|
let amount: bigint;
|
|
141
142
|
let totalSpent: bigint;
|
|
142
143
|
|
|
@@ -178,6 +179,7 @@ export async function validateIntent(intent: TransactionIntent): Promise<Transac
|
|
|
178
179
|
},
|
|
179
180
|
});
|
|
180
181
|
estimatedFees = estimation.estimatedFees;
|
|
182
|
+
estimatedAmount = estimation.amount;
|
|
181
183
|
|
|
182
184
|
// Handle Taquito errors
|
|
183
185
|
if (estimation.taquitoError) {
|
|
@@ -189,7 +191,7 @@ export async function validateIntent(intent: TransactionIntent): Promise<Transac
|
|
|
189
191
|
}
|
|
190
192
|
|
|
191
193
|
// Calculate final amounts
|
|
192
|
-
const amounts = calculateAmounts(intent, senderInfo, estimatedFees);
|
|
194
|
+
const amounts = calculateAmounts(intent, senderInfo, estimatedFees, estimatedAmount);
|
|
193
195
|
amount = amounts.amount;
|
|
194
196
|
totalSpent = amounts.totalSpent;
|
|
195
197
|
|