rubic-sdk 6.0.0-alpha.ton.5 → 6.0.0-alpha.ton.51

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.js

@@ -1,18 +1,20 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EddyBridgeProvider = void 0;
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const errors_1 = require("../../../../../common/errors");
 const tokens_1 = require("../../../../../common/tokens");
-const blockchain_1 = require("../../../../../common/utils/blockchain");
 const blockchain_name_1 = require("../../../../../core/blockchain/models/blockchain-name");
 const fake_wallet_address_1 = require("../../../../common/constants/fake-wallet-address");
 const check_unsupported_receiver_address_1 = require("../../../../common/utils/check-unsupported-receiver-address");
 const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
-const eddy_finance_provider_1 = require("../../../../on-chain/calculation-manager/providers/dexes/zetachain/eddy-finance/eddy-finance-provider");
+const calculate_rates_1 = require("./utils/calculate-rates");
 const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
 const cross_chain_provider_1 = require("../common/cross-chain-provider");
 const proxy_cross_chain_evm_trade_1 = require("../common/proxy-cross-chain-evm-facade/proxy-cross-chain-evm-trade");
-const eddy_bridge_contract_addresses_1 = require("./constants/eddy-bridge-contract-addresses");
 const eddy_bridge_supported_chains_1 = require("./constants/eddy-bridge-supported-chains");
 const swap_limits_1 = require("./constants/swap-limits");
 const eddy_bridge_trade_1 = require("./eddy-bridge-trade");
