rubic-sdk 5.31.0-alpha.eddy.1 → 5.31.0-alpha.eddy.2
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/eddy-bridge/eddy-bridge-provider.d.ts +0 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.js +14 -13
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.d.ts +1 -2
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.js +2 -4
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/models/eddy-trade-types.d.ts +1 -3
- package/package.json +1 -1
package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.d.ts
CHANGED
|
@@ -8,7 +8,6 @@ import { RubicStep } from '../common/models/rubicStep';
|
|
|
8
8
|
import { EddyBridgeSupportedChain } from './constants/eddy-bridge-supported-chains';
|
|
9
9
|
export declare class EddyBridgeProvider extends CrossChainProvider {
|
|
10
10
|
readonly type: "eddy_bridge";
|
|
11
|
-
private prevGasAmountInNonZetaChain;
|
|
12
11
|
isSupportedBlockchain(fromBlockchain: EvmBlockchainName): boolean;
|
|
13
12
|
calculate(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options: RequiredCrossChainOptions): Promise<CalculationResult>;
|
|
14
13
|
private getCalculationResult;
|
package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.js
CHANGED
|
@@ -37,12 +37,10 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
37
37
|
const routingDirection = (0, eddy_bridge_routing_directions_1.eddyRoutingDirection)(from, toToken);
|
|
38
38
|
const feeInfo = await this.getFeeInfo(fromBlockchain, options.providerAddress, from, useProxy);
|
|
39
39
|
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(from, feeInfo.rubicProxy?.platformFee?.percent);
|
|
40
|
-
const [eddySlippage,
|
|
40
|
+
const [eddySlippage, { toAmount, gasInTargetChain }] = await Promise.all([
|
|
41
41
|
eddy_bridge_contract_service_1.EddyBridgeContractService.getEddySlipage(),
|
|
42
|
-
|
|
43
|
-
eddy_bridge_contract_service_1.EddyBridgeContractService.getGasInTargetChain(fromWithoutFee)
|
|
42
|
+
this.getToTokenAmount(fromWithoutFee, toToken, options, routingDirection)
|
|
44
43
|
]);
|
|
45
|
-
const toAmount = await this.getToTokenAmount(fromWithoutFee, toToken, options, routingDirection, gasInTargetChainNonWei, eddyFee);
|
|
46
44
|
const to = await tokens_1.PriceTokenAmount.createToken({
|
|
47
45
|
...toToken.asStruct,
|
|
48
46
|
tokenAmount: toAmount
|
|
@@ -54,8 +52,7 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
54
52
|
toToken: to,
|
|
55
53
|
providerAddress: options.providerAddress,
|
|
56
54
|
slippage: options.slippageTolerance,
|
|
57
|
-
routingDirection: routingDirection
|
|
58
|
-
eddyFee
|
|
55
|
+
routingDirection: routingDirection
|
|
59
56
|
})
|
|
60
57
|
: null;
|
|
61
58
|
const trade = new eddy_bridge_trade_1.EddyBridgeTrade({
|
|
@@ -66,9 +63,8 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
66
63
|
to,
|
|
67
64
|
priceImpact: from.calculatePriceImpactPercent(to),
|
|
68
65
|
slippage: eddySlippage,
|
|
69
|
-
prevGasAmountInNonZetaChain:
|
|
70
|
-
routingDirection: routingDirection
|
|
71
|
-
eddyFee
|
|
66
|
+
prevGasAmountInNonZetaChain: gasInTargetChain,
|
|
67
|
+
routingDirection: routingDirection
|
|
72
68
|
},
|
|
73
69
|
providerAddress: options.providerAddress,
|
|
74
70
|
routePath: await this.getRoutePath(from, to)
|
|
@@ -110,10 +106,15 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
110
106
|
}
|
|
111
107
|
return { trade, tradeType: this.type };
|
|
112
108
|
}
|
|
113
|
-
async getToTokenAmount(from, toToken, options, routingDirection
|
|
109
|
+
async getToTokenAmount(from, toToken, options, routingDirection) {
|
|
110
|
+
const eddyFee = await eddy_bridge_contract_service_1.EddyBridgeContractService.getPlatformFee();
|
|
114
111
|
const ratioToAmount = 1 - eddyFee;
|
|
115
112
|
if (routingDirection === eddy_bridge_routing_directions_1.ERD.ZETA_TOKEN_TO_ANY_CHAIN_NATIVE) {
|
|
116
|
-
|
|
113
|
+
const gasInTargetChainNonWei = await eddy_bridge_contract_service_1.EddyBridgeContractService.getGasInTargetChain(from);
|
|
114
|
+
const toAmount = from.tokenAmount
|
|
115
|
+
.multipliedBy(ratioToAmount)
|
|
116
|
+
.minus(gasInTargetChainNonWei);
|
|
117
|
+
return { toAmount, gasInTargetChain: gasInTargetChainNonWei };
|
|
117
118
|
}
|
|
118
119
|
if (routingDirection === eddy_bridge_routing_directions_1.ERD.ZETA_NATIVE_TO_ANY_CHAIN_NATIVE) {
|
|
119
120
|
const to = await tokens_1.PriceToken.createToken({
|
|
@@ -129,7 +130,7 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
129
130
|
gasCalculation: 'disabled',
|
|
130
131
|
useProxy: false
|
|
131
132
|
});
|
|
132
|
-
return calcData.to.tokenAmount;
|
|
133
|
+
return { toAmount: calcData.to.tokenAmount, gasInTargetChain: undefined };
|
|
133
134
|
}
|
|
134
135
|
// BNB or ETH -> ZETA
|
|
135
136
|
const fromTokenInZetaChain = await tokens_1.PriceTokenAmount.createToken({
|
|
@@ -142,7 +143,7 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
142
143
|
gasCalculation: 'disabled',
|
|
143
144
|
useProxy: false
|
|
144
145
|
});
|
|
145
|
-
return calcData.to.tokenAmount;
|
|
146
|
+
return { toAmount: calcData.to.tokenAmount, gasInTargetChain: undefined };
|
|
146
147
|
}
|
|
147
148
|
skipkNotSupportedRoutes(from, toToken) {
|
|
148
149
|
// Prevents bridges BSC <-> Ethereum
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eddy-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.ts"],"names":[],"mappings":";;;AACA,8CAK2B;AAC3B,8CAAiE;AACjE,4DAA+D;AAC/D,gFAAgG;AAChG,2FAAwF;AACxF,qHAA+G;AAC/G,yFAAmF;AACnF,kJAA6I;AAG7I,gFAA6E;AAC7E,yEAAoE;AAIpE,oHAA6G;AAC7G,+FAA+F;AAC/F,2FAIkD;AAClD,yDAA6D;AAC7D,2DAAsD;AACtD,gFAA0E;AAC1E,0FAAoF;AACpF,2FAIgD;AAEhD,MAAa,kBAAmB,SAAQ,yCAAkB;IAA1D;;QACoB,SAAI,GAAG,+CAAsB,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"eddy-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.ts"],"names":[],"mappings":"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"}
|
package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ import { TradeInfo } from '../common/models/trade-info';
|
|
|
16
16
|
import { EddyBridgeGetGasDataParams, EddyBridgeTradeConstructorParams } from './models/eddy-trade-types';
|
|
17
17
|
export declare class EddyBridgeTrade extends EvmCrossChainTrade {
|
|
18
18
|
/** @internal */
|
|
19
|
-
static getGasData({ feeInfo, from, providerAddress, toToken, slippage, routingDirection
|
|
19
|
+
static getGasData({ feeInfo, from, providerAddress, toToken, slippage, routingDirection }: EddyBridgeGetGasDataParams): Promise<GasData | null>;
|
|
20
20
|
/**ABSTRACT PROPS */
|
|
21
21
|
readonly type: CrossChainTradeType;
|
|
22
22
|
readonly isAggregator: boolean;
|
|
@@ -32,7 +32,6 @@ export declare class EddyBridgeTrade extends EvmCrossChainTrade {
|
|
|
32
32
|
/** */
|
|
33
33
|
private readonly prevGasAmountInNonZetaChain;
|
|
34
34
|
private readonly routingDirection;
|
|
35
|
-
private readonly eddyFee;
|
|
36
35
|
private get fromBlockchain();
|
|
37
36
|
protected get fromContractAddress(): string;
|
|
38
37
|
protected get methodName(): string;
|
package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.js
CHANGED
|
@@ -25,7 +25,7 @@ const eddy_bridge_contract_service_1 = require("./services/eddy-bridge-contract-
|
|
|
25
25
|
const eddy_bridge_routing_directions_1 = require("./utils/eddy-bridge-routing-directions");
|
|
26
26
|
class EddyBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
27
27
|
/** @internal */
|
|
28
|
-
static async getGasData({ feeInfo, from, providerAddress, toToken, slippage, routingDirection
|
|
28
|
+
static async getGasData({ feeInfo, from, providerAddress, toToken, slippage, routingDirection }) {
|
|
29
29
|
const trade = new EddyBridgeTrade({
|
|
30
30
|
crossChainTrade: {
|
|
31
31
|
from,
|
|
@@ -35,8 +35,7 @@ class EddyBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
35
35
|
feeInfo,
|
|
36
36
|
slippage,
|
|
37
37
|
prevGasAmountInNonZetaChain: new bignumber_js_1.default(0),
|
|
38
|
-
routingDirection
|
|
39
|
-
eddyFee
|
|
38
|
+
routingDirection
|
|
40
39
|
},
|
|
41
40
|
providerAddress: providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS,
|
|
42
41
|
routePath: []
|
|
@@ -71,7 +70,6 @@ class EddyBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
71
70
|
this.toTokenAmountMin = web3_pure_1.Web3Pure.fromWei(this.to.weiAmountMinusSlippage(this.slippage), this.to.decimals);
|
|
72
71
|
this.prevGasAmountInNonZetaChain = params.crossChainTrade.prevGasAmountInNonZetaChain;
|
|
73
72
|
this.routingDirection = params.crossChainTrade.routingDirection;
|
|
74
|
-
this.eddyFee = params.crossChainTrade.eddyFee;
|
|
75
73
|
}
|
|
76
74
|
async getContractParams(options) {
|
|
77
75
|
const receiverAddress = options?.receiverAddress || this.walletAddress;
|
package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eddy-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA4D;AAE5D,6FAA4F;AAC5F,gFAAgG;AAEhG,6GAAwG;AAExG,uEAAmE;AACnE,2FAAwF;AAIxF,gFAAkG;AAClG,mFAA4E;AAC5E,mGAA6F;AAC7F,qHAA8G;AAC9G,2HAAoH;AACpH,iGAA2F;AAE3F,8DAAuE;AAKvE,oHAA6G;AAC7G,+FAIoD;AAKpD,iEAA8D;AAK9D,0FAAoF;AACpF,2FAAmF;AACnF,MAAa,eAAgB,SAAQ,0CAAkB;IACnD,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAC3B,OAAO,EACP,IAAI,EACJ,eAAe,EACf,OAAO,EACP,QAAQ,EACR,gBAAgB,
|
|
1
|
+
{"version":3,"file":"eddy-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,6 @@ export interface EddyBridgeGetGasDataParams {
|
|
|
12
12
|
providerAddress: string;
|
|
13
13
|
slippage: number;
|
|
14
14
|
routingDirection: EddyRoutingDirection;
|
|
15
|
-
eddyFee: number;
|
|
16
15
|
}
|
|
17
16
|
export interface EddyBridgeTradeConstructorParams {
|
|
18
17
|
crossChainTrade: {
|
|
@@ -22,9 +21,8 @@ export interface EddyBridgeTradeConstructorParams {
|
|
|
22
21
|
feeInfo: FeeInfo;
|
|
23
22
|
priceImpact: number | null;
|
|
24
23
|
slippage: number;
|
|
25
|
-
prevGasAmountInNonZetaChain: BigNumber;
|
|
24
|
+
prevGasAmountInNonZetaChain: BigNumber | undefined;
|
|
26
25
|
routingDirection: EddyRoutingDirection;
|
|
27
|
-
eddyFee: number;
|
|
28
26
|
};
|
|
29
27
|
providerAddress: string;
|
|
30
28
|
routePath: RubicStep[];
|