rubic-sdk 5.38.1-alpha.new-fee.19 → 5.38.1-alpha.new-fee.22
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.d.ts +2 -1
- package/lib/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.js +3 -1
- 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.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-trade.js +20 -15
- package/lib/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-provider.js +14 -6
- 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/orbiter-bridge-trade.d.ts +8 -0
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-trade.js +45 -2
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-provider.js +2 -2
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.js +6 -0
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.js.map +1 -1
- package/package.json +1 -1
package/lib/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.d.ts
CHANGED
|
@@ -117,7 +117,8 @@ export declare abstract class CrossChainTrade<T = unknown> {
|
|
|
117
117
|
protected checkReceiverAddress(receiverAddress: string | undefined, isRequired?: boolean, crossChainType?: CrossChainTradeType): Promise<void | never>;
|
|
118
118
|
/**
|
|
119
119
|
* Calculates value for swap transaction.
|
|
120
|
-
* @param providerValue Value, returned from cross-chain provider.
|
|
120
|
+
* @param providerValue Value, returned from cross-chain provider. Not '0' if from is native or provider has extranative
|
|
121
|
+
* @returns msg.value = providerValue(not)
|
|
121
122
|
*/
|
|
122
123
|
protected getSwapValue(providerValue?: BigNumber | string | number | null): string;
|
|
123
124
|
abstract getUsdPrice(providerFeeTokenPrice?: BigNumber): BigNumber;
|
|
@@ -134,7 +134,8 @@ class CrossChainTrade {
|
|
|
134
134
|
}
|
|
135
135
|
/**
|
|
136
136
|
* Calculates value for swap transaction.
|
|
137
|
-
* @param providerValue Value, returned from cross-chain provider.
|
|
137
|
+
* @param providerValue Value, returned from cross-chain provider. Not '0' if from is native or provider has extranative
|
|
138
|
+
* @returns msg.value = providerValue(not)
|
|
138
139
|
*/
|
|
139
140
|
getSwapValue(providerValue) {
|
|
140
141
|
const nativeToken = native_tokens_1.nativeTokensList[this.from.blockchain];
|
|
@@ -151,6 +152,7 @@ class CrossChainTrade {
|
|
|
151
152
|
else {
|
|
152
153
|
fromValue = new bignumber_js_1.default(providerValue || 0);
|
|
153
154
|
}
|
|
155
|
+
// 100 / 0.98
|
|
154
156
|
return new bignumber_js_1.default(fromValue).plus(fixedFeeValue).toFixed(0, 0);
|
|
155
157
|
}
|
|
156
158
|
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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"}
|
|
@@ -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;
|
|
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");
|
|
@@ -67,10 +68,11 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
67
68
|
}
|
|
68
69
|
async getContractParams(options) {
|
|
69
70
|
const receiverAddress = options?.receiverAddress || this.walletAddress;
|
|
70
|
-
const { data, value: providerValue,
|
|
71
|
+
const { data, value: providerValue, // 0.001078
|
|
72
|
+
to: providerRouter } = await this.setTransactionConfig(false, options?.useCacheData || false, options?.receiverAddress || this.walletAddress);
|
|
71
73
|
const bridgeData = proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getBridgeData(options, {
|
|
72
74
|
walletAddress: receiverAddress,
|
|
73
|
-
fromTokenAmount: this.from,
|
|
75
|
+
fromTokenAmount: this.from, // 0.0011
|
|
74
76
|
toTokenAmount: this.to,
|
|
75
77
|
srcChainTrade: null,
|
|
76
78
|
providerAddress: this.providerAddress,
|
|
@@ -80,16 +82,22 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
80
82
|
const extraNativeFee = '0';
|
|
81
83
|
const providerData = await proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getGenericProviderData(providerRouter, data, this.from.blockchain, providerRouter, extraNativeFee);
|
|
82
84
|
const methodArguments = [bridgeData, providerData];
|
|
83
|
-
const value = this.getSwapValue(providerValue);
|
|
85
|
+
const value = this.getSwapValue(providerValue); // 0.0011
|
|
84
86
|
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);
|
|
85
87
|
const sendingToken = this.from.isNative ? [] : [this.from.address];
|
|
86
88
|
const sendingAmount = this.from.isNative ? [] : [this.from.stringWeiAmount];
|
|
87
|
-
const evmdata =
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
89
|
+
// const evmdata = EvmWeb3Pure.encodeMethodCall(
|
|
90
|
+
// rubicProxyContractAddress[this.from.blockchain].gateway,
|
|
91
|
+
// gatewayRubicCrossChainAbi,
|
|
92
|
+
// 'startViaRubic',
|
|
93
|
+
// [sendingToken, sendingAmount, transactionConfiguration.data],
|
|
94
|
+
// value
|
|
95
|
+
// );
|
|
96
|
+
// console.log('%cMeson-DATA', 'color: greenyellow; font-size: 28px;', {
|
|
97
|
+
// to: evmdata.to,
|
|
98
|
+
// data: evmdata.data,
|
|
99
|
+
// value: evmdata.value
|
|
100
|
+
// });
|
|
93
101
|
return {
|
|
94
102
|
contractAddress: rubic_proxy_contract_address_1.rubicProxyContractAddress[this.from.blockchain].gateway,
|
|
95
103
|
contractAbi: gateway_rubic_cross_chain_abi_1.gatewayRubicCrossChainAbi,
|
|
@@ -101,10 +109,11 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
101
109
|
async getTransactionConfigAndAmount(receiverAddress) {
|
|
102
110
|
const rubicMultiProxyAddress = rubic_proxy_contract_address_1.rubicProxyContractAddress[this.fromBlockchain].router;
|
|
103
111
|
const fromAddress = this.isProxyTrade ? rubicMultiProxyAddress : this.walletAddress;
|
|
112
|
+
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(this.from, this.feeInfo.rubicProxy?.platformFee?.percent);
|
|
104
113
|
const { encoded, initiator } = await meson_cross_chain_api_service_1.MesonCcrApiService.fetchInfoForTx({
|
|
105
114
|
sourceAssetString: this.sourceAssetString,
|
|
106
115
|
targetAssetString: this.targetAssetString,
|
|
107
|
-
amount:
|
|
116
|
+
amount: fromWithoutFee.tokenAmount.toFixed(),
|
|
108
117
|
fromAddress,
|
|
109
118
|
receiverAddress: receiverAddress || this.walletAddress,
|
|
110
119
|
useProxy: this.isProxyTrade
|
|
@@ -112,11 +121,7 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
112
121
|
const postingValue = ethers_1.ethers.utils.solidityPack(['address', 'uint40'], [initiator, 1]);
|
|
113
122
|
const methodName = 'postSwapFromContract';
|
|
114
123
|
const methodArgs = [encoded, postingValue, rubicMultiProxyAddress];
|
|
115
|
-
|
|
116
|
-
// const nativeValueWithPercentFee = this.from.weiAmount
|
|
117
|
-
// .plus(this.from.weiAmount.multipliedBy(percentFee).dividedBy(100))
|
|
118
|
-
// .toFixed(0);
|
|
119
|
-
const value = this.from.isNative ? this.from.stringWeiAmount : '0';
|
|
124
|
+
const value = this.from.isNative ? fromWithoutFee.stringWeiAmount : '0';
|
|
120
125
|
const config = evm_web3_pure_1.EvmWeb3Pure.encodeMethodCall(meson_contract_addresses_1.mesonContractAddresses[this.fromBlockchain], meson_abi_1.MESON_ABI, methodName, methodArgs, value);
|
|
121
126
|
return { config, amount: this.to.stringWeiAmount };
|
|
122
127
|
}
|
|
@@ -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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"}
|
|
@@ -53,14 +53,22 @@ class OrbiterBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
53
53
|
...toToken.asStruct,
|
|
54
54
|
tokenAmount: web3_pure_1.Web3Pure.fromWei(toAmount, toToken.decimals)
|
|
55
55
|
});
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
56
|
+
// const fromWithCode = new PriceTokenAmount({
|
|
57
|
+
// ...fromWithoutFee.asStruct,
|
|
58
|
+
// weiAmount: this.getSendingAmount(
|
|
59
|
+
// fromWithoutFee.stringWeiAmount,
|
|
60
|
+
// quoteConfig,
|
|
61
|
+
// feeInfo
|
|
62
|
+
// )
|
|
63
|
+
// });
|
|
64
|
+
// const fromWithCode = new PriceTokenAmount({
|
|
65
|
+
// ...from.asStruct,
|
|
66
|
+
// weiAmount: this.getSendingAmount(from.stringWeiAmount, quoteConfig, feeInfo)
|
|
67
|
+
// });
|
|
60
68
|
const gasData = options.gasCalculation === 'enabled'
|
|
61
69
|
? await orbiter_bridge_trade_1.OrbiterBridgeTrade.getGasData({
|
|
62
70
|
feeInfo,
|
|
63
|
-
fromToken:
|
|
71
|
+
fromToken: from,
|
|
64
72
|
toToken: to,
|
|
65
73
|
receiverAddress: options.receiverAddress,
|
|
66
74
|
providerAddress: options.providerAddress,
|
|
@@ -70,7 +78,7 @@ class OrbiterBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
70
78
|
const trade = new orbiter_bridge_trade_1.OrbiterBridgeTrade({
|
|
71
79
|
crossChainTrade: {
|
|
72
80
|
feeInfo,
|
|
73
|
-
from
|
|
81
|
+
from,
|
|
74
82
|
gasData,
|
|
75
83
|
to,
|
|
76
84
|
priceImpact: from.calculatePriceImpactPercent(to),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orbiter-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAmE;AACnE,8CAAiE;AAEjE,uEAAmE;AACnE,yFAAmF;AAGnF,gFAA6E;AAC7E,yEAAoE;AAIpE,oHAA6G;AAE7G,0FAGgD;AAChD,iEAA4D;AAC5D,wEAAmE;AACnE,4DAAwD;AAExD,MAAa,qBAAsB,SAAQ,yCAAkB;IAA7D;;QACoB,SAAI,GAAG,+CAAsB,CAAC,cAAc,CAAC;QAErD,wBAAmB,GAAyB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"orbiter-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,5 +39,13 @@ export declare class OrbiterBridgeTrade extends EvmCrossChainTrade {
|
|
|
39
39
|
config: EvmEncodeConfig;
|
|
40
40
|
amount: string;
|
|
41
41
|
}>;
|
|
42
|
+
/**
|
|
43
|
+
* @example for native transfer
|
|
44
|
+
* 1000000 - 2%(rubicPercentFee) -> convertToCode -> 998015
|
|
45
|
+
* amountJore - 998015 + 2%
|
|
46
|
+
* When Jora subtracts amountJore - 2%, he will get value with orbiter-vc-code
|
|
47
|
+
*/
|
|
48
|
+
private getFromAmountWithoutFeeWithCode;
|
|
49
|
+
private getSendingAmount;
|
|
42
50
|
getTradeInfo(): TradeInfo;
|
|
43
51
|
}
|
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.OrbiterBridgeTrade = void 0;
|
|
7
|
+
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
|
+
const tokens_1 = require("../../../../../common/tokens");
|
|
4
9
|
const evm_web3_pure_1 = require("../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
|
|
10
|
+
const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
|
|
5
11
|
const get_cross_chain_gas_data_1 = require("../../utils/get-cross-chain-gas-data");
|
|
6
12
|
const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
|
|
7
13
|
const rubic_proxy_contract_address_1 = require("../common/constants/rubic-proxy-contract-address");
|
|
@@ -91,9 +97,17 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
91
97
|
async getContractParams(options) {
|
|
92
98
|
const receiverAddress = options?.receiverAddress || this.walletAddress;
|
|
93
99
|
const { data, value: providerValue, to: providerRouter } = await this.setTransactionConfig(false, options?.useCacheData || false, options?.receiverAddress || this.walletAddress);
|
|
100
|
+
const percentFee = (this.feeInfo.rubicProxy?.platformFee?.percent || 0) / 100;
|
|
101
|
+
const fromWeiAmountWithHiddenCode = new bignumber_js_1.default(this.getFromAmountWithoutFeeWithCode())
|
|
102
|
+
.dividedBy(1 - percentFee)
|
|
103
|
+
.decimalPlaces(0, 1);
|
|
104
|
+
const fromWithCode = new tokens_1.PriceTokenAmount({
|
|
105
|
+
...this.from.asStruct,
|
|
106
|
+
weiAmount: fromWeiAmountWithHiddenCode
|
|
107
|
+
});
|
|
94
108
|
const bridgeData = proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getBridgeData(options, {
|
|
95
109
|
walletAddress: receiverAddress,
|
|
96
|
-
fromTokenAmount:
|
|
110
|
+
fromTokenAmount: fromWithCode,
|
|
97
111
|
toTokenAmount: this.to,
|
|
98
112
|
srcChainTrade: null,
|
|
99
113
|
providerAddress: this.providerAddress,
|
|
@@ -107,6 +121,12 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
107
121
|
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);
|
|
108
122
|
const sendingToken = this.from.isNative ? [] : [this.from.address];
|
|
109
123
|
const sendingAmount = this.from.isNative ? [] : [this.from.stringWeiAmount];
|
|
124
|
+
const evmdata = evm_web3_pure_1.EvmWeb3Pure.encodeMethodCall(rubic_proxy_contract_address_1.rubicProxyContractAddress[this.from.blockchain].gateway, gateway_rubic_cross_chain_abi_1.gatewayRubicCrossChainAbi, 'startViaRubic', [sendingToken, sendingAmount, transactionConfiguration.data], value);
|
|
125
|
+
console.log('%cOrbiter-DATA', 'color: pink; font-size: 28px;', {
|
|
126
|
+
to: evmdata.to,
|
|
127
|
+
data: evmdata.data,
|
|
128
|
+
value: evmdata.value
|
|
129
|
+
});
|
|
110
130
|
return {
|
|
111
131
|
contractAddress: rubic_proxy_contract_address_1.rubicProxyContractAddress[this.from.blockchain].gateway,
|
|
112
132
|
contractAbi: gateway_rubic_cross_chain_abi_1.gatewayRubicCrossChainAbi,
|
|
@@ -118,7 +138,8 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
118
138
|
async getTransactionConfigAndAmount(receiverAddress) {
|
|
119
139
|
// Orbiter deposit address to send funds money to receiverWalletAddress after transfer confirmation
|
|
120
140
|
const orbiterTokensDispenser = this.quoteConfig.endpoint;
|
|
121
|
-
const transferAmount = this.from.stringWeiAmount;
|
|
141
|
+
// const transferAmount = this.from.stringWeiAmount;
|
|
142
|
+
const transferAmount = this.getFromAmountWithoutFeeWithCode();
|
|
122
143
|
const encodedReceiverAndCode = orbiter_utils_1.OrbiterUtils.getHexDataArg(this.quoteConfig.vc, receiverAddress || this.walletAddress);
|
|
123
144
|
const methodName = this.from.isNative ? 'transfer' : 'transferToken';
|
|
124
145
|
const methodArgs = this.from.isNative
|
|
@@ -131,6 +152,28 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
131
152
|
amount: this.to.stringWeiAmount
|
|
132
153
|
};
|
|
133
154
|
}
|
|
155
|
+
/**
|
|
156
|
+
* @example for native transfer
|
|
157
|
+
* 1000000 - 2%(rubicPercentFee) -> convertToCode -> 998015
|
|
158
|
+
* amountJore - 998015 + 2%
|
|
159
|
+
* When Jora subtracts amountJore - 2%, he will get value with orbiter-vc-code
|
|
160
|
+
*/
|
|
161
|
+
getFromAmountWithoutFeeWithCode() {
|
|
162
|
+
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(this.from, this.feeInfo.rubicProxy?.platformFee?.percent);
|
|
163
|
+
const transferAmount = orbiter_utils_1.OrbiterUtils.getAmountWithVcCode(fromWithoutFee.stringWeiAmount, this.quoteConfig);
|
|
164
|
+
return transferAmount;
|
|
165
|
+
}
|
|
166
|
+
getSendingAmount(fromStringWeiAmount, quoteConfig, feeInfo) {
|
|
167
|
+
const desiredAmount = orbiter_utils_1.OrbiterUtils.getAmountWithVcCode(fromStringWeiAmount, quoteConfig);
|
|
168
|
+
const fee = (feeInfo.rubicProxy?.platformFee?.percent || 0) * 1000;
|
|
169
|
+
const denominator = new bignumber_js_1.default(1000000);
|
|
170
|
+
const sendingAmount = new bignumber_js_1.default(desiredAmount)
|
|
171
|
+
.multipliedBy(denominator)
|
|
172
|
+
.dividedBy(denominator.minus(fee))
|
|
173
|
+
.decimalPlaces(0, 1)
|
|
174
|
+
.toFixed();
|
|
175
|
+
return new bignumber_js_1.default(sendingAmount);
|
|
176
|
+
}
|
|
134
177
|
getTradeInfo() {
|
|
135
178
|
return {
|
|
136
179
|
estimatedGas: this.estimatedGas,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orbiter-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-trade.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"orbiter-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-trade.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,7 @@ class OwlToBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
50
50
|
const gasData = options.gasCalculation === 'enabled'
|
|
51
51
|
? await owl_to_bridge_trade_1.OwlToBridgeTrade.getGasData({
|
|
52
52
|
feeInfo,
|
|
53
|
-
fromToken:
|
|
53
|
+
fromToken: from,
|
|
54
54
|
toToken: to,
|
|
55
55
|
providerAddress: options.providerAddress,
|
|
56
56
|
swapParams,
|
|
@@ -60,7 +60,7 @@ class OwlToBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
60
60
|
const trade = new owl_to_bridge_trade_1.OwlToBridgeTrade({
|
|
61
61
|
crossChainTrade: {
|
|
62
62
|
feeInfo,
|
|
63
|
-
from
|
|
63
|
+
from,
|
|
64
64
|
to,
|
|
65
65
|
gasData,
|
|
66
66
|
priceImpact: from.calculatePriceImpactPercent(to),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"owl-to-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAmE;AACnE,8CAAiE;AAEjE,sGAAkG;AAClG,2FAAwF;AACxF,yFAAmF;AAInF,yEAAoE;AACpE,8DAA2D;AAI3D,oHAA6G;AAC7G,iFAG6C;AAE7C,+DAAyD;AACzD,sEAAgE;AAEhE,MAAa,mBAAoB,SAAQ,yCAAkB;IAA3D;;QACW,SAAI,GAAwB,yBAAW,CAAC,aAAa,CAAC;IA8HjE,CAAC;IA5HU,qBAAqB,CAAC,UAA0B;QACnD,OAAO,mDAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC;IACzE,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;QACxD,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAI,yCAAmB,CAAC;QAEnF,IAAI,CAAC;YACD,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,IAAI,EACJ,OAAO,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAC3C,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,oCAAe,CAAC,WAAW,CAC9C,4BAAY,CAAC,IAAI,CAAC,UAAU,CAAC,EAC7B,IAAI,CAAC,OAAO,EACZ,4BAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAChC,OAAO,CAAC,OAAO,CAClB,CAAC;YACF,MAAM,WAAW,GAAG,IAAI,sBAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC/D,MAAM,WAAW,GAAG,IAAI,sBAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC/D,MAAM,UAAU,GAAG;gBACf,MAAM,EAAE,cAAc,CAAC,WAAW,CAAC,OAAO,EAAE;gBAC5C,YAAY,EAAE,QAAQ,CAAC,aAAa;gBACpC,YAAY,EAAE,QAAQ,CAAC,eAAe;gBACtC,eAAe,EAAE,OAAO,CAAC,eAAe,IAAI,aAAa;gBACzD,WAAW,EAAE,QAAQ,CAAC,UAAU;gBAChC,aAAa;aACK,CAAC;YAEvB,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,MAAM,oCAAe,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAE7E,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,aAAa,CAAC,SAAS,CAAC;aACpD,CAAC,CAAC;YAEH,MAAM,OAAO,GACT,OAAO,CAAC,cAAc,KAAK,SAAS;gBAChC,CAAC,CAAC,MAAM,sCAAgB,CAAC,UAAU,CAAC;oBAC9B,OAAO;oBACP,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"owl-to-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-provider.ts"],"names":[],"mappings":"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"}
|
package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.js
CHANGED
|
@@ -76,6 +76,12 @@ class OwlToBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
76
76
|
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);
|
|
77
77
|
const sendingToken = this.from.isNative ? [] : [this.from.address];
|
|
78
78
|
const sendingAmount = this.from.isNative ? [] : [this.from.stringWeiAmount];
|
|
79
|
+
const evmdata = evm_web3_pure_1.EvmWeb3Pure.encodeMethodCall(rubic_proxy_contract_address_1.rubicProxyContractAddress[this.from.blockchain].gateway, gateway_rubic_cross_chain_abi_1.gatewayRubicCrossChainAbi, 'startViaRubic', [sendingToken, sendingAmount, transactionConfiguration.data], value);
|
|
80
|
+
console.log('%cOwlTo-DATA', 'color: greenyellow; font-size: 28px;', {
|
|
81
|
+
to: evmdata.to,
|
|
82
|
+
data: evmdata.data,
|
|
83
|
+
value: evmdata.value
|
|
84
|
+
});
|
|
79
85
|
return {
|
|
80
86
|
contractAddress: rubic_proxy_contract_address_1.rubicProxyContractAddress[this.from.blockchain].gateway,
|
|
81
87
|
contractAbi: gateway_rubic_cross_chain_abi_1.gatewayRubicCrossChainAbi,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"owl-to-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"owl-to-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.ts"],"names":[],"mappings":";;;AAGA,6GAAwG;AAExG,2FAAwF;AAGxF,gFAAkG;AAClG,mFAA4E;AAC5E,mGAA6F;AAC7F,qHAA8G;AAC9G,2HAAoH;AACpH,iGAA2F;AAE3F,8DAAuE;AAKvE,oHAA6G;AAI7G,sEAAgE;AAEhE,MAAa,gBAAiB,SAAQ,0CAAkB;IACpD,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAC3B,OAAO,EACP,SAAS,EACT,OAAO,EACP,eAAe,EACf,UAAU,EACV,cAAc,EACM;QACpB,MAAM,KAAK,GAAG,IAAI,gBAAgB,CAAC;YAC/B,eAAe,EAAE;gBACb,OAAO;gBACP,IAAI,EAAE,SAAS;gBACf,EAAE,EAAE,OAAO;gBACX,WAAW,EAAE,SAAS,CAAC,2BAA2B,CAAC,OAAO,CAAC,IAAI,CAAC;gBAChE,OAAO,EAAE,IAAI;gBACb,UAAU;gBACV,cAAc;aACjB;YACD,eAAe;YACf,SAAS,EAAE,EAAE;YACb,QAAQ,EAAE,KAAK;SAClB,CAAC,CAAC;QACH,OAAO,IAAA,+CAAoB,EAAC,KAAK,CAAC,CAAC;IACvC,CAAC;IA4BD,IAAY,cAAc;QACtB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAsC,CAAC;IAC5D,CAAC;IAED,IAAc,mBAAmB;QAC7B,OAAO,IAAI,CAAC,YAAY;YACpB,CAAC,CAAC,wDAAyB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO;YACxD,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;IAC/B,CAAC;IAED,IAAc,UAAU;QACpB,OAAO,uCAAuC,CAAC;IACnD,CAAC;IAED,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAoB;QACnF,KAAK,CAAC,eAAe,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QAzChD,oBAAoB;QACJ,SAAI,GAAwB,+CAAsB,CAAC,aAAa,CAAC;QAEjE,iBAAY,GAAY,KAAK,CAAC;QAU9B,mBAAc,GAAmB,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC;QAEpE,eAAU,GAAe,yBAAW,CAAC,aAAa,CAAC;QA4B/D,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC;QACjC,IAAI,CAAC,EAAE,GAAG,eAAe,CAAC,EAAE,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;QACvC,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC;QAC/C,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC,EAAE,CAAC,WAAW,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;QACvC,IAAI,CAAC,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;QAC7C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC,cAAc,CAAC;IAC1D,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,OAAiC;QAC/D,MAAM,eAAe,GAAG,OAAO,EAAE,eAAe,IAAI,IAAI,CAAC,aAAa,CAAC;QAEvE,MAAM,EACF,IAAI,EACJ,KAAK,EAAE,aAAa,EACpB,EAAE,EAAE,cAAc,EACrB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,IAAI,KAAK,EAAE,eAAe,CAAC,CAAC;QAE5F,MAAM,UAAU,GAAG,qDAAuB,CAAC,aAAa,CAAC,OAAO,EAAE;YAC9D,aAAa,EAAE,eAAe;YAC9B,eAAe,EAAE,IAAI,CAAC,IAAI;YAC1B,aAAa,EAAE,IAAI,CAAC,EAAE;YACtB,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,IAAI,EAAE,UAAU,IAAI,CAAC,UAAU,EAAE;YACjC,WAAW,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,qDAAuB,CAAC,sBAAsB,CACrE,cAAc,EACd,IAAK,EACL,IAAI,CAAC,IAAI,CAAC,UAAU,EACpB,cAAc,EACd,GAAG,CACN,CAAC;QAEF,MAAM,eAAe,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QAE/C,MAAM,wBAAwB,GAAG,2BAAW,CAAC,gBAAgB,CACzD,wDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,EACtD,mDAAsB,EACtB,IAAI,CAAC,UAAU,EACf,eAAe,EACf,KAAK,CACR,CAAC;QAEF,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnE,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE5E,MAAM,OAAO,GAAG,2BAAW,CAAC,gBAAgB,CACxC,wDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,EACvD,yDAAyB,EACzB,eAAe,EACf,CAAC,YAAY,EAAE,aAAa,EAAE,wBAAwB,CAAC,IAAI,CAAC,EAC5D,KAAK,CACR,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,sCAAsC,EAAE;YAChE,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK;SACvB,CAAC,CAAC;QAEH,OAAO;YACH,eAAe,EAAE,wDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO;YACxE,WAAW,EAAE,yDAAyB;YACtC,UAAU,EAAE,eAAe;YAC3B,eAAe,EAAE,CAAC,YAAY,EAAE,aAAa,EAAE,wBAAwB,CAAC,IAAI,CAAC;YAC7E,KAAK;SACR,CAAC;IACN,CAAC;IAES,KAAK,CAAC,6BAA6B,CAAC,eAAwB;QAIlE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,oCAAe,CAAC,WAAW,CAAC;YAC9C,GAAG,IAAI,CAAC,UAAU;YAClB,eAAe,EAAE,eAAe,IAAI,IAAI,CAAC,aAAa,IAAI,yCAAmB;SAChF,CAAC,CAAC;QAEH,OAAO;YACH,MAAM,EAAE;gBACJ,IAAI,EAAE,GAAG,CAAC,aAAa,CAAC,IAAI;gBAC5B,EAAE,EAAE,GAAG,CAAC,aAAa,CAAC,EAAE;gBACxB,KAAK,EAAE,GAAG,CAAC,aAAa,CAAC,KAAK;aACjC;YACD,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,eAAe;SAClC,CAAC;IACN,CAAC;IAEM,YAAY;QACf,OAAO;YACH,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,QAAQ,EAAE,CAAC;YACX,SAAS,EAAE,IAAI,CAAC,SAAS;SAC5B,CAAC;IACN,CAAC;CACJ;AA3KD,4CA2KC"}
|