rubic-sdk 5.42.0-alpha.oneinch.10 → 5.42.0-alpha.oneinch.11
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/cross-chain/calculation-manager/providers/oneinch-provider/models/oneinch-ccr-trade-types.d.ts +0 -8
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-provider.js +5 -8
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.d.ts +1 -2
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.js +2 -25
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.js.map +1 -1
- package/package.json +1 -1
|
@@ -18,11 +18,3 @@ export interface OneinchCcrTradeParams {
|
|
|
18
18
|
routePath: RubicStep[];
|
|
19
19
|
useProxy: boolean;
|
|
20
20
|
}
|
|
21
|
-
export interface OneinchGetGasDataParams {
|
|
22
|
-
from: PriceTokenAmount<EvmBlockchainName>;
|
|
23
|
-
toToken: PriceTokenAmount<EvmBlockchainName>;
|
|
24
|
-
feeInfo: FeeInfo;
|
|
25
|
-
providerAddress: string;
|
|
26
|
-
quote: OneinchCcrQuoteResponse;
|
|
27
|
-
slippage: number;
|
|
28
|
-
}
|
|
@@ -38,15 +38,12 @@ class OneinchCcrProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
38
38
|
...toToken.asStruct,
|
|
39
39
|
weiAmount: new bignumber_js_1.default(quote.dstTokenAmount)
|
|
40
40
|
});
|
|
41
|
+
const gasInfo = quote.presets[quote.recommendedPreset].gasCost;
|
|
41
42
|
const gasData = options.gasCalculation === 'enabled'
|
|
42
|
-
?
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
providerAddress: options.providerAddress,
|
|
47
|
-
quote,
|
|
48
|
-
slippage: options.slippageTolerance
|
|
49
|
-
})
|
|
43
|
+
? {
|
|
44
|
+
gasPrice: new bignumber_js_1.default(gasInfo.gasPriceEstimate),
|
|
45
|
+
gasLimit: new bignumber_js_1.default(gasInfo.gasBumpEstimate)
|
|
46
|
+
}
|
|
50
47
|
: null;
|
|
51
48
|
return {
|
|
52
49
|
trade: new oneinch_ccr_trade_1.OneinchCcrTrade({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oneinch-ccr-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAiE;AAEjE,yFAAmF;AAGnF,gFAA6E;AAC7E,yEAAoE;
|
|
1
|
+
{"version":3,"file":"oneinch-ccr-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,9 +12,8 @@ import { FeeInfo } from '../common/models/fee-info';
|
|
|
12
12
|
import { GetContractParamsOptions } from '../common/models/get-contract-params-options';
|
|
13
13
|
import { OnChainSubtype } from '../common/models/on-chain-subtype';
|
|
14
14
|
import { TradeInfo } from '../common/models/trade-info';
|
|
15
|
-
import { OneinchCcrTradeParams
|
|
15
|
+
import { OneinchCcrTradeParams } from './models/oneinch-ccr-trade-types';
|
|
16
16
|
export declare class OneinchCcrTrade extends EvmCrossChainTrade {
|
|
17
|
-
static getGasData({ feeInfo, from, providerAddress, quote, toToken, slippage }: OneinchGetGasDataParams): Promise<GasData | null>;
|
|
18
17
|
readonly type: CrossChainTradeType;
|
|
19
18
|
readonly isAggregator: boolean;
|
|
20
19
|
readonly to: PriceTokenAmount<EvmBlockchainName>;
|
package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.js
CHANGED
|
@@ -2,38 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OneinchCcrTrade = void 0;
|
|
4
4
|
const blockchain_name_1 = require("../../../../../core/blockchain/models/blockchain-name");
|
|
5
|
-
const
|
|
5
|
+
const web3_pure_1 = require("../../../../../core/blockchain/web3-pure/web3-pure");
|
|
6
6
|
const check_unsupported_receiver_address_1 = require("../../../../common/utils/check-unsupported-receiver-address");
|
|
7
7
|
const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
|
|
8
8
|
const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
|
|
9
|
-
const get_cross_chain_gas_data_1 = require("../../utils/get-cross-chain-gas-data");
|
|
10
9
|
const evm_cross_chain_trade_1 = require("../common/emv-cross-chain-trade/evm-cross-chain-trade");
|
|
11
10
|
const bridge_type_1 = require("../common/models/bridge-type");
|
|
12
11
|
const oneinch_ccr_api_service_1 = require("./services/oneinch-ccr-api-service");
|
|
13
12
|
const oneinch_ccr_utils_1 = require("./services/oneinch-ccr-utils");
|
|
14
13
|
class OneinchCcrTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
15
|
-
static async getGasData({ feeInfo, from, providerAddress, quote, toToken, slippage }) {
|
|
16
|
-
try {
|
|
17
|
-
const trade = new OneinchCcrTrade({
|
|
18
|
-
crossChainTrade: {
|
|
19
|
-
from,
|
|
20
|
-
to: toToken,
|
|
21
|
-
gasData: null,
|
|
22
|
-
priceImpact: 0,
|
|
23
|
-
feeInfo,
|
|
24
|
-
quote,
|
|
25
|
-
slippage
|
|
26
|
-
},
|
|
27
|
-
providerAddress: providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS,
|
|
28
|
-
routePath: [],
|
|
29
|
-
useProxy: false
|
|
30
|
-
});
|
|
31
|
-
return (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade);
|
|
32
|
-
}
|
|
33
|
-
catch (_err) {
|
|
34
|
-
return null;
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
14
|
get fromWithoutFee() {
|
|
38
15
|
return (0, get_from_without_fee_1.getFromWithoutFee)(this.from, this.feeInfo.rubicProxy?.platformFee?.percent);
|
|
39
16
|
}
|
|
@@ -60,7 +37,7 @@ class OneinchCcrTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
60
37
|
this.gasData = params.crossChainTrade.gasData;
|
|
61
38
|
this.priceImpact = params.crossChainTrade.priceImpact;
|
|
62
39
|
this.slippage = params.crossChainTrade.slippage;
|
|
63
|
-
this.toTokenAmountMin = this.to.weiAmountMinusSlippage(this.slippage);
|
|
40
|
+
this.toTokenAmountMin = web3_pure_1.Web3Pure.fromWei(this.to.weiAmountMinusSlippage(this.slippage), this.to.decimals);
|
|
64
41
|
this.quote = params.crossChainTrade.quote;
|
|
65
42
|
}
|
|
66
43
|
async swap(options = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oneinch-ccr-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.ts"],"names":[],"mappings":";;;AAEA,gFAAgG;
|
|
1
|
+
{"version":3,"file":"oneinch-ccr-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.ts"],"names":[],"mappings":"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"}
|