rubic-sdk 6.0.0-alpha.ton.24 → 6.0.0-alpha.ton.26
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/lib/core/blockchain/services/ton/ton-utils.js +2 -1
- package/lib/core/blockchain/services/ton/ton-utils.js.map +1 -1
- package/lib/core/blockchain/services/ton/tonapi-service.d.ts +2 -7
- package/lib/core/blockchain/services/ton/tonapi-service.js +4 -12
- package/lib/core/blockchain/services/ton/tonapi-service.js.map +1 -1
- package/lib/core/blockchain/web3-private-service/web3-private/ton-web3-private/ton-web3-private.js +1 -1
- package/lib/core/blockchain/web3-private-service/web3-private/ton-web3-private/ton-web3-private.js.map +1 -1
- package/lib/core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public.js +4 -2
- package/lib/core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public.js.map +1 -1
- package/package.json +1 -1
|
@@ -15,7 +15,8 @@ class TonUtils {
|
|
|
15
15
|
const inMsgCell = core_1.Cell.fromBase64(boc);
|
|
16
16
|
const inMsgHash = inMsgCell.hash();
|
|
17
17
|
const inMsgHashBase64 = inMsgHash.toString('base64');
|
|
18
|
-
|
|
18
|
+
const inMsgHashBase64Url = inMsgHashBase64.replace(/\+/g, '-').replace(/\//g, '_');
|
|
19
|
+
return inMsgHashBase64Url;
|
|
19
20
|
}
|
|
20
21
|
/**
|
|
21
22
|
* @param walletAddress in any format: raw or friendly
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ton-utils.js","sourceRoot":"","sources":["../../../../../src/core/blockchain/services/ton/ton-utils.ts"],"names":[],"mappings":";;;AAAA,oCAAiC;AACjC,8CAAkD;AAClD,yDAAsD;AAGtD,8DAA4E;AAE5E,MAAa,QAAQ;IACjB;;;;OAIG;IACI,MAAM,CAAC,mBAAmB,CAAC,GAAW;QACzC,MAAM,SAAS,GAAG,WAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;QACnC,MAAM,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrD,
|
|
1
|
+
{"version":3,"file":"ton-utils.js","sourceRoot":"","sources":["../../../../../src/core/blockchain/services/ton/ton-utils.ts"],"names":[],"mappings":";;;AAAA,oCAAiC;AACjC,8CAAkD;AAClD,yDAAsD;AAGtD,8DAA4E;AAE5E,MAAa,QAAQ;IACjB;;;;OAIG;IACI,MAAM,CAAC,mBAAmB,CAAC,GAAW;QACzC,MAAM,SAAS,GAAG,WAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;QACnC,MAAM,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,kBAAkB,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAEnF,OAAO,kBAAkB,CAAC;IAC9B,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,sBAAsB,CACtC,aAAqB;QAErB,MAAM,GAAG,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CACrC,GAAG,8BAAc,YAAY,aAAa,QAAQ,EAClD;YACI,OAAO,EAAE;gBACL,aAAa,EAAE,8BAAc;aAChC;SACJ,CACJ,CAAC;QACF,IAAI,OAAO,IAAI,GAAG,EAAE;YAChB,MAAM,IAAI,sBAAa,CAAC,gDAAgD,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;SACxF;QAED,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AAnCD,4BAmCC"}
|
|
@@ -7,13 +7,8 @@ export declare class TonApiService {
|
|
|
7
7
|
* @param walletAddress in any format: raw or friendly
|
|
8
8
|
*/
|
|
9
9
|
fetchWalletSeqno(walletAddress: string): Promise<number>;
|
|
10
|
-
fetchTxInfo(
|
|
11
|
-
|
|
12
|
-
*
|
|
13
|
-
* @param type base64 is base64 hash string, boc - string converted from cells returned in tonConnectUI.sendTransactioon
|
|
14
|
-
* @returns
|
|
15
|
-
*/
|
|
16
|
-
checkIsTxCompleted(hashOrBoc: string, type: 'boc' | 'base64'): Promise<boolean>;
|
|
10
|
+
fetchTxInfo(txHash: string): Promise<TonApiTxDataByBocResp>;
|
|
11
|
+
checkIsTxCompleted(txHash: string): Promise<boolean>;
|
|
17
12
|
healthcheck(): Promise<boolean>;
|
|
18
13
|
fetchLastBlockInfo(): Promise<TonCenterBlockInfo>;
|
|
19
14
|
/**
|
|
@@ -4,7 +4,6 @@ exports.TonApiService = void 0;
|
|
|
4
4
|
const errors_1 = require("../../../../common/errors");
|
|
5
5
|
const injector_1 = require("../../../injector/injector");
|
|
6
6
|
const ton_constants_1 = require("../constants/ton-constants");
|
|
7
|
-
const ton_utils_1 = require("./ton-utils");
|
|
8
7
|
class TonApiService {
|
|
9
8
|
/**
|
|
10
9
|
*
|
|
@@ -17,23 +16,16 @@ class TonApiService {
|
|
|
17
16
|
}
|
|
18
17
|
return res.seqno;
|
|
19
18
|
}
|
|
20
|
-
async fetchTxInfo(
|
|
21
|
-
const
|
|
22
|
-
const res = await injector_1.Injector.httpClient.get(`${ton_constants_1.TONAPI_API_URL}/blockchain/messages/${msgHash}/transaction`, { headers: { Authorization: ton_constants_1.TONAPI_API_KEY } });
|
|
19
|
+
async fetchTxInfo(txHash) {
|
|
20
|
+
const res = await injector_1.Injector.httpClient.get(`${ton_constants_1.TONAPI_API_URL}/blockchain/messages/${txHash}/transaction`, { headers: { Authorization: ton_constants_1.TONAPI_API_KEY } });
|
|
23
21
|
if ('error' in res) {
|
|
24
22
|
throw new errors_1.RubicSdkError(`[TonApiService] Error in fetchTxInfo - ${res.error}`);
|
|
25
23
|
}
|
|
26
24
|
return res;
|
|
27
25
|
}
|
|
28
|
-
|
|
29
|
-
*
|
|
30
|
-
* @param type base64 is base64 hash string, boc - string converted from cells returned in tonConnectUI.sendTransactioon
|
|
31
|
-
* @returns
|
|
32
|
-
*/
|
|
33
|
-
async checkIsTxCompleted(hashOrBoc, type) {
|
|
26
|
+
async checkIsTxCompleted(txHash) {
|
|
34
27
|
try {
|
|
35
|
-
const
|
|
36
|
-
const res = await injector_1.Injector.httpClient.get(`${ton_constants_1.TONAPI_API_URL}/events/${msgHash}`, { headers: { Authorization: ton_constants_1.TONAPI_API_KEY } });
|
|
28
|
+
const res = await injector_1.Injector.httpClient.get(`${ton_constants_1.TONAPI_API_URL}/events/${txHash}`, { headers: { Authorization: ton_constants_1.TONAPI_API_KEY } });
|
|
37
29
|
if ('error' in res) {
|
|
38
30
|
throw new errors_1.RubicSdkError(`[TonApiService] Error in checkIsTxCompleted - ${res.error}`);
|
|
39
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tonapi-service.js","sourceRoot":"","sources":["../../../../../src/core/blockchain/services/ton/tonapi-service.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAClD,yDAAsD;AAoBtD,8DAAkG;
|
|
1
|
+
{"version":3,"file":"tonapi-service.js","sourceRoot":"","sources":["../../../../../src/core/blockchain/services/ton/tonapi-service.ts"],"names":[],"mappings":"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"}
|
package/lib/core/blockchain/web3-private-service/web3-private/ton-web3-private/ton-web3-private.js
CHANGED
|
@@ -47,7 +47,7 @@ class TonWeb3Private extends web3_private_1.Web3Private {
|
|
|
47
47
|
return true;
|
|
48
48
|
}
|
|
49
49
|
await (0, waitFor_1.waitFor)(30000);
|
|
50
|
-
isCompleted = await this.tonApi.checkIsTxCompleted(boc
|
|
50
|
+
isCompleted = await this.tonApi.checkIsTxCompleted(boc);
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
constructor(tonProviderCore) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ton-web3-private.js","sourceRoot":"","sources":["../../../../../../src/core/blockchain/web3-private-service/web3-private/ton-web3-private/ton-web3-private.ts"],"names":[],"mappings":";;;AACA,8CAAkD;AAClD,sDAAmD;AACnD,gFAA6F;AAC7F,0EAAsE;AACtE,oFAAgF;AAChF,6GAAwG;AAGxG,2EAAsE;AAEtE,kDAA8C;AAG9C,MAAa,cAAe,SAAQ,0BAAW;IAOpC,KAAK,CAAC,iBAAiB;QAC1B,OAAO,iCAAe,CAAC,GAAG,CAAC;IAC/B,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,OAA8B;QACvD,IAAI;YACA,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC;gBACpD,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,GAAG;gBAC/C,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC7B,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,oBAAQ,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YACjD,OAAO,CAAC,iBAAiB,EAAE,CAAC,MAAM,CAAC,CAAC;YACpC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;YAC9D,IAAI,CAAC,WAAW,EAAE;gBACd,MAAM,IAAI,sBAAa,CAAC,mDAAmD,CAAC,CAAC;aAChF;YACD,OAAO,GAAG,CAAC;SACd;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,2BAA2B,GAAG,EAAE,CAAC,CAAC;YAChD,MAAM,iCAAc,CAAC,UAAU,CAAC,GAAgB,CAAC,CAAC;SACrD;IACL,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,GAAW;QAC/C,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,IAAI,cAAc,GAAG,CAAC,CAAC;QACvB,MAAM,mBAAmB,GAAG,GAAG,CAAC;QAChC,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,cAAc,EAAE,EAAE,IAAK,CAAC,CAAC;QAE9D,OAAO,IAAI,EAAE;YACT,IAAI,cAAc,GAAG,mBAAmB,EAAE;gBACtC,aAAa,CAAC,UAAU,CAAC,CAAC;gBAC1B,OAAO,KAAK,CAAC;aAChB;YACD,IAAI,WAAW,EAAE;gBACb,aAAa,CAAC,UAAU,CAAC,CAAC;gBAC1B,OAAO,IAAI,CAAC;aACf;YACD,MAAM,IAAA,iBAAO,EAAC,KAAM,CAAC,CAAC;YACtB,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"ton-web3-private.js","sourceRoot":"","sources":["../../../../../../src/core/blockchain/web3-private-service/web3-private/ton-web3-private/ton-web3-private.ts"],"names":[],"mappings":";;;AACA,8CAAkD;AAClD,sDAAmD;AACnD,gFAA6F;AAC7F,0EAAsE;AACtE,oFAAgF;AAChF,6GAAwG;AAGxG,2EAAsE;AAEtE,kDAA8C;AAG9C,MAAa,cAAe,SAAQ,0BAAW;IAOpC,KAAK,CAAC,iBAAiB;QAC1B,OAAO,iCAAe,CAAC,GAAG,CAAC;IAC/B,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,OAA8B;QACvD,IAAI;YACA,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC;gBACpD,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,GAAG;gBAC/C,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC7B,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,oBAAQ,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YACjD,OAAO,CAAC,iBAAiB,EAAE,CAAC,MAAM,CAAC,CAAC;YACpC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;YAC9D,IAAI,CAAC,WAAW,EAAE;gBACd,MAAM,IAAI,sBAAa,CAAC,mDAAmD,CAAC,CAAC;aAChF;YACD,OAAO,GAAG,CAAC;SACd;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,2BAA2B,GAAG,EAAE,CAAC,CAAC;YAChD,MAAM,iCAAc,CAAC,UAAU,CAAC,GAAgB,CAAC,CAAC;SACrD;IACL,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,GAAW;QAC/C,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,IAAI,cAAc,GAAG,CAAC,CAAC;QACvB,MAAM,mBAAmB,GAAG,GAAG,CAAC;QAChC,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,cAAc,EAAE,EAAE,IAAK,CAAC,CAAC;QAE9D,OAAO,IAAI,EAAE;YACT,IAAI,cAAc,GAAG,mBAAmB,EAAE;gBACtC,aAAa,CAAC,UAAU,CAAC,CAAC;gBAC1B,OAAO,KAAK,CAAC;aAChB;YACD,IAAI,WAAW,EAAE;gBACb,aAAa,CAAC,UAAU,CAAC,CAAC;gBAC1B,OAAO,IAAI,CAAC;aACf;YACD,MAAM,IAAA,iBAAO,EAAC,KAAM,CAAC,CAAC;YACtB,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;SAC3D;IACL,CAAC;IAED,YAAY,eAAsC;QAC9C,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAlDhB,aAAQ,GAAG,2BAAW,CAAC;QAEzB,WAAM,GAAkB,IAAI,8BAAa,EAAE,CAAC;QAiDzD,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC;IAC7C,CAAC;CACJ;AAtDD,wCAsDC"}
|
package/lib/core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public.js
CHANGED
|
@@ -19,7 +19,7 @@ class TonWeb3Public extends web3_public_1.Web3Public {
|
|
|
19
19
|
this.tonApi = new tonapi_service_1.TonApiService();
|
|
20
20
|
}
|
|
21
21
|
async getTransactionStatus(txHash) {
|
|
22
|
-
const isCompleted = await this.tonApi.checkIsTxCompleted(txHash
|
|
22
|
+
const isCompleted = await this.tonApi.checkIsTxCompleted(txHash);
|
|
23
23
|
if (isCompleted) {
|
|
24
24
|
return tx_status_1.TX_STATUS.SUCCESS;
|
|
25
25
|
}
|
|
@@ -50,7 +50,9 @@ class TonWeb3Public extends web3_public_1.Web3Public {
|
|
|
50
50
|
if (!tokensWithBalance.length && nativeIndex === -1) {
|
|
51
51
|
return [];
|
|
52
52
|
}
|
|
53
|
-
const balances = tokensAddresses
|
|
53
|
+
const balances = tokensAddresses
|
|
54
|
+
.filter(address => !ton_web3_pure_1.TonWeb3Pure.isNativeAddress(address))
|
|
55
|
+
.map(address => {
|
|
54
56
|
const tokenWithBalance = tokensWithBalance.find(token => token.jetton.address.toLowerCase() ===
|
|
55
57
|
core_1.Address.parse(address).toRawString().toLowerCase());
|
|
56
58
|
if (tokenWithBalance) {
|
package/lib/core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ton-web3-public.js","sourceRoot":"","sources":["../../../../../../src/core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public.ts"],"names":[],"mappings":";;;;;;AAAA,oCAAoC;AACpC,gEAAqC;AACrC,6EAA6E;AAC7E,2EAAkD;AAClD,gFAA6E;AAE7E,oFAAgF;AAChF,6GAAwG;AAIxG,mDAA0D;AAC1D,gDAA4C;AAE5C,MAAa,aAAc,SAAQ,wBAAU;IACzC;QACI,KAAK,CAAC,iCAAe,CAAC,GAAG,CAAC,CAAC;QAGd,WAAM,GAAkB,IAAI,8BAAa,EAAE,CAAC;IAF7D,CAAC;IAIM,KAAK,CAAC,oBAAoB,CAAC,MAAc;QAC5C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"ton-web3-public.js","sourceRoot":"","sources":["../../../../../../src/core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public.ts"],"names":[],"mappings":"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"}
|