@ledgerhq/coin-vechain 2.11.0-nightly.1 → 2.11.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 +20 -0
- package/lib/bridge/synchronisation.d.ts.map +1 -1
- package/lib/bridge/synchronisation.js +6 -2
- package/lib/bridge/synchronisation.js.map +1 -1
- package/lib/bridge/synchronisation.test.js +2 -2
- package/lib/bridge/synchronisation.test.js.map +1 -1
- package/lib-es/bridge/synchronisation.d.ts.map +1 -1
- package/lib-es/bridge/synchronisation.js +7 -3
- package/lib-es/bridge/synchronisation.js.map +1 -1
- package/lib-es/bridge/synchronisation.test.js +3 -3
- package/lib-es/bridge/synchronisation.test.js.map +1 -1
- package/package.json +5 -5
- package/src/bridge/synchronisation.test.ts +3 -3
- package/src/bridge/synchronisation.ts +8 -3
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @ledgerhq/coin-vechain@2.11.0-nightly.
|
|
2
|
+
> @ledgerhq/coin-vechain@2.11.0-nightly.2 build /home/runner/work/ledger-live/ledger-live/libs/coin-modules/coin-vechain
|
|
3
3
|
> tsc && tsc -m esnext --moduleResolution bundler --outDir lib-es
|
|
4
4
|
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @ledgerhq/coin-evm
|
|
2
2
|
|
|
3
|
+
## 2.11.0-nightly.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies []:
|
|
8
|
+
- @ledgerhq/coin-framework@6.7.0-nightly.3
|
|
9
|
+
- @ledgerhq/cryptoassets@13.31.0-nightly.3
|
|
10
|
+
|
|
11
|
+
## 2.11.0-nightly.2
|
|
12
|
+
|
|
13
|
+
### Minor Changes
|
|
14
|
+
|
|
15
|
+
- [#12196](https://github.com/LedgerHQ/ledger-live/pull/12196) [`565da80`](https://github.com/LedgerHQ/ledger-live/commit/565da807b1ebbfc830fd0e47b3d8856f88d410a6) Thanks [@gre-ledger](https://github.com/gre-ledger)! - Remove deprecated getTokenById and hasTokenId functions
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- Updated dependencies [[`c6a676f`](https://github.com/LedgerHQ/ledger-live/commit/c6a676ff80581ac19b896adf44d54812983b72da), [`565da80`](https://github.com/LedgerHQ/ledger-live/commit/565da807b1ebbfc830fd0e47b3d8856f88d410a6)]:
|
|
20
|
+
- @ledgerhq/coin-framework@6.7.0-nightly.2
|
|
21
|
+
- @ledgerhq/cryptoassets@13.31.0-nightly.2
|
|
22
|
+
|
|
3
23
|
## 2.11.0-nightly.1
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAI/C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAI/C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,OAAO,CA8EpD,CAAC"}
|
|
@@ -41,6 +41,10 @@ const getAccountShape = async (info) => {
|
|
|
41
41
|
operationsDates.concat(vthoOperations.map(c => c.date.getTime()));
|
|
42
42
|
minDate = Math.min(...operationsDates);
|
|
43
43
|
}
|
|
44
|
+
const vthoToken = (0, tokens_1.findTokenById)("vechain/vip180/vtho");
|
|
45
|
+
if (!vthoToken) {
|
|
46
|
+
throw new Error('token with id "vechain/vip180/vtho" not found');
|
|
47
|
+
}
|
|
44
48
|
const shape = {
|
|
45
49
|
id: accountId,
|
|
46
50
|
balance: new bignumber_js_1.BigNumber(balance),
|
|
@@ -49,13 +53,13 @@ const getAccountShape = async (info) => {
|
|
|
49
53
|
operationsCount: operations.length,
|
|
50
54
|
operations,
|
|
51
55
|
blockHeight,
|
|
52
|
-
feesCurrency:
|
|
56
|
+
feesCurrency: vthoToken,
|
|
53
57
|
subAccounts: [
|
|
54
58
|
{
|
|
55
59
|
type: "TokenAccount",
|
|
56
60
|
id: vthoAccountId,
|
|
57
61
|
parentId: accountId,
|
|
58
|
-
token:
|
|
62
|
+
token: vthoToken,
|
|
59
63
|
balance: new bignumber_js_1.BigNumber(energy),
|
|
60
64
|
spendableBalance: new bignumber_js_1.BigNumber(energy),
|
|
61
65
|
creationDate: minDate !== -1 ? new Date(minDate) : new Date(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAyC;AAEzC,kDAA0B;AAC1B,kEAIgD;AAEhD,wCAA+F;AAC/F,
|
|
1
|
+
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,13 +96,13 @@ describe("scanAccounts", () => {
|
|
|
96
96
|
swapHistory: [],
|
|
97
97
|
type: "Account",
|
|
98
98
|
used: false,
|
|
99
|
-
feesCurrency: (0, cryptoassets_1.
|
|
99
|
+
feesCurrency: (0, cryptoassets_1.findTokenById)("vechain/vip180/vtho"),
|
|
100
100
|
subAccounts: [
|
|
101
101
|
{
|
|
102
102
|
type: "TokenAccount",
|
|
103
103
|
id: "js:2:vechain:0x5066118c66793ED86bd379b50b20E32B0FC1aBf5:vechain+vechain%2Fvip180%2Fvtho",
|
|
104
104
|
parentId: "js:2:vechain:0x5066118c66793ED86bd379b50b20E32B0FC1aBf5:vechain",
|
|
105
|
-
token: (0, cryptoassets_1.
|
|
105
|
+
token: (0, cryptoassets_1.findTokenById)("vechain/vip180/vtho"),
|
|
106
106
|
balance: new bignumber_js_1.default("0"),
|
|
107
107
|
spendableBalance: new bignumber_js_1.default("0"),
|
|
108
108
|
creationDate: expect.any(Date),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.test.js","sourceRoot":"","sources":["../../src/bridge/synchronisation.test.ts"],"names":[],"mappings":";;;;;AAAA,2CAAwC;AACxC,8DAA2E;AAC3E,yEAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"synchronisation.test.js","sourceRoot":"","sources":["../../src/bridge/synchronisation.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAI/C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAI/C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,OAAO,CA8EpD,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { BigNumber } from "bignumber.js";
|
|
|
2
2
|
import eip55 from "eip55";
|
|
3
3
|
import { emptyHistoryCache, encodeAccountId, encodeTokenAccountId, } from "@ledgerhq/coin-framework/account/index";
|
|
4
4
|
import { getAccount, getLastBlockHeight, getOperations, getTokenOperations } from "../network";
|
|
5
|
-
import { findTokenById
|
|
5
|
+
import { findTokenById } from "@ledgerhq/cryptoassets/tokens";
|
|
6
6
|
import { mergeOps } from "@ledgerhq/coin-framework/bridge/jsHelpers";
|
|
7
7
|
import { isAccountEmpty } from "./helpers";
|
|
8
8
|
import { VTHO_ADDRESS } from "@vechain/sdk-core";
|
|
@@ -35,6 +35,10 @@ export const getAccountShape = async (info) => {
|
|
|
35
35
|
operationsDates.concat(vthoOperations.map(c => c.date.getTime()));
|
|
36
36
|
minDate = Math.min(...operationsDates);
|
|
37
37
|
}
|
|
38
|
+
const vthoToken = findTokenById("vechain/vip180/vtho");
|
|
39
|
+
if (!vthoToken) {
|
|
40
|
+
throw new Error('token with id "vechain/vip180/vtho" not found');
|
|
41
|
+
}
|
|
38
42
|
const shape = {
|
|
39
43
|
id: accountId,
|
|
40
44
|
balance: new BigNumber(balance),
|
|
@@ -43,13 +47,13 @@ export const getAccountShape = async (info) => {
|
|
|
43
47
|
operationsCount: operations.length,
|
|
44
48
|
operations,
|
|
45
49
|
blockHeight,
|
|
46
|
-
feesCurrency:
|
|
50
|
+
feesCurrency: vthoToken,
|
|
47
51
|
subAccounts: [
|
|
48
52
|
{
|
|
49
53
|
type: "TokenAccount",
|
|
50
54
|
id: vthoAccountId,
|
|
51
55
|
parentId: accountId,
|
|
52
|
-
token:
|
|
56
|
+
token: vthoToken,
|
|
53
57
|
balance: new BigNumber(energy),
|
|
54
58
|
spendableBalance: new BigNumber(energy),
|
|
55
59
|
creationDate: minDate !== -1 ? new Date(minDate) : new Date(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,oBAAoB,GACrB,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { faker } from "@faker-js/faker";
|
|
2
2
|
import { createEmptyHistoryCache } from "@ledgerhq/coin-framework/account";
|
|
3
3
|
import { makeScanAccounts } from "@ledgerhq/coin-framework/bridge/jsHelpers";
|
|
4
|
-
import { getCryptoCurrencyById,
|
|
4
|
+
import { getCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
|
|
5
5
|
import BigNumber from "bignumber.js";
|
|
6
6
|
import { setupServer } from "msw/node";
|
|
7
7
|
import { firstValueFrom } from "rxjs";
|
|
@@ -91,13 +91,13 @@ describe("scanAccounts", () => {
|
|
|
91
91
|
swapHistory: [],
|
|
92
92
|
type: "Account",
|
|
93
93
|
used: false,
|
|
94
|
-
feesCurrency:
|
|
94
|
+
feesCurrency: findTokenById("vechain/vip180/vtho"),
|
|
95
95
|
subAccounts: [
|
|
96
96
|
{
|
|
97
97
|
type: "TokenAccount",
|
|
98
98
|
id: "js:2:vechain:0x5066118c66793ED86bd379b50b20E32B0FC1aBf5:vechain+vechain%2Fvip180%2Fvtho",
|
|
99
99
|
parentId: "js:2:vechain:0x5066118c66793ED86bd379b50b20E32B0FC1aBf5:vechain",
|
|
100
|
-
token:
|
|
100
|
+
token: findTokenById("vechain/vip180/vtho"),
|
|
101
101
|
balance: new BigNumber("0"),
|
|
102
102
|
spendableBalance: new BigNumber("0"),
|
|
103
103
|
creationDate: expect.any(Date),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.test.js","sourceRoot":"","sources":["../../src/bridge/synchronisation.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"synchronisation.test.js","sourceRoot":"","sources":["../../src/bridge/synchronisation.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/coin-vechain",
|
|
3
|
-
"version": "2.11.0-nightly.
|
|
3
|
+
"version": "2.11.0-nightly.3",
|
|
4
4
|
"description": "Ledger VeChain Coin integration",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger",
|
|
@@ -86,8 +86,8 @@
|
|
|
86
86
|
"rxjs": "^7.8.1",
|
|
87
87
|
"@vechain/sdk-core": "2.0.0",
|
|
88
88
|
"@vechain/sdk-network": "2.0.0",
|
|
89
|
-
"@ledgerhq/coin-framework": "^6.7.0-nightly.
|
|
90
|
-
"@ledgerhq/cryptoassets": "^13.31.0-nightly.
|
|
89
|
+
"@ledgerhq/coin-framework": "^6.7.0-nightly.3",
|
|
90
|
+
"@ledgerhq/cryptoassets": "^13.31.0-nightly.3",
|
|
91
91
|
"@ledgerhq/devices": "8.6.1",
|
|
92
92
|
"@ledgerhq/errors": "^6.26.0",
|
|
93
93
|
"@ledgerhq/live-env": "^2.19.0-nightly.0",
|
|
@@ -103,8 +103,8 @@
|
|
|
103
103
|
"msw": "^2.2.13",
|
|
104
104
|
"ts-jest": "^29.1.1",
|
|
105
105
|
"@ledgerhq/types-cryptoassets": "^7.29.0-nightly.0",
|
|
106
|
-
"@ledgerhq/
|
|
107
|
-
"@ledgerhq/
|
|
106
|
+
"@ledgerhq/disable-network-setup": "^0.0.0",
|
|
107
|
+
"@ledgerhq/types-live": "^6.87.0-nightly.2"
|
|
108
108
|
},
|
|
109
109
|
"scripts": {
|
|
110
110
|
"clean": "rimraf lib lib-es",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { faker } from "@faker-js/faker";
|
|
2
2
|
import { createEmptyHistoryCache } from "@ledgerhq/coin-framework/account";
|
|
3
3
|
import { makeScanAccounts } from "@ledgerhq/coin-framework/bridge/jsHelpers";
|
|
4
|
-
import { getCryptoCurrencyById,
|
|
4
|
+
import { getCryptoCurrencyById, findTokenById } from "@ledgerhq/cryptoassets";
|
|
5
5
|
import BigNumber from "bignumber.js";
|
|
6
6
|
import { setupServer } from "msw/node";
|
|
7
7
|
import { firstValueFrom } from "rxjs";
|
|
@@ -102,13 +102,13 @@ describe("scanAccounts", () => {
|
|
|
102
102
|
swapHistory: [],
|
|
103
103
|
type: "Account",
|
|
104
104
|
used: false,
|
|
105
|
-
feesCurrency:
|
|
105
|
+
feesCurrency: findTokenById("vechain/vip180/vtho"),
|
|
106
106
|
subAccounts: [
|
|
107
107
|
{
|
|
108
108
|
type: "TokenAccount",
|
|
109
109
|
id: "js:2:vechain:0x5066118c66793ED86bd379b50b20E32B0FC1aBf5:vechain+vechain%2Fvip180%2Fvtho",
|
|
110
110
|
parentId: "js:2:vechain:0x5066118c66793ED86bd379b50b20E32B0FC1aBf5:vechain",
|
|
111
|
-
token:
|
|
111
|
+
token: findTokenById("vechain/vip180/vtho"),
|
|
112
112
|
balance: new BigNumber("0"),
|
|
113
113
|
spendableBalance: new BigNumber("0"),
|
|
114
114
|
creationDate: expect.any(Date),
|
|
@@ -8,7 +8,7 @@ import {
|
|
|
8
8
|
} from "@ledgerhq/coin-framework/account/index";
|
|
9
9
|
|
|
10
10
|
import { getAccount, getLastBlockHeight, getOperations, getTokenOperations } from "../network";
|
|
11
|
-
import { findTokenById
|
|
11
|
+
import { findTokenById } from "@ledgerhq/cryptoassets/tokens";
|
|
12
12
|
import { GetAccountShape, mergeOps } from "@ledgerhq/coin-framework/bridge/jsHelpers";
|
|
13
13
|
import { Account } from "@ledgerhq/types-live";
|
|
14
14
|
import { isAccountEmpty } from "./helpers";
|
|
@@ -52,6 +52,11 @@ export const getAccountShape: GetAccountShape<Account> = async info => {
|
|
|
52
52
|
minDate = Math.min(...operationsDates);
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
+
const vthoToken = findTokenById("vechain/vip180/vtho");
|
|
56
|
+
if (!vthoToken) {
|
|
57
|
+
throw new Error('token with id "vechain/vip180/vtho" not found');
|
|
58
|
+
}
|
|
59
|
+
|
|
55
60
|
const shape = {
|
|
56
61
|
id: accountId,
|
|
57
62
|
balance: new BigNumber(balance),
|
|
@@ -60,13 +65,13 @@ export const getAccountShape: GetAccountShape<Account> = async info => {
|
|
|
60
65
|
operationsCount: operations.length,
|
|
61
66
|
operations,
|
|
62
67
|
blockHeight,
|
|
63
|
-
feesCurrency:
|
|
68
|
+
feesCurrency: vthoToken,
|
|
64
69
|
subAccounts: [
|
|
65
70
|
{
|
|
66
71
|
type: "TokenAccount" as const,
|
|
67
72
|
id: vthoAccountId,
|
|
68
73
|
parentId: accountId,
|
|
69
|
-
token:
|
|
74
|
+
token: vthoToken,
|
|
70
75
|
balance: new BigNumber(energy),
|
|
71
76
|
spendableBalance: new BigNumber(energy),
|
|
72
77
|
creationDate: minDate !== -1 ? new Date(minDate) : new Date(),
|