rubic-sdk 6.0.0-alpha.ton.3 → 6.0.0-alpha.ton.30
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/tonapi-service.d.ts +3 -2
- package/lib/core/blockchain/services/ton/tonapi-service.js +13 -10
- 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 +8 -9
- 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.d.ts +4 -1
- package/lib/core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public.js +34 -15
- package/lib/core/blockchain/web3-public-service/web3-public/ton-web3-public/ton-web3-public.js.map +1 -1
- package/lib/core/blockchain/web3-pure/typed-web3-pure/ton-web3-pure/ton-web3-pure.d.ts +11 -0
- package/lib/core/blockchain/web3-pure/typed-web3-pure/ton-web3-pure/ton-web3-pure.js +30 -0
- package/lib/core/blockchain/web3-pure/typed-web3-pure/ton-web3-pure/ton-web3-pure.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/constants/cross-chain-providers.d.ts +1 -2
- package/lib/features/cross-chain/calculation-manager/constants/cross-chain-providers.js +3 -3
- package/lib/features/cross-chain/calculation-manager/constants/cross-chain-providers.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/changenow-provider/changenow-cross-chain-trade.js +13 -4
- package/lib/features/cross-chain/calculation-manager/providers/changenow-provider/changenow-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/models/orbiter-api-status-types.d.ts +7 -0
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-provider.js +6 -2
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/services/orbiter-api-service.d.ts +4 -3
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/services/orbiter-api-service.js +14 -4
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/services/orbiter-api-service.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/symbiosis-provider/symbiosis-cross-chain-provider.js +1 -2
- package/lib/features/cross-chain/calculation-manager/providers/symbiosis-provider/symbiosis-cross-chain-provider.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/models/on-chain-manager-aggregators-types.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/models/on-chain-manager-aggregators-types.js +5 -3
- package/lib/features/on-chain/calculation-manager/models/on-chain-manager-aggregators-types.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/on-chain-manager.js +23 -14
- package/lib/features/on-chain/calculation-manager/on-chain-manager.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/1inch/one-inch-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/common/native-router-abstract/native-router-abstract-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/dln/chains/dln-evm-on-chain-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/dln/chains/dln-solana-on-chain-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/lifi/lifi-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/odos/odos-on-chain-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/okuswap/okuswap-on-chain-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/piteas/piteas-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-provider.js +4 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-provider.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-trade.js +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-trade.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/rango/services/rango-on-chain-api-service.d.ts +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/rango/services/rango-on-chain-api-service.js +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/rango/services/rango-on-chain-api-service.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/symbiosis/symbiosis-on-chain-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/models/tonkeeper-api-types.d.ts +2 -0
- package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/models/tonkeeper-trade-struct.d.ts +5 -0
- package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/services/tonkeeper-api-service.js +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/services/tonkeeper-api-service.js.map +1 -1
- 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 +20 -7
- package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-provider.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-trade.d.ts +3 -0
- package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-trade.js +27 -4
- package/lib/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/tonkeeper-on-chain-trade.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/xy-dex/xy-dex-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/zrx/zrx-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/common/evm-wrap-trade/evm-wrap-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-aggregator/aggregator-solana-on-chain-trade-abstract.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-aggregator/models/aggregator-on-chain-types.d.ts +1 -1
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-trade/on-chain-trade.js +1 -1
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-trade/on-chain-trade.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/models/ton--on-chian-trade-types.d.ts +5 -0
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/models/ton--on-chian-trade-types.js +3 -0
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/models/ton--on-chian-trade-types.js.map +1 -0
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/ton-on-chain-trade.d.ts +5 -0
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-trade/ton-on-chain-trade/ton-on-chain-trade.js +11 -0
- 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/lib/features/on-chain/calculation-manager/providers/dexes/common/curve-provider/curve-abstract-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/dexes/common/izumi-abstract/izumi-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/dexes/common/pancake-router/pancake-router-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/dexes/common/sync-swap-abstract/sync-swap-abstract-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/dexes/common/uniswap-v2-abstract/uniswap-v2-abstract-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/dexes/common/uniswap-v3-algebra-abstract/uniswap-v3-algebra-abstract-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/dexes/common/vooi-abstract/vooi-abstract-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/dexes/mode/eddy-finance-mode/eddy-finance-mode-trade.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/dexes/zetachain/eddy-finance/eddy-finance-trade.d.ts +2 -2
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/lib/index.js.map +1 -1
- package/package.json +1 -1
- package/lib/core/blockchain/services/ton/ton-utils.d.ts +0 -13
- package/lib/core/blockchain/services/ton/ton-utils.js +0 -36
- package/lib/core/blockchain/services/ton/ton-utils.js.map +0 -1
|
@@ -128,8 +128,7 @@ class SymbiosisCrossChainProvider extends cross_chain_provider_1.CrossChainProvi
|
|
|
128
128
|
providerRouter: tx.to,
|
|
129
129
|
providerGateway: approveTo
|
|
130
130
|
},
|
|
131
|
-
...(
|
|
132
|
-
rewards.length && { promotions: this.getPromotions(rewards) })
|
|
131
|
+
...(rewards?.length && { promotions: this.getPromotions(rewards) })
|
|
133
132
|
}, options.providerAddress, await this.getRoutePath(from, to, route)),
|
|
134
133
|
tradeType: this.type
|
|
135
134
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"symbiosis-cross-chain-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/symbiosis-provider/symbiosis-cross-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA2F;AAC3F,4FAAsF;AACtF,8CAAkG;AAElG,gFAIoD;AACpD,sGAAkG;AAElG,uEAAmE;AACnE,kHAA6G;AAC7G,yFAAmF;AAEnF,uHAAoH;AACpH,6HAAwH;AAIxH,wKAAiK;AAOjK,uJAAiJ;AACjJ,yHAA6H;AAC7H,+HAA4H;AAE5H,sHAG8D;AAE9D,MAAa,2BAA4B,SAAQ,yCAAkB;IAAnE;;QACoB,SAAI,GAAG,+CAAsB,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"symbiosis-cross-chain-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/symbiosis-provider/symbiosis-cross-chain-provider.ts"],"names":[],"mappings":"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"}
|
package/lib/features/on-chain/calculation-manager/models/on-chain-manager-aggregators-types.d.ts
CHANGED
|
@@ -3,15 +3,14 @@ import { DlnOnChainProvider } from '../providers/aggregators/dln/dln-on-chain-pr
|
|
|
3
3
|
import { PiteasProvider } from '../providers/aggregators/piteas/piteas-provider';
|
|
4
4
|
import { XyDexProvider } from '../providers/aggregators/xy-dex/xy-dex-provider';
|
|
5
5
|
import { ZrxProvider } from '../providers/aggregators/zrx/zrx-provider';
|
|
6
|
-
import { LifiProvider } from '../providers/aggregators/lifi/lifi-provider';
|
|
7
6
|
import { NativeRouterProvider } from '../providers/aggregators/native-router/native-router-provider';
|
|
8
7
|
import { OdosOnChainProvider } from '../providers/aggregators/odos/odos-on-chain-provider';
|
|
9
8
|
import { OkuSwapOnChainProvider } from '../providers/aggregators/okuswap/okuswap-on-chain-provider';
|
|
10
9
|
import { OpenOceanProvider } from '../providers/aggregators/open-ocean/open-ocean-provider';
|
|
11
10
|
import { RangoOnChainProvider } from '../providers/aggregators/rango/rango-on-chain-provider';
|
|
11
|
+
import { TonkeeperOnChainProvider } from '../providers/aggregators/tonkeeper/tonkeeper-on-chain-provider';
|
|
12
12
|
import { ZetaSwapProvider } from '../providers/aggregators/zetaswap/zetaswap-provider';
|
|
13
13
|
export declare const AGGREGATORS_ON_CHAIN: {
|
|
14
|
-
readonly LIFI: typeof LifiProvider;
|
|
15
14
|
readonly OPEN_OCEAN: typeof OpenOceanProvider;
|
|
16
15
|
readonly RANGO: typeof RangoOnChainProvider;
|
|
17
16
|
readonly ODOS: typeof OdosOnChainProvider;
|
|
@@ -23,4 +22,5 @@ export declare const AGGREGATORS_ON_CHAIN: {
|
|
|
23
22
|
readonly ONE_INCH: typeof OneInchProvider;
|
|
24
23
|
readonly ZETA_SWAP: typeof ZetaSwapProvider;
|
|
25
24
|
readonly NATIVE_ROUTER: typeof NativeRouterProvider;
|
|
25
|
+
readonly TONKEEPER: typeof TonkeeperOnChainProvider;
|
|
26
26
|
};
|
package/lib/features/on-chain/calculation-manager/models/on-chain-manager-aggregators-types.js
CHANGED
|
@@ -6,15 +6,16 @@ const dln_on_chain_provider_1 = require("../providers/aggregators/dln/dln-on-cha
|
|
|
6
6
|
const piteas_provider_1 = require("../providers/aggregators/piteas/piteas-provider");
|
|
7
7
|
const xy_dex_provider_1 = require("../providers/aggregators/xy-dex/xy-dex-provider");
|
|
8
8
|
const zrx_provider_1 = require("../providers/aggregators/zrx/zrx-provider");
|
|
9
|
-
const lifi_provider_1 = require("../providers/aggregators/lifi/lifi-provider");
|
|
10
9
|
const native_router_provider_1 = require("../providers/aggregators/native-router/native-router-provider");
|
|
11
10
|
const odos_on_chain_provider_1 = require("../providers/aggregators/odos/odos-on-chain-provider");
|
|
12
11
|
const okuswap_on_chain_provider_1 = require("../providers/aggregators/okuswap/okuswap-on-chain-provider");
|
|
13
12
|
const open_ocean_provider_1 = require("../providers/aggregators/open-ocean/open-ocean-provider");
|
|
14
13
|
const rango_on_chain_provider_1 = require("../providers/aggregators/rango/rango-on-chain-provider");
|
|
14
|
+
const tonkeeper_on_chain_provider_1 = require("../providers/aggregators/tonkeeper/tonkeeper-on-chain-provider");
|
|
15
15
|
const zetaswap_provider_1 = require("../providers/aggregators/zetaswap/zetaswap-provider");
|
|
16
16
|
exports.AGGREGATORS_ON_CHAIN = {
|
|
17
|
-
|
|
17
|
+
// Possibly Compromised
|
|
18
|
+
// LIFI: LifiProvider,
|
|
18
19
|
OPEN_OCEAN: open_ocean_provider_1.OpenOceanProvider,
|
|
19
20
|
RANGO: rango_on_chain_provider_1.RangoOnChainProvider,
|
|
20
21
|
ODOS: odos_on_chain_provider_1.OdosOnChainProvider,
|
|
@@ -25,7 +26,8 @@ exports.AGGREGATORS_ON_CHAIN = {
|
|
|
25
26
|
ZRX: zrx_provider_1.ZrxProvider,
|
|
26
27
|
ONE_INCH: one_inch_provider_1.OneInchProvider,
|
|
27
28
|
ZETA_SWAP: zetaswap_provider_1.ZetaSwapProvider,
|
|
28
|
-
NATIVE_ROUTER: native_router_provider_1.NativeRouterProvider
|
|
29
|
+
NATIVE_ROUTER: native_router_provider_1.NativeRouterProvider,
|
|
30
|
+
TONKEEPER: tonkeeper_on_chain_provider_1.TonkeeperOnChainProvider
|
|
29
31
|
// SYMBIOSIS: SymbiosisOnChainProvider
|
|
30
32
|
};
|
|
31
33
|
//# sourceMappingURL=on-chain-manager-aggregators-types.js.map
|
package/lib/features/on-chain/calculation-manager/models/on-chain-manager-aggregators-types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"on-chain-manager-aggregators-types.js","sourceRoot":"","sources":["../../../../../src/features/on-chain/calculation-manager/models/on-chain-manager-aggregators-types.ts"],"names":[],"mappings":";;;AAAA,+HAA0H;AAC1H,qIAA+H;AAC/H,4HAAwH;AACxH,4HAAuH;AACvH,mHAA+G;AAE/G
|
|
1
|
+
{"version":3,"file":"on-chain-manager-aggregators-types.js","sourceRoot":"","sources":["../../../../../src/features/on-chain/calculation-manager/models/on-chain-manager-aggregators-types.ts"],"names":[],"mappings":";;;AAAA,+HAA0H;AAC1H,qIAA+H;AAC/H,4HAAwH;AACxH,4HAAuH;AACvH,mHAA+G;AAE/G,0GAAqG;AACrG,iGAA2F;AAC3F,0GAAoG;AACpG,iGAA4F;AAC5F,oGAA8F;AAC9F,gHAA0G;AAC1G,2FAAuF;AAE1E,QAAA,oBAAoB,GAAG;IAChC,uBAAuB;IACvB,sBAAsB;IACtB,UAAU,EAAE,uCAAiB;IAC7B,KAAK,EAAE,8CAAoB;IAC3B,IAAI,EAAE,4CAAmB;IACzB,GAAG,EAAE,0CAAkB;IACvB,QAAQ,EAAE,kDAAsB;IAChC,MAAM,EAAE,gCAAc;IACtB,EAAE,EAAE,+BAAa;IACjB,GAAG,EAAE,0BAAW;IAChB,QAAQ,EAAE,mCAAe;IACzB,SAAS,EAAE,oCAAgB;IAC3B,aAAa,EAAE,6CAAoB;IACnC,SAAS,EAAE,sDAAwB;IACnC,sCAAsC;CAChC,CAAC"}
|
|
@@ -165,21 +165,30 @@ class OnChainManager {
|
|
|
165
165
|
return { tradeType: type, trade: null, error };
|
|
166
166
|
})));
|
|
167
167
|
}
|
|
168
|
-
async calculateLifiTrade(
|
|
168
|
+
async calculateLifiTrade(_from, _to, _options) {
|
|
169
169
|
try {
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
170
|
+
throw Error('Lifi has been compromised');
|
|
171
|
+
// const disabledProviders = [
|
|
172
|
+
// ...this.LIFI_DISABLED_PROVIDERS,
|
|
173
|
+
// ...options.disabledProviders
|
|
174
|
+
// ];
|
|
175
|
+
//
|
|
176
|
+
// const calculationOptions: LifiCalculationOptions = {
|
|
177
|
+
// ...options,
|
|
178
|
+
// slippageTolerance: options?.slippageTolerance!,
|
|
179
|
+
// gasCalculation: options.gasCalculation === 'disabled' ? 'disabled' : 'calculate',
|
|
180
|
+
// disabledProviders
|
|
181
|
+
// };
|
|
182
|
+
//
|
|
183
|
+
// const lifiAggregator = new this.AGGREGATORS.LIFI();
|
|
184
|
+
//
|
|
185
|
+
// const lifiCalculationCall = lifiAggregator.calculate(
|
|
186
|
+
// from as PriceTokenAmount<EvmBlockchainName>,
|
|
187
|
+
// to as PriceTokenAmount<EvmBlockchainName>,
|
|
188
|
+
// calculationOptions
|
|
189
|
+
// );
|
|
190
|
+
//
|
|
191
|
+
// return pTimeout(lifiCalculationCall, options.timeout);
|
|
183
192
|
}
|
|
184
193
|
catch (err) {
|
|
185
194
|
console.debug('[RUBIC_SDK] Trade calculation error occurred for lifi.', err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"on-chain-manager.js","sourceRoot":"","sources":["../../../../src/features/on-chain/calculation-manager/on-chain-manager.ts"],"names":[],"mappings":";;;;;;AAAA,+BAAwF;AACxF,kEAAiE;AACjE,8CAAkD;AAClD,8CAAwE;AACxE,oDAAkD;AAClD,sDAA0D;AAC1D,2EAAkD;AAElD,kGAA8F;AAE9F,qHAA6G;AAC7G,kIAA6H;AAC7H,6HAAwH;AACxH,0GAAqG;AAErG,qIAAgI;
|
|
1
|
+
{"version":3,"file":"on-chain-manager.js","sourceRoot":"","sources":["../../../../src/features/on-chain/calculation-manager/on-chain-manager.ts"],"names":[],"mappings":";;;;;;AAAA,+BAAwF;AACxF,kEAAiE;AACjE,8CAAkD;AAClD,8CAAwE;AACxE,oDAAkD;AAClD,sDAA0D;AAC1D,2EAAkD;AAElD,kGAA8F;AAE9F,qHAA6G;AAC7G,kIAA6H;AAC7H,6HAAwH;AACxH,0GAAqG;AAErG,qIAAgI;AAOhI,6HAAwH;AAKxH,+HAG+F;AAC/F,qJAA+I;AAE/I,6HAAwH;AAGxH,oGAAmF;AAGnF;;GAEG;AACH,MAAa,cAAc;IAcvB,YAAoC,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;QAXpE;;WAEG;QACc,mBAAc,GAA+B,2CAAmB,CAAC;QAEjE,0BAAqB,GAAG,IAAI,+CAAqB,EAAE,CAAC;QAEpD,gBAAW,GAAG,yDAAoB,CAAC;QAEnC,4BAAuB,GAAuB,EAAE,CAAC;IAEK,CAAC;IAEjE,wBAAwB,CAC3B,SAMgB,EAChB,UAA2B,EAC3B,OAAoC,EACpC,OAA0C;QAE1C,IAAI,OAAO,YAAY,cAAK,IAAI,SAAS,CAAC,UAAU,KAAK,OAAO,CAAC,UAAU,EAAE;YACzE,MAAM,IAAI,sBAAa,CAAC,gDAAgD,CAAC,CAAC;SAC7E;QAED,OAAO,IAAA,WAAI,EAAC,IAAA,kEAA6B,EAAC,SAAS,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CACtF,IAAA,gBAAS,EAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,CACvB,IAAA,eAAQ,EAAC,CAAC,IAAA,SAAE,EAAC,IAAI,CAAC,EAAE,IAAA,SAAE,EAAC,EAAE,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CACvE,EACD,IAAA,gBAAS,EAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,EAAE;YAClC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE;gBACpE,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,EAAE,EAAE,WAAW,CAAC,CAAC;aAC1D;YAED,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAC/E,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAwB,CAAC,CACvC,CAAC;YAE3C,MAAM,iBAAiB,GAAG,IAAI,CAAC,iCAAiC,CAC5D,IAAI,EACJ,EAAE,EACF,WAAW,CACd,CAAC;YAEF,MAAM,WAAW,GAAG,CAAC,GAAG,eAAe,EAAE,GAAG,iBAAiB,CAAC,CAAC,MAAM,CAAC;YAEtE,OAAO,IAAA,YAAK,EACR,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,EAAE,CACrC,IAAA,uBAAW,EACP,IAAI,CAAC,6BAA6B,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,WAAW,CAAC,CACtE,CACJ,EACD,GAAG,iBAAiB,CACvB,CAAC,IAAI,CACF,IAAA,UAAG,EAAC,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC1B,KAAK,EAAE,WAAW;gBAClB,UAAU,EAAE,KAAK,GAAG,CAAC;gBACrB,YAAY,EAAE,YAAY,IAAI,IAAI;aACrC,CAAC,CAAC,EACH,IAAA,gBAAS,EAAC;gBACN,KAAK,EAAE,WAAW;gBAClB,UAAU,EAAE,CAAC;gBACb,YAAY,EAAE,IAAI;aACrB,CAAC,CACL,CAAC;QACN,CAAC,CAAC,CACL,CAAC;IACN,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+BG;IACI,KAAK,CAAC,cAAc,CACvB,SAMgB,EAChB,UAA2B,EAC3B,OAAoC,EACpC,OAA0C;QAE1C,IAAI,OAAO,YAAY,cAAK,IAAI,SAAS,CAAC,UAAU,KAAK,OAAO,CAAC,UAAU,EAAE;YACzE,MAAM,IAAI,sBAAa,CAAC,gDAAgD,CAAC,CAAC;SAC7E;QAED,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,MAAM,IAAA,kEAA6B,EACpD,SAAS,EACT,UAAU,CAAC,QAAQ,EAAE,EACrB,OAAO,CACV,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC,wBAAwB,CAAC,IAAI,EAAE,EAAE,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC;IAEO,KAAK,CAAC,cAAc,CACxB,IAAsB,EACtB,EAAc,EACd,OAA0C;QAE1C,MAAM,SAAS,GAAG,kCAAe,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAA0B,CAAC;QAEzF,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACvD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAC3B,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;SAC5B,CAAC,CAAC;QACH,IAAI,QAAiB,CAAC;QACtB,IAAI,OAAO,EAAE,QAAQ,KAAK,KAAK,EAAE;YAC7B,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;SAC/B;aAAM;YACH,QAAQ;gBACJ,4CAAmB,CAAC,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC;oBAC1D,CAAC,CAAC,eAAe,CAAC,WAAW,IAAI,eAAe,CAAC,aAAa,CAAC,CAAC;SACvE;QAED,OAAO,IAAA,wBAAc,EACjB,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,EACxB;YACI,OAAO,EAAE,cAAc,CAAC,yBAAyB;YACjD,iBAAiB,EAAE,EAAE;YACrB,eAAe,EACX,OAAO,EAAE,eAAe;gBACxB,IAAI,CAAC,eAAe,EAAE,CAAC,SAAS,CAAC,EAAE,OAAO;gBAC1C,qDAAwB,CAAC,OAAO;YACpC,QAAQ;YACR,aAAa,EAAE;gBACX,IAAI,EAAE,eAAe;gBACrB,EAAE,EAAE,aAAa;aACpB;SACJ,CACJ,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAClC,IAAsB,EACtB,EAAc,EACd,OAAiD;QAEjD,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE;YACpE,OAAO;gBACH;oBACI,KAAK,EAAE,cAAc,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC;oBACrD,SAAS,EAAE,yCAAmB,CAAC,OAAO;iBACzC;aACJ,CAAC;SACL;QAED,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAC9E,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAwB,CAAC,CACnC,CAAC;QAC3C,MAAM,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;QAClF,MAAM,yBAAyB,GAAG,IAAI,CAAC,iCAAiC,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAE5F,MAAM,SAAS,GAAG,CACd,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,kBAAkB,EAAE,GAAG,yBAAyB,CAAC,CAAC,CACxE,CAAC,IAAI,EAAE,CAAC;QAET,OAAO,SAAS,CAAC,MAAM,CAAC,gBAAO,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;YACrD,IAAI,MAAM,YAAY,6BAAY,IAAI,MAAM,YAAY,6BAAY,EAAE;gBAClE,IAAI,MAAM,YAAY,6BAAY,IAAI,MAAM,YAAY,6BAAY,EAAE;oBAClE,OAAO,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC;iBAClE;gBACD,OAAO,MAAM,YAAY,6BAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAClD;YACD,OAAO,CAAC,CAAC;QACb,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,gBAAgB,CAAC,KAAY;QACjC,OAAO,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC9D,CAAC;IAEO,KAAK,CAAC,cAAc,CACxB,IAAsB,EACtB,EAAc,EACd,cAAqD,EACrD,OAAiD;QAEjD,OAAO,OAAO,CAAC,GAAG,CACd,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE,CACpC,IAAA,mBAAQ,EAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;aAC3D,IAAI,CAAC,KAAK,CAAC,EAAE;YACV,IAAI,KAAK,EAAE;gBACP,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;aACrC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC;aACD,KAAK,CAAC,KAAK,CAAC,EAAE;YACX,OAAO,CAAC,KAAK,CACT,oDAAoD,IAAI,kBAAkB,EAC1E,KAAK,CACR,CAAC;YACF,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QACnD,CAAC,CAAC,CACT,CACJ,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC5B,KAAuB,EACvB,GAAe,EACf,QAAkD;QAElD,IAAI;YACA,MAAM,KAAK,CAAC,2BAA2B,CAAC,CAAC;YACzC,8BAA8B;YAC9B,uCAAuC;YACvC,mCAAmC;YACnC,KAAK;YACL,EAAE;YACF,uDAAuD;YACvD,kBAAkB;YAClB,sDAAsD;YACtD,wFAAwF;YACxF,wBAAwB;YACxB,KAAK;YACL,EAAE;YACF,sDAAsD;YACtD,EAAE;YACF,wDAAwD;YACxD,mDAAmD;YACnD,iDAAiD;YACjD,yBAAyB;YACzB,KAAK;YACL,EAAE;YACF,yDAAyD;SAC5D;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,wDAAwD,EAAE,GAAG,CAAC,CAAC;YAC7E,OAAO,EAAE,IAAI,EAAE,yCAAmB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;SACzD;IACL,CAAC;IAEM,MAAM,CAAC,YAAY,CACtB,IAAsB,EACtB,EAAc,EACd,OAAkC;QAElC,MAAM,SAAS,GAAG,IAA2C,CAAC;QAC9D,MAAM,OAAO,GAAG,EAAmC,CAAC;QACpD,OAAO,IAAI,6BAAY,CACnB;YACI,IAAI,EAAE,SAAS;YACf,EAAE,EAAE,IAAI,yBAAgB,CAAoB;gBACxC,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,CAAC,SAAS;aAC5B,CAAC;YACF,iBAAiB,EAAE,CAAC;YACpB,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;YAChB,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE,KAAK;YACf,YAAY,EAAE,SAAS;YACvB,cAAc,EAAE,SAAS;YAEzB,aAAa,EAAE;gBACX,IAAI,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE;gBAC5B,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE;aAC7B;SACJ,EACD,OAAO,CAAC,eAAgB,CAC3B,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,6BAA6B,CACvC,QAAyB,EACzB,IAAsB,EACtB,EAAc,EACd,OAAiD;QAEjD,IAAI;YACA,MAAM,YAAY,GAAG,MAAM,IAAA,mBAAQ,EAC/B,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,EACrC,OAAO,CAAC,OAAO,CAClB,CAAC;YACF,IAAI,CAAC,YAAY,EAAE;gBACf,OAAO,IAAI,CAAC;aACf;YAED,OAAO;gBACH,KAAK,EAAE,YAAY;gBACnB,SAAS,EAAE,QAAQ,CAAC,IAAI;aAC3B,CAAC;SACL;QAAC,OAAO,GAAY,EAAE;YACnB,OAAO,CAAC,KAAK,CACT,oDAAoD,QAAQ,CAAC,IAAI,kBAAkB,EACnF,GAAG,CACN,CAAC;YACF,OAAO;gBACH,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,QAAQ,CAAC,IAAI;gBACxB,KAAK,EAAE,yCAAkB,CAAC,UAAU,CAAC,GAAG,CAAC;aAC5C,CAAC;SACL;IACL,CAAC;IAEO,iCAAiC,CACrC,IAAsB,EACtB,EAAc,EACd,OAAiD;QAEjD,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;aACvD,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC,IAAI,eAAe,EAAE,CAAC;aAC7C,MAAM,CAAC,UAAU,CAAC,EAAE;YACjB,OAAO,CACH,CAAC,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,iBAAiB,EAAE,UAAU,CAAC,SAAS,CAAC;gBAC3E,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,CACpD,CAAC;QACN,CAAC,CAAC,CAAC;QAEP,OAAO,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YACzC,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;YACnE,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,cAAc,CAClB,IAAsB,EACtB,EAAc,EACd,OAAiD,EACjD,UAAqC;QAErC,IAAI,UAAU,CAAC,SAAS,KAAK,yCAAmB,CAAC,IAAI,EAAE;YACnD,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;SACrD;QACD,OAAO,IAAA,mBAAQ,EACX,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,OAA4C,CAAC,EAC5E,OAAO,CAAC,OAAO,CAClB,CAAC;IACN,CAAC;IAEO,kBAAkB,CACtB,OAAkD,EAClD,UAAqC;QAErC,OAAO,OAAO;aACT,IAAI,CAAC,YAAY,CAAC,EAAE;YACjB,IAAI,OAAO,IAAI,YAAY,EAAE;gBACzB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC;aACnF;YAED,IAAI,CAAC,YAAY,EAAE;gBACf,OAAO,IAAI,CAAC;aACf;YAED,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,CAAC;QACpE,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,CAAC,EAAE;YACT,OAAO,CAAC,KAAK,CACT,oDAAoD,UAAU,CAAC,SAAS,kBAAkB,EAC1F,GAAG,CACN,CAAC;YAEF,OAAO;gBACH,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,UAAU,CAAC,SAAS;gBAC/B,KAAK,EAAE,yCAAkB,CAAC,UAAU,CAAC,GAAG,CAAC;aAC5C,CAAC;QACN,CAAC,CAAC,CAAC;IACX,CAAC;IAEO,oBAAoB,CACxB,iBAAqC,EACrC,QAA0B;QAE1B,OAAO,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACxF,CAAC;IAEO,mBAAmB,CACvB,SAA2B,EAC3B,OAAmB,EACnB,WAAqD;QAErD,MAAM,YAAY,GAA8B;YAC5C,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,IAAI;YACX,SAAS,EAAE,yCAAmB,CAAC,OAAO;SACzC,CAAC;QACF,IAAI;YACA,YAAY,CAAC,KAAK,GAAG,cAAc,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;SACrF;QAAC,OAAO,GAAY,EAAE;YACnB,YAAY,CAAC,KAAK,GAAG,GAAoB,CAAC;SAC7C;QACD,OAAO,IAAA,SAAE,EAAC;YACN,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,CAAC;YACb,YAAY;SACf,CAAC,CAAC;IACP,CAAC;;AAzaL,wCA0aC;AAza2B,wCAAyB,GAAG,KAAM,AAAT,CAAU"}
|
package/lib/features/on-chain/calculation-manager/providers/aggregators/1inch/one-inch-trade.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { EncodeTransactionOptions } from '../../../../../common/models/encode-tr
|
|
|
4
4
|
import { OneinchTradeStruct } from './models/oneinch-trade-struct';
|
|
5
5
|
import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
|
|
6
6
|
import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
|
|
7
|
-
import {
|
|
7
|
+
import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
|
|
8
8
|
export declare class OneInchTrade extends AggregatorEvmOnChainTrade {
|
|
9
9
|
/** @internal */
|
|
10
10
|
static getGasLimit(tradeStruct: OneinchTradeStruct): Promise<BigNumber | null>;
|
|
@@ -24,7 +24,7 @@ export declare class OneInchTrade extends AggregatorEvmOnChainTrade {
|
|
|
24
24
|
readonly transactionData: string | null;
|
|
25
25
|
get type(): OnChainTradeType;
|
|
26
26
|
constructor(tradeStruct: OneinchTradeStruct, providerAddress: string);
|
|
27
|
-
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<
|
|
27
|
+
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
|
|
28
28
|
private getResponseFromApiToTransactionRequest;
|
|
29
29
|
private specifyError;
|
|
30
30
|
}
|
|
@@ -2,7 +2,7 @@ import BigNumber from 'bignumber.js';
|
|
|
2
2
|
import { EvmEncodeConfig } from '../../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/models/evm-encode-config';
|
|
3
3
|
import { EncodeTransactionOptions } from '../../../../../../common/models/encode-transaction-options';
|
|
4
4
|
import { AggregatorEvmOnChainTrade } from '../../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
|
|
5
|
-
import {
|
|
5
|
+
import { EvmEncodedConfigAndToAmount } from '../../../common/on-chain-aggregator/models/aggregator-on-chain-types';
|
|
6
6
|
import { NativeRouterTradeInstance, NativeRouterTradeStruct } from './models/native-router-trade-struct';
|
|
7
7
|
export declare abstract class NativeRouterAbstractTrade extends AggregatorEvmOnChainTrade {
|
|
8
8
|
static getGasLimit(tradeStruct: NativeRouterTradeStruct, providerGateway: string): Promise<BigNumber | null>;
|
|
@@ -12,5 +12,5 @@ export declare abstract class NativeRouterAbstractTrade extends AggregatorEvmOnC
|
|
|
12
12
|
get dexContractAddress(): string;
|
|
13
13
|
constructor(tradeInstance: NativeRouterTradeInstance);
|
|
14
14
|
encode(options: EncodeTransactionOptions): Promise<EvmEncodeConfig>;
|
|
15
|
-
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<
|
|
15
|
+
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
|
|
16
16
|
}
|
|
@@ -7,7 +7,7 @@ import { DlnEvmOnChainSupportedBlockchain, DlnOnChainSupportedBlockchain } from
|
|
|
7
7
|
import { DlnTradeStruct } from '../models/dln-trade-struct';
|
|
8
8
|
import { OnChainTradeType } from '../../../common/models/on-chain-trade-type';
|
|
9
9
|
import { AggregatorEvmOnChainTrade } from '../../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
|
|
10
|
-
import {
|
|
10
|
+
import { EvmEncodedConfigAndToAmount } from '../../../common/on-chain-aggregator/models/aggregator-on-chain-types';
|
|
11
11
|
export declare class DlnEvmOnChainTrade extends AggregatorEvmOnChainTrade {
|
|
12
12
|
private readonly transactionRequest;
|
|
13
13
|
static getGasLimit(tradeStruct: DlnTradeStruct<DlnEvmOnChainSupportedBlockchain>): Promise<BigNumber | null>;
|
|
@@ -18,6 +18,6 @@ export declare class DlnEvmOnChainTrade extends AggregatorEvmOnChainTrade {
|
|
|
18
18
|
get dexContractAddress(): string;
|
|
19
19
|
get toTokenAmountMin(): PriceTokenAmount;
|
|
20
20
|
constructor(tradeStruct: DlnTradeStruct<DlnOnChainSupportedBlockchain & EvmBlockchainName>, providerAddress: string);
|
|
21
|
-
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<
|
|
21
|
+
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
|
|
22
22
|
encode(options: EncodeTransactionOptions): Promise<EvmEncodeConfig>;
|
|
23
23
|
}
|
|
@@ -7,7 +7,7 @@ import { DlnEvmOnChainSupportedBlockchain, DlnOnChainSupportedBlockchain } from
|
|
|
7
7
|
import { DlnTradeStruct } from '../models/dln-trade-struct';
|
|
8
8
|
import { OnChainTradeType } from '../../../common/models/on-chain-trade-type';
|
|
9
9
|
import { AggregatorSolanaOnChainTrade } from '../../../common/on-chain-aggregator/aggregator-solana-on-chain-trade-abstract';
|
|
10
|
-
import {
|
|
10
|
+
import { EvmEncodedConfigAndToAmount } from '../../../common/on-chain-aggregator/models/aggregator-on-chain-types';
|
|
11
11
|
export declare class DlnSolanaOnChainTrade extends AggregatorSolanaOnChainTrade {
|
|
12
12
|
private readonly transactionRequest;
|
|
13
13
|
static getGasLimit(_tradeStruct: DlnTradeStruct<DlnEvmOnChainSupportedBlockchain>): Promise<BigNumber | null>;
|
|
@@ -18,5 +18,5 @@ export declare class DlnSolanaOnChainTrade extends AggregatorSolanaOnChainTrade
|
|
|
18
18
|
get toTokenAmountMin(): PriceTokenAmount;
|
|
19
19
|
constructor(tradeStruct: DlnTradeStruct<DlnOnChainSupportedBlockchain & SolanaBlockchainName>, providerAddress: string);
|
|
20
20
|
encodeDirect(options: EncodeTransactionOptions): Promise<EvmEncodeConfig>;
|
|
21
|
-
protected getToAmountAndTxData(receiverAddress?: string, _fromAddress?: string): Promise<
|
|
21
|
+
protected getToAmountAndTxData(receiverAddress?: string, _fromAddress?: string): Promise<EvmEncodedConfigAndToAmount>;
|
|
22
22
|
}
|
package/lib/features/on-chain/calculation-manager/providers/aggregators/lifi/lifi-trade.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { EncodeTransactionOptions } from '../../../../../common/models/encode-tr
|
|
|
4
4
|
import { LifiTradeStruct } from './models/lifi-trade-struct';
|
|
5
5
|
import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
|
|
6
6
|
import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
|
|
7
|
-
import {
|
|
7
|
+
import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
|
|
8
8
|
export declare class LifiTrade extends AggregatorEvmOnChainTrade {
|
|
9
9
|
/** @internal */
|
|
10
10
|
static getGasLimit(lifiTradeStruct: LifiTradeStruct): Promise<BigNumber | null>;
|
|
@@ -19,5 +19,5 @@ export declare class LifiTrade extends AggregatorEvmOnChainTrade {
|
|
|
19
19
|
protected getSwapError(err: unknown & {
|
|
20
20
|
code: number;
|
|
21
21
|
}): Error;
|
|
22
|
-
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<
|
|
22
|
+
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
|
|
23
23
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import BigNumber from 'bignumber.js';
|
|
2
2
|
import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
|
|
3
3
|
import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
|
|
4
|
-
import {
|
|
4
|
+
import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
|
|
5
5
|
import { OdosOnChainTradeStruct } from './models/odos-on-chain-trade-types';
|
|
6
6
|
export declare class OdosOnChainTrade extends AggregatorEvmOnChainTrade {
|
|
7
7
|
static getGasLimit(tradeStruct: OdosOnChainTradeStruct, providerGateway: string): Promise<BigNumber | null>;
|
|
@@ -11,5 +11,5 @@ export declare class OdosOnChainTrade extends AggregatorEvmOnChainTrade {
|
|
|
11
11
|
get dexContractAddress(): string;
|
|
12
12
|
protected get spenderAddress(): string;
|
|
13
13
|
constructor(tradeStruct: OdosOnChainTradeStruct, providerAddress: string, providerGateway: string);
|
|
14
|
-
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<
|
|
14
|
+
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
|
|
15
15
|
}
|
|
@@ -5,7 +5,7 @@ import { EncodeTransactionOptions } from '../../../../../common/models/encode-tr
|
|
|
5
5
|
import { TransactionReceipt } from 'web3-eth';
|
|
6
6
|
import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
|
|
7
7
|
import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
|
|
8
|
-
import {
|
|
8
|
+
import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
|
|
9
9
|
import { OkuSwapSupportedBlockchain } from './models/okuswap-on-chain-supported-chains';
|
|
10
10
|
import { OkuSwapOnChainTradeStruct } from './models/okuswap-trade-types';
|
|
11
11
|
export declare class OkuSwapOnChainTrade extends AggregatorEvmOnChainTrade {
|
|
@@ -26,5 +26,5 @@ export declare class OkuSwapOnChainTrade extends AggregatorEvmOnChainTrade {
|
|
|
26
26
|
needApprove(fromAddress?: string): Promise<boolean>;
|
|
27
27
|
private needPermit2Approve;
|
|
28
28
|
encode(options: EncodeTransactionOptions): Promise<EvmEncodeConfig>;
|
|
29
|
-
protected getTransactionConfigAndAmount(_options: EncodeTransactionOptions): Promise<
|
|
29
|
+
protected getTransactionConfigAndAmount(_options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
|
|
30
30
|
}
|
|
@@ -4,7 +4,7 @@ import { EncodeTransactionOptions } from '../../../../../common/models/encode-tr
|
|
|
4
4
|
import { GetContractParamsOptions } from '../../../../../cross-chain/calculation-manager/providers/common/models/get-contract-params-options';
|
|
5
5
|
import { OpenOceanTradeStruct } from './models/open-ocean-trade-struct';
|
|
6
6
|
import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
|
|
7
|
-
import {
|
|
7
|
+
import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
|
|
8
8
|
export declare class OpenOceanTrade extends AggregatorEvmOnChainTrade {
|
|
9
9
|
/** @internal */
|
|
10
10
|
static getGasLimit(openOceanTradeStruct: OpenOceanTradeStruct): Promise<BigNumber | null>;
|
|
@@ -15,7 +15,7 @@ export declare class OpenOceanTrade extends AggregatorEvmOnChainTrade {
|
|
|
15
15
|
get dexContractAddress(): string;
|
|
16
16
|
get toTokenAmountMin(): PriceTokenAmount;
|
|
17
17
|
constructor(tradeStruct: OpenOceanTradeStruct, providerAddress: string);
|
|
18
|
-
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<
|
|
18
|
+
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
|
|
19
19
|
private getTokenAddress;
|
|
20
20
|
protected getSwapData(options: GetContractParamsOptions): Promise<unknown[]>;
|
|
21
21
|
}
|
package/lib/features/on-chain/calculation-manager/providers/aggregators/piteas/piteas-trade.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { PiteasMethodParameters, PiteasQuoteRequestParams } from './models/pitea
|
|
|
4
4
|
import { PiteasTradeStruct } from './models/piteas-trade-struct';
|
|
5
5
|
import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
|
|
6
6
|
import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
|
|
7
|
-
import {
|
|
7
|
+
import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
|
|
8
8
|
import { EvmOnChainTradeStruct } from '../../common/on-chain-trade/evm-on-chain-trade/models/evm-on-chain-trade-struct';
|
|
9
9
|
export declare class PiteasTrade extends AggregatorEvmOnChainTrade {
|
|
10
10
|
static getGasLimit(tradeStruct: EvmOnChainTradeStruct, providerGateway: string, methodParameters: PiteasMethodParameters): Promise<BigNumber | null>;
|
|
@@ -14,5 +14,5 @@ export declare class PiteasTrade extends AggregatorEvmOnChainTrade {
|
|
|
14
14
|
protected get spenderAddress(): string;
|
|
15
15
|
get dexContractAddress(): string;
|
|
16
16
|
constructor(tradeStruct: PiteasTradeStruct, providerAddress: string, quoteRequestParams: PiteasQuoteRequestParams);
|
|
17
|
-
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<
|
|
17
|
+
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
|
|
18
18
|
}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.RangoOnChainProvider = void 0;
|
|
7
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
8
|
const tokens_1 = require("../../../../../../common/tokens");
|
|
9
|
+
const rango_contract_address_1 = require("../../../../../common/providers/rango/constants/rango-contract-address");
|
|
9
10
|
const rango_supported_blockchains_1 = require("../../../../../common/providers/rango/models/rango-supported-blockchains");
|
|
10
11
|
const rango_parser_1 = require("../../../../../common/providers/rango/services/rango-parser");
|
|
11
12
|
const on_chain_trade_type_1 = require("../../common/models/on-chain-trade-type");
|
|
@@ -31,9 +32,10 @@ class RangoOnChainProvider extends aggregator_on_chain_provider_abstract_1.Aggre
|
|
|
31
32
|
...options,
|
|
32
33
|
swapperGroups: rango_on_chain_disabled_providers_1.RANGO_ON_CHAIN_DISABLED_PROVIDERS
|
|
33
34
|
});
|
|
34
|
-
const { route, tx } = await rango_on_chain_api_service_1.RangoOnChainApiService.getSwapTransaction(swapParams);
|
|
35
|
+
const { route, tx } = await rango_on_chain_api_service_1.RangoOnChainApiService.getSwapTransaction(swapParams, false);
|
|
35
36
|
const { outputAmountMin, outputAmount } = route;
|
|
36
|
-
const providerGateway = tx
|
|
37
|
+
const providerGateway = tx?.txTo ||
|
|
38
|
+
rango_contract_address_1.rangoContractAddresses[from.blockchain].providerGateway;
|
|
37
39
|
const to = new tokens_1.PriceTokenAmount({
|
|
38
40
|
...toToken.asStruct,
|
|
39
41
|
weiAmount: new bignumber_js_1.default(outputAmount)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rango-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;
|
|
1
|
+
{"version":3,"file":"rango-on-chain-provider.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { PriceTokenAmount } from '../../../../../../common/tokens';
|
|
|
3
3
|
import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
|
|
4
4
|
import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
|
|
5
5
|
import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
|
|
6
|
-
import {
|
|
6
|
+
import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
|
|
7
7
|
import { RangoOnChainTradeStruct } from './models/rango-on-chain-trade-types';
|
|
8
8
|
export declare class RangoOnChainTrade extends AggregatorEvmOnChainTrade {
|
|
9
9
|
static getGasLimit(tradeStruct: RangoOnChainTradeStruct, providerGateway: string): Promise<BigNumber | null>;
|
|
@@ -17,5 +17,5 @@ export declare class RangoOnChainTrade extends AggregatorEvmOnChainTrade {
|
|
|
17
17
|
protected get spenderAddress(): string;
|
|
18
18
|
get dexContractAddress(): string;
|
|
19
19
|
constructor(tradeStruct: RangoOnChainTradeStruct, providerAddress: string, providerGateway: string);
|
|
20
|
-
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<
|
|
20
|
+
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
|
|
21
21
|
}
|
|
@@ -44,7 +44,7 @@ class RangoOnChainTrade extends aggregator_evm_on_chain_trade_abstract_1.Aggrega
|
|
|
44
44
|
swapperGroups: rango_on_chain_disabled_providers_1.RANGO_ON_CHAIN_DISABLED_PROVIDERS,
|
|
45
45
|
fromAddress: this.walletAddress
|
|
46
46
|
});
|
|
47
|
-
const { tx: transaction, route } = await rango_on_chain_api_service_1.RangoOnChainApiService.getSwapTransaction(params);
|
|
47
|
+
const { tx: transaction, route } = await rango_on_chain_api_service_1.RangoOnChainApiService.getSwapTransaction(params, true);
|
|
48
48
|
const { outputAmount: toAmount } = route;
|
|
49
49
|
return {
|
|
50
50
|
tx: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rango-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-trade.ts"],"names":[],"mappings":";;;AACA,8CAAkD;AAClD,8CAAqD;AACrD,6GAAwG;AAGxG,4FAA8F;AAC9F,uJAAiJ;AACjJ,iHAA0G;AAE1G,iFAAgG;AAChG,oIAAoH;AAEpH,kGAA+F;AAE/F,sFAA+E;AAE/E,MAAa,iBAAkB,SAAQ,kEAAyB;IAC5D,eAAe;IACR,MAAM,CAAC,KAAK,CAAC,WAAW,CAC3B,WAAoC,EACpC,eAAuB;QAEvB,MAAM,UAAU,GAAG,IAAI,iBAAiB,CACpC,WAAW,EACX,2BAAW,CAAC,aAAa,EACzB,eAAe,CAClB,CAAC;QAEF,OAAO,IAAA,yCAAiB,EAAC,UAAU,CAAC,CAAC;IACzC,CAAC;IAWD,IAAW,gBAAgB;QACvB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAClC,CAAC;IAED,IAAc,cAAc;QACxB,OAAO,IAAI,CAAC,QAAQ;YAChB,CAAC,CAAC,wDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO;YACzD,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;IAC/B,CAAC;IAED,IAAW,kBAAkB;QACzB,MAAM,IAAI,sBAAa,CAAC,+CAA+C,CAAC,CAAC;IAC7E,CAAC;IAED,YACI,WAAoC,EACpC,eAAuB,EACvB,eAAuB;QAEvB,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAvBxB,SAAI,GAAqB,yCAAmB,CAAC,KAAK,CAAC;QAyB/D,IAAI,CAAC,iBAAiB,GAAG,IAAI,yBAAgB,CAAC;YAC1C,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ;YACnB,SAAS,EAAE,WAAW,CAAC,mBAAmB;SAC7C,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,MAAM,GAAG,MAAM,gCAAiB,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;YAC1E,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,eAAe,EAAE,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,aAAa;YAC9D,aAAa,EAAE,qEAAiC;YAChD,WAAW,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;QAEH,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,MAAM,mDAAsB,CAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"rango-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/rango/rango-on-chain-trade.ts"],"names":[],"mappings":";;;AACA,8CAAkD;AAClD,8CAAqD;AACrD,6GAAwG;AAGxG,4FAA8F;AAC9F,uJAAiJ;AACjJ,iHAA0G;AAE1G,iFAAgG;AAChG,oIAAoH;AAEpH,kGAA+F;AAE/F,sFAA+E;AAE/E,MAAa,iBAAkB,SAAQ,kEAAyB;IAC5D,eAAe;IACR,MAAM,CAAC,KAAK,CAAC,WAAW,CAC3B,WAAoC,EACpC,eAAuB;QAEvB,MAAM,UAAU,GAAG,IAAI,iBAAiB,CACpC,WAAW,EACX,2BAAW,CAAC,aAAa,EACzB,eAAe,CAClB,CAAC;QAEF,OAAO,IAAA,yCAAiB,EAAC,UAAU,CAAC,CAAC;IACzC,CAAC;IAWD,IAAW,gBAAgB;QACvB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAClC,CAAC;IAED,IAAc,cAAc;QACxB,OAAO,IAAI,CAAC,QAAQ;YAChB,CAAC,CAAC,wDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO;YACzD,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;IAC/B,CAAC;IAED,IAAW,kBAAkB;QACzB,MAAM,IAAI,sBAAa,CAAC,+CAA+C,CAAC,CAAC;IAC7E,CAAC;IAED,YACI,WAAoC,EACpC,eAAuB,EACvB,eAAuB;QAEvB,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAvBxB,SAAI,GAAqB,yCAAmB,CAAC,KAAK,CAAC;QAyB/D,IAAI,CAAC,iBAAiB,GAAG,IAAI,yBAAgB,CAAC;YAC1C,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ;YACnB,SAAS,EAAE,WAAW,CAAC,mBAAmB;SAC7C,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,MAAM,GAAG,MAAM,gCAAiB,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;YAC1E,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,eAAe,EAAE,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,aAAa;YAC9D,aAAa,EAAE,qEAAiC;YAChD,WAAW,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;QAEH,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,MAAM,mDAAsB,CAAC,kBAAkB,CAC9E,MAAM,EACN,IAAI,CACP,CAAC;QAEF,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,KAAuC,CAAC;QAE3E,OAAO;YACH,EAAE,EAAE;gBACA,IAAI,EAAE,WAAY,CAAC,MAAO;gBAC1B,EAAE,EAAE,WAAY,CAAC,IAAK;gBACtB,KAAK,EAAE,WAAY,CAAC,KAAK,IAAI,GAAG;gBAChC,GAAG,EAAE,WAAY,CAAC,QAAQ,IAAI,SAAS;gBACvC,QAAQ,EAAE,WAAY,CAAC,QAAQ,IAAI,SAAS;aAC/C;YACD,QAAQ;SACX,CAAC;IACN,CAAC;CACJ;AAjFD,8CAiFC"}
|
|
@@ -4,7 +4,7 @@ import { RangoSwapTransactionResponse } from '../../../../../../common/providers
|
|
|
4
4
|
import { RangoBestRouteQueryParams, RangoSwapQueryParams, RangoTxStatusQueryParams } from '../../../../../../common/providers/rango/models/rango-parser-types';
|
|
5
5
|
export declare class RangoOnChainApiService {
|
|
6
6
|
static getBestRoute(params: RangoBestRouteQueryParams): Promise<RangoBestRouteResponse>;
|
|
7
|
-
static getSwapTransaction(params: RangoSwapQueryParams): Promise<RangoSwapTransactionResponse>;
|
|
7
|
+
static getSwapTransaction(params: RangoSwapQueryParams, isSwap: boolean): Promise<RangoSwapTransactionResponse>;
|
|
8
8
|
/**
|
|
9
9
|
* @description Get transaction status data
|
|
10
10
|
*/
|
|
@@ -21,9 +21,9 @@ class RangoOnChainApiService {
|
|
|
21
21
|
}
|
|
22
22
|
return res;
|
|
23
23
|
}
|
|
24
|
-
static async getSwapTransaction(params) {
|
|
24
|
+
static async getSwapTransaction(params, isSwap) {
|
|
25
25
|
const res = await injector_1.Injector.httpClient.get(`${rango_api_common_1.RANGO_API_ENDPOINT}/swap`, { params: params });
|
|
26
|
-
if (!res.route || res.error || !res.tx) {
|
|
26
|
+
if (!res.route || (isSwap && (res.error || !res.tx))) {
|
|
27
27
|
throw new errors_1.RubicSdkError(res.error ?? 'No available routes in rango.');
|
|
28
28
|
}
|
|
29
29
|
return res;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rango-on-chain-api-service.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/rango/services/rango-on-chain-api-service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8CAAkD;AAClD,4DAAoD;AACpD,yDAAsD;AACtD,qGAAoG;AAWpG,MAAa,sBAAsB;IACxB,MAAM,CAAC,KAAK,CAAC,YAAY,CAC5B,MAAiC;QAEjC,MAAM,GAAG,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CACrC,GAAG,qCAAkB,QAAQ,EAC7B;YACI,MAAM,EAAE,MAAqC;SAChD,CACJ,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE;YACzB,MAAM,IAAI,sBAAa,CAAC,GAAG,CAAC,KAAK,IAAI,+BAA+B,CAAC,CAAC;SACzE;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAKmB,AAAb,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAClC,MAA4B;
|
|
1
|
+
{"version":3,"file":"rango-on-chain-api-service.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/rango/services/rango-on-chain-api-service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8CAAkD;AAClD,4DAAoD;AACpD,yDAAsD;AACtD,qGAAoG;AAWpG,MAAa,sBAAsB;IACxB,MAAM,CAAC,KAAK,CAAC,YAAY,CAC5B,MAAiC;QAEjC,MAAM,GAAG,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CACrC,GAAG,qCAAkB,QAAQ,EAC7B;YACI,MAAM,EAAE,MAAqC;SAChD,CACJ,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE;YACzB,MAAM,IAAI,sBAAa,CAAC,GAAG,CAAC,KAAK,IAAI,+BAA+B,CAAC,CAAC;SACzE;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAKmB,AAAb,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAClC,MAA4B,EAC5B,MAAe;QAEf,MAAM,GAAG,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CACrC,GAAG,qCAAkB,OAAO,EAC5B,EAAE,MAAM,EAAE,MAAqC,EAAE,CACpD,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE;YAClD,MAAM,IAAI,sBAAa,CAAC,GAAG,CAAC,KAAK,IAAI,+BAA+B,CAAC,CAAC;SACzE;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,WAAW,CAC3B,MAAgC;QAEhC,MAAM,GAAG,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CACrC,GAAG,qCAAkB,SAAS,EAC9B,EAAE,MAAM,EAAE,MAAqC,EAAE,CACpD,CAAC;QAEF,IAAI,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE;YAC7C,MAAM,IAAI,sBAAa,CACnB,oEAAoE,CACvE,CAAC;SACL;QAED,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AAxDD,wDAwDC;AAnCuB;IAHnB,IAAA,kBAAK,EAAC;QACH,MAAM,EAAE,KAAM;KACjB,CAAC;sDAeD"}
|
|
@@ -2,7 +2,7 @@ import BigNumber from 'bignumber.js';
|
|
|
2
2
|
import { EncodeTransactionOptions } from '../../../../../common/models/encode-transaction-options';
|
|
3
3
|
import { OnChainTradeType } from '../../common/models/on-chain-trade-type';
|
|
4
4
|
import { AggregatorEvmOnChainTrade } from '../../common/on-chain-aggregator/aggregator-evm-on-chain-trade-abstract';
|
|
5
|
-
import {
|
|
5
|
+
import { EvmEncodedConfigAndToAmount } from '../../common/on-chain-aggregator/models/aggregator-on-chain-types';
|
|
6
6
|
import { SymbiosisTradeStruct } from './models/symbiosis-on-chain-trade-types';
|
|
7
7
|
export declare class SymbiosisOnChainTrade extends AggregatorEvmOnChainTrade {
|
|
8
8
|
static getGasLimit(tradeStruct: SymbiosisTradeStruct, providerGateway: string): Promise<BigNumber | null>;
|
|
@@ -11,5 +11,5 @@ export declare class SymbiosisOnChainTrade extends AggregatorEvmOnChainTrade {
|
|
|
11
11
|
protected get spenderAddress(): string;
|
|
12
12
|
get dexContractAddress(): string;
|
|
13
13
|
constructor(tradeStruct: SymbiosisTradeStruct, providerAddress: string, providerGateway: string);
|
|
14
|
-
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<
|
|
14
|
+
protected getTransactionConfigAndAmount(options: EncodeTransactionOptions): Promise<EvmEncodedConfigAndToAmount>;
|
|
15
15
|
}
|
|
@@ -13,7 +13,9 @@ export interface TonkeeperStonfiQuoteInfo extends TonkeeperCommonQuoteInfo {
|
|
|
13
13
|
interface TonkeeperCommonQuoteInfo {
|
|
14
14
|
fromAsset: string;
|
|
15
15
|
toAsset: string;
|
|
16
|
+
/** wei amount */
|
|
16
17
|
fromAmount: string;
|
|
18
|
+
/** wei amount */
|
|
17
19
|
toAmount: string;
|
|
18
20
|
blockchainFee: string;
|
|
19
21
|
path: string[];
|
|
@@ -3,4 +3,9 @@ import { OnChainTradeStruct } from '../../../common/on-chain-trade/evm-on-chain-
|
|
|
3
3
|
import { TonkeeperQuoteResp } from './tonkeeper-api-types';
|
|
4
4
|
export interface TonkeeperOnChainTradeStruct extends OnChainTradeStruct<TonBlockchainName> {
|
|
5
5
|
bestRoute: TonkeeperQuoteResp;
|
|
6
|
+
rawAddresses: TxTokensRawAddresses;
|
|
7
|
+
}
|
|
8
|
+
export interface TxTokensRawAddresses {
|
|
9
|
+
fromRawAddress: string;
|
|
10
|
+
toRawAddress: string;
|
|
6
11
|
}
|
|
@@ -20,11 +20,11 @@ class TonkeeperApiService {
|
|
|
20
20
|
});
|
|
21
21
|
return req;
|
|
22
22
|
});
|
|
23
|
-
const routes = (await Promise.all(promises)).filter(route => typeof route !== 'string');
|
|
23
|
+
const routes = (await Promise.all(promises)).filter(route => typeof route !== 'string' && route.trades.length);
|
|
24
24
|
if (!routes.length) {
|
|
25
25
|
throw new errors_1.NotSupportedTokensError();
|
|
26
26
|
}
|
|
27
|
-
const bestRoute = routes.sort((routeA, routeB) => new bignumber_js_1.default(routeB.trades[0]
|
|
27
|
+
const bestRoute = routes.sort((routeA, routeB) => new bignumber_js_1.default(routeB.trades[0]?.toAmount).comparedTo(routeA.trades[0]?.toAmount))[0];
|
|
28
28
|
return bestRoute;
|
|
29
29
|
}
|
|
30
30
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tonkeeper-api-service.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/services/tonkeeper-api-service.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA4D;AAC5D,yDAAsD;AAStD,MAAa,mBAAmB;IAKrB,MAAM,CAAC,KAAK,CAAC,YAAY,CAC5B,cAAsB,EACtB,YAAoB,EACpB,UAAkB;QAElB,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC/C,MAAM,GAAG,GAAG,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAC/B,GAAG,IAAI,CAAC,MAAM,iBAAiB,EAC/B;gBACI,MAAM,EAAE;oBACJ,SAAS,EAAE,cAAc;oBACzB,OAAO,EAAE,YAAY;oBACrB,QAAQ,EAAE,OAAO;oBACjB,UAAU;iBACb;aACJ,CACJ,CAAC;YACF,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAC/C,KAAK,CAAC,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,
|
|
1
|
+
{"version":3,"file":"tonkeeper-api-service.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/tonkeeper/services/tonkeeper-api-service.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA4D;AAC5D,yDAAsD;AAStD,MAAa,mBAAmB;IAKrB,MAAM,CAAC,KAAK,CAAC,YAAY,CAC5B,cAAsB,EACtB,YAAoB,EACpB,UAAkB;QAElB,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC/C,MAAM,GAAG,GAAG,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAC/B,GAAG,IAAI,CAAC,MAAM,iBAAiB,EAC/B;gBACI,MAAM,EAAE;oBACJ,SAAS,EAAE,cAAc;oBACzB,OAAO,EAAE,YAAY;oBACrB,QAAQ,EAAE,OAAO;oBACjB,UAAU;iBACb;aACJ,CACJ,CAAC;YACF,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAC/C,KAAK,CAAC,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CACpC,CAAC;QAE1B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAChB,MAAM,IAAI,gCAAuB,EAAE,CAAC;SACvC;QAED,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAC7C,IAAI,sBAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CACnF,CAAC,CAAC,CAAE,CAAC;QAEN,OAAO,SAAS,CAAC;IACrB,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,mBAAmB,CACnC,SAA6B,EAC7B,aAAqB,EACrB,QAAgB;QAEhB,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC,QAAQ,OAAO,CAAC;QACzC,8CAA8C;QAC9C,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,QAAQ,UAAU,CAAC,CAAC;QACvE,MAAM,GAAG,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,IAAI,CACtC,GAAG,IAAI,CAAC,MAAM,cAAc,EAC5B;YACI,IAAI,EAAE;gBACF,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,CAAC,GAAG,CAAC,EAAE,SAAS;aACnB;YACD,OAAO,EAAE;gBACL,aAAa,EAAE,aAAa;gBAC5B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;aAChC;SACJ,CACJ,CAAC;QAEF,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,MAAM,IAAI,gCAAuB,EAAE,CAAC;SACvC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;;AArEL,kDAsEC;AArEkB,0BAAM,GAAW,+BAA+B,CAAC;AAEjD,kCAAc,GAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC"}
|
|
@@ -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 getRawAddresses;
|
|
13
14
|
protected getGasFeeInfo(tradeStruct: TonkeeperOnChainTradeStruct): Promise<GasFeeInfo | null>;
|
|
14
15
|
}
|