rubic-sdk 5.30.0-alpha.eddy-bridge.10 → 5.30.0-alpha.eddy-bridge.12
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 +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.js +51 -5
- 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.js +4 -2
- 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/utils/get-eddy-bridge-dst-status.js +19 -11
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/get-eddy-bridge-dst-status.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/dexes/common/uniswap-v2-abstract/uniswap-v2-abstract-trade.js +7 -0
- package/lib/features/on-chain/calculation-manager/providers/dexes/common/uniswap-v2-abstract/uniswap-v2-abstract-trade.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/dexes/mode/eddy-finance-mode/eddy-finance-mode-trade.js +1 -1
- package/lib/features/on-chain/calculation-manager/providers/dexes/mode/eddy-finance-mode/eddy-finance-mode-trade.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/dexes/zetachain/eddy-finance/eddy-finance-trade.d.ts +0 -4
- package/lib/features/on-chain/calculation-manager/providers/dexes/zetachain/eddy-finance/eddy-finance-trade.js +0 -15
- package/lib/features/on-chain/calculation-manager/providers/dexes/zetachain/eddy-finance/eddy-finance-trade.js.map +1 -1
- package/package.json +1 -1
package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ export declare class EddyBridgeProvider extends CrossChainProvider {
|
|
|
10
10
|
readonly type: "eddy_bridge";
|
|
11
11
|
isSupportedBlockchain(fromBlockchain: EvmBlockchainName): boolean;
|
|
12
12
|
calculate(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options: RequiredCrossChainOptions): Promise<CalculationResult>;
|
|
13
|
-
private
|
|
13
|
+
private getToTokenAmount;
|
|
14
14
|
private skipkNotSupportedRoutes;
|
|
15
15
|
protected getRoutePath(fromToken: PriceTokenAmount<EvmBlockchainName>, toToken: PriceTokenAmount<EvmBlockchainName>): Promise<RubicStep[]>;
|
|
16
16
|
protected getFeeInfo(fromBlockchain: EddyBridgeSupportedChain, providerAddress: string, percentFeeToken: PriceTokenAmount, useProxy: boolean): Promise<FeeInfo>;
|
package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.js
CHANGED
|
@@ -1,12 +1,18 @@
|
|
|
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.EddyBridgeProvider = void 0;
|
|
7
|
+
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
4
8
|
const errors_1 = require("../../../../../common/errors");
|
|
5
9
|
const tokens_1 = require("../../../../../common/tokens");
|
|
10
|
+
const native_tokens_1 = require("../../../../../common/tokens/constants/native-tokens");
|
|
6
11
|
const blockchain_name_1 = require("../../../../../core/blockchain/models/blockchain-name");
|
|
7
12
|
const fake_wallet_address_1 = require("../../../../common/constants/fake-wallet-address");
|
|
8
13
|
const check_unsupported_receiver_address_1 = require("../../../../common/utils/check-unsupported-receiver-address");
|
|
9
14
|
const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
|
|
15
|
+
const eddy_finance_provider_1 = require("../../../../on-chain/calculation-manager/providers/dexes/zetachain/eddy-finance/eddy-finance-provider");
|
|
10
16
|
const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
|
|
11
17
|
const cross_chain_provider_1 = require("../common/cross-chain-provider");
|
|
12
18
|
const proxy_cross_chain_evm_trade_1 = require("../common/proxy-cross-chain-evm-facade/proxy-cross-chain-evm-trade");
|
|
@@ -30,14 +36,14 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
30
36
|
try {
|
|
31
37
|
(0, check_unsupported_receiver_address_1.checkUnsupportedReceiverAddress)(options?.receiverAddress, options?.fromAddress || walletAddress);
|
|
32
38
|
this.skipkNotSupportedRoutes(from, toToken);
|
|
33
|
-
const [
|
|
34
|
-
this.
|
|
39
|
+
const [toAmount, feeInfo] = await Promise.all([
|
|
40
|
+
this.getToTokenAmount(from, toToken, options),
|
|
35
41
|
this.getFeeInfo(fromBlockchain, options.providerAddress, from, useProxy)
|
|
36
42
|
]);
|
|
37
43
|
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(from, feeInfo.rubicProxy?.platformFee?.percent);
|
|
38
44
|
const to = await tokens_1.PriceTokenAmount.createToken({
|
|
39
45
|
...toToken.asStruct,
|
|
40
|
-
tokenAmount:
|
|
46
|
+
tokenAmount: toAmount
|
|
41
47
|
});
|
|
42
48
|
const gasData = options.gasCalculation === 'enabled'
|
|
43
49
|
? await eddy_bridge_trade_1.EddyBridgeTrade.getGasData({
|
|
@@ -69,10 +75,50 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
69
75
|
};
|
|
70
76
|
}
|
|
71
77
|
}
|
|
72
|
-
async
|
|
78
|
+
async getToTokenAmount(from, toToken, options) {
|
|
79
|
+
const zetaToken = native_tokens_1.nativeTokensList[blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN];
|
|
73
80
|
const web3Public = this.getFromWeb3Public(blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN);
|
|
74
81
|
const platformFee = await web3Public.callContractMethod(eddy_bridge_contract_addresses_1.EDDY_CONTRACT_ADDRESS_IN_ZETACHAIN, edyy_bridge_abi_1.EDDY_BRIDGE_ABI, 'platformFee', []);
|
|
75
|
-
|
|
82
|
+
// eddy currently takes 1% from bridged amount (platformFee = 10, ratioToAmount in than case = 0.99)
|
|
83
|
+
const ratioToAmount = 1 - platformFee / 1000;
|
|
84
|
+
// Direct bridge ETH.ETH <-> ETH or BNB.BNB <-> BNB
|
|
85
|
+
if (from.symbol.toLowerCase() === toToken.symbol.toLowerCase()) {
|
|
86
|
+
return from.tokenAmount.multipliedBy(ratioToAmount);
|
|
87
|
+
// ZETA -> Native in BNB or Ethereum
|
|
88
|
+
}
|
|
89
|
+
else if (from.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN && from.isNative) {
|
|
90
|
+
const to = new tokens_1.PriceToken({
|
|
91
|
+
address: eddy_bridge_contract_addresses_1.TOKEN_SYMBOL_TO_ZETACHAIN_ADDRESS[toToken.symbol],
|
|
92
|
+
blockchain: blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN,
|
|
93
|
+
decimals: 18,
|
|
94
|
+
name: toToken.symbol,
|
|
95
|
+
price: new bignumber_js_1.default(0),
|
|
96
|
+
symbol: toToken.symbol
|
|
97
|
+
});
|
|
98
|
+
const fromWithEddyBridgeFee = new tokens_1.PriceTokenAmount({
|
|
99
|
+
...from.asStruct,
|
|
100
|
+
tokenAmount: from.tokenAmount.multipliedBy(ratioToAmount)
|
|
101
|
+
});
|
|
102
|
+
const calcData = await new eddy_finance_provider_1.EddyFinanceProvider().calculate(fromWithEddyBridgeFee, to, {
|
|
103
|
+
...options,
|
|
104
|
+
gasCalculation: 'disabled',
|
|
105
|
+
useProxy: false
|
|
106
|
+
});
|
|
107
|
+
return calcData.to.tokenAmount;
|
|
108
|
+
// BNB or ETH -> ZETA
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
const toWithPrice = new tokens_1.PriceToken({
|
|
112
|
+
...zetaToken,
|
|
113
|
+
price: new bignumber_js_1.default(0)
|
|
114
|
+
});
|
|
115
|
+
const calcData = await new eddy_finance_provider_1.EddyFinanceProvider().calculate(from, toWithPrice, {
|
|
116
|
+
...options,
|
|
117
|
+
gasCalculation: 'disabled',
|
|
118
|
+
useProxy: false
|
|
119
|
+
});
|
|
120
|
+
return calcData.to.tokenAmount.multipliedBy(ratioToAmount);
|
|
121
|
+
}
|
|
76
122
|
}
|
|
77
123
|
skipkNotSupportedRoutes(from, toToken) {
|
|
78
124
|
const supportedTokens = ['eth', 'bnb', 'zeta'];
|
|
@@ -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":"
|
|
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.js
CHANGED
|
@@ -36,9 +36,11 @@ class EddyBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
36
36
|
get fromBlockchain() {
|
|
37
37
|
return this.from.blockchain;
|
|
38
38
|
}
|
|
39
|
-
//
|
|
39
|
+
// EddyFinance has deployed contract only in ZetaChain, other routes go directly via `transfer`
|
|
40
40
|
get fromContractAddress() {
|
|
41
|
-
return this.isProxyTrade
|
|
41
|
+
return this.isProxyTrade
|
|
42
|
+
? rubic_proxy_contract_address_1.rubicProxyContractAddress[this.fromBlockchain].gateway
|
|
43
|
+
: eddy_bridge_contract_addresses_1.EDDY_CONTRACT_ADDRESS_IN_ZETACHAIN;
|
|
42
44
|
}
|
|
43
45
|
// @TODO check method on rubic-contract
|
|
44
46
|
get methodName() {
|
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":";;;AACA,8CAAkD;AAElD,6FAA4F;AAC5F,gFAAgG;AAChG,6GAAwG;AAExG,2FAAwF;AAGxF,gFAAkG;AAClG,mFAA4E;AAC5E,mGAA6F;AAC7F,qHAA8G;AAC9G,2HAAoH;AACpH,iGAA2F;AAE3F,8DAAuE;AAKvE,oHAA6G;AAC7G,+FAIoD;AAKpD,iEAA8D;AAM9D,MAAa,eAAgB,SAAQ,0CAAkB;IACnD,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAC3B,OAAO,EACP,IAAI,EACJ,eAAe,EACf,OAAO,EACkB;QACzB,MAAM,KAAK,GAAG,IAAI,eAAe,CAAC;YAC9B,eAAe,EAAE;gBACb,IAAI;gBACJ,EAAE,EAAE,OAAO;gBACX,OAAO,EAAE,IAAI;gBACb,WAAW,EAAE,CAAC;gBACd,OAAO;aACV;YACD,eAAe,EAAE,eAAe,IAAI,2BAAW,CAAC,aAAa;YAC7D,SAAS,EAAE,EAAE;SAChB,CAAC,CAAC;QAEH,OAAO,IAAA,+CAAoB,EAAC,KAAK,CAAC,CAAC;IACvC,CAAC;IAsBD,MAAM;IAEN,IAAY,cAAc;QACtB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAsC,CAAC;IAC5D,CAAC;IAED
|
|
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,22 +4,30 @@ exports.getEddyBridgeDstSwapStatus = void 0;
|
|
|
4
4
|
const tx_status_1 = require("../../../../../../core/blockchain/web3-public-service/web3-public/models/tx-status");
|
|
5
5
|
const injector_1 = require("../../../../../../core/injector/injector");
|
|
6
6
|
async function getEddyBridgeDstSwapStatus(data) {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
try {
|
|
8
|
+
const srcRes = await injector_1.Injector.httpClient.get(`https://zetachain.blockpi.network/lcd/v1/public/zeta-chain/crosschain/inTxHashToCctx/${data.srcTxHash}`);
|
|
9
|
+
const cctxHash = srcRes.inTxHashToCctx.cctx_index[0];
|
|
10
|
+
const cctxRes = await injector_1.Injector.httpClient.get(`
|
|
10
11
|
https://zetachain.blockpi.network/lcd/v1/public/zeta-chain/crosschain/cctx/${cctxHash}
|
|
11
12
|
`);
|
|
12
|
-
|
|
13
|
-
|
|
13
|
+
const dstTxHash = cctxRes.CrossChainTx?.outbound_tx_params?.[0]?.outbound_tx_hash;
|
|
14
|
+
if (dstTxHash) {
|
|
15
|
+
return {
|
|
16
|
+
hash: dstTxHash,
|
|
17
|
+
status: tx_status_1.TX_STATUS.SUCCESS
|
|
18
|
+
};
|
|
19
|
+
}
|
|
14
20
|
return {
|
|
15
|
-
hash:
|
|
16
|
-
status: tx_status_1.TX_STATUS.
|
|
21
|
+
hash: null,
|
|
22
|
+
status: tx_status_1.TX_STATUS.PENDING
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
return {
|
|
27
|
+
hash: null,
|
|
28
|
+
status: tx_status_1.TX_STATUS.PENDING
|
|
17
29
|
};
|
|
18
30
|
}
|
|
19
|
-
return {
|
|
20
|
-
hash: null,
|
|
21
|
-
status: tx_status_1.TX_STATUS.PENDING
|
|
22
|
-
};
|
|
23
31
|
}
|
|
24
32
|
exports.getEddyBridgeDstSwapStatus = getEddyBridgeDstSwapStatus;
|
|
25
33
|
//# sourceMappingURL=get-eddy-bridge-dst-status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-eddy-bridge-dst-status.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/get-eddy-bridge-dst-status.ts"],"names":[],"mappings":";;;AAAA,oGAAiG;AACjG,yDAAsD;AAgB/C,KAAK,UAAU,0BAA0B,CAAC,IAAyB;IACtE,MAAM,MAAM,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CACxC,wFAAwF,IAAI,CAAC,SAAS,EAAE,CAC3G,CAAC;
|
|
1
|
+
{"version":3,"file":"get-eddy-bridge-dst-status.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/get-eddy-bridge-dst-status.ts"],"names":[],"mappings":";;;AAAA,oGAAiG;AACjG,yDAAsD;AAgB/C,KAAK,UAAU,0BAA0B,CAAC,IAAyB;IACtE,IAAI;QACA,MAAM,MAAM,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CACxC,wFAAwF,IAAI,CAAC,SAAS,EAAE,CAC3G,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAErD,MAAM,OAAO,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAAmB;qFACa,QAAQ;KACxF,CAAC,CAAC;QACC,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC;QAElF,IAAI,SAAS,EAAE;YACX,OAAO;gBACH,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,qBAAS,CAAC,OAAO;aAC5B,CAAC;SACL;QAED,OAAO;YACH,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,qBAAS,CAAC,OAAO;SAC5B,CAAC;KACL;IAAC,MAAM;QACJ,OAAO;YACH,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,qBAAS,CAAC,OAAO;SAC5B,CAAC;KACL;AACL,CAAC;AA7BD,gEA6BC"}
|
|
@@ -16,8 +16,10 @@ const decorators_1 = require("../../../../../../../common/utils/decorators");
|
|
|
16
16
|
const errors_2 = require("../../../../../../../common/utils/errors");
|
|
17
17
|
const functions_1 = require("../../../../../../../common/utils/functions");
|
|
18
18
|
const options_1 = require("../../../../../../../common/utils/options");
|
|
19
|
+
const blockchain_name_1 = require("../../../../../../../core/blockchain/models/blockchain-name");
|
|
19
20
|
const evm_web3_pure_1 = require("../../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
|
|
20
21
|
const injector_1 = require("../../../../../../../core/injector/injector");
|
|
22
|
+
const on_chain_trade_type_1 = require("../../../common/models/on-chain-trade-type");
|
|
21
23
|
const evm_on_chain_trade_1 = require("../../../common/on-chain-trade/evm-on-chain-trade/evm-on-chain-trade");
|
|
22
24
|
const default_estimated_gas_1 = require("./constants/default-estimated-gas");
|
|
23
25
|
const SWAP_METHOD_1 = require("./constants/SWAP_METHOD");
|
|
@@ -81,6 +83,11 @@ class UniswapV2AbstractTrade extends evm_on_chain_trade_1.EvmOnChainTrade {
|
|
|
81
83
|
getAmountInAndAmountOut() {
|
|
82
84
|
let amountIn = this.fromWithoutFee.stringWeiAmount;
|
|
83
85
|
let amountOut = this.toTokenAmountMin.stringWeiAmount;
|
|
86
|
+
if (this.from.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN &&
|
|
87
|
+
this.type === on_chain_trade_type_1.ON_CHAIN_TRADE_TYPE.EDDY_FINANCE &&
|
|
88
|
+
!this.from.isNative) {
|
|
89
|
+
amountIn = this.fromWithoutFee.weiAmount.minus(1).toFixed();
|
|
90
|
+
}
|
|
84
91
|
if (this.exact === 'output') {
|
|
85
92
|
amountIn = this.fromWithoutFee.weiAmountPlusSlippage(this.slippageTolerance).toFixed(0);
|
|
86
93
|
amountOut = this.to.stringWeiAmount;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uniswap-v2-abstract-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/dexes/common/uniswap-v2-abstract/uniswap-v2-abstract-trade.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAAqC;AACrC,8CAAqF;AAErF,4DAAoD;AACpD,oDAAqD;AACrD,0DAA6D;AAC7D,sDAAoE;
|
|
1
|
+
{"version":3,"file":"uniswap-v2-abstract-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/dexes/common/uniswap-v2-abstract/uniswap-v2-abstract-trade.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAAqC;AACrC,8CAAqF;AAErF,4DAAoD;AACpD,oDAAqD;AACrD,0DAA6D;AAC7D,sDAAoE;AACpE,gFAIoD;AAKpD,6GAAwG;AACxG,yDAAsD;AAGtD,+HAG+F;AAE/F,wJAAkJ;AAElJ,gKAA2J;AAC3J,4IAKoH;AACpH,kJAAoJ;AAOpJ,MAAsB,sBAAuB,SAAQ,oCAAe;IAChE,gBAAgB;IAEF,AAAP,MAAM,CAAC,qBAAqB,CAAC,UAA0B;QAC1D,2DAA2D;QAC3D,aAAa;QACb,MAAM,QAAQ,GAAG,IAAI,IAAI,CACrB;YACI,IAAI,EAAE,EAAE,UAAU,EAAE;YACpB,WAAW,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC;SACtE,EACD,KAAK,CACR,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE;YAC9B,MAAM,IAAI,sBAAa,CAAC,qCAAqC,CAAC,CAAC;SAClE;QACD,OAAO,QAAQ,CAAC,kBAAkB,CAAC;IACvC,CAAC;IAEM,MAAM,KAAK,IAAI;QAClB,MAAM,IAAI,sBAAa,CAAC,kDAAkD,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3F,CAAC;IAWM,MAAM,CAAC,aAAa,CACvB,UAA6B,EAC7B,KAAY,EACZ,qBAAoD;QAEpD,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACxE,MAAM,UAAU,GAAG,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC;QACxE,OAAO,UAAU,CAAC,uBAAuB,CACrC,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,EACtC,IAAI,CAAC,WAAW,EAChB,UAAU,EACV,qBAAqB,CACxB,CAAC;IACN,CAAC;IAoBD,IAAW,IAAI;QACX,OAAQ,IAAI,CAAC,WAA6C,CAAC,IAAI,CAAC;IACpE,CAAC;IAED,IAAc,wBAAwB;QAClC,OAAO,IAAA,kCAAwB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC1D,CAAC;IAED,IAAc,iBAAiB;QAC3B,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACpB,OAAO,IAAI,CAAC,uBAAuB,EAAE,CAAC,QAAQ,CAAC;SAClD;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED,IAAY,iBAAiB;QACzB,OAAuC,IAAI,CAAC,WAAY,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAC5E,IAAI,CAAC,oBAAoB,CAC5B,CAAC;IACN,CAAC;IAED,IAAY,sBAAsB;QAC9B,OAAuC,IAAI,CAAC,WAAY,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAC5E,iDAAmC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CACjE,CAAC;IACN,CAAC;IAED,IAAY,oBAAoB;QAC5B,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACpB,OAAO,eAAe,CAAC;SAC1B;QACD,IAAI,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE;YAClB,OAAO,eAAe,CAAC;SAC1B;QACD,OAAO,kBAAkB,CAAC;IAC9B,CAAC;IAED,YAAmB,WAAiC,EAAE,eAAuB;QACzE,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAEpC,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC;QACnD,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC;QAC3C,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;IACjD,CAAC;IAES,uBAAuB;QAC7B,IAAI,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;QACnD,IAAI,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;QAEtD,IACI,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS;YAClD,IAAI,CAAC,IAAI,KAAK,yCAAmB,CAAC,YAAY;YAC9C,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EACrB;YACE,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;SAC/D;QAED,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE;YACzB,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACxF,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC;SACvC;QAED,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IACnC,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAEzD,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE;YAClC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAChE,IAAI,WAAW,EAAE;gBACb,MAAM,IAAI,sBAAa,CACnB,6DAA6D,CAChE,CAAC;aACL;YAED,IAAI;gBACA,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;aAC7B;YAAC,OAAO,IAAI,EAAE;gBACX,MAAM,IAAI,sBAAa,CACnB,mHAAmH,CACtH,CAAC;aACL;SACJ;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CACvC,OAAO,EACP,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,CACrB,CAAC;QACF,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,MAAM,GAAG,2BAAW,CAAC,gBAAgB,CACvC,IAAI,CAAC,kBAAkB,EACS,IAAI,CAAC,WAAY,CAAC,WAAW,EAC7D,UAAU,EACV,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,WAAW,CAAC,EACtE,IAAI,CAAC,iBAAiB,EACtB,SAAS,CACZ,CAAC;QAEF,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC;IAC7D,CAAC;IAES,YAAY,CAAC,GAA6B;QAChD,IAAI,IAAI,CAAC,gBAAgB,EAAE,EAAE;YACzB,MAAM,IAAI,0CAAiC,EAAE,CAAC;SACjD;QACD,MAAM,IAAA,mBAAU,EAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAES,iBAAiB,CAAC,eAAwB;QAChD,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC/D,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAElF,OAAO;YACH,GAAG,gBAAgB;YACnB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YACpC,eAAe,IAAI,IAAI,CAAC,aAAa;YACrC,IAAI,CAAC,wBAAwB;SAChC,CAAC;IACN,CAAC;IAES,KAAK,CAAC,aAAa,CACzB,OAA+B,EAC/B,WAAoB,EACpB,UAAoB;QAEpB,IAAI,UAAU,KAAK,KAAK,EAAE;YACtB,OAAO,IAAI,CAAC,iBAAiB,CAAC;SACjC;QACD,IAAI,UAAU,KAAK,IAAI,EAAE;YACrB,OAAO,IAAI,CAAC,sBAAsB,CAAC;SACtC;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAC1F,MAAM,sBAAsB,GAAG,IAAI,CAAC,yBAAyB,CACzD,IAAI,CAAC,sBAAsB,EAC3B,OAAO,CACV,CAAC;QAEF,MAAM,mBAAmB,GAAG,MAAM,IAAA,2BAAe,EAC7C,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAClC,IAAI,CAAC,qCAAqC,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAC7E,CAAC;QAEF,MAAM,eAAe,GAAG,MAAM,IAAA,2BAAe,EACzC,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAClC,IAAI,CAAC,qCAAqC,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAClF,CAAC;QAEF,IAAI,mBAAmB,CAAC,OAAO,EAAE;YAC7B,IAAI,eAAe,CAAC,OAAO,EAAE;gBACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;aACjC;YACD,MAAM,IAAI,0CAAiC,EAAE,CAAC;SACjD;QAED,IAAI,eAAe,CAAC,OAAO,EAAE;YACzB,OAAO,IAAI,CAAC,sBAAsB,CAAC;SACtC;QAED,MAAM,IAAA,mBAAU,EAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;IAES,yBAAyB,CAC/B,MAAc,EACd,OAA+B;QAE/B,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAErC,OAAO;YACH,IAAI,CAAC,kBAAkB;YACS,IAAI,CAAC,WAAY,CAAC,WAAW;YAC7D,MAAM;YACN,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,eAAe,CAAC;YAChD,EAAE,KAAK,EAAE;SACZ,CAAC;IACN,CAAC;IAEO,qCAAqC,CACzC,UAAoF,EACpF,WAAoB;QAEpB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;YACjC;gBACI,IAAI,EAAE,WAAW,IAAI,IAAI,CAAC,aAAa;gBACvC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;aAC/D;SACJ,CAAyE,CAAC;IAC/E,CAAC;IAED,gBAAgB;IACT,KAAK,CAAC,uBAAuB;QAChC,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,aAAa,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED,gBAAgB;IACT,sBAAsB;QACzB,MAAM,mBAAmB,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;QACxD,IAAI,UAAU,GAA8B,gBAAgB,CAAC;QAC7D,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACpB,UAAU,GAAG,aAAa,CAAC;SAC9B;QACD,IAAI,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE;YAClB,UAAU,GAAG,aAAa,CAAC;SAC9B;QAED,MAAM,WAAW,GAAkC,IAAI,CAAC,WAAW,CAAC;QACpE,MAAM,cAAc,GAChB,WAAW,CAAC,uBAAuB,CAAC,UAAU,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC;QAC3E,IAAI,CAAC,cAAc,EAAE;YACjB,MAAM,IAAI,sBAAa,CAAC,6BAA6B,CAAC,CAAC;SAC1D;QAED,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC3C,OAAO,IAAI,sBAAS,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;;AA9RL,wDA+RC;AAxQG,gBAAgB;AACO,kCAAW,GAAc,oCAAmB,CAAC;AAEpE,gBAAgB;AACO,kCAAW,GAAoC,yBAAW,CAAC;AAElF,gBAAgB;AACO,8CAAuB,GAAwB,2CAAmB,CAAC;AA3B5E;IADb,kBAAK;yDAeL"}
|
|
@@ -35,7 +35,7 @@ class EddyFinanceModeTrade extends uniswap_v2_abstract_trade_1.UniswapV2Abstract
|
|
|
35
35
|
await this.checkBalance();
|
|
36
36
|
}
|
|
37
37
|
catch (_err) {
|
|
38
|
-
throw new errors_1.RubicSdkError('To use `encode` function, wallet must have enough balance or you must
|
|
38
|
+
throw new errors_1.RubicSdkError('To use `encode` function, wallet must have enough balance or you must provide `supportFee` parameter in options.');
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
const methodName = await this.getMethodName(options, options.fromAddress, false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eddy-finance-mode-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/dexes/mode/eddy-finance-mode/eddy-finance-mode-trade.ts"],"names":[],"mappings":";;;AAAA,8CAA+E;AAE/E,6GAAwG;AAExG,qHAA+G;AAC/G,uJAAiJ;AAEjJ,wKAAiK;AACjK,+HAG+F;AAE/F,sJAAmJ;AAEnJ,8JAAwJ;AACxJ,0HAIoG;AAEpG,MAAa,oBAAqB,SAAQ,kDAAsB;IAAhE;;QAKoB,uBAAkB,GAAG,wDAA4C,CAAC;IAqHtF,CAAC;IAzHU,MAAM,KAAK,IAAI;QAClB,OAAO,yCAAmB,CAAC,YAAY,CAAC;IAC5C,CAAC;IAMD,IAAc,cAAc;QACxB,OAAO,IAAI,CAAC,QAAQ;YAChB,CAAC,CAAC,wDAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO;YACzD,CAAC,CAAC,mDAAuC,CAAC;IAClD,CAAC;IAES,KAAK,CAAC,6BAA6B,CACzC,OAAiC;QAEjC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACvD,IAAA,oEAA+B,EAC3B,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,WAAW,IAAI,IAAI,CAAC,aAAa,CAC7C,CAAC;QAEF,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE;YAClC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAChE,IAAI,WAAW,EAAE;gBACb,MAAM,IAAI,sBAAa,CACnB,6DAA6D,CAChE,CAAC;aACL;YAED,IAAI;gBACA,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;aAC7B;YAAC,OAAO,IAAI,EAAE;gBACX,MAAM,IAAI,sBAAa,CACnB,
|
|
1
|
+
{"version":3,"file":"eddy-finance-mode-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/dexes/mode/eddy-finance-mode/eddy-finance-mode-trade.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,8 +14,4 @@ export declare class EddyFinanceTrade extends UniswapV2AbstractTrade {
|
|
|
14
14
|
protected getCallParameters(): unknown[];
|
|
15
15
|
protected getSwapParametersByMethod(method: string): Parameters<InstanceType<typeof EvmWeb3Private>['executeContractMethod']>;
|
|
16
16
|
protected getSwapData(options: GetContractParamsOptions): Promise<unknown[]>;
|
|
17
|
-
protected getAmountInAndAmountOut(): {
|
|
18
|
-
amountIn: string;
|
|
19
|
-
amountOut: string;
|
|
20
|
-
};
|
|
21
17
|
}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EddyFinanceTrade = void 0;
|
|
4
4
|
const errors_1 = require("../../../../../../../common/errors");
|
|
5
|
-
const blockchain_name_1 = require("../../../../../../../core/blockchain/models/blockchain-name");
|
|
6
5
|
const evm_web3_pure_1 = require("../../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
|
|
7
6
|
const check_unsupported_receiver_address_1 = require("../../../../../../common/utils/check-unsupported-receiver-address");
|
|
8
7
|
const rubic_proxy_contract_address_1 = require("../../../../../../cross-chain/calculation-manager/providers/common/constants/rubic-proxy-contract-address");
|
|
@@ -88,20 +87,6 @@ class EddyFinanceTrade extends uniswap_v2_abstract_trade_1.UniswapV2AbstractTrad
|
|
|
88
87
|
]
|
|
89
88
|
];
|
|
90
89
|
}
|
|
91
|
-
getAmountInAndAmountOut() {
|
|
92
|
-
let amountIn = this.fromWithoutFee.stringWeiAmount;
|
|
93
|
-
let amountOut = this.toTokenAmountMin.stringWeiAmount;
|
|
94
|
-
if (this.from.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN &&
|
|
95
|
-
this.type === on_chain_trade_type_1.ON_CHAIN_TRADE_TYPE.EDDY_FINANCE &&
|
|
96
|
-
!this.from.isNative) {
|
|
97
|
-
amountIn = this.fromWithoutFee.weiAmount.minus(1).toFixed();
|
|
98
|
-
}
|
|
99
|
-
if (this.exact === 'output') {
|
|
100
|
-
amountIn = this.fromWithoutFee.weiAmountPlusSlippage(this.slippageTolerance).toFixed(0);
|
|
101
|
-
amountOut = this.to.stringWeiAmount;
|
|
102
|
-
}
|
|
103
|
-
return { amountIn, amountOut };
|
|
104
|
-
}
|
|
105
90
|
}
|
|
106
91
|
exports.EddyFinanceTrade = EddyFinanceTrade;
|
|
107
92
|
EddyFinanceTrade.swapMethods = EDDY_SWAP_METHOD_1.EDDY_SWAP_METHOD;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eddy-finance-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/dexes/zetachain/eddy-finance/eddy-finance-trade.ts"],"names":[],"mappings":";;;AAAA,8CAA+E;
|
|
1
|
+
{"version":3,"file":"eddy-finance-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/dexes/zetachain/eddy-finance/eddy-finance-trade.ts"],"names":[],"mappings":"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"}
|