rubic-sdk 6.0.0-alpha.ton.21 → 6.0.0-alpha.ton.23
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/web3-public-service/web3-public/ton-web3-public/ton-web3-public.js +13 -4
- 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/common/on-chain-trade/ton-on-chain-trade/ton-on-chain-trade.d.ts +1 -0
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/ton-on-chain-trade.js +3 -1
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/ton-on-chain-trade.js.map +1 -1
- package/package.json +1 -1
package/lib/core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public.js
CHANGED
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.TonWeb3Public = void 0;
|
|
7
|
+
const core_1 = require("@ton/core");
|
|
7
8
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
9
|
const native_tokens_1 = require("../../../../../common/tokens/constants/native-tokens");
|
|
9
10
|
const p_timeout_1 = __importDefault(require("../../../../../common/utils/p-timeout"));
|
|
@@ -44,11 +45,19 @@ class TonWeb3Public extends web3_public_1.Web3Public {
|
|
|
44
45
|
return new bignumber_js_1.default(info.balance || 0);
|
|
45
46
|
}
|
|
46
47
|
async getTokensBalances(userAddress, tokensAddresses) {
|
|
47
|
-
|
|
48
|
-
return [];
|
|
49
|
-
const promises = tokensAddresses.map(rawAddress => this.tonApi.fetchTokenInfoForWallet(userAddress, rawAddress));
|
|
50
|
-
const balances = (await Promise.all(promises)).map(tokenInfo => new bignumber_js_1.default(tokenInfo.balance));
|
|
48
|
+
const tokensWithBalance = await this.tonApi.fetchAllNonNullableTokensInfoForWallet(userAddress);
|
|
51
49
|
const nativeIndex = tokensAddresses.findIndex(ton_web3_pure_1.TonWeb3Pure.isNativeAddress);
|
|
50
|
+
if (!tokensWithBalance.length && nativeIndex === -1) {
|
|
51
|
+
return [];
|
|
52
|
+
}
|
|
53
|
+
const balances = tokensAddresses.map(address => {
|
|
54
|
+
const tokenWithBalance = tokensWithBalance.find(token => token.jetton.address.toLowerCase() ===
|
|
55
|
+
core_1.Address.parse(address).toRawString().toLowerCase());
|
|
56
|
+
if (tokenWithBalance) {
|
|
57
|
+
return new bignumber_js_1.default(tokenWithBalance.balance);
|
|
58
|
+
}
|
|
59
|
+
return new bignumber_js_1.default(0);
|
|
60
|
+
});
|
|
52
61
|
if (nativeIndex !== -1) {
|
|
53
62
|
const acountInfo = await this.tonApi.fetchAccountInfo(userAddress);
|
|
54
63
|
const nativeBalance = new bignumber_js_1.default(acountInfo.balance);
|
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,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,EAAE,QAAQ,CAAC,CAAC;QAC3E,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,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;QACrF,OAAO,IAAI,sBAAS,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,eAAe,CAAC,WAAmB,EAAE,YAAoB;QAClE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAClF,OAAO,IAAI,sBAAS,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;IAC5C,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAC1B,WAAmB,EACnB,eAAyB;QAEzB,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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"}
|
|
@@ -19,6 +19,7 @@ export declare abstract class TonOnChainTrade extends OnChainTrade {
|
|
|
19
19
|
readonly feeInfo: FeeInfo;
|
|
20
20
|
readonly gasFeeInfo: GasFeeInfo | null;
|
|
21
21
|
protected readonly fromWithoutFee: PriceTokenAmount<TonBlockchainName>;
|
|
22
|
+
private skipAmountCheck;
|
|
22
23
|
protected get spenderAddress(): string;
|
|
23
24
|
protected get web3Public(): TonWeb3Public;
|
|
24
25
|
protected get web3Private(): TonWeb3Private;
|
|
@@ -19,6 +19,7 @@ class TonOnChainTrade extends on_chain_trade_1.OnChainTrade {
|
|
|
19
19
|
constructor(tradeStruct, providerAddress) {
|
|
20
20
|
super(providerAddress);
|
|
21
21
|
this.feeInfo = {};
|
|
22
|
+
this.skipAmountCheck = false;
|
|
22
23
|
this.from = tradeStruct.from;
|
|
23
24
|
this.to = tradeStruct.to;
|
|
24
25
|
this.slippageTolerance = tradeStruct.slippageTolerance;
|
|
@@ -50,7 +51,7 @@ class TonOnChainTrade extends on_chain_trade_1.OnChainTrade {
|
|
|
50
51
|
const tonEncodedConfig = await this.encode({
|
|
51
52
|
fromAddress,
|
|
52
53
|
receiverAddress,
|
|
53
|
-
skipAmountCheck:
|
|
54
|
+
skipAmountCheck: this.skipAmountCheck,
|
|
54
55
|
...(options?.referrer && { referrer: options?.referrer })
|
|
55
56
|
});
|
|
56
57
|
try {
|
|
@@ -68,6 +69,7 @@ class TonOnChainTrade extends on_chain_trade_1.OnChainTrade {
|
|
|
68
69
|
await this.checkFromAddress(options.fromAddress);
|
|
69
70
|
await this.checkReceiverAddress(options.receiverAddress);
|
|
70
71
|
if (!options.skipAmountCheck) {
|
|
72
|
+
this.skipAmountCheck = true;
|
|
71
73
|
await this.handleAmountCheckBeforeSwap(options);
|
|
72
74
|
}
|
|
73
75
|
return this.encodeDirect(options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ton-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/ton-on-chain-trade.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAElD,oDAAqD;AACrD,gFAAgG;AAIhG,yDAAsD;AAQtD,sDAAiD;AAGjD,MAAsB,eAAgB,SAAQ,6BAAY;
|
|
1
|
+
{"version":3,"file":"ton-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/ton-on-chain-trade.ts"],"names":[],"mappings":"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"}
|