rubic-sdk 5.4.3-alpha.orbiter-proxy.13 → 5.4.3-alpha.orbiter-proxy.15
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/orbiter-bridge/models/orbiter-bridge-trade-types.d.ts +2 -0
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-provider.js +4 -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/orbiter-bridge-trade.d.ts +2 -2
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-trade.js +11 -9
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-trade.js.map +1 -1
- package/package.json +1 -1
|
@@ -10,6 +10,7 @@ export interface OrbiterGetGasDataParams {
|
|
|
10
10
|
feeInfo: FeeInfo;
|
|
11
11
|
providerAddress: string;
|
|
12
12
|
quoteConfig: OrbiterQuoteConfig;
|
|
13
|
+
fromWithoutFee: PriceTokenAmount<EvmBlockchainName>;
|
|
13
14
|
receiverAddress?: string;
|
|
14
15
|
}
|
|
15
16
|
export interface OrbiterTradeParams {
|
|
@@ -20,6 +21,7 @@ export interface OrbiterTradeParams {
|
|
|
20
21
|
feeInfo: FeeInfo;
|
|
21
22
|
priceImpact: number | null;
|
|
22
23
|
quoteConfig: OrbiterQuoteConfig;
|
|
24
|
+
fromWithoutFee: PriceTokenAmount<EvmBlockchainName>;
|
|
23
25
|
};
|
|
24
26
|
providerAddress: string;
|
|
25
27
|
routePath: RubicStep[];
|
|
@@ -55,7 +55,8 @@ class OrbiterBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
55
55
|
toToken: to,
|
|
56
56
|
receiverAddress: options.receiverAddress,
|
|
57
57
|
providerAddress: options.providerAddress,
|
|
58
|
-
quoteConfig
|
|
58
|
+
quoteConfig,
|
|
59
|
+
fromWithoutFee
|
|
59
60
|
})
|
|
60
61
|
: null;
|
|
61
62
|
const trade = new orbiter_bridge_trade_1.OrbiterBridgeTrade({
|
|
@@ -65,7 +66,8 @@ class OrbiterBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
65
66
|
gasData,
|
|
66
67
|
to,
|
|
67
68
|
priceImpact: from.calculatePriceImpactPercent(to),
|
|
68
|
-
quoteConfig
|
|
69
|
+
quoteConfig,
|
|
70
|
+
fromWithoutFee
|
|
69
71
|
},
|
|
70
72
|
providerAddress: options.providerAddress,
|
|
71
73
|
routePath: await this.getRoutePath(from, 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,8CAAkD;AAClD,8CAAiE;AAEjE,yDAAsD;AACtD,qHAA+G;AAC/G,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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"}
|
|
@@ -14,7 +14,7 @@ import { TradeInfo } from '../common/models/trade-info';
|
|
|
14
14
|
import { OrbiterGetGasDataParams, OrbiterTradeParams } from './models/orbiter-bridge-trade-types';
|
|
15
15
|
export declare class OrbiterBridgeTrade extends EvmCrossChainTrade {
|
|
16
16
|
/** @internal */
|
|
17
|
-
static getGasData({ fromToken, toToken, feeInfo, receiverAddress, providerAddress, quoteConfig }: OrbiterGetGasDataParams): Promise<GasData | null>;
|
|
17
|
+
static getGasData({ fromToken, toToken, feeInfo, receiverAddress, providerAddress, quoteConfig, fromWithoutFee }: OrbiterGetGasDataParams): Promise<GasData | null>;
|
|
18
18
|
/**ABSTRACT PROPS */
|
|
19
19
|
readonly type: CrossChainTradeType;
|
|
20
20
|
readonly isAggregator: boolean;
|
|
@@ -28,8 +28,8 @@ export declare class OrbiterBridgeTrade extends EvmCrossChainTrade {
|
|
|
28
28
|
readonly priceImpact: number | null;
|
|
29
29
|
/** */
|
|
30
30
|
private quoteConfig;
|
|
31
|
+
private fromWithoutFee;
|
|
31
32
|
private get fromBlockchain();
|
|
32
|
-
private get fromWithoutFee();
|
|
33
33
|
protected get fromContractAddress(): string;
|
|
34
34
|
protected get methodName(): string;
|
|
35
35
|
constructor(params: OrbiterTradeParams);
|
|
@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.OrbiterBridgeTrade = void 0;
|
|
7
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
|
+
const tokens_1 = require("../../../../../common/tokens");
|
|
8
9
|
const evm_web3_pure_1 = require("../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
|
|
9
10
|
const web3_pure_1 = require("../../../../../core/blockchain/web3-pure/web3-pure");
|
|
10
11
|
const injector_1 = require("../../../../../core/injector/injector");
|
|
11
|
-
const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
|
|
12
12
|
const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
|
|
13
13
|
const convert_gas_price_1 = require("../../utils/convert-gas-price");
|
|
14
14
|
const rubic_proxy_contract_address_1 = require("../common/constants/rubic-proxy-contract-address");
|
|
@@ -22,7 +22,7 @@ const orbiter_contract_addresses_1 = require("./models/orbiter-contract-addresse
|
|
|
22
22
|
const orbiter_utils_1 = require("./services/orbiter-utils");
|
|
23
23
|
class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
24
24
|
/** @internal */
|
|
25
|
-
static async getGasData({ fromToken, toToken, feeInfo, receiverAddress, providerAddress, quoteConfig }) {
|
|
25
|
+
static async getGasData({ fromToken, toToken, feeInfo, receiverAddress, providerAddress, quoteConfig, fromWithoutFee }) {
|
|
26
26
|
const fromBlockchain = fromToken.blockchain;
|
|
27
27
|
const walletAddress = injector_1.Injector.web3PrivateService.getWeb3PrivateByBlockchain(fromBlockchain).address;
|
|
28
28
|
if (!walletAddress) {
|
|
@@ -39,7 +39,8 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
39
39
|
feeInfo,
|
|
40
40
|
gasData: null,
|
|
41
41
|
priceImpact: fromToken.calculatePriceImpactPercent(toToken) || 0,
|
|
42
|
-
quoteConfig
|
|
42
|
+
quoteConfig,
|
|
43
|
+
fromWithoutFee
|
|
43
44
|
},
|
|
44
45
|
routePath: [],
|
|
45
46
|
providerAddress
|
|
@@ -83,10 +84,6 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
83
84
|
get fromBlockchain() {
|
|
84
85
|
return this.from.blockchain;
|
|
85
86
|
}
|
|
86
|
-
get fromWithoutFee() {
|
|
87
|
-
const amount = (0, get_from_without_fee_1.getFromWithoutFee)(this.from, this.feeInfo.rubicProxy?.platformFee?.percent);
|
|
88
|
-
return amount;
|
|
89
|
-
}
|
|
90
87
|
get fromContractAddress() {
|
|
91
88
|
return this.isProxyTrade
|
|
92
89
|
? rubic_proxy_contract_address_1.rubicProxyContractAddress[this.fromBlockchain].gateway
|
|
@@ -109,6 +106,7 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
109
106
|
this.gasData = params.crossChainTrade.gasData;
|
|
110
107
|
this.priceImpact = params.crossChainTrade.priceImpact;
|
|
111
108
|
this.quoteConfig = params.crossChainTrade.quoteConfig;
|
|
109
|
+
this.fromWithoutFee = params.crossChainTrade.fromWithoutFee;
|
|
112
110
|
}
|
|
113
111
|
async swapDirect(options = {}) {
|
|
114
112
|
await this.checkTradeErrors();
|
|
@@ -140,9 +138,13 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
140
138
|
async getContractParams(options) {
|
|
141
139
|
const receiverAddress = options?.receiverAddress || this.walletAddress;
|
|
142
140
|
const { data, value: providerValue, to: providerRouter } = await this.callOrbiterContract(receiverAddress, options.directTransaction);
|
|
141
|
+
const fromWithoutFeeWithSendingAmount = new tokens_1.PriceTokenAmount({
|
|
142
|
+
...this.fromWithoutFee.asStruct,
|
|
143
|
+
weiAmount: new bignumber_js_1.default(this.getSendingAmount())
|
|
144
|
+
});
|
|
143
145
|
const bridgeData = proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getBridgeData(options, {
|
|
144
146
|
walletAddress: receiverAddress,
|
|
145
|
-
fromTokenAmount:
|
|
147
|
+
fromTokenAmount: fromWithoutFeeWithSendingAmount,
|
|
146
148
|
toTokenAmount: this.to,
|
|
147
149
|
srcChainTrade: null,
|
|
148
150
|
providerAddress: this.providerAddress,
|
|
@@ -171,7 +173,7 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
171
173
|
const sendingAmount = new bignumber_js_1.default(desiredAmount)
|
|
172
174
|
.multipliedBy(denominator)
|
|
173
175
|
.dividedBy(denominator.minus(fee))
|
|
174
|
-
.decimalPlaces(0)
|
|
176
|
+
.decimalPlaces(0, 1)
|
|
175
177
|
.toFixed();
|
|
176
178
|
return sendingAmount;
|
|
177
179
|
}
|
|
@@ -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":";;;;;;AAAA,gEAAqC;
|
|
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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"}
|