rubic-sdk 4.29.0-alpha-aerodrome-dex.5 → 4.29.1-alpha-xy-amount.0
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/rubic-sdk.min.js +33 -1
- package/dist/rubic-sdk.min.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-trade.d.ts +1 -0
- package/lib/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-trade.js +33 -1
- package/lib/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-trade.js.map +1 -1
- package/package.json +1 -1
package/lib/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-trade.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.XyCrossChainTrade = void 0;
|
|
4
|
+
const updated_rates_error_1 = require("../../../../../common/errors/cross-chain/updated-rates-error");
|
|
5
|
+
const tokens_1 = require("../../../../../common/tokens");
|
|
4
6
|
const evm_web3_pure_1 = require("../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
|
|
5
7
|
const web3_pure_1 = require("../../../../../core/blockchain/web3-pure/web3-pure");
|
|
6
8
|
const injector_1 = require("../../../../../core/injector/injector");
|
|
@@ -146,7 +148,8 @@ class XyCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
146
148
|
...this.transactionRequest,
|
|
147
149
|
...(receiverAddress && { receiveAddress: receiverAddress })
|
|
148
150
|
};
|
|
149
|
-
const { tx } = await injector_1.Injector.httpClient.get(`${xy_cross_chain_provider_1.XyCrossChainProvider.apiEndpoint}/swap`, { params: { ...params } });
|
|
151
|
+
const { tx, toTokenAmount } = await injector_1.Injector.httpClient.get(`${xy_cross_chain_provider_1.XyCrossChainProvider.apiEndpoint}/swap`, { params: { ...params } });
|
|
152
|
+
await this.checkOrderAmount(toTokenAmount);
|
|
150
153
|
return tx;
|
|
151
154
|
}
|
|
152
155
|
getUsdPrice() {
|
|
@@ -167,6 +170,35 @@ class XyCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
167
170
|
this.slippage * 10000
|
|
168
171
|
];
|
|
169
172
|
}
|
|
173
|
+
async checkOrderAmount(toTokenAmount) {
|
|
174
|
+
const newAmount = web3_pure_1.Web3Pure.fromWei(toTokenAmount, this.to.decimals);
|
|
175
|
+
const acceptableExpensesChangePercent = 2;
|
|
176
|
+
const amountPlusPercent = this.to.tokenAmount.plus(this.to.tokenAmount.multipliedBy(acceptableExpensesChangePercent).dividedBy(100));
|
|
177
|
+
const infoObject = {
|
|
178
|
+
newAmount: newAmount.toFixed(),
|
|
179
|
+
oldAmount: this.to.tokenAmount.toFixed(),
|
|
180
|
+
oldAmountPlusPercent: amountPlusPercent.toFixed(),
|
|
181
|
+
newAmountLessThenOld: newAmount.lt(this.to.tokenAmount),
|
|
182
|
+
newAmountGreatThenOldMore2Percent: newAmount.gt(amountPlusPercent)
|
|
183
|
+
};
|
|
184
|
+
console.log(infoObject);
|
|
185
|
+
if (newAmount.lt(this.to.tokenAmount) || newAmount.gt(amountPlusPercent)) {
|
|
186
|
+
const newTo = await tokens_1.PriceTokenAmount.createFromToken({
|
|
187
|
+
...this.to,
|
|
188
|
+
tokenAmount: newAmount
|
|
189
|
+
});
|
|
190
|
+
throw new updated_rates_error_1.UpdatedRatesError(new XyCrossChainTrade({
|
|
191
|
+
from: this.from,
|
|
192
|
+
to: newTo,
|
|
193
|
+
transactionRequest: this.transactionRequest,
|
|
194
|
+
gasData: this.gasData,
|
|
195
|
+
priceImpact: this.from.calculatePriceImpactPercent(newTo),
|
|
196
|
+
slippage: this.slippage,
|
|
197
|
+
feeInfo: this.feeInfo,
|
|
198
|
+
onChainTrade: null
|
|
199
|
+
}, this.providerAddress));
|
|
200
|
+
}
|
|
201
|
+
}
|
|
170
202
|
}
|
|
171
203
|
exports.XyCrossChainTrade = XyCrossChainTrade;
|
|
172
204
|
XyCrossChainTrade.nativeAddress = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xy-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-trade.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"xy-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-trade.ts"],"names":[],"mappings":"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"}
|