rubic-sdk 6.0.0-alpha.ton.4 → 6.0.0-alpha.ton.6
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/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-provider.d.ts +1 -0
- package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-provider.js +7 -3
- package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-provider.js.map +1 -1
- package/package.json +1 -1
|
@@ -10,5 +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 fetchRawTokensAddresses;
|
|
13
14
|
protected getGasFeeInfo(tradeStruct: TonkeeperOnChainTradeStruct): Promise<GasFeeInfo | null>;
|
|
14
15
|
}
|
|
@@ -24,9 +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 [fromRawAddress, toRawAddress, { fromWithoutFee, proxyFeeInfo }] = await Promise.all([
|
|
28
|
-
|
|
29
|
-
(await ton_utils_1.TonUtils.getAllFormatsOfAddress(toToken.address)).raw_form,
|
|
27
|
+
const [[fromRawAddress, toRawAddress], { fromWithoutFee, proxyFeeInfo }] = await Promise.all([
|
|
28
|
+
this.fetchRawTokensAddresses(from, toToken),
|
|
30
29
|
this.handleProxyContract(from, options)
|
|
31
30
|
]);
|
|
32
31
|
const bestRoute = await tonkeeper_api_service_1.TonkeeperApiService.makeQuoteReq(fromRawAddress, toRawAddress, fromWithoutFee.stringWeiAmount);
|
|
@@ -56,6 +55,11 @@ class TonkeeperOnChainProvider extends aggregator_on_chain_provider_abstract_1.A
|
|
|
56
55
|
};
|
|
57
56
|
}
|
|
58
57
|
}
|
|
58
|
+
async fetchRawTokensAddresses(from, toToken) {
|
|
59
|
+
const promises = [from, toToken].map(async (token) => token.isNative ? 'ton' : (await ton_utils_1.TonUtils.getAllFormatsOfAddress(token.address)).raw_form);
|
|
60
|
+
const rawAddresses = (await Promise.all(promises));
|
|
61
|
+
return rawAddresses;
|
|
62
|
+
}
|
|
59
63
|
async getGasFeeInfo(tradeStruct) {
|
|
60
64
|
const nativeTonCoin = native_tokens_1.nativeTokensList[blockchain_name_1.BLOCKCHAIN_NAME.TON];
|
|
61
65
|
const gasLimitWei = tradeStruct.bestRoute.trades[0].blockchainFee;
|
|
@@ -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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"}
|