@@ -33,20 +35,16 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
         const walletAddress = this.getWalletAddress(fromBlockchain) || fake_wallet_address_1.FAKE_WALLET_ADDRESS;
         try {
             (0, check_unsupported_receiver_address_1.checkUnsupportedReceiverAddress)(options?.receiverAddress, options?.fromAddress || walletAddress);
-            const isSupportedRoute = this.checkIsSupportedRoute(from, toToken);
-            if (!isSupportedRoute) {
-                throw new errors_1.NotSupportedTokensError();
-            }
             const routingDirection = (0, eddy_bridge_routing_directions_1.eddyRoutingDirection)(from, toToken);
             const feeInfo = await this.getFeeInfo(fromBlockchain, options.providerAddress, from, useProxy);
             const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(from, feeInfo.rubicProxy?.platformFee?.percent);
-            const [eddySlippage, { toAmount, gasInTargetChain }] = await Promise.all([
+            const [eddySlippage, outputAmount] = await Promise.all([
                 eddy_bridge_contract_service_1.EddyBridgeContractService.getEddySlipage(),
-                this.getToTokenAmount(fromWithoutFee, toToken, options, routingDirection)
+                (0, calculate_rates_1.calculateRates)(fromWithoutFee, toToken, options.slippageTolerance)
             ]);
             const to = await tokens_1.PriceTokenAmount.createToken({
                 ...toToken.asStruct,
-                tokenAmount: toAmount
+                weiAmount: new bignumber_js_1.default(outputAmount)
             });
             const gasData = options.gasCalculation === 'enabled'
                 ? await eddy_bridge_trade_1.EddyBridgeTrade.getGasData({
@@ -55,7 +53,8 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
                     toToken: to,
                     providerAddress: options.providerAddress,
                     slippage: options.slippageTolerance,
-                    routingDirection: routingDirection
+                    routingDirection,
+                    quoteOptions: options
                 })
                 : null;
             const trade = new eddy_bridge_trade_1.EddyBridgeTrade({
@@ -65,9 +64,9 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
                     gasData,
                     to,
                     priceImpact: from.calculatePriceImpactPercent(to),
-                    slippage: eddySlippage,
-                    prevGasAmountInNonZetaChain: gasInTargetChain,
-                    routingDirection: routingDirection
+                    slippage: eddySlippage + options.slippageTolerance,
+                    routingDirection,
+                    quoteOptions: options
                 },
                 providerAddress: options.providerAddress,
                 routePath: await this.getRoutePath(from, to)
@@ -91,7 +90,7 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
         let hasEnoughCapacity = true;
         if (fromWithoutFee.blockchain !== blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN) {
             try {
-                const maxAmountWei = await eddy_bridge_api_service_1.EddyBridgeApiService.getWeiTokenLimitInForeignChain(fromWithoutFee.symbol);
+                const maxAmountWei = await eddy_bridge_api_service_1.EddyBridgeApiService.getWeiTokenLimitInForeignChain(fromWithoutFee);
                 hasEnoughCapacity = fromWithoutFee.weiAmount.lte(maxAmountWei);
             }
             catch { }
@@ -112,69 +111,6 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
         }
         return { trade, tradeType: this.type };
     }
-    async getToTokenAmount(from, toToken, options, routingDirection) {
-        const eddyFee = await eddy_bridge_contract_service_1.EddyBridgeContractService.getPlatformFee();
-        const ratioToAmount = 1 - eddyFee;
-        if (routingDirection === eddy_bridge_routing_directions_1.ERD.ZETA_TOKEN_TO_ANY_CHAIN_NATIVE) {
-            const gasInTargetChainNonWei = await eddy_bridge_contract_service_1.EddyBridgeContractService.getGasInTargetChain(from);
-            const toAmount = from.tokenAmount
-                .multipliedBy(ratioToAmount)
-                .minus(gasInTargetChainNonWei);
-            return { toAmount, gasInTargetChain: gasInTargetChainNonWei };
-        }
-        if (routingDirection === eddy_bridge_routing_directions_1.ERD.ZETA_NATIVE_TO_ANY_CHAIN_NATIVE) {
-            const to = await tokens_1.PriceToken.createToken({
-                address: eddy_bridge_contract_addresses_1.TOKEN_SYMBOL_TO_ZETACHAIN_ADDRESS[toToken.symbol],
-                blockchain: blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN
-            });
-            const fromWithEddyBridgeFee = new tokens_1.PriceTokenAmount({
-                ...from.asStruct,
-                tokenAmount: from.tokenAmount.multipliedBy(ratioToAmount)
-            });
-            const calcData = await new eddy_finance_provider_1.EddyFinanceProvider().calculate(fromWithEddyBridgeFee, to, {
-                ...options,
-                gasCalculation: 'disabled',
-                useProxy: false
-            });
-            return { toAmount: calcData.to.tokenAmount, gasInTargetChain: undefined };
-        }
-        // BNB or ETH -> ZETA
-        const fromTokenInZetaChain = await tokens_1.PriceTokenAmount.createToken({
-            address: eddy_bridge_contract_addresses_1.TOKEN_SYMBOL_TO_ZETACHAIN_ADDRESS[from.symbol],
-            blockchain: blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN,
-            tokenAmount: from.tokenAmount.multipliedBy(ratioToAmount)
-        });
-        const calcData = await new eddy_finance_provider_1.EddyFinanceProvider().calculate(fromTokenInZetaChain, toToken, {
-            ...options,
-            gasCalculation: 'disabled',
-            useProxy: false
-        });
-        return { toAmount: calcData.to.tokenAmount, gasInTargetChain: undefined };
-    }
-    checkIsSupportedRoute(from, toToken) {
-        // Prevents bridges BSC <-> Ethereum
-        if (from.blockchain !== blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN &&
-            toToken.blockchain !== blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN) {
-            return false;
-        }
-        // Only gas-token(BNB, ETH) can be bridged from supported chains in ZetaChain(ZETA)
-        if (from.blockchain !== blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN && from.isNative && toToken.isNative) {
-            return true;
-        }
-        const isSupportedZrc20 = Object.values(eddy_bridge_contract_addresses_1.TOKEN_SYMBOL_TO_ZETACHAIN_ADDRESS).some(zrc20Address => (0, blockchain_1.compareAddresses)(zrc20Address, from.address));
-        // Zetachain(BNB) -> BSC(BNB) and Zetachain(ETH) -> ETH(ETH)
-        if (from.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN &&
-            isSupportedZrc20 &&
-            toToken.isNative &&
-            new RegExp(toToken.symbol, 'i').test(from.symbol)) {
-            return true;
-        }
-        // ZetaChain(ZETA) -> BSC(BNB) or ETH(ETH)
-        if (from.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN && from.isNative && toToken.isNative) {
-            return true;
-        }
-        return false;
-    }
     async getRoutePath(fromToken, toToken) {
         return [{ type: 'cross-chain', provider: this.type, path: [fromToken, toToken] }];
     }

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.js.map

@@ -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":"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"}
+{"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

@@ -16,7 +16,7 @@ import { TradeInfo } from '../common/models/trade-info';
 import { EddyBridgeGetGasDataParams, EddyBridgeTradeConstructorParams } from './models/eddy-trade-types';
 export declare class EddyBridgeTrade extends EvmCrossChainTrade {
     /** @internal */
-    static getGasData({ feeInfo, from, providerAddress, toToken, slippage, routingDirection }: EddyBridgeGetGasDataParams): Promise<GasData | null>;
+    static getGasData({ feeInfo, from, providerAddress, toToken, slippage, routingDirection, quoteOptions }: EddyBridgeGetGasDataParams): Promise<GasData | null>;
     /**ABSTRACT PROPS */
     readonly type: CrossChainTradeType;
     readonly isAggregator: boolean;
@@ -29,8 +29,7 @@ export declare class EddyBridgeTrade extends EvmCrossChainTrade {
     readonly gasData: GasData;
     readonly priceImpact: number | null;
     private readonly slippage;
-    /** */
-    private readonly prevGasAmountInNonZetaChain;
+    private readonly quoteOptions;
     private readonly routingDirection;
     private get fromBlockchain();
     protected get fromContractAddress(): string;

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EddyBridgeTrade = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const errors_1 = require("../../../../../common/errors");
-const wrapped_native_tokens_1 = require("../../../../../common/tokens/constants/wrapped-native-tokens");
-const blockchain_name_1 = require("../../../../../core/blockchain/models/blockchain-name");
 const evm_web3_pure_1 = require("../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
 const web3_pure_1 = require("../../../../../core/blockchain/web3-pure/web3-pure");
 const fake_wallet_address_1 = require("../../../../common/constants/fake-wallet-address");
+const calculate_rates_1 = require("./utils/calculate-rates");
+const eddy_swap_controller_factory_1 = require("./utils/eddy-swap-controller-factory");
 const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
 const get_cross_chain_gas_data_1 = require("../../utils/get-cross-chain-gas-data");
 const rubic_proxy_contract_address_1 = require("../common/constants/rubic-proxy-contract-address");
@@ -20,12 +20,10 @@ const evm_cross_chain_trade_1 = require("../common/emv-cross-chain-trade/evm-cro
 const bridge_type_1 = require("../common/models/bridge-type");
 const proxy_cross_chain_evm_trade_1 = require("../common/proxy-cross-chain-evm-facade/proxy-cross-chain-evm-trade");
 const eddy_bridge_contract_addresses_1 = require("./constants/eddy-bridge-contract-addresses");
-const edyy_bridge_abi_1 = require("./constants/edyy-bridge-abi");
-const eddy_bridge_contract_service_1 = require("./services/eddy-bridge-contract-service");
 const eddy_bridge_routing_directions_1 = require("./utils/eddy-bridge-routing-directions");
 class EddyBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
     /** @internal */
-    static async getGasData({ feeInfo, from, providerAddress, toToken, slippage, routingDirection }) {
+    static async getGasData({ feeInfo, from, providerAddress, toToken, slippage, routingDirection, quoteOptions }) {
         const trade = new EddyBridgeTrade({
             crossChainTrade: {
                 from,
@@ -34,8 +32,9 @@ class EddyBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
                 priceImpact: 0,
                 feeInfo,
                 slippage,
-                prevGasAmountInNonZetaChain: new bignumber_js_1.default(0),
-                routingDirection
+                routingDirection,
+                // ratioToAmount: 1,
+                quoteOptions
             },
             providerAddress: providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS,
             routePath: []
@@ -45,11 +44,18 @@ class EddyBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
     get fromBlockchain() {
         return this.from.blockchain;
     }
-    // EddyFinance has deployed contract only in ZetaChain, other routes go directly via `transfer`
     get fromContractAddress() {
-        return this.isProxyTrade
-            ? rubic_proxy_contract_address_1.rubicProxyContractAddress[this.fromBlockchain].gateway
-            : eddy_bridge_contract_addresses_1.EDDY_CONTRACT_ADDRESS_IN_ZETACHAIN;
+        if (this.isProxyTrade)
+            return rubic_proxy_contract_address_1.rubicProxyContractAddress[this.fromBlockchain].gateway;
+        switch (this.routingDirection) {
+            case eddy_bridge_routing_directions_1.ERD.ANY_CHAIN_TOKEN_TO_ANY_CHAIN_TOKEN:
+            case eddy_bridge_routing_directions_1.ERD.ANY_CHAIN_TOKEN_TO_ZETA_TOKEN:
+                return eddy_bridge_contract_addresses_1.CUSTODY_ADDRESSES[this.fromBlockchain];
+            case eddy_bridge_routing_directions_1.ERD.ZETA_TOKEN_TO_ANY_CHAIN_ALL:
+                return eddy_bridge_contract_addresses_1.EDDY_OMNI_CONTRACT_IN_ZETACHAIN;
+            default:
+                return eddy_bridge_contract_addresses_1.EDDY_OMNI_CONTRACT_IN_ZETACHAIN;
+        }
     }
     get methodName() {
         return 'startBridgeTokensViaGenericCrossChain';
@@ -68,8 +74,8 @@ class EddyBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
         this.priceImpact = params.crossChainTrade.priceImpact;
         this.slippage = params.crossChainTrade.slippage;
         this.toTokenAmountMin = web3_pure_1.Web3Pure.fromWei(this.to.weiAmountMinusSlippage(this.slippage), this.to.decimals);
-        this.prevGasAmountInNonZetaChain = params.crossChainTrade.prevGasAmountInNonZetaChain;
         this.routingDirection = params.crossChainTrade.routingDirection;
+        this.quoteOptions = params.crossChainTrade.quoteOptions;
     }
     async getContractParams(options) {
         const receiverAddress = options?.receiverAddress || this.walletAddress;
@@ -98,52 +104,18 @@ class EddyBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
         };
     }
     async getTransactionConfigAndAmount(_receiverAddress) {
-        let config = {};
-        const wrappedZetaAddress = wrapped_native_tokens_1.wrappedNativeTokensList[blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN].address;
-        if (this.routingDirection === eddy_bridge_routing_directions_1.ERD.ANY_CHAIN_NATIVE_TO_ZETA_NATIVE) {
-            const walletAddress = this.walletAddress || fake_wallet_address_1.FAKE_WALLET_ADDRESS;
-            let data = eddy_bridge_contract_addresses_1.EDDY_CONTRACT_ADDRESS_IN_ZETACHAIN +
-                walletAddress.slice(2) +
-                wrappedZetaAddress.slice(2);
-            config = {
-                data,
-                to: eddy_bridge_contract_addresses_1.TSS_ADDRESSES_EDDY_BRIDGE[this.fromBlockchain],
-                value: this.from.stringWeiAmount
-            };
-        }
-        else if (this.routingDirection === eddy_bridge_routing_directions_1.ERD.ZETA_NATIVE_TO_ANY_CHAIN_NATIVE) {
-            const destZrc20TokenAddress = eddy_bridge_contract_addresses_1.TOKEN_SYMBOL_TO_ZETACHAIN_ADDRESS[this.to.symbol];
-            config = evm_web3_pure_1.EvmWeb3Pure.encodeMethodCall(eddy_bridge_contract_addresses_1.EDDY_CONTRACT_ADDRESS_IN_ZETACHAIN, edyy_bridge_abi_1.EDDY_BRIDGE_ABI, 'transferZetaToConnectedChain', ['0x', wrappedZetaAddress, destZrc20TokenAddress], this.from.stringWeiAmount);
-        }
-        else if (this.routingDirection === eddy_bridge_routing_directions_1.ERD.ZETA_TOKEN_TO_ANY_CHAIN_NATIVE) {
-            const srcZrc20TokenAddress = this.from.address;
-            const destZrc20TokenAddress = eddy_bridge_contract_addresses_1.TOKEN_SYMBOL_TO_ZETACHAIN_ADDRESS[this.to.symbol];
-            const methodArgs = [
-                '0x',
-                this.from.stringWeiAmount,
-                srcZrc20TokenAddress,
-                destZrc20TokenAddress
-            ];
-            config = evm_web3_pure_1.EvmWeb3Pure.encodeMethodCall(eddy_bridge_contract_addresses_1.EDDY_CONTRACT_ADDRESS_IN_ZETACHAIN, edyy_bridge_abi_1.EDDY_BRIDGE_ABI, 'withdrawToNativeChain', methodArgs, '0');
-        }
-        if (this.routingDirection === eddy_bridge_routing_directions_1.ERD.ZETA_TOKEN_TO_ANY_CHAIN_NATIVE) {
-            const newGasAmount = await eddy_bridge_contract_service_1.EddyBridgeContractService.getGasInTargetChain(this.from);
-            const newNonWeiAmount = web3_pure_1.Web3Pure.fromWei(this.to.stringWeiAmount, this.to.decimals)
-                .plus(this.prevGasAmountInNonZetaChain)
-                .minus(newGasAmount);
-            const newWeiAmount = web3_pure_1.Web3Pure.toWei(newNonWeiAmount, this.to.decimals);
-            return { config, amount: newWeiAmount };
-        }
+        const evmConfig = eddy_swap_controller_factory_1.EddySwapControllerFactory.createController(this.from, this.to, this.walletAddress || fake_wallet_address_1.FAKE_WALLET_ADDRESS, this.routingDirection).getEvmConfig();
+        const outputAmount = await (0, calculate_rates_1.calculateRates)(this.from, this.to, this.slippage);
         return {
-            config,
-            amount: this.to.stringWeiAmount
+            config: evmConfig,
+            amount: outputAmount
         };
     }
     getTradeInfo() {
         return {
             estimatedGas: this.estimatedGas,
             feeInfo: this.feeInfo,
-            priceImpact: this.priceImpact || null,
+            priceImpact: this.priceImpact ?? null,
             slippage: this.slippage * 100,
             routePath: this.routePath
         };

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.js.map

@@ -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":"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"}
+{"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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"}

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/models/eddy-bridge-api-types.d.ts

@@ -5,4 +5,16 @@ interface ZetaChainForeignCoinInfo {
     zrc20_contract_address: string;
     liquidity_cap: string;
 }
+export interface QuoteRequest {
+    fromAmount: string;
+    fromChainId: number;
+    fromToken: string;
+    toChainId: number;
+    toToken: string;
+}
+export interface QuoteResponse {
+    destChainGasFees: string;
+    outputAmount: string;
+    srcChainGasFees: string;
+}
 export {};

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/models/eddy-quote-controller.d.ts

@@ -0,0 +1,4 @@
+import BigNumber from 'bignumber.js';
+export interface EddyQuoteController {
+    calculateToAmount(): Promise<BigNumber>;
+}

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/models/eddy-quote-controller.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=eddy-quote-controller.js.map

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/models/eddy-quote-controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"eddy-quote-controller.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/models/eddy-quote-controller.ts"],"names":[],"mappings":""}

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/models/eddy-swap-controller.d.ts

@@ -0,0 +1,4 @@
+import { EvmEncodeConfig } from '../../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/models/evm-encode-config';
+export interface EddySwapController {
+    getEvmConfig(): EvmEncodeConfig;
+}

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/models/eddy-swap-controller.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=eddy-swap-controller.js.map

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/models/eddy-swap-controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"eddy-swap-controller.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/models/eddy-swap-controller.ts"],"names":[],"mappings":""}

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/models/eddy-trade-types.d.ts

@@ -1,6 +1,6 @@
-import BigNumber from 'bignumber.js';
 import { PriceTokenAmount } from '../../../../../../common/tokens';
 import { EvmBlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
+import { RequiredCrossChainOptions } from '../../../models/cross-chain-options';
 import { GasData } from '../../common/emv-cross-chain-trade/models/gas-data';
 import { FeeInfo } from '../../common/models/fee-info';
 import { RubicStep } from '../../common/models/rubicStep';
@@ -12,6 +12,7 @@ export interface EddyBridgeGetGasDataParams {
     providerAddress: string;
     slippage: number;
     routingDirection: EddyRoutingDirection;
+    quoteOptions: RequiredCrossChainOptions;
 }
 export interface EddyBridgeTradeConstructorParams {
     crossChainTrade: {
@@ -21,8 +22,8 @@ export interface EddyBridgeTradeConstructorParams {
         feeInfo: FeeInfo;
         priceImpact: number | null;
         slippage: number;
-        prevGasAmountInNonZetaChain: BigNumber | undefined;
         routingDirection: EddyRoutingDirection;
+        quoteOptions: RequiredCrossChainOptions;
     };
     providerAddress: string;
     routePath: RubicStep[];

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-api-service.d.ts

@@ -1,3 +1,7 @@
+import { PriceTokenAmount } from '../../../../../../common/tokens';
+import { EvmBlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
+import { QuoteRequest, QuoteResponse } from '../models/eddy-bridge-api-types';
 export declare class EddyBridgeApiService {
-    static getWeiTokenLimitInForeignChain(tokenSymbol: string): Promise<string>;
+    static getWeiTokenLimitInForeignChain(fromWithoutFee: PriceTokenAmount<EvmBlockchainName>): Promise<string>;
+    static fetchRates(params: QuoteRequest): Promise<QuoteResponse>;
 }

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-api-service.js

@@ -4,17 +4,21 @@ exports.EddyBridgeApiService = void 0;
 const errors_1 = require("../../../../../../common/errors");
 const blockchain_1 = require("../../../../../../common/utils/blockchain");
 const injector_1 = require("../../../../../../core/injector/injector");
-const eddy_bridge_contract_addresses_1 = require("../constants/eddy-bridge-contract-addresses");
+const find_transit_token_address_1 = require("../utils/find-transit-token-address");
 class EddyBridgeApiService {
-    static async getWeiTokenLimitInForeignChain(tokenSymbol) {
+    static async getWeiTokenLimitInForeignChain(fromWithoutFee) {
         const { foreignCoins } = await injector_1.Injector.httpClient.get(`https://zetachain.blockpi.network/lcd/v1/public/zeta-chain/fungible/foreign_coins`);
-        const zrc20TokenAddress = eddy_bridge_contract_addresses_1.TOKEN_SYMBOL_TO_ZETACHAIN_ADDRESS[tokenSymbol];
+        const zrc20TokenAddress = (0, find_transit_token_address_1.findCompatibleZrc20TokenAddress)(fromWithoutFee);
         const tokenInfo = foreignCoins.find(token => (0, blockchain_1.compareAddresses)(token.zrc20_contract_address, zrc20TokenAddress));
         if (!tokenInfo) {
             throw new errors_1.NotSupportedTokensError();
         }
         return tokenInfo.liquidity_cap;
     }
+    static async fetchRates(params) {
+        const api = 'https://api.eddy.finance/api/v1/swap/get-quote-bridge';
+        return injector_1.Injector.httpClient.post(api, params);
+    }
 }
 exports.EddyBridgeApiService = EddyBridgeApiService;
 //# sourceMappingURL=eddy-bridge-api-service.js.map

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-api-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"eddy-bridge-api-service.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-api-service.ts"],"names":[],"mappings":";;;AAAA,8CAA4D;AAC5D,4DAA+D;AAC/D,yDAAsD;AAEtD,gGAAgG;AAGhG,MAAa,oBAAoB;IACtB,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,WAAmB;QAClE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAClD,mFAAmF,CACtF,CAAC;QACF,MAAM,iBAAiB,GAAG,kEAAiC,CAAC,WAAW,CAAE,CAAC;QAE1E,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CACxC,IAAA,6BAAgB,EAAC,KAAK,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CACpE,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,gCAAuB,EAAE,CAAC;SACvC;QAED,OAAO,SAAS,CAAC,aAAa,CAAC;IACnC,CAAC;CACJ;AAjBD,oDAiBC"}
+{"version":3,"file":"eddy-bridge-api-service.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-api-service.ts"],"names":[],"mappings":";;;AAAA,8CAA4D;AAE5D,4DAA+D;AAE/D,yDAAsD;AAOtD,oFAAsF;AAEtF,MAAa,oBAAoB;IACtB,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAC9C,cAAmD;QAEnD,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAClD,mFAAmF,CACtF,CAAC;QACF,MAAM,iBAAiB,GAAG,IAAA,4DAA+B,EAAC,cAAc,CAAC,CAAC;QAE1E,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CACxC,IAAA,6BAAgB,EAAC,KAAK,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CACpE,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,gCAAuB,EAAE,CAAC;SACvC;QAED,OAAO,SAAS,CAAC,aAAa,CAAC;IACnC,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,MAAoB;QAC/C,MAAM,GAAG,GAAG,uDAAuD,CAAC;QACpE,OAAO,mBAAQ,CAAC,UAAU,CAAC,IAAI,CAAgB,GAAG,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC;CACJ;AAxBD,oDAwBC"}

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.d.ts

@@ -1,12 +1,15 @@
 import BigNumber from 'bignumber.js';
-import { PriceTokenAmount } from '../../../../../../common/tokens';
+import { PriceToken } from '../../../../../../common/tokens';
 import { EvmBlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
 export declare class EddyBridgeContractService {
     static getPlatformFee(): Promise<number>;
-    static getGasInTargetChain(from: PriceTokenAmount<EvmBlockchainName>): Promise<BigNumber>;
     /**
-     *
-     * @returns eddy static slippage from 0 to 1
+     * Eddy takes gasFee in source chain native currency
+     * @param toToken target chain token
+     */
+    static getGasFeeInDestChain(fromToken: PriceToken<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>): Promise<BigNumber>;
+    /**
+     * @returns eddy static slippage
      */
     static getEddySlipage(): Promise<number>;
 }

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.js

@@ -1,34 +1,67 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EddyBridgeContractService = void 0;
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const tokens_1 = require("../../../../../../common/tokens");
 const blockchain_name_1 = require("../../../../../../core/blockchain/models/blockchain-name");
 const web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/web3-pure");
 const injector_1 = require("../../../../../../core/injector/injector");
 const eddy_bridge_contract_addresses_1 = require("../constants/eddy-bridge-contract-addresses");
 const edyy_bridge_abi_1 = require("../constants/edyy-bridge-abi");
 const zrc_20_token_abi_1 = require("../constants/zrc-20-token-abi");
+const find_transit_token_address_1 = require("../utils/find-transit-token-address");
 class EddyBridgeContractService {
     static async getPlatformFee() {
-        const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN);
-        const res = await web3Public.callContractMethod(eddy_bridge_contract_addresses_1.EDDY_CONTRACT_ADDRESS_IN_ZETACHAIN, edyy_bridge_abi_1.EDDY_BRIDGE_ABI, 'platformFee', []);
-        // eddy currently takes 1% from bridged amount (platformFee = 10, ratioToAmount in than case = 0.99)
-        return res / 1000;
+        try {
+            const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN);
+            const res = await web3Public.callContractMethod(eddy_bridge_contract_addresses_1.EDDY_OMNI_CONTRACT_IN_ZETACHAIN, edyy_bridge_abi_1.EDDY_BRIDGE_ABI, 'platformFee', []);
+            // eddy currently takes 1% from bridged amount (platformFee = 10, ratioToAmount in than case = 0.99)
+            return res / 1000;
+        }
+        catch (err) {
+            return 0;
+        }
     }
-    static async getGasInTargetChain(from) {
-        const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN);
-        const res = await web3Public.callContractMethod(from.address, zrc_20_token_abi_1.ZRC_20_ABI, 'withdrawGasFee', []);
-        const gasFeeNonWei = web3_pure_1.Web3Pure.fromWei(res?.[1] || 0, from.decimals);
-        return gasFeeNonWei;
+    /**
+     * Eddy takes gasFee in source chain native currency
+     * @param toToken target chain token
+     */
+    static async getGasFeeInDestChain(fromToken, toToken) {
+        try {
+            if (fromToken.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN) {
+                return new bignumber_js_1.default(0);
+            }
+            const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN);
+            const res = await web3Public.callContractMethod((0, find_transit_token_address_1.findCompatibleZrc20TokenAddress)(toToken), zrc_20_token_abi_1.ZRC_20_ABI, 'withdrawGasFee', []);
+            const { zrc20GasFeeTokenAddress, zrc20WeiAmount } = res;
+            const zrc20TokenWithPrice = await tokens_1.PriceToken.createToken({
+                address: zrc20GasFeeTokenAddress,
+                blockchain: blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN
+            });
+            const gasFeeUsdt = web3_pure_1.Web3Pure.fromWei(zrc20WeiAmount || 0, zrc20TokenWithPrice.decimals).multipliedBy(zrc20TokenWithPrice.price);
+            const gasFeeInSrcTokenEquivalent = gasFeeUsdt.dividedBy(fromToken.price);
+            return gasFeeInSrcTokenEquivalent;
+        }
+        catch (err) {
+            throw err;
+        }
     }
     /**
-     *
-     * @returns eddy static slippage from 0 to 1
+     * @returns eddy static slippage
      */
     static async getEddySlipage() {
-        const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN);
-        const res = await web3Public.callContractMethod(eddy_bridge_contract_addresses_1.EDDY_CONTRACT_ADDRESS_IN_ZETACHAIN, edyy_bridge_abi_1.EDDY_BRIDGE_ABI, 'slippage', []);
-        // if res equals to 10 then 10 / 1000 = 1%
-        return res / 1000;
+        try {
+            const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN);
+            const res = await web3Public.callContractMethod(eddy_bridge_contract_addresses_1.EDDY_OMNI_CONTRACT_IN_ZETACHAIN, edyy_bridge_abi_1.EDDY_BRIDGE_ABI, 'slippage', []);
+            // if res equals to 10 then 10 / 1000 = 1%
+            return res / 1000;
+        }
+        catch (err) {
+            return 0.02;
+        }
     }
 }
 exports.EddyBridgeContractService = EddyBridgeContractService;

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.js.map

@@ -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":";;;AAEA,gFAAgG;AAChG,uEAAmE;AACnE,yDAAsD;AAEtD,gGAAiG;AACjG,kEAA+D;AAC/D,oEAA2D;AAE3D,MAAa,yBAAyB;IAC3B,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,mEAAkC,EAClC,iCAAe,EACf,aAAa,EACb,EAAE,CACL,CAAC;QACF,oGAAoG;QACpG,OAAO,GAAG,GAAG,IAAK,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,mBAAmB,CACnC,IAAyC;QAEzC,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,SAAS,CAAC,CAAC;QACvF,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAC3C,IAAI,CAAC,OAAO,EACZ,6BAAU,EACV,gBAAgB,EAChB,EAAE,CACL,CAAC;QACF,MAAM,YAAY,GAAG,oBAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEpE,OAAO,YAAY,CAAC;IACxB,CAAC;IAED;;;OAGG;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,mEAAkC,EAClC,iCAAe,EACf,UAAU,EACV,EAAE,CACL,CAAC;QACF,0CAA0C;QAC1C,OAAO,GAAG,GAAG,IAAK,CAAC;IACvB,CAAC;CACJ;AA3CD,8DA2CC"}
+{"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":";;;;;;AAAA,gEAAqC;AACrC,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;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,oBAAoB,CACpC,SAAwC,EACxC,OAAsC;QAEtC,IAAI;YACA,IAAI,SAAS,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS,EAAE;gBACpD,OAAO,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;aAC3B;YAED,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,SAAS,CAAC,CAAC;YACvF,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAG5C,IAAA,4DAA+B,EAAC,OAAO,CAAC,EAAE,6BAAU,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;YAC/E,MAAM,EAAE,uBAAuB,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC;YAExD,MAAM,mBAAmB,GAAG,MAAM,mBAAU,CAAC,WAAW,CAAC;gBACrD,OAAO,EAAE,uBAAuB;gBAChC,UAAU,EAAE,iCAAe,CAAC,SAAS;aACxC,CAAC,CAAC;YACH,MAAM,UAAU,GAAG,oBAAQ,CAAC,OAAO,CAC/B,cAAc,IAAI,CAAC,EACnB,mBAAmB,CAAC,QAAQ,CAC/B,CAAC,YAAY,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,0BAA0B,GAAG,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAEzE,OAAO,0BAA0B,CAAC;SACrC;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAED;;OAEG;IACI,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,UAAU,EACV,EAAE,CACL,CAAC;YACF,0CAA0C;YAC1C,OAAO,GAAG,GAAG,IAAK,CAAC;SACtB;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,IAAI,CAAC;SACf;IACL,CAAC;CACJ;AAvED,8DAuEC"}

package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/calculate-rates.d.ts

@@ -0,0 +1,3 @@
+import { PriceToken, PriceTokenAmount } from '../../../../../../common/tokens';
+import { EvmBlockchainName } from '../../../../../../core/blockchain/models/blockchain-name';
+export declare const calculateRates: (from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, slippage: number) => Promise<string>;