rubic-sdk 6.0.0-alpha.ton.18 → 6.0.0-alpha.ton.19
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 +2 -5
- 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.d.ts +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-provider.js +6 -9
- 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.js
CHANGED
|
@@ -4,11 +4,11 @@ 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"));
|
|
10
11
|
const blockchain_name_1 = require("../../../models/blockchain-name");
|
|
11
|
-
const ton_utils_1 = require("../../../services/ton/ton-utils");
|
|
12
12
|
const tonapi_service_1 = require("../../../services/ton/tonapi-service");
|
|
13
13
|
const ton_web3_pure_1 = require("../../../web3-pure/typed-web3-pure/ton-web3-pure/ton-web3-pure");
|
|
14
14
|
const tx_status_1 = require("../models/tx-status");
|
|
@@ -49,10 +49,7 @@ class TonWeb3Public extends web3_public_1.Web3Public {
|
|
|
49
49
|
if (!tokens.length || !tokensAddresses.length) {
|
|
50
50
|
return [];
|
|
51
51
|
}
|
|
52
|
-
const rawTokensAddresses =
|
|
53
|
-
const res = await ton_utils_1.TonUtils.getAllFormatsOfAddress(address);
|
|
54
|
-
return res.raw_form.toLowerCase();
|
|
55
|
-
}));
|
|
52
|
+
const rawTokensAddresses = tokensAddresses.map(address => core_1.Address.parse(address).toRawString().toLowerCase());
|
|
56
53
|
const balances = tokens
|
|
57
54
|
.filter(token => rawTokensAddresses.includes(token.jetton.address.toLowerCase()))
|
|
58
55
|
.map(token => new bignumber_js_1.default(token.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,
|
|
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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"}
|
|
@@ -10,6 +10,6 @@ export declare class TonkeeperOnChainProvider extends AggregatorOnChainProvider
|
|
|
10
10
|
readonly tradeType: "TONKEEPER";
|
|
11
11
|
isSupportedBlockchain(blockchain: BlockchainName): blockchain is TonBlockchainName;
|
|
12
12
|
calculate(from: PriceTokenAmount, toToken: PriceToken, options: RequiredOnChainCalculationOptions): Promise<OnChainTrade | OnChainTradeError>;
|
|
13
|
-
private
|
|
13
|
+
private getRawAddresses;
|
|
14
14
|
protected getGasFeeInfo(tradeStruct: TonkeeperOnChainTradeStruct): Promise<GasFeeInfo | null>;
|
|
15
15
|
}
|
|
@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.TonkeeperOnChainProvider = void 0;
|
|
7
|
+
const core_1 = require("@ton/core");
|
|
7
8
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
9
|
const tokens_1 = require("../../../../../../common/tokens");
|
|
9
10
|
const native_tokens_1 = require("../../../../../../common/tokens/constants/native-tokens");
|
|
10
11
|
const blockchain_name_1 = require("../../../../../../core/blockchain/models/blockchain-name");
|
|
11
|
-
const ton_utils_1 = require("../../../../../../core/blockchain/services/ton/ton-utils");
|
|
12
12
|
const web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/web3-pure");
|
|
13
13
|
const on_chain_trade_type_1 = require("../../common/models/on-chain-trade-type");
|
|
14
14
|
const aggregator_on_chain_provider_abstract_1 = require("../../common/on-chain-aggregator/aggregator-on-chain-provider-abstract");
|
|
@@ -24,10 +24,8 @@ class TonkeeperOnChainProvider extends aggregator_on_chain_provider_abstract_1.A
|
|
|
24
24
|
}
|
|
25
25
|
async calculate(from, toToken, options) {
|
|
26
26
|
try {
|
|
27
|
-
const [
|
|
28
|
-
|
|
29
|
-
this.handleProxyContract(from, options)
|
|
30
|
-
]);
|
|
27
|
+
const [fromRawAddress, toRawAddress] = this.getRawAddresses(from, toToken);
|
|
28
|
+
const { fromWithoutFee, proxyFeeInfo } = await this.handleProxyContract(from, options);
|
|
31
29
|
const bestRoute = await tonkeeper_api_service_1.TonkeeperApiService.makeQuoteReq(fromRawAddress, toRawAddress, fromWithoutFee.stringWeiAmount);
|
|
32
30
|
const to = new tokens_1.PriceTokenAmount({
|
|
33
31
|
...toToken.asStruct,
|
|
@@ -59,17 +57,16 @@ class TonkeeperOnChainProvider extends aggregator_on_chain_provider_abstract_1.A
|
|
|
59
57
|
};
|
|
60
58
|
}
|
|
61
59
|
}
|
|
62
|
-
|
|
63
|
-
const
|
|
60
|
+
getRawAddresses(from, toToken) {
|
|
61
|
+
const rawAddresses = [from, toToken].map(token => {
|
|
64
62
|
if (token.address.startsWith('0:') || token.address.startsWith('-1:')) {
|
|
65
63
|
return token.address;
|
|
66
64
|
}
|
|
67
65
|
if (token.isNative) {
|
|
68
66
|
return 'ton';
|
|
69
67
|
}
|
|
70
|
-
return
|
|
68
|
+
return core_1.Address.parse(token.address).toRawString();
|
|
71
69
|
});
|
|
72
|
-
const rawAddresses = (await Promise.all(promises));
|
|
73
70
|
return rawAddresses;
|
|
74
71
|
}
|
|
75
72
|
async getGasFeeInfo(tradeStruct) {
|
|
@@ -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,
|
|
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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"}
|