@ledgerhq/coin-ton 0.13.7 → 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/.eslintrc.js +1 -0
- package/CHANGELOG.md +6 -0
- package/lib/bridge/bridgeHelpers/api.js +7 -7
- package/lib/bridge/bridgeHelpers/api.js.map +1 -1
- package/lib/synchronisation.d.ts.map +1 -1
- package/lib/synchronisation.js +13 -2
- package/lib/synchronisation.js.map +1 -1
- package/lib-es/bridge/bridgeHelpers/api.js +7 -7
- package/lib-es/bridge/bridgeHelpers/api.js.map +1 -1
- package/lib-es/synchronisation.d.ts.map +1 -1
- package/lib-es/synchronisation.js +13 -2
- package/lib-es/synchronisation.js.map +1 -1
- package/package.json +6 -6
- package/src/bridge/bridgeHelpers/api.ts +7 -7
- package/src/synchronisation.ts +14 -2
package/.eslintrc.js
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @ledgerhq/coin-ton
|
|
2
2
|
|
|
3
|
+
## 0.13.8-nightly.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
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
|
|
8
|
+
|
|
3
9
|
## 0.13.7
|
|
4
10
|
|
|
5
11
|
### Patch Changes
|
|
@@ -38,9 +38,9 @@ async function fetchTransactions(addr, opts) {
|
|
|
38
38
|
const address = ton_1.Address.parse(addr);
|
|
39
39
|
const urlAddr = address.toString({ bounceable: false, urlSafe: true });
|
|
40
40
|
let url = `/transactions?account=${urlAddr}&limit=256`;
|
|
41
|
-
if (opts?.startLt
|
|
41
|
+
if (opts?.startLt)
|
|
42
42
|
url += `&start_lt=${opts.startLt}`;
|
|
43
|
-
if (opts?.endLt
|
|
43
|
+
if (opts?.endLt)
|
|
44
44
|
url += `&end_lt=${opts.endLt}`;
|
|
45
45
|
return await fetch(url);
|
|
46
46
|
}
|
|
@@ -72,20 +72,20 @@ async function fetchJettonTransactions(addr, opts) {
|
|
|
72
72
|
const address = ton_1.Address.parse(addr);
|
|
73
73
|
const urlAddr = address.toString({ bounceable: false, urlSafe: true });
|
|
74
74
|
let url = `/jetton/transfers?address=${urlAddr}&limit=256`;
|
|
75
|
-
if (opts?.jettonMaster
|
|
75
|
+
if (opts?.jettonMaster)
|
|
76
76
|
url += `&jetton_master=${opts.jettonMaster}`;
|
|
77
|
-
if (opts?.startLt
|
|
77
|
+
if (opts?.startLt)
|
|
78
78
|
url += `&start_lt=${opts.startLt}`;
|
|
79
|
-
if (opts?.endLt
|
|
79
|
+
if (opts?.endLt)
|
|
80
80
|
url += `&end_lt=${opts.endLt}`;
|
|
81
81
|
return (await fetch(url)).jetton_transfers;
|
|
82
82
|
}
|
|
83
83
|
exports.fetchJettonTransactions = fetchJettonTransactions;
|
|
84
84
|
async function fetchJettonWallets(opts) {
|
|
85
85
|
let url = `/jetton/wallets?limit=256`;
|
|
86
|
-
if (opts?.jettonMaster
|
|
86
|
+
if (opts?.jettonMaster)
|
|
87
87
|
url += `&jetton_address=${opts.jettonMaster}`;
|
|
88
|
-
if (opts?.address
|
|
88
|
+
if (opts?.address) {
|
|
89
89
|
const address = ton_1.Address.parse(opts.address);
|
|
90
90
|
const urlAddr = address.toString({ bounceable: false, urlSafe: true });
|
|
91
91
|
url += `&owner_address=${urlAddr}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/bridge/bridgeHelpers/api.ts"],"names":[],"mappings":";;;;;;AAAA,0EAA6C;AAC7C,kCAAmC;AACnC,yCAA6C;AAgB7C,MAAM,SAAS,GAAG,CAAC,IAAa,EAAU,EAAE;IAC1C,MAAM,cAAc,GAAG,IAAA,sBAAa,GAAE,CAAC;IAEvC,OAAO,GAAG,cAAc,CAAC,KAAK,CAAC,gBAAgB,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,KAAK,EAAK,IAAY,EAAc,EAAE;IAClD,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAE5B,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAA,sBAAO,EAAI;QAChC,MAAM,EAAE,KAAK;QACb,GAAG;KACJ,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,IAAI,GAAG,KAAK,EAAK,IAAY,EAAE,IAA6B,EAAE,EAAE;IACpE,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAE5B,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,sBAAO,EAAI;QAC9C,MAAM,EAAE,MAAM;QACd,GAAG;QACH,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;QAC1B,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;KAChD,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEK,KAAK,UAAU,oBAAoB;IACxC,MAAM,IAAI,GAAG,MAAM,KAAK,CAA6B,kBAAkB,CAAC,CAAC;IACzE,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;AACzB,CAAC;AAHD,oDAGC;AAEM,KAAK,UAAU,iBAAiB,CACrC,IAAY,EACZ,IAA2C;IAE3C,MAAM,OAAO,GAAG,aAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACvE,IAAI,GAAG,GAAG,yBAAyB,OAAO,YAAY,CAAC;IACvD,IAAI,IAAI,EAAE,OAAO
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/bridge/bridgeHelpers/api.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"}
|
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",
|
|
@@ -33,7 +44,7 @@ const getAccountShape = async (info, { blacklistedTokenIds }) => {
|
|
|
33
44
|
const oldOps = (initialAccount?.operations ?? []);
|
|
34
45
|
const { last_transaction_lt, balance } = await (0, api_1.fetchAccountInfo)(address);
|
|
35
46
|
// if last_transaction_lt is empty, then there are no transactions in account (as well in token accounts)
|
|
36
|
-
if (last_transaction_lt
|
|
47
|
+
if (last_transaction_lt) {
|
|
37
48
|
if (oldOps.length === 0 || shouldSyncFromScratch) {
|
|
38
49
|
const [tmpTxs, tmpJettonTxs] = await Promise.all([
|
|
39
50
|
(0, txn_1.getTransactions)(address),
|
|
@@ -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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"}
|
|
@@ -31,9 +31,9 @@ export async function fetchTransactions(addr, opts) {
|
|
|
31
31
|
const address = Address.parse(addr);
|
|
32
32
|
const urlAddr = address.toString({ bounceable: false, urlSafe: true });
|
|
33
33
|
let url = `/transactions?account=${urlAddr}&limit=256`;
|
|
34
|
-
if (opts?.startLt
|
|
34
|
+
if (opts?.startLt)
|
|
35
35
|
url += `&start_lt=${opts.startLt}`;
|
|
36
|
-
if (opts?.endLt
|
|
36
|
+
if (opts?.endLt)
|
|
37
37
|
url += `&end_lt=${opts.endLt}`;
|
|
38
38
|
return await fetch(url);
|
|
39
39
|
}
|
|
@@ -63,19 +63,19 @@ export async function fetchJettonTransactions(addr, opts) {
|
|
|
63
63
|
const address = Address.parse(addr);
|
|
64
64
|
const urlAddr = address.toString({ bounceable: false, urlSafe: true });
|
|
65
65
|
let url = `/jetton/transfers?address=${urlAddr}&limit=256`;
|
|
66
|
-
if (opts?.jettonMaster
|
|
66
|
+
if (opts?.jettonMaster)
|
|
67
67
|
url += `&jetton_master=${opts.jettonMaster}`;
|
|
68
|
-
if (opts?.startLt
|
|
68
|
+
if (opts?.startLt)
|
|
69
69
|
url += `&start_lt=${opts.startLt}`;
|
|
70
|
-
if (opts?.endLt
|
|
70
|
+
if (opts?.endLt)
|
|
71
71
|
url += `&end_lt=${opts.endLt}`;
|
|
72
72
|
return (await fetch(url)).jetton_transfers;
|
|
73
73
|
}
|
|
74
74
|
export async function fetchJettonWallets(opts) {
|
|
75
75
|
let url = `/jetton/wallets?limit=256`;
|
|
76
|
-
if (opts?.jettonMaster
|
|
76
|
+
if (opts?.jettonMaster)
|
|
77
77
|
url += `&jetton_address=${opts.jettonMaster}`;
|
|
78
|
-
if (opts?.address
|
|
78
|
+
if (opts?.address) {
|
|
79
79
|
const address = Address.parse(opts.address);
|
|
80
80
|
const urlAddr = address.toString({ bounceable: false, urlSafe: true });
|
|
81
81
|
url += `&owner_address=${urlAddr}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/bridge/bridgeHelpers/api.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAgB7C,MAAM,SAAS,GAAG,CAAC,IAAa,EAAU,EAAE;IAC1C,MAAM,cAAc,GAAG,aAAa,EAAE,CAAC;IAEvC,OAAO,GAAG,cAAc,CAAC,KAAK,CAAC,gBAAgB,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,KAAK,EAAK,IAAY,EAAc,EAAE;IAClD,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAE5B,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,OAAO,CAAI;QAChC,MAAM,EAAE,KAAK;QACb,GAAG;KACJ,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,IAAI,GAAG,KAAK,EAAK,IAAY,EAAE,IAA6B,EAAE,EAAE;IACpE,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAE5B,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,MAAM,OAAO,CAAI;QAC9C,MAAM,EAAE,MAAM;QACd,GAAG;QACH,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;QAC1B,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;KAChD,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,MAAM,IAAI,GAAG,MAAM,KAAK,CAA6B,kBAAkB,CAAC,CAAC;IACzE,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAAY,EACZ,IAA2C;IAE3C,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACvE,IAAI,GAAG,GAAG,yBAAyB,OAAO,YAAY,CAAC;IACvD,IAAI,IAAI,EAAE,OAAO
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/bridge/bridgeHelpers/api.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",
|
|
@@ -27,7 +38,7 @@ export const getAccountShape = async (info, { blacklistedTokenIds }) => {
|
|
|
27
38
|
const oldOps = (initialAccount?.operations ?? []);
|
|
28
39
|
const { last_transaction_lt, balance } = await fetchAccountInfo(address);
|
|
29
40
|
// if last_transaction_lt is empty, then there are no transactions in account (as well in token accounts)
|
|
30
|
-
if (last_transaction_lt
|
|
41
|
+
if (last_transaction_lt) {
|
|
31
42
|
if (oldOps.length === 0 || shouldSyncFromScratch) {
|
|
32
43
|
const [tmpTxs, tmpJettonTxs] = await Promise.all([
|
|
33
44
|
getTransactions(address),
|
|
@@ -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",
|
|
@@ -56,12 +56,12 @@
|
|
|
56
56
|
"rxjs": "^7.8.1",
|
|
57
57
|
"@ledgerhq/coin-framework": "^6.2.0",
|
|
58
58
|
"@ledgerhq/cryptoassets": "^13.26.0",
|
|
59
|
-
"@ledgerhq/devices": "8.5.0",
|
|
60
|
-
"@ledgerhq/errors": "^6.
|
|
61
|
-
"@ledgerhq/live-env": "^2.
|
|
62
|
-
"@ledgerhq/live-network": "^2.0.
|
|
59
|
+
"@ledgerhq/devices": "8.5.1-nightly.0",
|
|
60
|
+
"@ledgerhq/errors": "^6.25.0-nightly.0",
|
|
61
|
+
"@ledgerhq/live-env": "^2.15.0-nightly.1",
|
|
62
|
+
"@ledgerhq/live-network": "^2.0.16-nightly.1",
|
|
63
63
|
"@ledgerhq/logs": "^6.13.0",
|
|
64
|
-
"@ledgerhq/types-cryptoassets": "^7.
|
|
64
|
+
"@ledgerhq/types-cryptoassets": "^7.26.0-nightly.0",
|
|
65
65
|
"@ledgerhq/types-live": "^6.82.0"
|
|
66
66
|
},
|
|
67
67
|
"devDependencies": {
|
|
@@ -58,8 +58,8 @@ export async function fetchTransactions(
|
|
|
58
58
|
const address = Address.parse(addr);
|
|
59
59
|
const urlAddr = address.toString({ bounceable: false, urlSafe: true });
|
|
60
60
|
let url = `/transactions?account=${urlAddr}&limit=256`;
|
|
61
|
-
if (opts?.startLt
|
|
62
|
-
if (opts?.endLt
|
|
61
|
+
if (opts?.startLt) url += `&start_lt=${opts.startLt}`;
|
|
62
|
+
if (opts?.endLt) url += `&end_lt=${opts.endLt}`;
|
|
63
63
|
return await fetch<TonTransactionsList>(url);
|
|
64
64
|
}
|
|
65
65
|
|
|
@@ -97,9 +97,9 @@ export async function fetchJettonTransactions(
|
|
|
97
97
|
const address = Address.parse(addr);
|
|
98
98
|
const urlAddr = address.toString({ bounceable: false, urlSafe: true });
|
|
99
99
|
let url = `/jetton/transfers?address=${urlAddr}&limit=256`;
|
|
100
|
-
if (opts?.jettonMaster
|
|
101
|
-
if (opts?.startLt
|
|
102
|
-
if (opts?.endLt
|
|
100
|
+
if (opts?.jettonMaster) url += `&jetton_master=${opts.jettonMaster}`;
|
|
101
|
+
if (opts?.startLt) url += `&start_lt=${opts.startLt}`;
|
|
102
|
+
if (opts?.endLt) url += `&end_lt=${opts.endLt}`;
|
|
103
103
|
return (await fetch<TonResponseJettonTransfer>(url)).jetton_transfers;
|
|
104
104
|
}
|
|
105
105
|
|
|
@@ -108,8 +108,8 @@ export async function fetchJettonWallets(opts?: {
|
|
|
108
108
|
jettonMaster?: string;
|
|
109
109
|
}): Promise<TonJettonWallet[]> {
|
|
110
110
|
let url = `/jetton/wallets?limit=256`;
|
|
111
|
-
if (opts?.jettonMaster
|
|
112
|
-
if (opts?.address
|
|
111
|
+
if (opts?.jettonMaster) url += `&jetton_address=${opts.jettonMaster}`;
|
|
112
|
+
if (opts?.address) {
|
|
113
113
|
const address = Address.parse(opts.address);
|
|
114
114
|
const urlAddr = address.toString({ bounceable: false, urlSafe: true });
|
|
115
115
|
url += `&owner_address=${urlAddr}`;
|
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",
|
|
@@ -60,7 +72,7 @@ export const getAccountShape: GetAccountShape<TonAccount> = async (
|
|
|
60
72
|
const oldOps = (initialAccount?.operations ?? []) as TonOperation[];
|
|
61
73
|
const { last_transaction_lt, balance } = await fetchAccountInfo(address);
|
|
62
74
|
// if last_transaction_lt is empty, then there are no transactions in account (as well in token accounts)
|
|
63
|
-
if (last_transaction_lt
|
|
75
|
+
if (last_transaction_lt) {
|
|
64
76
|
if (oldOps.length === 0 || shouldSyncFromScratch) {
|
|
65
77
|
const [tmpTxs, tmpJettonTxs] = await Promise.all([
|
|
66
78
|
getTransactions(address),
|