rubic-sdk 6.0.0-alpha.ton.6 → 6.0.0-alpha.ton.8
Sign up to get free protection for your applications and to get access to all the features.
- package/lib/core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public.d.ts +3 -0
- package/lib/core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public.js +13 -3
- package/lib/core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-provider.js +9 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-provider.js.map +1 -1
- package/package.json +1 -1
package/lib/core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public.d.ts
CHANGED
|
@@ -10,6 +10,9 @@ export declare class TonWeb3Public extends Web3Public {
|
|
|
10
10
|
getTransactionStatus(boc: string): Promise<TxStatus>;
|
|
11
11
|
healthCheck(timeoutMs: number): Promise<boolean>;
|
|
12
12
|
getBalance(userAddress: string, tokenAddress?: string | undefined): Promise<BigNumber>;
|
|
13
|
+
/**
|
|
14
|
+
* @deprecated Use getBalance instead for all tokens and native currency
|
|
15
|
+
*/
|
|
13
16
|
getTokenBalance(userAddress: string, tokenAddress: string): Promise<BigNumber>;
|
|
14
17
|
getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
|
|
15
18
|
callForTokensInfo(tokensAddresses: string[] | ReadonlyArray<string>, tokenFields?: SupportedTokenField[]): Promise<Partial<Record<SupportedTokenField, string>>[]>;
|
package/lib/core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.TonWeb3Public = void 0;
|
|
7
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
|
+
const native_tokens_1 = require("../../../../../common/tokens/constants/native-tokens");
|
|
8
9
|
const p_timeout_1 = __importDefault(require("../../../../../common/utils/p-timeout"));
|
|
9
10
|
const blockchain_name_1 = require("../../../models/blockchain-name");
|
|
10
11
|
const ton_utils_1 = require("../../../services/ton/ton-utils");
|
|
@@ -33,9 +34,12 @@ class TonWeb3Public extends web3_public_1.Web3Public {
|
|
|
33
34
|
const isNative = !tokenAddress || ton_web3_pure_1.TonWeb3Pure.isNativeAddress(tokenAddress);
|
|
34
35
|
const balance = isNative
|
|
35
36
|
? (await this.tonApi.fetchAccountInfo(userAddress)).balance
|
|
36
|
-
: await this.
|
|
37
|
-
return new bignumber_js_1.default(balance);
|
|
37
|
+
: (await this.tonApi.fetchTokenInfoForWallet(userAddress, tokenAddress)).balance;
|
|
38
|
+
return new bignumber_js_1.default(balance || 0);
|
|
38
39
|
}
|
|
40
|
+
/**
|
|
41
|
+
* @deprecated Use getBalance instead for all tokens and native currency
|
|
42
|
+
*/
|
|
39
43
|
async getTokenBalance(userAddress, tokenAddress) {
|
|
40
44
|
const info = await this.tonApi.fetchTokenInfoForWallet(userAddress, tokenAddress);
|
|
41
45
|
return new bignumber_js_1.default(info.balance || 0);
|
|
@@ -55,7 +59,13 @@ class TonWeb3Public extends web3_public_1.Web3Public {
|
|
|
55
59
|
return balances;
|
|
56
60
|
}
|
|
57
61
|
async callForTokensInfo(tokensAddresses, tokenFields = ['decimals', 'symbol', 'name']) {
|
|
58
|
-
const info = await Promise.all(tokensAddresses.map(address =>
|
|
62
|
+
const info = await Promise.all(tokensAddresses.map(address => {
|
|
63
|
+
if (ton_web3_pure_1.TonWeb3Pure.isNativeAddress(address)) {
|
|
64
|
+
const nativeToken = native_tokens_1.nativeTokensList[blockchain_name_1.BLOCKCHAIN_NAME.TON];
|
|
65
|
+
return nativeToken;
|
|
66
|
+
}
|
|
67
|
+
return this.tonApi.fetchTokenInfo(address);
|
|
68
|
+
}));
|
|
59
69
|
if (!info.length) {
|
|
60
70
|
return [];
|
|
61
71
|
}
|
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,gEAAqC;AACrC,2EAAkD;AAClD,gFAA6E;AAE7E,0EAAsE;AACtE,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,GAAW;QACzC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAC9D,IAAI,WAAW,EAAE;YACb,OAAO,qBAAS,CAAC,OAAO,CAAC;SAC5B;QACD,OAAO,qBAAS,CAAC,OAAO,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,SAAiB;QACtC,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,IAAA,mBAAQ,EAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC/E,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,UAAU,CACnB,WAAmB,EACnB,YAAiC;QAEjC,MAAM,QAAQ,GAAG,CAAC,YAAY,IAAI,2BAAW,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QAC5E,MAAM,OAAO,GAAG,QAAQ;YACpB,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO;YAC3D,CAAC,CAAC,MAAM,IAAI,CAAC,
|
|
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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"}
|
|
@@ -56,7 +56,15 @@ class TonkeeperOnChainProvider extends aggregator_on_chain_provider_abstract_1.A
|
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
58
|
async fetchRawTokensAddresses(from, toToken) {
|
|
59
|
-
const promises = [from, toToken].map(async (token) =>
|
|
59
|
+
const promises = [from, toToken].map(async (token) => {
|
|
60
|
+
if (token.address.startsWith('0:') || token.address.startsWith('-1:')) {
|
|
61
|
+
return token.address;
|
|
62
|
+
}
|
|
63
|
+
if (token.isNative) {
|
|
64
|
+
return 'ton';
|
|
65
|
+
}
|
|
66
|
+
return (await ton_utils_1.TonUtils.getAllFormatsOfAddress(token.address)).raw_form;
|
|
67
|
+
});
|
|
60
68
|
const rawAddresses = (await Promise.all(promises));
|
|
61
69
|
return rawAddresses;
|
|
62
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tonkeeper-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AACjE,6EAA6E;AAC7E,gFAIoD;AACpD,0EAAsE;AACtE,uEAAmE;AAInE,iFAA8E;AAC9E,kIAAmH;AAInH,4EAAuE;AACvE,yEAAmE;AAEnE,MAAa,wBAAyB,SAAQ,iEAAyB;IAAvE;;QACoB,cAAS,GAAG,yCAAmB,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"tonkeeper-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-provider.ts"],"names":[],"mappings":"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"}
|