rubic-sdk 5.34.0-alpha.eddy.2 → 5.34.0-alpha.eddy.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/eddy-bridge/constants/eddy-bridge-contract-addresses.d.ts +1 -2
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/constants/eddy-bridge-contract-addresses.js +6 -12
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/constants/eddy-bridge-contract-addresses.js.map +1 -1
- 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 +7 -16
- 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 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.js +4 -3
- 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 +3 -0
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.js +9 -4
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/eddy-bridge-routing-directions.js +3 -8
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/eddy-bridge-routing-directions.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/find-transit-token-address.js +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/find-transit-token-address.js.map +1 -1
- package/package.json +1 -1
|
@@ -6,8 +6,7 @@ export declare const TSS_ADDRESSES_EDDY_BRIDGE: Record<TssAvailableEddyBridgeCha
|
|
|
6
6
|
export declare const CUSTODY_ADDRESSES: Partial<Record<EvmBlockchainName, string>>;
|
|
7
7
|
export declare const ZETA_CHAIN_SUPPORTED_TOKENS: ZetachainTokenInfo[];
|
|
8
8
|
interface ZetachainTokenInfo {
|
|
9
|
-
|
|
10
|
-
commonSymbol: string;
|
|
9
|
+
symbol: string;
|
|
11
10
|
relativeChain: EvmBlockchainName;
|
|
12
11
|
address: string;
|
|
13
12
|
}
|
|
@@ -15,38 +15,32 @@ exports.CUSTODY_ADDRESSES = {
|
|
|
15
15
|
exports.ZETA_CHAIN_SUPPORTED_TOKENS = [
|
|
16
16
|
{
|
|
17
17
|
address: '0xd97b1de3619ed2c6beb3860147e30ca8a7dc9891',
|
|
18
|
-
|
|
19
|
-
commonSymbol: 'ETH',
|
|
18
|
+
symbol: 'ETH',
|
|
20
19
|
relativeChain: blockchain_name_1.BLOCKCHAIN_NAME.ETHEREUM
|
|
21
20
|
},
|
|
22
21
|
{
|
|
23
22
|
address: '0x48f80608b672dc30dc7e3dbbd0343c5f02c738eb',
|
|
24
|
-
|
|
25
|
-
commonSymbol: 'BNB',
|
|
23
|
+
symbol: 'BNB',
|
|
26
24
|
relativeChain: blockchain_name_1.BLOCKCHAIN_NAME.BINANCE_SMART_CHAIN
|
|
27
25
|
},
|
|
28
26
|
{
|
|
29
27
|
address: '0x0cbe0dF132a6c6B4a2974Fa1b7Fb953CF0Cc798a',
|
|
30
|
-
|
|
31
|
-
commonSymbol: 'USDC',
|
|
28
|
+
symbol: 'USDC',
|
|
32
29
|
relativeChain: blockchain_name_1.BLOCKCHAIN_NAME.ETHEREUM
|
|
33
30
|
},
|
|
34
31
|
{
|
|
35
32
|
address: '0x7c8dDa80bbBE1254a7aACf3219EBe1481c6E01d7',
|
|
36
|
-
|
|
37
|
-
commonSymbol: 'USDT',
|
|
33
|
+
symbol: 'USDT',
|
|
38
34
|
relativeChain: blockchain_name_1.BLOCKCHAIN_NAME.ETHEREUM
|
|
39
35
|
},
|
|
40
36
|
{
|
|
41
37
|
address: '0x05BA149A7bd6dC1F937fA9046A9e05C05f3b18b0',
|
|
42
|
-
|
|
43
|
-
commonSymbol: 'USDC',
|
|
38
|
+
symbol: 'USDC',
|
|
44
39
|
relativeChain: blockchain_name_1.BLOCKCHAIN_NAME.BINANCE_SMART_CHAIN
|
|
45
40
|
},
|
|
46
41
|
{
|
|
47
42
|
address: '0x91d4F0D54090Df2D81e834c3c8CE71C6c865e79F',
|
|
48
|
-
|
|
49
|
-
commonSymbol: 'USDT',
|
|
43
|
+
symbol: 'USDT',
|
|
50
44
|
relativeChain: blockchain_name_1.BLOCKCHAIN_NAME.BINANCE_SMART_CHAIN
|
|
51
45
|
}
|
|
52
46
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eddy-bridge-contract-addresses.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/constants/eddy-bridge-contract-addresses.ts"],"names":[],"mappings":";;;AAAA,gFAAgG;AAInF,QAAA,+BAA+B,GAAG,4CAA4C,CAAC;AAC/E,QAAA,6CAA6C,GACtD,4CAA4C,CAAC;AAEpC,QAAA,yBAAyB,GAAgD;IAClF,CAAC,iCAAe,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACxE,CAAC,iCAAe,CAAC,mBAAmB,CAAC,EAAE,4CAA4C;CACtF,CAAC;AAEW,QAAA,iBAAiB,GAA+C;IACzE,CAAC,iCAAe,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACxE,CAAC,iCAAe,CAAC,mBAAmB,CAAC,EAAE,4CAA4C;CACtF,CAAC;AAEW,QAAA,2BAA2B,GAAyB;IAC7D;QACI,OAAO,EAAE,4CAA4C;QACrD,
|
|
1
|
+
{"version":3,"file":"eddy-bridge-contract-addresses.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/constants/eddy-bridge-contract-addresses.ts"],"names":[],"mappings":";;;AAAA,gFAAgG;AAInF,QAAA,+BAA+B,GAAG,4CAA4C,CAAC;AAC/E,QAAA,6CAA6C,GACtD,4CAA4C,CAAC;AAEpC,QAAA,yBAAyB,GAAgD;IAClF,CAAC,iCAAe,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACxE,CAAC,iCAAe,CAAC,mBAAmB,CAAC,EAAE,4CAA4C;CACtF,CAAC;AAEW,QAAA,iBAAiB,GAA+C;IACzE,CAAC,iCAAe,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACxE,CAAC,iCAAe,CAAC,mBAAmB,CAAC,EAAE,4CAA4C;CACtF,CAAC;AAEW,QAAA,2BAA2B,GAAyB;IAC7D;QACI,OAAO,EAAE,4CAA4C;QACrD,MAAM,EAAE,KAAK;QACb,aAAa,EAAE,iCAAe,CAAC,QAAQ;KAC1C;IACD;QACI,OAAO,EAAE,4CAA4C;QACrD,MAAM,EAAE,KAAK;QACb,aAAa,EAAE,iCAAe,CAAC,mBAAmB;KACrD;IACD;QACI,OAAO,EAAE,4CAA4C;QACrD,MAAM,EAAE,MAAM;QACd,aAAa,EAAE,iCAAe,CAAC,QAAQ;KAC1C;IACD;QACI,OAAO,EAAE,4CAA4C;QACrD,MAAM,EAAE,MAAM;QACd,aAAa,EAAE,iCAAe,CAAC,QAAQ;KAC1C;IACD;QACI,OAAO,EAAE,4CAA4C;QACrD,MAAM,EAAE,MAAM;QACd,aAAa,EAAE,iCAAe,CAAC,mBAAmB;KACrD;IACD;QACI,OAAO,EAAE,4CAA4C;QACrD,MAAM,EAAE,MAAM;QACd,aAAa,EAAE,iCAAe,CAAC,mBAAmB;KACrD;CACJ,CAAC"}
|
package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.d.ts
CHANGED
|
@@ -13,7 +13,6 @@ export declare class EddyBridgeProvider extends CrossChainProvider {
|
|
|
13
13
|
private getCalculationResult;
|
|
14
14
|
private getToTokenAmount;
|
|
15
15
|
private calculateOnChainToAmount;
|
|
16
|
-
private checkIsSupportedRoute;
|
|
17
16
|
protected getRoutePath(fromToken: PriceTokenAmount<EvmBlockchainName>, toToken: PriceTokenAmount<EvmBlockchainName>): Promise<RubicStep[]>;
|
|
18
17
|
protected getFeeInfo(fromBlockchain: EddyBridgeSupportedChain, providerAddress: string, percentFeeToken: PriceTokenAmount, useProxy: boolean): Promise<FeeInfo>;
|
|
19
18
|
}
|
package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.js
CHANGED
|
@@ -36,10 +36,7 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
36
36
|
const walletAddress = this.getWalletAddress(fromBlockchain) || fake_wallet_address_1.FAKE_WALLET_ADDRESS;
|
|
37
37
|
try {
|
|
38
38
|
(0, check_unsupported_receiver_address_1.checkUnsupportedReceiverAddress)(options?.receiverAddress, options?.fromAddress || walletAddress);
|
|
39
|
-
const
|
|
40
|
-
if (!isSupportedRoute) {
|
|
41
|
-
throw new errors_1.NotSupportedTokensError();
|
|
42
|
-
}
|
|
39
|
+
const routingDirection = (0, eddy_bridge_routing_directions_1.eddyRoutingDirection)(from, toToken);
|
|
43
40
|
const feeInfo = await this.getFeeInfo(fromBlockchain, options.providerAddress, from, useProxy);
|
|
44
41
|
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(from, feeInfo.rubicProxy?.platformFee?.percent);
|
|
45
42
|
const [eddySlippage, { toAmount, gasInTargetChain }] = await Promise.all([
|
|
@@ -56,7 +53,8 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
56
53
|
from: fromWithoutFee,
|
|
57
54
|
toToken: to,
|
|
58
55
|
providerAddress: options.providerAddress,
|
|
59
|
-
slippage: options.slippageTolerance
|
|
56
|
+
slippage: options.slippageTolerance,
|
|
57
|
+
routingDirection
|
|
60
58
|
})
|
|
61
59
|
: null;
|
|
62
60
|
const trade = new eddy_bridge_trade_1.EddyBridgeTrade({
|
|
@@ -67,7 +65,8 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
67
65
|
to,
|
|
68
66
|
priceImpact: from.calculatePriceImpactPercent(to),
|
|
69
67
|
slippage: eddySlippage,
|
|
70
|
-
prevGasAmountInNonZetaChain: gasInTargetChain
|
|
68
|
+
prevGasAmountInNonZetaChain: gasInTargetChain,
|
|
69
|
+
routingDirection
|
|
71
70
|
},
|
|
72
71
|
providerAddress: options.providerAddress,
|
|
73
72
|
routePath: await this.getRoutePath(from, to)
|
|
@@ -119,11 +118,12 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
119
118
|
const isSwapFromZetachain = from.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN;
|
|
120
119
|
const isSwapToZetachain = toToken.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN;
|
|
121
120
|
if ((0, eddy_bridge_routing_directions_1.isDirectBridge)(from, toToken)) {
|
|
121
|
+
// zeta(bnb) -> bsc(usdc)
|
|
122
122
|
const gasInTargetChainNonWei =
|
|
123
123
|
// takes additional gas-fee only for Bsc, Ethereum, Bitcoin
|
|
124
124
|
toToken.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN
|
|
125
125
|
? new bignumber_js_1.default(0)
|
|
126
|
-
: await eddy_bridge_contract_service_1.EddyBridgeContractService.getGasInTargetChain(
|
|
126
|
+
: await eddy_bridge_contract_service_1.EddyBridgeContractService.getGasInTargetChain(toToken);
|
|
127
127
|
const toAmount = from.tokenAmount
|
|
128
128
|
.multipliedBy(ratioToAmount)
|
|
129
129
|
.minus(gasInTargetChainNonWei);
|
|
@@ -173,15 +173,6 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
173
173
|
});
|
|
174
174
|
return calcData.to.tokenAmount;
|
|
175
175
|
}
|
|
176
|
-
checkIsSupportedRoute(from, toToken) {
|
|
177
|
-
if (from.blockchain !== blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN &&
|
|
178
|
-
toToken.blockchain !== blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN &&
|
|
179
|
-
!from.isNative &&
|
|
180
|
-
toToken.isNative) {
|
|
181
|
-
return false;
|
|
182
|
-
}
|
|
183
|
-
return true;
|
|
184
|
-
}
|
|
185
176
|
async getRoutePath(fromToken, toToken) {
|
|
186
177
|
return [{ type: 'cross-chain', provider: this.type, path: [fromToken, toToken] }];
|
|
187
178
|
}
|
|
@@ -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":";;;;;;AAAA,gEAAqC;AACrC,
|
|
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 }: EddyBridgeGetGasDataParams): Promise<GasData | null>;
|
|
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;
|
package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.js
CHANGED
|
@@ -24,7 +24,7 @@ const eddy_bridge_routing_directions_1 = require("./utils/eddy-bridge-routing-di
|
|
|
24
24
|
const eddy_evm_config_factory_1 = require("./utils/eddy-evm-config-factory");
|
|
25
25
|
class EddyBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
26
26
|
/** @internal */
|
|
27
|
-
static async getGasData({ feeInfo, from, providerAddress, toToken, slippage }) {
|
|
27
|
+
static async getGasData({ feeInfo, from, providerAddress, toToken, slippage, routingDirection }) {
|
|
28
28
|
const trade = new EddyBridgeTrade({
|
|
29
29
|
crossChainTrade: {
|
|
30
30
|
from,
|
|
@@ -33,7 +33,8 @@ class EddyBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
33
33
|
priceImpact: 0,
|
|
34
34
|
feeInfo,
|
|
35
35
|
slippage,
|
|
36
|
-
prevGasAmountInNonZetaChain: new bignumber_js_1.default(0)
|
|
36
|
+
prevGasAmountInNonZetaChain: new bignumber_js_1.default(0),
|
|
37
|
+
routingDirection
|
|
37
38
|
},
|
|
38
39
|
providerAddress: providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS,
|
|
39
40
|
routePath: []
|
|
@@ -74,7 +75,7 @@ class EddyBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
74
75
|
this.slippage = params.crossChainTrade.slippage;
|
|
75
76
|
this.toTokenAmountMin = web3_pure_1.Web3Pure.fromWei(this.to.weiAmountMinusSlippage(this.slippage), this.to.decimals);
|
|
76
77
|
this.prevGasAmountInNonZetaChain = params.crossChainTrade.prevGasAmountInNonZetaChain;
|
|
77
|
-
this.routingDirection =
|
|
78
|
+
this.routingDirection = params.crossChainTrade.routingDirection;
|
|
78
79
|
}
|
|
79
80
|
async getContractParams(options) {
|
|
80
81
|
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,gFAAgG;AAEhG,6GAAwG;AAExG,uEAAmE;AACnE,2FAAwF;AAIxF,gFAAkG;AAClG,mFAA4E;AAC5E,mGAA6F;AAC7F,qHAA8G;AAC9G,2HAAoH;AACpH,iGAA2F;AAE3F,8DAAuE;AAKvE,oHAA6G;AAC7G,+FAGoD;AAMpD,0FAAoF;AACpF,
|
|
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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"}
|
|
@@ -4,12 +4,14 @@ import { EvmBlockchainName } from '../../../../../../core/blockchain/models/bloc
|
|
|
4
4
|
import { GasData } from '../../common/emv-cross-chain-trade/models/gas-data';
|
|
5
5
|
import { FeeInfo } from '../../common/models/fee-info';
|
|
6
6
|
import { RubicStep } from '../../common/models/rubicStep';
|
|
7
|
+
import { EddyRoutingDirection } from '../utils/eddy-bridge-routing-directions';
|
|
7
8
|
export interface EddyBridgeGetGasDataParams {
|
|
8
9
|
from: PriceTokenAmount<EvmBlockchainName>;
|
|
9
10
|
toToken: PriceTokenAmount<EvmBlockchainName>;
|
|
10
11
|
feeInfo: FeeInfo;
|
|
11
12
|
providerAddress: string;
|
|
12
13
|
slippage: number;
|
|
14
|
+
routingDirection: EddyRoutingDirection;
|
|
13
15
|
}
|
|
14
16
|
export interface EddyBridgeTradeConstructorParams {
|
|
15
17
|
crossChainTrade: {
|
|
@@ -20,6 +22,7 @@ export interface EddyBridgeTradeConstructorParams {
|
|
|
20
22
|
priceImpact: number | null;
|
|
21
23
|
slippage: number;
|
|
22
24
|
prevGasAmountInNonZetaChain: BigNumber | undefined;
|
|
25
|
+
routingDirection: EddyRoutingDirection;
|
|
23
26
|
};
|
|
24
27
|
providerAddress: string;
|
|
25
28
|
routePath: RubicStep[];
|
|
@@ -11,10 +11,15 @@ const zrc_20_token_abi_1 = require("../constants/zrc-20-token-abi");
|
|
|
11
11
|
const find_transit_token_address_1 = require("../utils/find-transit-token-address");
|
|
12
12
|
class EddyBridgeContractService {
|
|
13
13
|
static async getPlatformFee() {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
try {
|
|
15
|
+
const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN);
|
|
16
|
+
const res = await web3Public.callContractMethod(eddy_bridge_contract_addresses_1.EDDY_OMNI_CONTRACT_IN_ZETACHAIN, edyy_bridge_abi_1.EDDY_BRIDGE_ABI, 'platformFee', []);
|
|
17
|
+
// eddy currently takes 1% from bridged amount (platformFee = 10, ratioToAmount in than case = 0.99)
|
|
18
|
+
return res / 1000;
|
|
19
|
+
}
|
|
20
|
+
catch (err) {
|
|
21
|
+
return 0;
|
|
22
|
+
}
|
|
18
23
|
}
|
|
19
24
|
/**
|
|
20
25
|
* @param token source chain token
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eddy-bridge-contract-service.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.ts"],"names":[],"mappings":";;;AACA,8CAA+C;AAC/C,gFAAgG;AAChG,uEAAmE;AACnE,yDAAsD;AAEtD,gGAA8F;AAC9F,kEAA+D;AAC/D,oEAA2D;AAC3D,oFAAsF;AAEtF,MAAa,yBAAyB;IAC3B,MAAM,CAAC,KAAK,CAAC,cAAc;QAC9B,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"eddy-bridge-contract-service.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.ts"],"names":[],"mappings":";;;AACA,8CAA+C;AAC/C,gFAAgG;AAChG,uEAAmE;AACnE,yDAAsD;AAEtD,gGAA8F;AAC9F,kEAA+D;AAC/D,oEAA2D;AAC3D,oFAAsF;AAEtF,MAAa,yBAAyB;IAC3B,MAAM,CAAC,KAAK,CAAC,cAAc;QAC9B,IAAI;YACA,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,SAAS,CAAC,CAAC;YACvF,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAC3C,gEAA+B,EAC/B,iCAAe,EACf,aAAa,EACb,EAAE,CACL,CAAC;YACF,oGAAoG;YACpG,OAAO,GAAG,GAAG,IAAK,CAAC;SACtB;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,CAAC;SACZ;IACL,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,mBAAmB,CACnC,KAAoC;QAEpC,MAAM,UAAU,GACZ,KAAK,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS;YAC1C,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,MAAM,mBAAU,CAAC,WAAW,CAAC;gBACzB,OAAO,EAAE,IAAA,4DAA+B,EAAC,KAAK,CAAC;gBAC/C,UAAU,EAAE,iCAAe,CAAC,SAAS;aACxC,CAAC,CAAC;QAEb,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,SAAS,CAAC,CAAC;QACvF,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAC3C,UAAU,CAAC,OAAO,EAClB,6BAAU,EACV,gBAAgB,EAChB,EAAE,CACL,CAAC;QACF,MAAM,YAAY,GAAG,oBAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;QAE1E,OAAO,YAAY,CAAC;IACxB,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,cAAc;QAC9B,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,SAAS,CAAC,CAAC;QACvF,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAC3C,gEAA+B,EAC/B,iCAAe,EACf,UAAU,EACV,EAAE,CACL,CAAC;QACF,0CAA0C;QAC1C,OAAO,GAAG,GAAG,IAAK,CAAC;IACvB,CAAC;CACJ;AAzDD,8DAyDC"}
|
|
@@ -26,7 +26,8 @@ function eddyRoutingDirection(from, to) {
|
|
|
26
26
|
}
|
|
27
27
|
if (from.blockchain !== blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN &&
|
|
28
28
|
to.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN) {
|
|
29
|
-
const isSupportedToken = eddy_bridge_contract_addresses_1.ZETA_CHAIN_SUPPORTED_TOKENS.some(zrcToken => (0, blockchain_1.compareAddresses)(zrcToken.address, to.address)
|
|
29
|
+
const isSupportedToken = eddy_bridge_contract_addresses_1.ZETA_CHAIN_SUPPORTED_TOKENS.some(zrcToken => (0, blockchain_1.compareAddresses)(zrcToken.address, to.address) &&
|
|
30
|
+
from.blockchain === zrcToken.relativeChain);
|
|
30
31
|
if (from.isNative && to.isNative)
|
|
31
32
|
return exports.ERD.ANY_CHAIN_NATIVE_TO_ZETA_NATIVE;
|
|
32
33
|
if (from.isNative && isSupportedToken)
|
|
@@ -48,13 +49,7 @@ exports.eddyRoutingDirection = eddyRoutingDirection;
|
|
|
48
49
|
* Check if route is Bsc(ETH) <-> Ethereum(ETH), Ethereum(USDT) <-> Zetachain(USDT.ETH) etc.
|
|
49
50
|
*/
|
|
50
51
|
function isDirectBridge(from, toToken) {
|
|
51
|
-
return (
|
|
52
|
-
eddy_bridge_contract_addresses_1.ZETA_CHAIN_SUPPORTED_TOKENS.some(zrcToken => {
|
|
53
|
-
return (((0, blockchain_1.compareAddresses)(from.symbol, zrcToken.zetaSymbol) &&
|
|
54
|
-
(0, blockchain_1.compareAddresses)(toToken.symbol, zrcToken.commonSymbol)) ||
|
|
55
|
-
((0, blockchain_1.compareAddresses)(toToken.symbol, zrcToken.zetaSymbol) &&
|
|
56
|
-
(0, blockchain_1.compareAddresses)(from.symbol, zrcToken.commonSymbol)));
|
|
57
|
-
}));
|
|
52
|
+
return (0, blockchain_1.compareAddresses)(from.symbol, toToken.symbol);
|
|
58
53
|
}
|
|
59
54
|
exports.isDirectBridge = isDirectBridge;
|
|
60
55
|
//# sourceMappingURL=eddy-bridge-routing-directions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eddy-bridge-routing-directions.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/eddy-bridge-routing-directions.ts"],"names":[],"mappings":";;;AAAA,8CAA4D;AAE5D,4DAA+D;AAC/D,gFAAgG;AAEhG,gGAA0F;AAE1F,yBAAyB;AACZ,QAAA,GAAG,GAAG;IACf,+BAA+B,EAAE,iCAAiC;IAClE,8BAA8B,EAAE,gCAAgC;IAChE,4BAA4B,EAAE,8BAA8B;IAC5D,2BAA2B,EAAE,6BAA6B;IAC1D,mCAAmC,EAAE,qCAAqC;IAC1E,kCAAkC,EAAE,oCAAoC;IACxE,6BAA6B,EAAE,+BAA+B;CACxD,CAAC;AAIX,SAAgB,oBAAoB,CAChC,IAAyC,EACzC,EAAiC;IAEjC,IAAI,IAAI,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS,EAAE;QAC/C,MAAM,gBAAgB,GAAG,4DAA2B,CAAC,IAAI,CACrD,QAAQ,CAAC,EAAE,CACP,IAAA,6BAAgB,EAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;YAChD,EAAE,CAAC,UAAU,KAAK,QAAQ,CAAC,aAAa,CAC/C,CAAC;QACF,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO,WAAG,CAAC,4BAA4B,CAAC;QAC3D,IAAI,gBAAgB;YAAE,OAAO,WAAG,CAAC,2BAA2B,CAAC;KAChE;IAED,IACI,IAAI,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS;QAC7C,EAAE,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS,EAC7C;QACE,MAAM,gBAAgB,GAAG,4DAA2B,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"eddy-bridge-routing-directions.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/eddy-bridge-routing-directions.ts"],"names":[],"mappings":";;;AAAA,8CAA4D;AAE5D,4DAA+D;AAC/D,gFAAgG;AAEhG,gGAA0F;AAE1F,yBAAyB;AACZ,QAAA,GAAG,GAAG;IACf,+BAA+B,EAAE,iCAAiC;IAClE,8BAA8B,EAAE,gCAAgC;IAChE,4BAA4B,EAAE,8BAA8B;IAC5D,2BAA2B,EAAE,6BAA6B;IAC1D,mCAAmC,EAAE,qCAAqC;IAC1E,kCAAkC,EAAE,oCAAoC;IACxE,6BAA6B,EAAE,+BAA+B;CACxD,CAAC;AAIX,SAAgB,oBAAoB,CAChC,IAAyC,EACzC,EAAiC;IAEjC,IAAI,IAAI,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS,EAAE;QAC/C,MAAM,gBAAgB,GAAG,4DAA2B,CAAC,IAAI,CACrD,QAAQ,CAAC,EAAE,CACP,IAAA,6BAAgB,EAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;YAChD,EAAE,CAAC,UAAU,KAAK,QAAQ,CAAC,aAAa,CAC/C,CAAC;QACF,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO,WAAG,CAAC,4BAA4B,CAAC;QAC3D,IAAI,gBAAgB;YAAE,OAAO,WAAG,CAAC,2BAA2B,CAAC;KAChE;IAED,IACI,IAAI,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS;QAC7C,EAAE,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS,EAC7C;QACE,MAAM,gBAAgB,GAAG,4DAA2B,CAAC,IAAI,CACrD,QAAQ,CAAC,EAAE,CACP,IAAA,6BAAgB,EAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC;YAC9C,IAAI,CAAC,UAAU,KAAK,QAAQ,CAAC,aAAa,CACjD,CAAC;QACF,IAAI,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,QAAQ;YAAE,OAAO,WAAG,CAAC,+BAA+B,CAAC;QAC7E,IAAI,IAAI,CAAC,QAAQ,IAAI,gBAAgB;YAAE,OAAO,WAAG,CAAC,8BAA8B,CAAC;QACjF,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,gBAAgB;YAAE,OAAO,WAAG,CAAC,6BAA6B,CAAC;KACpF;IAED,IACI,IAAI,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS;QAC7C,EAAE,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS,EAC7C;QACE,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,EAAE,CAAC,QAAQ;YAAE,OAAO,WAAG,CAAC,mCAAmC,CAAC;QAClF,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,EAAE,CAAC,QAAQ;YAAE,OAAO,WAAG,CAAC,kCAAkC,CAAC;KACrF;IAED,MAAM,IAAI,gCAAuB,EAAE,CAAC;AACxC,CAAC;AArCD,oDAqCC;AAED;;GAEG;AACH,SAAgB,cAAc,CAC1B,IAAyC,EACzC,OAAsC;IAEtC,OAAO,IAAA,6BAAgB,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;AACzD,CAAC;AALD,wCAKC"}
|
|
@@ -5,7 +5,7 @@ const errors_1 = require("../../../../../../common/errors");
|
|
|
5
5
|
const blockchain_1 = require("../../../../../../common/utils/blockchain");
|
|
6
6
|
const eddy_bridge_contract_addresses_1 = require("../constants/eddy-bridge-contract-addresses");
|
|
7
7
|
function findCompatibleZrc20TokenAddress(token) {
|
|
8
|
-
const transitTokenInZetachain = eddy_bridge_contract_addresses_1.ZETA_CHAIN_SUPPORTED_TOKENS.find(zrcToken => (0, blockchain_1.compareAddresses)(zrcToken.
|
|
8
|
+
const transitTokenInZetachain = eddy_bridge_contract_addresses_1.ZETA_CHAIN_SUPPORTED_TOKENS.find(zrcToken => (0, blockchain_1.compareAddresses)(zrcToken.symbol, token.symbol) &&
|
|
9
9
|
zrcToken.relativeChain === token.blockchain);
|
|
10
10
|
if (!transitTokenInZetachain)
|
|
11
11
|
throw new errors_1.NotSupportedTokensError();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-transit-token-address.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/find-transit-token-address.ts"],"names":[],"mappings":";;;AAAA,8CAA4D;AAE5D,4DAA+D;AAG/D,gGAA0F;AAE1F,SAAgB,+BAA+B,CAAC,KAAoC;IAChF,MAAM,uBAAuB,GAAG,4DAA2B,CAAC,IAAI,CAC5D,QAAQ,CAAC,EAAE,CACP,IAAA,6BAAgB,EAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"find-transit-token-address.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/find-transit-token-address.ts"],"names":[],"mappings":";;;AAAA,8CAA4D;AAE5D,4DAA+D;AAG/D,gGAA0F;AAE1F,SAAgB,+BAA+B,CAAC,KAAoC;IAChF,MAAM,uBAAuB,GAAG,4DAA2B,CAAC,IAAI,CAC5D,QAAQ,CAAC,EAAE,CACP,IAAA,6BAAgB,EAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;QAC/C,QAAQ,CAAC,aAAa,KAAK,KAAK,CAAC,UAAU,CAClD,CAAC;IACF,IAAI,CAAC,uBAAuB;QAAE,MAAM,IAAI,gCAAuB,EAAE,CAAC;IAElE,OAAO,uBAAuB,CAAC,OAAO,CAAC;AAC3C,CAAC;AATD,0EASC"}
|