@ledgerhq/coin-ton 0.13.7-nightly.2 → 0.13.8-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 +12 -23
- package/lib/synchronisation.d.ts.map +1 -1
- package/lib/synchronisation.js +12 -1
- package/lib/synchronisation.js.map +1 -1
- package/lib-es/synchronisation.d.ts.map +1 -1
- package/lib-es/synchronisation.js +12 -1
- package/lib-es/synchronisation.js.map +1 -1
- package/package.json +4 -4
- package/src/synchronisation.ts +13 -1
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @ledgerhq/coin-ton@0.13.7
|
|
2
|
+
> @ledgerhq/coin-ton@0.13.7 build /home/runner/work/ledger-live/ledger-live/libs/coin-modules/coin-ton
|
|
3
3
|
> tsc && tsc -m esnext --moduleResolution bundler --outDir lib-es
|
|
4
4
|
|
package/CHANGELOG.md
CHANGED
|
@@ -1,39 +1,28 @@
|
|
|
1
1
|
# @ledgerhq/coin-ton
|
|
2
2
|
|
|
3
|
-
## 0.13.
|
|
3
|
+
## 0.13.8-nightly.0
|
|
4
4
|
|
|
5
5
|
### Patch Changes
|
|
6
6
|
|
|
7
|
-
-
|
|
8
|
-
- @ledgerhq/coin-framework@6.2.0-nightly.2
|
|
9
|
-
- @ledgerhq/types-live@6.82.0-nightly.2
|
|
7
|
+
- [#11485](https://github.com/LedgerHQ/ledger-live/pull/11485) [`ad4a534`](https://github.com/LedgerHQ/ledger-live/commit/ad4a534ce02b1b6c99f70539042e88a141141806) Thanks [@lawRathod](https://github.com/lawRathod)! - Fix sync issues when account imported using accountID
|
|
10
8
|
|
|
11
|
-
## 0.13.7
|
|
9
|
+
## 0.13.7
|
|
12
10
|
|
|
13
11
|
### Patch Changes
|
|
14
12
|
|
|
15
|
-
- [
|
|
13
|
+
- Updated dependencies [[`1f1cbeb`](https://github.com/LedgerHQ/ledger-live/commit/1f1cbeb4485fb4b85b76ffe040c632d049f4e0c4), [`80f8f1e`](https://github.com/LedgerHQ/ledger-live/commit/80f8f1eaef8a7bc84ba5441790296dec6cbfa199), [`d41fc9c`](https://github.com/LedgerHQ/ledger-live/commit/d41fc9c458050ef1234c04af9642321c41cecda1), [`67ec10b`](https://github.com/LedgerHQ/ledger-live/commit/67ec10b773b4a6b512a8a6485940fa0abd41c3ef), [`31dceca`](https://github.com/LedgerHQ/ledger-live/commit/31dcecad24abdaa8a77208e82532c47728c11180)]:
|
|
14
|
+
- @ledgerhq/cryptoassets@13.26.0
|
|
15
|
+
- @ledgerhq/coin-framework@6.2.0
|
|
16
|
+
- @ledgerhq/types-live@6.82.0
|
|
16
17
|
|
|
17
|
-
|
|
18
|
-
- @ledgerhq/coin-framework@6.2.0-nightly.1
|
|
19
|
-
- @ledgerhq/cryptoassets@13.26.0-nightly.1
|
|
20
|
-
- @ledgerhq/types-live@6.82.0-nightly.1
|
|
21
|
-
- @ledgerhq/errors@6.25.0-nightly.0
|
|
22
|
-
- @ledgerhq/live-env@2.15.0-nightly.1
|
|
23
|
-
- @ledgerhq/types-cryptoassets@7.26.0-nightly.0
|
|
24
|
-
- @ledgerhq/devices@8.5.1-nightly.0
|
|
25
|
-
- @ledgerhq/live-network@2.0.16-nightly.1
|
|
26
|
-
|
|
27
|
-
## 0.13.7-nightly.0
|
|
18
|
+
## 0.13.7-next.0
|
|
28
19
|
|
|
29
20
|
### Patch Changes
|
|
30
21
|
|
|
31
|
-
- Updated dependencies [[`
|
|
32
|
-
- @ledgerhq/
|
|
33
|
-
- @ledgerhq/
|
|
34
|
-
- @ledgerhq/
|
|
35
|
-
- @ledgerhq/cryptoassets@13.25.1-nightly.0
|
|
36
|
-
- @ledgerhq/live-network@2.0.16-nightly.0
|
|
22
|
+
- Updated dependencies [[`1f1cbeb`](https://github.com/LedgerHQ/ledger-live/commit/1f1cbeb4485fb4b85b76ffe040c632d049f4e0c4), [`80f8f1e`](https://github.com/LedgerHQ/ledger-live/commit/80f8f1eaef8a7bc84ba5441790296dec6cbfa199), [`d41fc9c`](https://github.com/LedgerHQ/ledger-live/commit/d41fc9c458050ef1234c04af9642321c41cecda1), [`67ec10b`](https://github.com/LedgerHQ/ledger-live/commit/67ec10b773b4a6b512a8a6485940fa0abd41c3ef), [`31dceca`](https://github.com/LedgerHQ/ledger-live/commit/31dcecad24abdaa8a77208e82532c47728c11180)]:
|
|
23
|
+
- @ledgerhq/cryptoassets@13.26.0-next.0
|
|
24
|
+
- @ledgerhq/coin-framework@6.2.0-next.0
|
|
25
|
+
- @ledgerhq/types-live@6.82.0-next.0
|
|
37
26
|
|
|
38
27
|
## 0.13.6
|
|
39
28
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,eAAe,EAGhB,MAAM,2CAA2C,CAAC;AAoBnD,OAAO,EAAE,UAAU,EAA+B,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,eAAe,EAGhB,MAAM,2CAA2C,CAAC;AAoBnD,OAAO,EAAE,UAAU,EAA+B,MAAM,SAAS,CAAC;AAKlE,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,UAAU,CAwGvD,CAAC;AAiHF,eAAO,MAAM,IAAI,oJAA0C,CAAC"}
|
package/lib/synchronisation.js
CHANGED
|
@@ -13,10 +13,21 @@ const flatMap_1 = __importDefault(require("lodash/flatMap"));
|
|
|
13
13
|
const api_1 = require("./bridge/bridgeHelpers/api");
|
|
14
14
|
const txn_1 = require("./bridge/bridgeHelpers/txn");
|
|
15
15
|
const logic_1 = require("./logic");
|
|
16
|
+
const ton_1 = require("@ton/ton");
|
|
16
17
|
const jettonTxMessageHashesMap = new Map();
|
|
17
18
|
const getAccountShape = async (info, { blacklistedTokenIds }) => {
|
|
18
|
-
|
|
19
|
+
let address = info.address;
|
|
20
|
+
const { rest, currency, derivationMode, initialAccount } = info;
|
|
19
21
|
const publicKey = reconciliatePubkey(rest?.publicKey, initialAccount);
|
|
22
|
+
// handle when address is pubkey, can happen when accounts imported using accountID
|
|
23
|
+
if (publicKey === address) {
|
|
24
|
+
address = ton_1.WalletContractV4.create({
|
|
25
|
+
workchain: 0,
|
|
26
|
+
publicKey: Buffer.from(publicKey, "hex"),
|
|
27
|
+
}).address.toString({ bounceable: false, urlSafe: true });
|
|
28
|
+
// update the account info with the correct address
|
|
29
|
+
info.address = address;
|
|
30
|
+
}
|
|
20
31
|
const blockHeight = await (0, api_1.fetchLastBlockNumber)();
|
|
21
32
|
const accountId = (0, index_1.encodeAccountId)({
|
|
22
33
|
type: "js",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":";;;;;;AAAA,kEAMgD;AAChD,yEAKmD;AACnD,kEAAuE;AACvE,yCAAqC;AAErC,gEAAqC;AACrC,6DAAqC;AACrC,oDAKoC;AAEpC,oDAKoC;AACpC,mCAAsC;
|
|
1
|
+
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,eAAe,EAGhB,MAAM,2CAA2C,CAAC;AAoBnD,OAAO,EAAE,UAAU,EAA+B,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,eAAe,EAGhB,MAAM,2CAA2C,CAAC;AAoBnD,OAAO,EAAE,UAAU,EAA+B,MAAM,SAAS,CAAC;AAKlE,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,UAAU,CAwGvD,CAAC;AAiHF,eAAO,MAAM,IAAI,oJAA0C,CAAC"}
|
|
@@ -7,10 +7,21 @@ import flatMap from "lodash/flatMap";
|
|
|
7
7
|
import { fetchAccountInfo, fetchAdjacentTransactions, fetchJettonWallets, fetchLastBlockNumber, } from "./bridge/bridgeHelpers/api";
|
|
8
8
|
import { getJettonTransfers, getTransactions, mapJettonTxToOps, mapTxToOps, } from "./bridge/bridgeHelpers/txn";
|
|
9
9
|
import { getSyncHash } from "./logic";
|
|
10
|
+
import { WalletContractV4 } from "@ton/ton";
|
|
10
11
|
const jettonTxMessageHashesMap = new Map();
|
|
11
12
|
export const getAccountShape = async (info, { blacklistedTokenIds }) => {
|
|
12
|
-
|
|
13
|
+
let address = info.address;
|
|
14
|
+
const { rest, currency, derivationMode, initialAccount } = info;
|
|
13
15
|
const publicKey = reconciliatePubkey(rest?.publicKey, initialAccount);
|
|
16
|
+
// handle when address is pubkey, can happen when accounts imported using accountID
|
|
17
|
+
if (publicKey === address) {
|
|
18
|
+
address = WalletContractV4.create({
|
|
19
|
+
workchain: 0,
|
|
20
|
+
publicKey: Buffer.from(publicKey, "hex"),
|
|
21
|
+
}).address.toString({ bounceable: false, urlSafe: true });
|
|
22
|
+
// update the account info with the correct address
|
|
23
|
+
info.address = address;
|
|
24
|
+
}
|
|
14
25
|
const blockHeight = await fetchLastBlockNumber();
|
|
15
26
|
const accountId = encodeAccountId({
|
|
16
27
|
type: "js",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,iBAAiB,EACjB,eAAe,EACf,oBAAoB,GACrB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAGL,QAAQ,EACR,QAAQ,GACT,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAErC,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EACzB,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,gBAAgB,EAChB,UAAU,GACX,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../src/synchronisation.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/coin-ton",
|
|
3
|
-
"version": "0.13.
|
|
3
|
+
"version": "0.13.8-nightly.0",
|
|
4
4
|
"description": "Ton Coin integration",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger",
|
|
@@ -54,15 +54,15 @@
|
|
|
54
54
|
"lodash": "^4.17.21",
|
|
55
55
|
"msw": "^2.0.11",
|
|
56
56
|
"rxjs": "^7.8.1",
|
|
57
|
-
"@ledgerhq/coin-framework": "^6.2.0
|
|
58
|
-
"@ledgerhq/cryptoassets": "^13.26.0
|
|
57
|
+
"@ledgerhq/coin-framework": "^6.2.0",
|
|
58
|
+
"@ledgerhq/cryptoassets": "^13.26.0",
|
|
59
59
|
"@ledgerhq/devices": "8.5.1-nightly.0",
|
|
60
60
|
"@ledgerhq/errors": "^6.25.0-nightly.0",
|
|
61
61
|
"@ledgerhq/live-env": "^2.15.0-nightly.1",
|
|
62
62
|
"@ledgerhq/live-network": "^2.0.16-nightly.1",
|
|
63
63
|
"@ledgerhq/logs": "^6.13.0",
|
|
64
64
|
"@ledgerhq/types-cryptoassets": "^7.26.0-nightly.0",
|
|
65
|
-
"@ledgerhq/types-live": "^6.82.0
|
|
65
|
+
"@ledgerhq/types-live": "^6.82.0"
|
|
66
66
|
},
|
|
67
67
|
"devDependencies": {
|
|
68
68
|
"@types/imurmurhash": "^0.1.4",
|
package/src/synchronisation.ts
CHANGED
|
@@ -31,6 +31,7 @@ import {
|
|
|
31
31
|
} from "./bridge/bridgeHelpers/txn";
|
|
32
32
|
import { getSyncHash } from "./logic";
|
|
33
33
|
import { TonAccount, TonOperation, TonSubAccount } from "./types";
|
|
34
|
+
import { WalletContractV4 } from "@ton/ton";
|
|
34
35
|
|
|
35
36
|
const jettonTxMessageHashesMap = new Map<string, string>();
|
|
36
37
|
|
|
@@ -38,10 +39,21 @@ export const getAccountShape: GetAccountShape<TonAccount> = async (
|
|
|
38
39
|
info,
|
|
39
40
|
{ blacklistedTokenIds },
|
|
40
41
|
) => {
|
|
41
|
-
|
|
42
|
+
let address = info.address;
|
|
43
|
+
const { rest, currency, derivationMode, initialAccount } = info;
|
|
42
44
|
|
|
43
45
|
const publicKey = reconciliatePubkey(rest?.publicKey, initialAccount);
|
|
44
46
|
|
|
47
|
+
// handle when address is pubkey, can happen when accounts imported using accountID
|
|
48
|
+
if (publicKey === address) {
|
|
49
|
+
address = WalletContractV4.create({
|
|
50
|
+
workchain: 0,
|
|
51
|
+
publicKey: Buffer.from(publicKey, "hex"),
|
|
52
|
+
}).address.toString({ bounceable: false, urlSafe: true });
|
|
53
|
+
// update the account info with the correct address
|
|
54
|
+
info.address = address;
|
|
55
|
+
}
|
|
56
|
+
|
|
45
57
|
const blockHeight = await fetchLastBlockNumber();
|
|
46
58
|
const accountId = encodeAccountId({
|
|
47
59
|
type: "js",
|