rubic-sdk 5.38.1-alpha.oo.2 → 5.38.1-alpha.oo.4
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/common/cross-chain-trade.js +1 -0
- package/lib/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-provider.js +3 -3
- package/lib/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-trade.js +7 -4
- package/lib/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-trade.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/services/open-ocean-api-service.js +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/services/open-ocean-api-service.js.map +1 -1
- package/package.json +1 -1
|
@@ -155,6 +155,7 @@ class CrossChainTrade {
|
|
|
155
155
|
else {
|
|
156
156
|
fromValue = new bignumber_js_1.default(providerValue || 0);
|
|
157
157
|
}
|
|
158
|
+
// 100 / 0.98
|
|
158
159
|
return new bignumber_js_1.default(fromValue).plus(fixedFeeValue).toFixed(0, 0);
|
|
159
160
|
}
|
|
160
161
|
async setTransactionConfig(skipAmountChangeCheck, useCacheData, receiverAddress) {
|
package/lib/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,14 +36,14 @@ class MesonCrossChainProvider extends cross_chain_provider_1.CrossChainProvider
|
|
|
36
36
|
const { max, min, mesonFee, sourceAssetString, targetAssetString } = await this.fetchTradeInfo(fromWith6Decimals, toToken);
|
|
37
37
|
const feeInfo = await this.getFeeInfo(fromBlockchain, options.providerAddress, from, useProxy);
|
|
38
38
|
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(fromWith6Decimals, feeInfo.rubicProxy?.platformFee?.percent);
|
|
39
|
-
const toAmount =
|
|
39
|
+
const toAmount = fromWithoutFee.tokenAmount.minus(mesonFee);
|
|
40
40
|
const to = new tokens_1.PriceTokenAmount({
|
|
41
41
|
...toToken.asStruct,
|
|
42
42
|
tokenAmount: toAmount
|
|
43
43
|
});
|
|
44
44
|
const gasData = options.gasCalculation === 'enabled'
|
|
45
45
|
? await meson_cross_chain_trade_1.MesonCrossChainTrade.getGasData({
|
|
46
|
-
from:
|
|
46
|
+
from: fromWith6Decimals,
|
|
47
47
|
feeInfo,
|
|
48
48
|
toToken: to,
|
|
49
49
|
providerAddress: options.providerAddress,
|
|
@@ -54,7 +54,7 @@ class MesonCrossChainProvider extends cross_chain_provider_1.CrossChainProvider
|
|
|
54
54
|
const trade = new meson_cross_chain_trade_1.MesonCrossChainTrade({
|
|
55
55
|
crossChainTrade: {
|
|
56
56
|
feeInfo,
|
|
57
|
-
from:
|
|
57
|
+
from: fromWith6Decimals,
|
|
58
58
|
gasData,
|
|
59
59
|
to,
|
|
60
60
|
priceImpact: from.calculatePriceImpactPercent(to),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meson-cross-chain-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAM2B;AAC3B,8CAAiE;AACjE,4DAA+D;AAE/D,sGAAkG;AAClG,yFAAmF;AACnF,gDAAwB;AAGxB,yEAAoE;AACpE,8DAA2D;AAI3D,oHAA6G;AAC7G,uGAGwD;AACxD,uEAAiE;AAGjE,4FAA8E;AAE9E,MAAa,uBAAwB,SAAQ,yCAAkB;IAA/D;;QACoB,SAAI,GAAG,yBAAW,CAAC,KAAK,CAAC;IAgN7C,CAAC;IA9MU,qBAAqB,CAAC,UAA6B;QACtD,OAAO,mEAA8B,CAAC,IAAI,CACtC,mBAAmB,CAAC,EAAE,CAAC,mBAAmB,KAAK,UAAU,CAC5D,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAAkC;QAElC,MAAM,cAAc,GAAG,IAAI,CAAC,UAAsC,CAAC;QACnE,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;QAExD,IAAI;YACA,IAAI,CAAC,QAAQ,EAAE;gBACX,MAAM,IAAI,sBAAa,CAAC,kCAAkC,CAAC,CAAC;aAC/D;YAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAE1D,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,GAC9D,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;YAE1D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CACjC,cAAc,EACd,OAAO,CAAC,eAAe,EACvB,IAAI,EACJ,QAAQ,CACX,CAAC;YAEF,MAAM,cAAc,GAAG,IAAA,wCAAiB,EACpC,iBAAiB,EACjB,OAAO,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAC3C,CAAC;YAEF,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"meson-cross-chain-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.MesonCrossChainTrade = void 0;
|
|
4
4
|
const ethers_1 = require("ethers");
|
|
5
5
|
const evm_web3_pure_1 = require("../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
|
|
6
|
+
const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
|
|
6
7
|
const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
|
|
7
8
|
const get_cross_chain_gas_data_1 = require("../../utils/get-cross-chain-gas-data");
|
|
8
9
|
const rubic_proxy_contract_address_1 = require("../common/constants/rubic-proxy-contract-address");
|
|
@@ -66,7 +67,8 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
66
67
|
}
|
|
67
68
|
async getContractParams(options) {
|
|
68
69
|
const receiverAddress = options?.receiverAddress || this.walletAddress;
|
|
69
|
-
const { data, value: providerValue,
|
|
70
|
+
const { data, value: providerValue, // 0.001078
|
|
71
|
+
to: providerRouter } = await this.setTransactionConfig(false, options?.useCacheData || false, options?.receiverAddress || this.walletAddress);
|
|
70
72
|
const bridgeData = proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getBridgeData(options, {
|
|
71
73
|
walletAddress: receiverAddress,
|
|
72
74
|
fromTokenAmount: this.from,
|
|
@@ -79,7 +81,7 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
79
81
|
const extraNativeFee = '0';
|
|
80
82
|
const providerData = await proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getGenericProviderData(providerRouter, data, this.from.blockchain, providerRouter, extraNativeFee);
|
|
81
83
|
const methodArguments = [bridgeData, providerData];
|
|
82
|
-
const value = this.getSwapValue(providerValue);
|
|
84
|
+
const value = this.getSwapValue(providerValue); // 0.0011
|
|
83
85
|
const transactionConfiguration = evm_web3_pure_1.EvmWeb3Pure.encodeMethodCall(rubic_proxy_contract_address_1.rubicProxyContractAddress[this.from.blockchain].router, evm_common_cross_chain_abi_1.evmCommonCrossChainAbi, this.methodName, methodArguments, value);
|
|
84
86
|
const sendingToken = this.from.isNative ? [] : [this.from.address];
|
|
85
87
|
const sendingAmount = this.from.isNative ? [] : [this.from.stringWeiAmount];
|
|
@@ -94,10 +96,11 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
94
96
|
async getTransactionConfigAndAmount(receiverAddress) {
|
|
95
97
|
const rubicMultiProxyAddress = rubic_proxy_contract_address_1.rubicProxyContractAddress[this.fromBlockchain].router;
|
|
96
98
|
const fromAddress = this.isProxyTrade ? rubicMultiProxyAddress : this.walletAddress;
|
|
99
|
+
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(this.from, this.feeInfo.rubicProxy?.platformFee?.percent);
|
|
97
100
|
const { encoded, initiator } = await meson_cross_chain_api_service_1.MesonCcrApiService.fetchInfoForTx({
|
|
98
101
|
sourceAssetString: this.sourceAssetString,
|
|
99
102
|
targetAssetString: this.targetAssetString,
|
|
100
|
-
amount:
|
|
103
|
+
amount: fromWithoutFee.tokenAmount.toFixed(),
|
|
101
104
|
fromAddress,
|
|
102
105
|
receiverAddress: receiverAddress || this.walletAddress,
|
|
103
106
|
useProxy: this.isProxyTrade
|
|
@@ -105,7 +108,7 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
105
108
|
const postingValue = ethers_1.ethers.utils.solidityPack(['address', 'uint40'], [initiator, 1]);
|
|
106
109
|
const methodName = 'postSwapFromContract';
|
|
107
110
|
const methodArgs = [encoded, postingValue, rubicMultiProxyAddress];
|
|
108
|
-
const value = this.from.isNative ?
|
|
111
|
+
const value = this.from.isNative ? fromWithoutFee.stringWeiAmount : '0';
|
|
109
112
|
const config = evm_web3_pure_1.EvmWeb3Pure.encodeMethodCall(meson_contract_addresses_1.mesonContractAddresses[this.fromBlockchain], meson_abi_1.MESON_ABI, methodName, methodArgs, value);
|
|
110
113
|
return { config, amount: this.to.stringWeiAmount };
|
|
111
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meson-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-trade.ts"],"names":[],"mappings":";;;AACA,mCAAgC;AAGhC,6GAAwG;
|
|
1
|
+
{"version":3,"file":"meson-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-trade.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ class OpenOceanApiService {
|
|
|
26
26
|
}
|
|
27
27
|
static async fetchSwapData(fromWithoutFee, to, walletAddress, slippageTolerance) {
|
|
28
28
|
const gasPriceNonWei = await this.getGasPriceNonWei(fromWithoutFee);
|
|
29
|
-
const swapResponse = await injector_1.Injector.httpClient.get(`${this.xApiUrl}/v4/${open_ocean_blockchain_1.openOceanBlockchainName[fromWithoutFee.blockchain]}/
|
|
29
|
+
const swapResponse = await injector_1.Injector.httpClient.get(`${this.xApiUrl}/v4/${open_ocean_blockchain_1.openOceanBlockchainName[fromWithoutFee.blockchain]}/swap`, {
|
|
30
30
|
headers: { apikey: 'sndfje3u4b3fnNSDNFUSDNVSunw345842hrnfd3b4nt4' },
|
|
31
31
|
params: {
|
|
32
32
|
chain: open_ocean_blockchain_1.openOceanBlockchainName[fromWithoutFee.blockchain],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-ocean-api-service.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/open-ocean/services/open-ocean-api-service.ts"],"names":[],"mappings":";;;AACA,6EAA6E;AAC7E,gFAAgG;AAChG,uEAAmE;AACnE,yDAAsD;AAEtD,wEAAqE;AACrE,8EAA6E;AAM7E,MAAa,mBAAmB;IAOrB,MAAM,CAAC,KAAK,CAAC,cAAc,CAC9B,cAAqE,EACrE,OAAsC,EACtC,iBAAyB;QAEzB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAEpE,MAAM,aAAa,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAC/C,GAAG,IAAI,CAAC,OAAO,OAAO,+CAAuB,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,EAChF;YACI,OAAO,EAAE,EAAE,MAAM,EAAE,8CAA8C,EAAE;YACnE,MAAM,EAAE;gBACJ,KAAK,EAAE,+CAAuB,CAAC,cAAc,CAAC,UAAU,CAAC;gBACzD,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC;gBACpD,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;gBAC9C,MAAM,EAAE,cAAc,CAAC,WAAW,CAAC,QAAQ,EAAE;gBAC7C,iDAAiD;gBACjD,QAAQ,EAAE,iBAAkB,GAAG,GAAG;gBAClC,QAAQ,EAAE,cAAc;aAC3B;SACJ,CACJ,CAAC;QAEF,OAAO,aAAa,CAAC;IACzB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,aAAa,CAC7B,cAAqE,EACrE,EAAoB,EACpB,aAAqB,EACrB,iBAAyB;QAEzB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAEpE,MAAM,YAAY,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAC9C,GAAG,IAAI,CAAC,OAAO,OAAO,+CAAuB,CAAC,cAAc,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"open-ocean-api-service.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/open-ocean/services/open-ocean-api-service.ts"],"names":[],"mappings":"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"}
|